diff options
| author | cy <cy@FreeBSD.org> | 2017-10-05 09:54:56 +0800 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2017-10-05 09:54:56 +0800 |
| commit | cb08f2c394af58bb89771b7deb071894224eb26a (patch) | |
| tree | 95f63f1e5b1f7e4bef125696f6f7e0501f784ea5 | |
| parent | a3ba5e66d469c2159d92201563e94ec0047f85cc (diff) | |
| download | freebsd-ports-gnome-cb08f2c394af58bb89771b7deb071894224eb26a.tar.gz freebsd-ports-gnome-cb08f2c394af58bb89771b7deb071894224eb26a.tar.zst freebsd-ports-gnome-cb08f2c394af58bb89771b7deb071894224eb26a.zip | |
Register net/fsbclient and cad/alliance conflict.
Reported by: rodrigo
| -rw-r--r-- | cad/alliance/Makefile | 2 | ||||
| -rw-r--r-- | net/fspclient/Makefile | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile index b1ee0d31b395..6bdf43bc2e87 100644 --- 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 diff --git a/net/fspclient/Makefile b/net/fspclient/Makefile index 35118d02fd9e..d27cbab9eaa1 100644 --- 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} |