Date: Sat, 19 Jun 2004 02:33:41 +0800 (CST) From: Yen-Ming Lee <leeym@utopia.leeym.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/68086: fix port: textproc/p5-Pod* Message-ID: <20040618183341.136753EB2C0@utopia.leeym.com> Resent-Message-ID: <200406181840.i5IIeNxT039005@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 68086
>Category: ports
>Synopsis: fix port: textproc/p5-Pod*
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 18 18:40:23 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Yen-Ming Lee
>Release: FreeBSD 5.2.1-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD utopia.leeym.com 5.2.1-RELEASE-p8 FreeBSD 5.2.1-RELEASE-p8 #105: Sat May 29 05:19:25 CST 2004 root@utopia.leeym.com:/usr/obj/usr/src/sys/UTOPIA i386
>Description:
p5-podlators and p5-PodParser conflict with perl 5.6 or above.
They should be conditional dependency when PERL_LEVEL < 500601.
Originally I want to add "CONFLICTS= perl-5.6.* perl-5.8.*" in p5-podlators
and p5-PodParser, however it may break some ports immediately. So I remove
the CONFLICTS knobs.
>How-To-Repeat:
>Fix:
--- pod.diff begins here ---
Index: p5-Pod-Constants/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/p5-Pod-Constants/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- p5-Pod-Constants/Makefile 24 Oct 2003 12:04:01 -0000 1.3
+++ p5-Pod-Constants/Makefile 18 Jun 2004 18:26:42 -0000
@@ -7,6 +7,7 @@
PORTNAME= Pod-Constants
PORTVERSION= 0.15
+PORTREVISION= 1
CATEGORIES= textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ../../authors/id/S/SA/SAMV
@@ -15,12 +16,15 @@
MAINTAINER= skv@FreeBSD.org
COMMENT= Include constants from POD
-BUILD_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
PERL_CONFIGURE= yes
MAN3= Pod::Constants.3
-MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500601
+BUILD_DEPENDS+= ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+RUN_DEPENDS+= ${BUILD_DEPENDS}
+.endif
+
+.include <bsd.port.post.mk>
Index: p5-Pod-Stripper/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/p5-Pod-Stripper/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- p5-Pod-Stripper/Makefile 18 Nov 2003 16:00:54 -0000 1.1
+++ p5-Pod-Stripper/Makefile 18 Jun 2004 18:26:42 -0000
@@ -7,6 +7,7 @@
PORTNAME= Pod-Stripper
PORTVERSION= 0.22
+PORTREVISION= 1
CATEGORIES= textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Pod
@@ -15,17 +16,21 @@
MAINTAINER= skv@FreeBSD.org
COMMENT= Strip all pod, and output what's left
-BUILD_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
PERL_CONFIGURE= yes
-CONFIGURE_ARGS+= INSTALLDIRS="site"
+CONFIGURE_ARGS= INSTALLDIRS="site"
MAN1= podstrip.1
MAN3= Pod::Stripper.3
-MAN1PREFIX= ${PREFIX}
post-patch:
@${FIND} ${WRKSRC} -type f|${XARGS} ${PERL} -pi -e 's/\x0d(?=\x0a)//;'
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500601
+BUILD_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+RUN_DEPENDS+= ${BUILD_DEPENDS}
+
+.endif
+
+.include <bsd.port.post.mk>
Index: p5-PodParser/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/p5-PodParser/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- p5-PodParser/Makefile 11 May 2004 09:48:55 -0000 1.10
+++ p5-PodParser/Makefile 18 Jun 2004 18:26:42 -0000
@@ -16,13 +16,12 @@
COMMENT= Modules to work with POD (Plain Old Documentation)
PERL_CONFIGURE= yes
-CONFIGURE_ARGS+= INSTALLDIRS="site"
+CONFIGURE_ARGS= INSTALLDIRS="site"
MAN1= pod2usage.1 podchecker.1 podselect.1
MAN3= Pod::Checker.3 Pod::Find.3 Pod::InputObjects.3 \
Pod::ParseUtils.3 Pod::Parser.3 Pod::PlainText.3 Pod::Select.3 \
Pod::Usage.3
-MAN1PREFIX= ${PREFIX}
post-patch:
@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
@@ -30,8 +29,8 @@
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS= ${BUILD_DEPENDS}
+BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS+= ${BUILD_DEPENDS}
.endif
.include <bsd.port.post.mk>
Index: p5-podlators/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/p5-podlators/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- p5-podlators/Makefile 9 Aug 2003 12:01:33 -0000 1.4
+++ p5-podlators/Makefile 18 Jun 2004 18:26:42 -0000
@@ -7,6 +7,7 @@
PORTNAME= podlators
PORTVERSION= 1.27
+PORTREVISION= 1
CATEGORIES= textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Pod
@@ -15,9 +16,6 @@
MAINTAINER= skv@FreeBSD.org
COMMENT= Modules to convert and parse POD (Plain Old Documentation)
-RUN_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
-BUILD_DEPENDS= ${RUN_DEPENDS}
-
PERL_CONFIGURE= yes
CONFIGURE_ARGS= INSTALLDIRS=site
@@ -29,6 +27,7 @@
.if ${PERL_LEVEL} < 500601
RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+ ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser \
${SITE_PERL}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor
.endif
--- pod.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040618183341.136753EB2C0>