From owner-freebsd-perl@FreeBSD.ORG Wed Jan 21 22:35:19 2009 Return-Path: Delivered-To: perl@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87EA21065673 for ; Wed, 21 Jan 2009 22:35:19 +0000 (UTC) (envelope-from vovkasm@zoo.rambler.ru) Received: from zoo.rambler.ru (zoo.rambler.ru [81.19.67.44]) by mx1.freebsd.org (Postfix) with ESMTP id F0F868FC29 for ; Wed, 21 Jan 2009 22:35:18 +0000 (UTC) (envelope-from vovkasm@zoo.rambler.ru) Received: from zoo.rambler.ru (localhost [127.0.0.1]) by zoo.rambler.ru (8.13.8/8.13.8) with ESMTP id n0LMHGKO005109; Thu, 22 Jan 2009 01:17:16 +0300 (MSK) (envelope-from vovkasm@zoo.rambler.ru) Received: (from vovkasm@localhost) by zoo.rambler.ru (8.13.8/8.13.8/Submit) id n0LMHGMj005108; Thu, 22 Jan 2009 01:17:16 +0300 (MSK) (envelope-from vovkasm) Date: Thu, 22 Jan 2009 01:17:16 +0300 (MSK) Message-Id: <200901212217.n0LMHGMj005108@zoo.rambler.ru> To: FreeBSD-gnats-submit@freebsd.org From: Vladimir Timofeev X-send-pr-version: 3.113 X-GNATS-Notify: Cc: perl@freebsd.org Subject: [PATCH] devel/p5-Test-Harness: install prove script without conflict with core perl X-BeenThere: freebsd-perl@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: maintainer of a number of perl-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jan 2009 22:35:20 -0000 >Submitter-Id: current-users >Originator: Vladimir Timofeev >Organization: >Confidential: no >Synopsis: [PATCH] devel/p5-Test-Harness: install prove script without conflict with core perl >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 6.2-RELEASE-p1 amd64 >Environment: System: FreeBSD zoo.rambler.ru 6.2-RELEASE-p1 FreeBSD 6.2-RELEASE-p1 #1: Thu Feb 15 17:00:27 MSK 2007 >Description: This patch install bin/prove script as bin/p5prove for perl-5.8 and bin/prove for older perls. This allow to us using new prove's functions, for ex. colorized output, and saved states Idea from devel/p5-Module-CoreList. Port maintainer (perl@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- p5-Test-Harness-3.14_2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/p5-Test-Harness/Makefile,v retrieving revision 1.37 diff -u -r1.37 Makefile --- Makefile 15 Jan 2009 12:07:14 -0000 1.37 +++ Makefile 21 Jan 2009 22:07:19 -0000 @@ -7,7 +7,7 @@ PORTNAME= Test-Harness PORTVERSION= 3.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -17,7 +17,6 @@ PERL_CONFIGURE= yes -MAN1= prove.1 MAN3= App::Prove.3 \ App::Prove::State.3 \ App::Prove::State::Result.3 \ @@ -62,21 +61,18 @@ .include .if ${PERL_LEVEL} >= 500800 -.undef MAN1 -PLIST_SUB+= PL_FILES="@comment " +PLIST_SUB= P5_PREFIX="p5" +MAN1= p5prove.1 pre-patch: - @${PERL} -pi -e "s,'bin/prove',," ${WRKSRC}/Makefile.PL + @${MV} ${WRKSRC}/bin/prove ${WRKSRC}/bin/p5prove + @${PERL} -pi -e "s,^bin/prove$$,bin/p5prove," ${WRKSRC}/MANIFEST + @${PERL} -pi -e "s,'bin/prove','bin/p5prove'," ${WRKSRC}/Makefile.PL .else -PLIST_SUB+= PL_FILES="" +MAN1= prove.1 +PLIST_SUB= P5_PREFIX="" .endif post-patch: @${REINPLACE_CMD} -e '/INSTALLDIRS/d' ${WRKSRC}/${CONFIGURE_SCRIPT} -post-configure: -.if ${PERL_LEVEL} >= 500800 - @${REINPLACE_CMD} -E -e '/(DESTINSTALLSITEMAN1DIR|DESTINSTALLSCRIPT)/d' \ - ${WRKSRC}/${MAKEFILE} -.endif - .include Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/devel/p5-Test-Harness/pkg-plist,v retrieving revision 1.16 diff -u -r1.16 pkg-plist --- pkg-plist 23 Sep 2008 12:18:49 -0000 1.16 +++ pkg-plist 21 Jan 2009 22:07:19 -0000 @@ -1,4 +1,4 @@ -%%PL_FILES%%bin/prove +bin/%%P5_PREFIX%%prove %%SITE_PERL%%/App/Prove.pm %%SITE_PERL%%/App/Prove/State.pm %%SITE_PERL%%/App/Prove/State/Result.pm --- p5-Test-Harness-3.14_2.patch ends here ---