From owner-svn-ports-all@freebsd.org Mon Aug 15 16:08:28 2016 Return-Path: Delivered-To: svn-ports-all@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 CCBF1BBB2BB; Mon, 15 Aug 2016 16:08:28 +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 9CC591F04; Mon, 15 Aug 2016 16:08:28 +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 u7FG8RTL023738; Mon, 15 Aug 2016 16:08:27 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7FG8RPW023736; Mon, 15 Aug 2016 16:08:27 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201608151608.u7FG8RPW023736@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Mon, 15 Aug 2016 16:08:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420248 - in head/textproc: libtext-charwidth-perl p5-Text-CharWidth X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Aug 2016 16:08:28 -0000 Author: pawel Date: Mon Aug 15 16:08:27 2016 New Revision: 420248 URL: https://svnweb.freebsd.org/changeset/ports/420248 Log: Register conflict, both ports install exact same files Modified: head/textproc/libtext-charwidth-perl/Makefile head/textproc/p5-Text-CharWidth/Makefile Modified: head/textproc/libtext-charwidth-perl/Makefile ============================================================================== --- head/textproc/libtext-charwidth-perl/Makefile Mon Aug 15 16:07:45 2016 (r420247) +++ head/textproc/libtext-charwidth-perl/Makefile Mon Aug 15 16:08:27 2016 (r420248) @@ -16,6 +16,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER USES= perl5 tar:bz2 USE_PERL5= configure +CONFLICTS_INSTALL= p5-Text-CharWidth-[0-9]* + post-extract: @${MV} ${WRKSRC}.orig ${WRKSRC} Modified: head/textproc/p5-Text-CharWidth/Makefile ============================================================================== --- head/textproc/p5-Text-CharWidth/Makefile Mon Aug 15 16:07:45 2016 (r420247) +++ head/textproc/p5-Text-CharWidth/Makefile Mon Aug 15 16:08:27 2016 (r420248) @@ -14,4 +14,6 @@ COMMENT= Get number of occupied columns USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= libtext-charwidth-perl-[0-9]* + .include