Fixing PLIST by removing '*.orig' relics from patch stage

16 files changed, 70 insertions, 39 deletions

diff --git a/devel/p5-Data-ShowTable/Makefile b/devel/p5-Data-ShowTable/Makefile
index 3706c9d8075..9eec59fa174 100644
--- a/devel/p5-Data-ShowTable/Makefile
+++ b/devel/p5-Data-ShowTable/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2008/10/19 19:17:51 he Exp $
+# $NetBSD: Makefile,v 1.16 2010/02/16 15:22:44 sno Exp $
 #
 
 DISTNAME=		Data-ShowTable-3.3
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		4
+PKGREVISION=		5
 SVR4_PKGNAME=		p5dst
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Data/}
@@ -17,5 +17,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 PERL5_PACKLIST=		auto/Data/ShowTable/.packlist
 REPLACE_PERL+=		showtable
 
+pre-configure:
+	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-ExtUtils-MakeMaker/Makefile b/devel/p5-ExtUtils-MakeMaker/Makefile
index 6edcd355ad8..6557b73090c 100644
--- a/devel/p5-ExtUtils-MakeMaker/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2010/01/16 15:11:22 sno Exp $
+# $NetBSD: Makefile,v 1.15 2010/02/16 15:22:44 sno Exp $
 #
 
 DISTNAME=	ExtUtils-MakeMaker-6.56
@@ -17,7 +17,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 PERL5_PACKLIST=	auto/ExtUtils/MakeMaker/.packlist
 
 pre-configure:
-	cd ${WRKSRC} && find `pwd` -name "*.orig" -type f | xargs rm
+	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Template-Plugin-VMethods/Makefile b/devel/p5-Template-Plugin-VMethods/Makefile
index 443c2b02ff6..0641dc2be3b 100644
--- a/devel/p5-Template-Plugin-VMethods/Makefile
+++ b/devel/p5-Template-Plugin-VMethods/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/08/26 19:42:56 sno Exp $
+# $NetBSD: Makefile,v 1.3 2010/02/16 15:22:44 sno Exp $
 #
 
 DISTNAME=	Template-Plugin-VMethods-0.03
@@ -19,7 +19,7 @@ DEPENDS+=	p5-Template-Toolkit>=2.06:../../www/p5-Template-Toolkit
 PERL5_PACKLIST=		auto/Template/Plugin/VMethods/.packlist
 
 pre-configure:
-	cd ${WRKSRC} && find `pwd` -name "*.orig" -type f | xargs rm
+	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Tie-File/Makefile b/devel/p5-Tie-File/Makefile
index 4896c1d111d..e26c8e5face 100644
--- a/devel/p5-Tie-File/Makefile
+++ b/devel/p5-Tie-File/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/12/18 00:20:10 he Exp $
+# $NetBSD: Makefile,v 1.4 2010/02/16 15:22:44 sno Exp $
 #
 
 DISTNAME=	Tie-File-0.96
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 SVR4_PKGNAME=	p5tfi
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Tie/}
@@ -17,5 +17,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PERL5_PACKLIST=		auto/Tie/File/.packlist
 
+pre-configure:
+	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/p5-Padre-Plugin-Vi/Makefile b/editors/p5-Padre-Plugin-Vi/Makefile
index a1db5a2d95c..7f0205d7ada 100644
--- a/editors/p5-Padre-Plugin-Vi/Makefile
+++ b/editors/p5-Padre-Plugin-Vi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/01/16 18:32:32 sno Exp $
+# $NetBSD: Makefile,v 1.2 2010/02/16 15:22:45 sno Exp $
 #
 
 DISTNAME=	Padre-Plugin-Vi-0.22
@@ -19,7 +19,7 @@ PERL5_PACKLIST=		auto/Padre/Plugin/Vi/.packlist
 PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 pre-configure:
-	cd ${WRKSRC} && find `pwd` -name "*.orig" -type f | xargs rm
+	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-Ezmlm/Makefile b/mail/p5-Mail-Ezmlm/Makefile
index 5a9c6e01de0..85b2cfd2827 100644
--- a/mail/p5-Mail-Ezmlm/Makefile
+++ b/mail/p5-Mail-Ezmlm/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2008/10/19 19:18:12 he Exp $
+# $NetBSD: Makefile,v 1.7 2010/02/16 15:22:45 sno Exp $
 #
 
 DISTNAME=		Ezmlm-0.07.2
 PKGNAME=		p5-Mail-${DISTNAME}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		mail perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Mail/}
 
@@ -29,5 +29,8 @@ PERL5_PACKLIST=		auto/Mail/Ezmlm/.packlist
 
 BUILD_DEFS+=		QMAILDIR
 
+pre-configure:
+	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-Net-Ident/Makefile b/net/p5-Net-Ident/Makefile
index a1a73ae0c25..f21750324a0 100644
--- a/net/p5-Net-Ident/Makefile
+++ b/net/p5-Net-Ident/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2010/02/13 22:18:24 heinz Exp $
+# $NetBSD: Makefile,v 1.6 2010/02/16 15:22:45 sno Exp $
 #
 
 DISTNAME=		Net-Ident-1.20
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		2
+PKGREVISION=		3
 SVR4_PKGNAME=		p5nid
 CATEGORIES=		net perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Net/}
@@ -20,5 +20,8 @@ USE_LANGUAGES=		#empty
 
 PERL5_PACKLIST=		auto/Net/Ident/.packlist
 
+pre-configure:
+	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-eBay-API/Makefile b/net/p5-eBay-API/Makefile
index 55605489015..5b0f426c751 100644
--- a/net/p5-eBay-API/Makefile
+++ b/net/p5-eBay-API/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/01/08 12:57:17 sno Exp $
+# $NetBSD: Makefile,v 1.5 2010/02/16 15:22:45 sno Exp $
 
 DISTNAME=		eBay-API-0.25
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		net perl5 www
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=../../authors/id/T/TK/TKEEFER/}
 
@@ -34,5 +34,8 @@ REPLACE_PERL+=	*/*/*/*/*/*/*/*.pm
 
 PERL5_PACKLIST=		auto/eBay/API/.packlist
 
+pre-configure:
+	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-ispman/Makefile b/net/p5-ispman/Makefile
index 051fa5dbfe8..ec5e21c6055 100644
--- a/net/p5-ispman/Makefile
+++ b/net/p5-ispman/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2008/10/19 19:18:31 he Exp $
+# $NetBSD: Makefile,v 1.22 2010/02/16 15:22:45 sno Exp $
 #
 
 DISTNAME=		ispman-0.5
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		4
+PKGREVISION=		5
 SVR4_PKGNAME=		p5isp
 CATEGORIES=		net perl5
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ispman/}
@@ -35,6 +35,9 @@ SUBST_STAGE.etc-fix=	pre-configure
 SUBST_FILES.etc-fix=	ISPMan/*
 SUBST_SED.etc-fix=	-e 's:/etc:${PREFIX}/etc:g'
 
+pre-configure:
+	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/IO-stringy-1.212_patched/lib/IO/Scalar.pm \
 		${DESTDIR}${PERL5_INSTALLVENDORLIB}/IO/ScalarPatched.pm
diff --git a/textproc/p5-Text-WrapI18N/Makefile b/textproc/p5-Text-WrapI18N/Makefile
index 1b20c84e4a4..e5b50fcb8ab 100644
--- a/textproc/p5-Text-WrapI18N/Makefile
+++ b/textproc/p5-Text-WrapI18N/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/01/02 21:45:45 he Exp $
+# $NetBSD: Makefile,v 1.7 2010/02/16 15:22:45 sno Exp $
 
 DISTNAME=	Text-WrapI18N-0.06
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Text/}
 
@@ -17,5 +17,8 @@ DEPENDS+=	p5-Text-CharWidth-[0-9]*:../../textproc/p5-Text-CharWidth
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Text/WrapI18N/.packlist
 
+pre-configure:
+	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index aee64b5f044..c4ea0f0a324 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2010/01/18 09:59:32 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2010/02/16 15:22:45 sno Exp $
 #
 
 DISTNAME=	Apache-Gallery-0.9.1
@@ -72,7 +72,7 @@ post-patch:
 	    ${WRKSRC}/htdocs/gallery-new.css
 
 pre-configure:
-	@${RM} -f ${WRKSRC}/lib/Apache/Gallery.pm.orig
+	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
 
 post-build:
 	@for j in default new; \
diff --git a/www/p5-CGI-Kwiki/Makefile b/www/p5-CGI-Kwiki/Makefile
index 06c7467dc5f..a8aaa4b7e0e 100644
--- a/www/p5-CGI-Kwiki/Makefile
+++ b/www/p5-CGI-Kwiki/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.10 2008/10/19 19:19:07 he Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/16 15:22:45 sno Exp $
 #
 
 DISTNAME=	CGI-Kwiki-0.18
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=		3
-SVR4_PKGNAME=		p5ckw
-CATEGORIES=		www perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=CGI/}
+PKGREVISION=	3
+SVR4_PKGNAME=	p5ckw
+CATEGORIES=	www perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=CGI/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.kwiki.org/
-COMMENT=		Quickie Wiki that's not too Tricky
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.kwiki.org/
+COMMENT=	Quickie Wiki that's not too Tricky
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=		p5-Test-Simple>=0.47:../../devel/p5-Test-Simple
-DEPENDS+=		p5-Locale-Maketext>=1.08:../../misc/p5-Locale-Maketext
+DEPENDS+=	p5-Test-Simple>=0.47:../../devel/p5-Test-Simple
+DEPENDS+=	p5-Locale-Maketext>=1.08:../../misc/p5-Locale-Maketext
 
 PERL5_PACKLIST=		auto/CGI-Kwiki/.packlist
 
diff --git a/www/p5-HTTP-Request-Form/Makefile b/www/p5-HTTP-Request-Form/Makefile
index 14b6c6679d9..7606b6aa7c9 100644
--- a/www/p5-HTTP-Request-Form/Makefile
+++ b/www/p5-HTTP-Request-Form/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2008/10/19 19:19:15 he Exp $
+# $NetBSD: Makefile,v 1.20 2010/02/16 15:22:45 sno Exp $
 #
 
 DISTNAME=	HTTP-Request-Form-0.952
 PKGNAME=	p5-${DISTNAME:S/952/9.5.2/}
-PKGREVISION=	1
+PKGREVISION=	2
 SVR4_PKGNAME=	p5htt
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=HTTP/}
@@ -20,5 +20,8 @@ DEPENDS+=	p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
 
 PERL5_PACKLIST=		auto/HTTP/Request/Form/.packlist
 
+pre-configure:
+	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-LWP-Authen-Negotiate/Makefile b/www/p5-LWP-Authen-Negotiate/Makefile
index 19ce32ef927..28e61e3e8b9 100644
--- a/www/p5-LWP-Authen-Negotiate/Makefile
+++ b/www/p5-LWP-Authen-Negotiate/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/11/21 15:03:05 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/02/16 15:22:45 sno Exp $
 
 DISTNAME=	LWP-Authen-Negotiate-0.08
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	perl5 www
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=LWP/}
 
@@ -18,5 +19,8 @@ DEPENDS+=	{perl>=5.10,p5-MIME-Base64>=2.12}:../../converters/p5-MIME-Base64
 
 PERL5_PACKLIST=		auto/LWP/Authen/Negotiate/.packlist
 
+pre-configure:
+	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index e3929dc85da..8d837e5b8e8 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/08/26 17:36:53 sno Exp $
+# $NetBSD: Makefile,v 1.33 2010/02/16 15:22:45 sno Exp $
 #
 
 DISTNAME=	Template-Toolkit-2.22
@@ -26,7 +26,7 @@ MAKE_PARAMS=	TT_ACCEPT=y
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 pre-configure:
-	cd ${WRKSRC} && find `pwd` -name "*.orig" -type f | xargs rm
+	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index 6bf31856cbc..631d6911404 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2010/02/16 15:22:45 sno Exp $
 
 DISTNAME=	Tk-804.028
 PKGNAME=	p5-Tk-804.028
-PKGREVISION=	3
+PKGREVISION=	4
 SVR4_PKGNAME=	p5tk
 CATEGORIES=	x11 tk perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Tk/}
@@ -32,6 +32,9 @@ SUBST_STAGE.prefix=	post-patch
 SUBST_FILES.prefix=	PNG/Makefile.PL
 SUBST_SED.prefix=	-e 's,%%LOCALBASE%%,${LOCALBASE},g'
 
+pre-configure:
+	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
+
 .include "../../lang/perl5/module.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"