Register net/fsbclient and cad/alliance conflict.

Reported by: rodrigo
2017-10-05 01:54:56 +00:00
parent 9287384691
commit 6198309bba
2 changed files with 3 additions and 0 deletions
--- a/cad/alliance/Makefile
+++ b/cad/alliance/Makefile
@@ -19,6 +19,8 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

 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
--- a/net/fspclient/Makefile
+++ b/net/fspclient/Makefile
@@ -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}