From leeym@utopia.leeym.com  Sun Aug  8 20:04:01 2004
Return-Path: <leeym@utopia.leeym.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 3216516A4CE; Sun,  8 Aug 2004 20:04:01 +0000 (GMT)
Received: from utopia.leeym.com (utopia.leeym.com [211.21.137.52])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 45C1D43D49; Sun,  8 Aug 2004 20:04:00 +0000 (GMT)
	(envelope-from leeym@utopia.leeym.com)
Received: from localhost (localhost [127.0.0.1])
	by utopia.leeym.com (Postfix) with ESMTP id D01243E9B28;
	Mon,  9 Aug 2004 04:03:55 +0800 (CST)
Received: from utopia.leeym.com ([127.0.0.1])
 by localhost (utopia.leeym.com [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 05709-07; Mon,  9 Aug 2004 04:02:14 +0800 (CST)
Received: by utopia.leeym.com (Postfix, from userid 1000)
	id 7F1ED3EA789; Mon,  9 Aug 2004 04:01:46 +0800 (CST)
Message-Id: <20040808200146.7F1ED3EA789@utopia.leeym.com>
Date: Mon,  9 Aug 2004 04:01:46 +0800 (CST)
From: Yen-Ming Lee <leeym@utopia.leeym.com>
Reply-To: Yen-Ming Lee <leeym@utopia.leeym.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: skv@FreeBSD.org, mat@FreeBSD.org
Subject: fix port: textproc/p5-Pod* again (updated)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         70185
>Category:       ports
>Synopsis:       fix port: textproc/p5-Pod* again (updated)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    skv
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 08 20:10:36 GMT 2004
>Closed-Date:    Tue Aug 10 19:01:59 GMT 2004
>Last-Modified:  Tue Aug 10 19:01:59 GMT 2004
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD utopia.leeym.com 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #167: Tue Jul 27 05:17:58 CST 2004 root@utopia.leeym.com:/usr/obj/usr/src/sys/UTOPIA i386


	
>Description:

* use PERL instead of REINPLACE_CMD (obsolete ports/70181)

- backout the commits in ports/68086, choose alternative instead
- remove CONFLICT knobs
- not to install scripts and related manpages under perl 5.6 or above
- bump PORTREVISION

>How-To-Repeat:
	
>Fix:

	

--- pod.diff begins here ---
Index: p5-PodParser/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/p5-PodParser/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- p5-PodParser/Makefile	5 Aug 2004 01:10:27 -0000	1.11
+++ p5-PodParser/Makefile	8 Aug 2004 19:57:17 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	PodParser
 PORTVERSION=	1.28
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Pod
@@ -23,16 +24,20 @@
 		Pod::ParseUtils.3 Pod::Parser.3 Pod::PlainText.3 Pod::Select.3 \
 		Pod::Usage.3
 
-CONFLICTS=	perl-5.6.* perl-5.8.*
-
-post-patch:
-	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
-
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500601
+.if ${PERL_LEVEL} < 500600
 BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
 RUN_DEPENDS+=	${BUILD_DEPENDS}
+.else
+.undef		MAN1
+PLIST_SUB+=	PL_FILES="@comment "
 .endif
+
+post-patch:
+.if ${PERL_LEVEL} > 500600
+	@${PERL} -pi -e 'm,_FILES, && s,.,,sg' ${WRKSRC}/Makefile.PL
+.endif
+	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
 
 .include <bsd.port.post.mk>
Index: p5-PodParser/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/textproc/p5-PodParser/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- p5-PodParser/pkg-plist	12 Feb 2003 12:13:58 -0000	1.2
+++ p5-PodParser/pkg-plist	8 Aug 2004 19:57:17 -0000
@@ -1,6 +1,6 @@
-bin/pod2usage
-bin/podchecker
-bin/podselect
+%%PL_FILES%%bin/pod2usage
+%%PL_FILES%%bin/podchecker
+%%PL_FILES%%bin/podselect
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Parser/.packlist
 %%SITE_PERL%%/Pod/Checker.pm
 %%SITE_PERL%%/Pod/Find.pm
Index: p5-podlators/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/p5-podlators/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- p5-podlators/Makefile	5 Aug 2004 01:10:27 -0000	1.5
+++ p5-podlators/Makefile	8 Aug 2004 19:57:17 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	podlators
 PORTVERSION=	1.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Pod
@@ -16,6 +16,9 @@
 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
 
@@ -23,14 +26,17 @@
 MAN3=		Pod::Man.3 Pod::ParseLink.3 Pod::Text.3 Pod::Text::Color.3 \
 		Pod::Text::Overstrike.3 Pod::Text::Termcap.3
 
-CONFLICTS=	perl-5.6.* perl-5.8.*
-
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500601
+.if ${PERL_LEVEL} < 500600
 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
+.else
+.undef MAN1
+PLIST_SUB+=	PL_FILES="@comment "
+
+post-patch:
+	@${PERL} -pi -e 'm,pod2man|pod2text, && s,.,,sg' ${WRKSRC}/Makefile.PL
 .endif
 
 .include <bsd.port.post.mk>
Index: p5-podlators/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/textproc/p5-podlators/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- p5-podlators/pkg-plist	11 Feb 2003 13:12:26 -0000	1.2
+++ p5-podlators/pkg-plist	8 Aug 2004 19:57:17 -0000
@@ -1,5 +1,5 @@
-bin/pod2man
-bin/pod2text
+%%PL_FILES%%bin/pod2man
+%%PL_FILES%%bin/pod2text
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/.packlist
 %%SITE_PERL%%/Pod/Man.pm
 %%SITE_PERL%%/Pod/ParseLink.pm
Index: p5-Pod-Stripper/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/p5-Pod-Stripper/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- p5-Pod-Stripper/Makefile	5 Aug 2004 01:10:26 -0000	1.2
+++ p5-Pod-Stripper/Makefile	8 Aug 2004 19:57:17 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	Pod-Stripper
 PORTVERSION=	0.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Pod
@@ -16,6 +16,9 @@
 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"
 
@@ -25,12 +28,4 @@
 post-patch:
 	@${FIND} ${WRKSRC} -type f|${XARGS} ${PERL} -pi -e 's/\x0d(?=\x0a)//;'
 
-.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>
+.include <bsd.port.mk>
Index: p5-Pod-Constants/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/p5-Pod-Constants/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- p5-Pod-Constants/Makefile	5 Aug 2004 01:10:27 -0000	1.4
+++ p5-Pod-Constants/Makefile	8 Aug 2004 19:57:17 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	Pod-Constants
 PORTVERSION=	0.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/S/SA/SAMV
@@ -16,15 +16,11 @@
 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
 
-.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>
+.include <bsd.port.mk>
--- pod.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->skv 
Responsible-Changed-By: leeym 
Responsible-Changed-When: Sun Aug 8 20:29:16 GMT 2004 
Responsible-Changed-Why:  
Over to the maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=70185 
State-Changed-From-To: open->closed 
State-Changed-By: skv 
State-Changed-When: Tue Aug 10 19:01:39 GMT 2004 
State-Changed-Why:  
Committed with changes. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=70185 
>Unformatted:
