Date: Thu, 22 Jan 2009 01:17:16 +0300 (MSK) From: Vladimir Timofeev <vovkasm@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: perl@FreeBSD.org Subject: ports/130842: [PATCH] devel/p5-Test-Harness: install prove script without conflict with core perl Message-ID: <200901212217.n0LMHGMj005108@zoo.rambler.ru> Resent-Message-ID: <200901212220.n0LMK2SU054210@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 130842
>Category: ports
>Synopsis: [PATCH] devel/p5-Test-Harness: install prove script without conflict with core perl
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 21 22:20:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Vladimir Timofeev
>Release: FreeBSD 6.2-RELEASE-p1 amd64
>Organization:
>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 <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
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 ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901212217.n0LMHGMj005108>