aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpawel <pawel@FreeBSD.org>2017-12-02 06:12:15 +0800
committerpawel <pawel@FreeBSD.org>2017-12-02 06:12:15 +0800
commit5029b8e419abcceb8f97a94b34b58176d88c6382 (patch)
tree1e2ba43920fcb84a698f4f9352c711a214aa9a96
parentaa64c134e83adcc4d1d3e098a5ce7b0876e9ba98 (diff)
downloadfreebsd-ports-gnome-5029b8e419abcceb8f97a94b34b58176d88c6382.tar.gz
freebsd-ports-gnome-5029b8e419abcceb8f97a94b34b58176d88c6382.tar.zst
freebsd-ports-gnome-5029b8e419abcceb8f97a94b34b58176d88c6382.zip
Register conflict
-rw-r--r--mail/popular/Makefile1
-rw-r--r--ports-mgmt/ports-tools/Makefile2
2 files changed, 3 insertions, 0 deletions
diff --git a/mail/popular/Makefile b/mail/popular/Makefile
index b9c8fa1e9eda..e3c2428ccd7b 100644
--- a/mail/popular/Makefile
+++ b/mail/popular/Makefile
@@ -13,6 +13,7 @@ COMMENT= Suite of programs for setting up large POP3 server systems
BUILD_DEPENDS= p5-XML-DOM>=0:textproc/p5-XML-DOM
CONFLICTS= pserv-[0-9]* synce-librapi2-[0-9]*
+CONFLICTS_INSTALL= ports-tools # bin/pcheck
USES= libtool perl5 gmake tar:bzip2 ssl
GNU_CONFIGURE= yes
diff --git a/ports-mgmt/ports-tools/Makefile b/ports-mgmt/ports-tools/Makefile
index bd988517d130..612fffcba297 100644
--- a/ports-mgmt/ports-tools/Makefile
+++ b/ports-mgmt/ports-tools/Makefile
@@ -11,6 +11,8 @@ COMMENT= Collection of ports tree related scripts
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
+CONFLICTS_INSTALL= popular # bin/pcheck
+
USE_GITHUB= yes
GH_ACCOUNT= ppekala