svn commit: r455315 - in head: mail/popular ports-mgmt/ports-tools

[Pawel Pekala]

Author: pawel
Date: Fri Dec  1 22:12:15 2017
New Revision: 455315
URL: https://svnweb.freebsd.org/changeset/ports/455315

Log:
  Register conflict

Modified:
  head/mail/popular/Makefile
  head/ports-mgmt/ports-tools/Makefile

Modified: head/mail/popular/Makefile
==============================================================================
--- head/mail/popular/Makefile	Fri Dec  1 22:09:52 2017	(r455314)
+++ head/mail/popular/Makefile	Fri Dec  1 22:12:15 2017	(r455315)
@@ -13,6 +13,7 @@ COMMENT=	Suite of programs for setting up large POP3 s
 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

Modified: head/ports-mgmt/ports-tools/Makefile
==============================================================================
--- head/ports-mgmt/ports-tools/Makefile	Fri Dec  1 22:09:52 2017	(r455314)
+++ head/ports-mgmt/ports-tools/Makefile	Fri Dec  1 22:12:15 2017	(r455315)
@@ -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