From owner-svn-ports-all@freebsd.org  Thu Oct  5 01:54:57 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE43FE27A20;
 Thu,  5 Oct 2017 01:54:57 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AD3CC7E6FB;
 Thu,  5 Oct 2017 01:54:57 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v951suAW072753;
 Thu, 5 Oct 2017 01:54:56 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v951suP9072751;
 Thu, 5 Oct 2017 01:54:56 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201710050154.v951suP9072751@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Thu, 5 Oct 2017 01:54:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r451257 - in head: cad/alliance net/fspclient
X-SVN-Group: ports-head
X-SVN-Commit-Author: cy
X-SVN-Commit-Paths: in head: cad/alliance net/fspclient
X-SVN-Commit-Revision: 451257
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Oct 2017 01:54:58 -0000

Author: cy
Date: Thu Oct  5 01:54:56 2017
New Revision: 451257
URL: https://svnweb.freebsd.org/changeset/ports/451257

Log:
  Register net/fsbclient and cad/alliance conflict.
  
  Reported by:	rodrigo

Modified:
  head/cad/alliance/Makefile   (contents, props changed)
  head/net/fspclient/Makefile   (contents, props changed)

Modified: head/cad/alliance/Makefile
==============================================================================
--- head/cad/alliance/Makefile	Thu Oct  5 01:54:46 2017	(r451256)
+++ head/cad/alliance/Makefile	Thu Oct  5 01:54:56 2017	(r451257)
@@ -19,6 +19,8 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-se
 
 BROKEN_aarch64=		fails to link: collect2: error: ld returned 1 exit status
 
+CONFLICTS_INSTALL=	fspclient-*
+
 WRKSRC=		${WRKDIR}/alliance-5.0
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message

Modified: head/net/fspclient/Makefile
==============================================================================
--- head/net/fspclient/Makefile	Thu Oct  5 01:54:46 2017	(r451256)
+++ head/net/fspclient/Makefile	Thu Oct  5 01:54:56 2017	(r451257)
@@ -9,6 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Ftp-like client for the FSP service
 
+CONFLICTS_INSTALL=	alliance-*
 USES=		tar:bzip2 scons
 MAKE_ARGS=	prefix=${PREFIX}