Convert packages to use PERL5_PACKLIST (part 1). These were the easy

ones to do, and each compiled and installed/de-installed apparently
correctly.

As a side effect of the dynamic PLIST, we no longer need to have separate
-static and -shared PLISTs.  It's now easier than ever to make a perl5
package for NetBSD :)

16 files changed, 27 insertions, 150 deletions

diff --git a/textproc/eperl/Makefile b/textproc/eperl/Makefile
index cbd7fbf7a3f..da71e49c84b 100644
--- a/textproc/eperl/Makefile
+++ b/textproc/eperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/08/24 08:20:44 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/27 07:11:21 jlam Exp $
 #
 
 DISTNAME=	eperl-2.2.14
@@ -12,42 +12,19 @@ BUILD_DEPENDS+=	autoreconf:../../devel/autoconf
 DEPENDS=	libperl-5.*:../../lang/libperl
 
 USE_PERL5=	# defined
-PERL=		${LOCALBASE}/bin/perl
-P5_PACKLIST=	${P5_SITEARCH}/auto/Parse/ePerl/.packlist
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Parse/ePerl/.packlist
 
 GNU_CONFIGURE=	# defined
 ALL_TARGET=	all libeperl.a
 
-PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-
 pre-configure:
 	cd ${WRKSRC} && autoreconf
 
 post-build:
-	cd ${WRKSRC}/mod/Parse && ${PERL} Makefile.PL && ${MAKE}
+	cd ${WRKSRC}/mod/Parse; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+	cd ${WRKSRC}/mod/Parse; ${MAKE_PROGRAM}
 
 post-install:
-	cd ${WRKSRC}/mod/Parse && ${MAKE} install
-	${RM} -f ${PLIST_SRC}
-	${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC}
-	#
-	# Add the installed files to the PLIST.
-	#
-	( ${CAT} ${P5_PACKLIST}; for f in ${P5_PACKLIST}; do echo $$f; done ) \
-		| ${SED} -e "s,/./,/,g" -e "s,${PREFIX}/,," \
-		| sort -u \
-		>> ${PLIST_SRC}
-	#
-	# We're not sure which directories are empty and can be deleted, so
-	# try them all, but ignore failures.
-	#
-	( ${CAT} ${P5_PACKLIST}; for f in ${P5_PACKLIST}; do echo $$f; done ) \
-		| ${SED} -e "s,/./,/,g" -e "s,${PREFIX}/,," \
-			-e "s,^,@unexec rmdir -p %D/," \
-			-e "s,/[^/]*$$, 2>/dev/null || true," \
-		| sort -ur \
-		>> ${PLIST_SRC}
+	cd ${WRKSRC}/mod/Parse; ${MAKE_PROGRAM} install
 
 .include "../../mk/bsd.pkg.mk"
-
-P5_SITEARCH!=	eval `${PERL} -V:installsitearch`; echo $${installsitearch}
diff --git a/textproc/eperl/pkg/PLIST b/textproc/eperl/pkg/PLIST
index 952655cf689..94879fe2a3b 100644
--- a/textproc/eperl/pkg/PLIST
+++ b/textproc/eperl/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/08/24 08:20:44 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/08/27 07:11:21 jlam Exp $
 bin/eperl
 man/man1/eperl.1
 share/eperl/00README
@@ -27,4 +27,3 @@ share/eperl/demo.table.phtml
 share/eperl/demo.text.iphtml
 share/eperl/demo.text.phtml
 @dirrm share/eperl
-@comment The following lines are automatically generated from the .packlist files.
diff --git a/textproc/p5-Convert-ASN1/Makefile b/textproc/p5-Convert-ASN1/Makefile
index bb0d2404766..858c8d41562 100644
--- a/textproc/p5-Convert-ASN1/Makefile
+++ b/textproc/p5-Convert-ASN1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/06/09 14:14:49 kleink Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 07:11:21 jlam Exp $
 #
 
 DISTNAME=	Convert-ASN1-0.07
@@ -8,9 +8,10 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Convert/}
 
 MAINTAINER=	packages@netbsd.org
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Convert/ASN1/.packlist
 
 do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Convert-ASN1/pkg/PLIST b/textproc/p5-Convert-ASN1/pkg/PLIST
index 7a630ea882b..55718e56b9e 100644
--- a/textproc/p5-Convert-ASN1/pkg/PLIST
+++ b/textproc/p5-Convert-ASN1/pkg/PLIST
@@ -1,13 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/06/09 14:14:51 kleink Exp $
-lib/perl5/site_perl/Convert/ASN1/_decode.pm
-lib/perl5/site_perl/Convert/ASN1/_encode.pm
-lib/perl5/site_perl/Convert/ASN1/parser.pm
-lib/perl5/site_perl/Convert/ASN1/Debug.pm
-lib/perl5/site_perl/Convert/ASN1/IO.pm
-lib/perl5/site_perl/Convert/ASN1.pod
-lib/perl5/site_perl/Convert/ASN1.pm
-lib/perl5/man/man3/Convert::ASN1.3
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Convert/ASN1/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Convert/ASN1
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Convert
-@dirrm lib/perl5/site_perl/Convert/ASN1
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:21 jlam Exp $
diff --git a/textproc/p5-Convert-BER/Makefile b/textproc/p5-Convert-BER/Makefile
index b4cb4b8ccd5..86db4eca93b 100644
--- a/textproc/p5-Convert-BER/Makefile
+++ b/textproc/p5-Convert-BER/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/12/28 12:54:00 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/27 07:11:21 jlam Exp $
 #
 
 DISTNAME=	Convert-BER-1.26
@@ -8,9 +8,10 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Convert/}
 
 MAINTAINER=	packages@netbsd.org
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Convert/BER/.packlist
 
 do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Convert-BER/pkg/PLIST b/textproc/p5-Convert-BER/pkg/PLIST
index 71aaaf91786..55718e56b9e 100644
--- a/textproc/p5-Convert-BER/pkg/PLIST
+++ b/textproc/p5-Convert-BER/pkg/PLIST
@@ -1,8 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/12/02 17:02:12 rh Exp $
-lib/perl5/site_perl/Convert/BER.pod
-lib/perl5/site_perl/Convert/BER.pm
-lib/perl5/man/man3/Convert::BER.3
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Convert/BER/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Convert/BER
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Convert
-@dirrm lib/perl5/site_perl/Convert
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:21 jlam Exp $
diff --git a/textproc/p5-Filter/Makefile b/textproc/p5-Filter/Makefile
index 1d499c4280a..6b615e28d0e 100644
--- a/textproc/p5-Filter/Makefile
+++ b/textproc/p5-Filter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/12/28 12:54:55 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/27 07:11:22 jlam Exp $
 #
 
 DISTNAME=	Filter-1.16
@@ -8,9 +8,10 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Filter/}
 
 MAINTAINER=	packages@netbsd.org
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Filter/.packlist
 
 do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Filter/pkg/PLIST b/textproc/p5-Filter/pkg/PLIST
new file mode 100644
index 00000000000..0e80fcfee19
--- /dev/null
+++ b/textproc/p5-Filter/pkg/PLIST
@@ -0,0 +1 @@
+@comment $NetBSD: PLIST,v 1.1 2000/08/27 07:11:22 jlam Exp $
diff --git a/textproc/p5-Filter/pkg/PLIST-md.shared b/textproc/p5-Filter/pkg/PLIST-md.shared
deleted file mode 100644
index d77d5dc44de..00000000000
--- a/textproc/p5-Filter/pkg/PLIST-md.shared
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST-md.shared,v 1.1.1.1 1999/12/02 16:39:36 rh Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/Util/Call/Call.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/Util/Call/Call.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/Util/Exec/Exec.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/Util/Exec/Exec.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/decrypt/decrypt.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/decrypt/decrypt.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/tee/tee.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/tee/tee.bs
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/decrypt
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/tee
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/Util/Call
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/Util/Exec
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/Util
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter
diff --git a/textproc/p5-Filter/pkg/PLIST-md.static b/textproc/p5-Filter/pkg/PLIST-md.static
deleted file mode 100644
index 86cf4592dea..00000000000
--- a/textproc/p5-Filter/pkg/PLIST-md.static
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST-md.static,v 1.1.1.1 1999/12/02 16:39:36 rh Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/Util/Call/Call.a
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/Util/Call/extralibs.ld
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/Util/Exec/Exec.a
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/Util/Exec/extralibs.ld
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/decrypt/decrypt.a
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/decrypt/extralibs.ld
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/tee/tee.a
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/tee/extralibs.ld
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/decrypt
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/tee
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/Util/Call
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/Util/Exec
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/Util
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter
diff --git a/textproc/p5-Filter/pkg/PLIST-mi b/textproc/p5-Filter/pkg/PLIST-mi
deleted file mode 100644
index a6894db782d..00000000000
--- a/textproc/p5-Filter/pkg/PLIST-mi
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST-mi,v 1.1.1.1 1999/12/02 16:39:36 rh Exp $
-lib/perl5/site_perl/Filter/cpp.pm
-lib/perl5/site_perl/Filter/sh.pm
-lib/perl5/site_perl/Filter/exec.pm
-lib/perl5/site_perl/Filter/Util/Call.pm
-lib/perl5/site_perl/Filter/Util/Exec.pm
-lib/perl5/site_perl/Filter/decrypt.pm
-lib/perl5/site_perl/Filter/tee.pm
-lib/perl5/man/man3/Filter::Util::Call.3
-lib/perl5/man/man3/Filter::Util::Exec.3
-lib/perl5/man/man3/Filter::decrypt.3
-lib/perl5/man/man3/Filter::tee.3
-lib/perl5/man/man3/Filter::sh.3
-lib/perl5/man/man3/Filter::cpp.3
-lib/perl5/man/man3/Filter::exec.3
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Filter/.packlist
-@dirrm lib/perl5/site_perl/Filter/Util
-@dirrm lib/perl5/site_perl/Filter
diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index ca72eb5dc04..74238f457df 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/05/18 16:13:37 bad Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 07:11:23 jlam Exp $
 #
 
 DISTNAME=	XML-Parser-2.23
-PKGNAME=	p5-XML-Parser-2.23
+PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
 
 MAINTAINER=	bad@netbsd.org
 HOMEPAGE=	http://wwwx.netheaven.com/~coopercc/xmlparser/intro.html
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Parser/.packlist
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/perl Makefile.PL
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-XML-Parser/pkg/PLIST b/textproc/p5-XML-Parser/pkg/PLIST
new file mode 100644
index 00000000000..23e11f3c158
--- /dev/null
+++ b/textproc/p5-XML-Parser/pkg/PLIST
@@ -0,0 +1 @@
+@comment $NetBSD: PLIST,v 1.1 2000/08/27 07:11:23 jlam Exp $
diff --git a/textproc/p5-XML-Parser/pkg/PLIST-md.shared b/textproc/p5-XML-Parser/pkg/PLIST-md.shared
deleted file mode 100644
index 447fe3cb7ca..00000000000
--- a/textproc/p5-XML-Parser/pkg/PLIST-md.shared
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST-md.shared,v 1.1.1.1 1999/05/18 16:13:38 bad Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/XML/Parser/Expat/Expat.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/XML/Parser/Expat/Expat.so
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/XML/Parser/Expat
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/XML/Parser
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/XML
diff --git a/textproc/p5-XML-Parser/pkg/PLIST-md.static b/textproc/p5-XML-Parser/pkg/PLIST-md.static
deleted file mode 100644
index f50636d5606..00000000000
--- a/textproc/p5-XML-Parser/pkg/PLIST-md.static
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST-md.static,v 1.1.1.1 1999/05/18 16:13:38 bad Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/XML/Parser/Expat/Expat.a
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/XML/Parser/Expat/extralibs.ld
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/XML/Parser/Expat
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/XML/Parser
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/XML
diff --git a/textproc/p5-XML-Parser/pkg/PLIST-mi b/textproc/p5-XML-Parser/pkg/PLIST-mi
deleted file mode 100644
index 5f3be1c4c06..00000000000
--- a/textproc/p5-XML-Parser/pkg/PLIST-mi
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $NetBSD: PLIST-mi,v 1.1.1.1 1999/05/18 16:13:38 bad Exp $
-lib/perl5/man/man3/XML::Parser.3
-lib/perl5/man/man3/XML::Parser::Expat.3
-lib/perl5/site_perl/XML/Parser.pm
-lib/perl5/site_perl/XML/Parser/Encodings/Japanese_Encodings.msg
-lib/perl5/site_perl/XML/Parser/Encodings/README
-lib/perl5/site_perl/XML/Parser/Encodings/big5.enc
-lib/perl5/site_perl/XML/Parser/Encodings/iso-8859-2.enc
-lib/perl5/site_perl/XML/Parser/Encodings/iso-8859-3.enc
-lib/perl5/site_perl/XML/Parser/Encodings/iso-8859-4.enc
-lib/perl5/site_perl/XML/Parser/Encodings/iso-8859-5.enc
-lib/perl5/site_perl/XML/Parser/Encodings/iso-8859-7.enc
-lib/perl5/site_perl/XML/Parser/Encodings/iso-8859-8.enc
-lib/perl5/site_perl/XML/Parser/Encodings/iso-8859-9.enc
-lib/perl5/site_perl/XML/Parser/Encodings/windows-1250.enc
-lib/perl5/site_perl/XML/Parser/Encodings/x-euc-jp-jisx0221.enc
-lib/perl5/site_perl/XML/Parser/Encodings/x-euc-jp-unicode.enc
-lib/perl5/site_perl/XML/Parser/Encodings/x-sjis-cp932.enc
-lib/perl5/site_perl/XML/Parser/Encodings/x-sjis-jdk117.enc
-lib/perl5/site_perl/XML/Parser/Encodings/x-sjis-jisx0221.enc
-lib/perl5/site_perl/XML/Parser/Encodings/x-sjis-unicode.enc
-lib/perl5/site_perl/XML/Parser/Expat.pm
-@dirrm lib/perl5/site_perl/XML/Parser/Encodings
-@dirrm lib/perl5/site_perl/XML/Parser
-@dirrm lib/perl5/site_perl/XML
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/XML/Parser/.packlist