From owner-svn-ports-head@FreeBSD.ORG Sat Mar 22 11:53:57 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9A2614A7; Sat, 22 Mar 2014 11:53:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 86E54678; Sat, 22 Mar 2014 11:53:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2MBrvKv084225; Sat, 22 Mar 2014 11:53:57 GMT (envelope-from az@svn.freebsd.org) Received: (from az@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2MBrvqY084223; Sat, 22 Mar 2014 11:53:57 GMT (envelope-from az@svn.freebsd.org) Message-Id: <201403221153.s2MBrvqY084223@svn.freebsd.org> From: Andrej Zverev Date: Sat, 22 Mar 2014 11:53:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348789 - head/devel/p5-ReadLine-Perl X-SVN-Group: ports-head 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.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Mar 2014 11:53:57 -0000 Author: az Date: Sat Mar 22 11:53:56 2014 New Revision: 348789 URL: http://svnweb.freebsd.org/changeset/ports/348789 QAT: https://qat.redports.org/buildarchive/r348789/ Log: - resolve install conflict with devel/p5-ReadLine-Perl-TTYtter - bump portrevision Modified: head/devel/p5-ReadLine-Perl/Makefile head/devel/p5-ReadLine-Perl/pkg-plist Modified: head/devel/p5-ReadLine-Perl/Makefile ============================================================================== --- head/devel/p5-ReadLine-Perl/Makefile Sat Mar 22 11:23:39 2014 (r348788) +++ head/devel/p5-ReadLine-Perl/Makefile Sat Mar 22 11:53:56 2014 (r348789) @@ -3,7 +3,7 @@ PORTNAME= ReadLine-Perl PORTVERSION= 1.0303 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= Term @@ -16,4 +16,9 @@ COMMENT= Perl 5 module for Term::ReadLin USES= perl5 USE_PERL5= configure +post-install: + # this port and devel/p5-ReadLine-Perl-TTYtter both install same file + # teach this port don't install this file and resolve conflict + ${RM} ${STAGEDIR}/${SITE_PERL}/${PERL_ARCH}/auto/Term/ReadLine/.packlist + .include Modified: head/devel/p5-ReadLine-Perl/pkg-plist ============================================================================== --- head/devel/p5-ReadLine-Perl/pkg-plist Sat Mar 22 11:23:39 2014 (r348788) +++ head/devel/p5-ReadLine-Perl/pkg-plist Sat Mar 22 11:53:56 2014 (r348789) @@ -1,6 +1,5 @@ %%SITE_PERL%%/Term/ReadLine/Perl.pm %%SITE_PERL%%/Term/ReadLine/readline.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine/.packlist @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term @dirrmtry %%SITE_PERL%%/Term/ReadLine