From owner-svn-ports-head@freebsd.org  Fri Dec  1 22:12:16 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 B8EC2E6C8E6;
 Fri,  1 Dec 2017 22:12:16 +0000 (UTC)
 (envelope-from pawel@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 84B1D7387B;
 Fri,  1 Dec 2017 22:12:16 +0000 (UTC)
 (envelope-from pawel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB1MCFnD085095;
 Fri, 1 Dec 2017 22:12:15 GMT (envelope-from pawel@FreeBSD.org)
Received: (from pawel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB1MCFSH085093;
 Fri, 1 Dec 2017 22:12:15 GMT (envelope-from pawel@FreeBSD.org)
Message-Id: <201712012212.vB1MCFSH085093@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pawel set sender to
 pawel@FreeBSD.org using -f
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Fri, 1 Dec 2017 22:12:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r455315 - in head: mail/popular ports-mgmt/ports-tools
X-SVN-Group: ports-head
X-SVN-Commit-Author: pawel
X-SVN-Commit-Paths: in head: mail/popular ports-mgmt/ports-tools
X-SVN-Commit-Revision: 455315
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Dec 2017 22:12:16 -0000

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