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 :)

13 files changed, 60 insertions, 80 deletions

diff --git a/misc/gnucash/Makefile b/misc/gnucash/Makefile
index f0bc5d86f06..6bf8820b006 100644
--- a/misc/gnucash/Makefile
+++ b/misc/gnucash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/08/15 02:44:44 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2000/08/27 07:11:14 jlam Exp $
 #
 
 DISTNAME=		gnucash-1.4.3
@@ -29,17 +29,10 @@ LTCONFIG_OVERRIDE+=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-guile-config=${LOCALBASE}/bin/guile-config
 CONFIGURE_ARGS+=	--without-motif --without-included-gettext
+CONFIGURE_ARGS+=	--with-perl-includes=${PERL5_ARCHLIB}
 
 CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS+=		-I${LOCALBASE}/include
 
 .include "../../mk/bsd.pkg.mk"
-
-# These definitions are after the inclusion of bsd.pkg.mk so that
-# LOCALBASE and SED are defined at this point.
-#
-PERL=			${LOCALBASE}/bin/perl
-P5_ARCHLIB!=		eval `${PERL} -V:installarchlib`; \
-			echo $${installarchlib}
-CONFIGURE_ARGS+=	--with-perl-includes=${P5_ARCHLIB}
diff --git a/misc/p5-Array-PrintCols/Makefile b/misc/p5-Array-PrintCols/Makefile
index f25294a25fb..b135b3909dd 100644
--- a/misc/p5-Array-PrintCols/Makefile
+++ b/misc/p5-Array-PrintCols/Makefile
@@ -1,18 +1,25 @@
-# $NetBSD: Makefile,v 1.7 1999/04/15 20:39:45 tron Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/27 07:11:14 jlam Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/09/14 02:54:03 jfitz Exp
 #
 
 DISTNAME=		Array-PrintCols-1.2
-PKGNAME=		p5-Array-PrintCols-1.2
+PKGNAME=		p5-${DISTNAME}
 CATEGORIES=		misc perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Array/}
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/Array-PrintCols/PrintCols.html
 
-USE_PERL5=		YES
+USE_PERL5=		# defined
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Array/PrintCols/.packlist
 
-NO_BUILD=		YES
 WRKSRC=			${WRKDIR}/Array-PrintCols
 
+pre-configure:
+	${RM} -f ${WRKSRC}/Makefile
+	${CP} ${FILESDIR}/Makefile.PL ${WRKSRC}/Makefile.PL
+
+do-configure:
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/p5-Array-PrintCols/files/Makefile.PL b/misc/p5-Array-PrintCols/files/Makefile.PL
new file mode 100644
index 00000000000..1802f1ab111
--- /dev/null
+++ b/misc/p5-Array-PrintCols/files/Makefile.PL
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile.PL,v 1.1 2000/08/27 07:11:15 jlam Exp $
+use ExtUtils::MakeMaker;
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+WriteMakefile(
+    'NAME'	=> 'Array::PrintCols',
+    'DISTNAME'  => 'Array-PrintCols',
+    'VERSION'   => '1.2',
+    'linkext'   => { LINKTYPE=>'' },	# no link needed
+    'dist'      => {'COMPRESS'=>'gzip -9f', 'SUFFIX' => 'gz'}
+);
diff --git a/misc/p5-Array-PrintCols/files/patch-sum b/misc/p5-Array-PrintCols/files/patch-sum
index 2cbd96fc8fe..309d7bc9553 100644
--- a/misc/p5-Array-PrintCols/files/patch-sum
+++ b/misc/p5-Array-PrintCols/files/patch-sum
@@ -1,3 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:18 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/27 07:11:15 jlam Exp $
 
-MD5 (patch-aa) = e10a40916744fbf256a378f23fe66755
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/misc/p5-Array-PrintCols/patches/patch-aa b/misc/p5-Array-PrintCols/patches/patch-aa
deleted file mode 100644
index 4967c470698..00000000000
--- a/misc/p5-Array-PrintCols/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:10:28 agc Exp $
-
---- Makefile.orig	Tue Dec 19 00:47:43 1995
-+++ Makefile	Fri Oct 24 21:22:05 1997
-@@ -57,7 +57,7 @@
-      VERSION = 0
- 
- # Where Perl 5 lives
--        PERL = /usr/local/bin/perl5
-+        PERL = ${PREFIX}/bin/perl5
- 
-      DEFAULT = install-local
-  
-@@ -65,8 +65,8 @@
-       NETLIB = $(NETROOT)/lib
-       NETMAN = $(NETROOT)/man/man$(MANSEC)
-   
--   LOCALROOT = /usr/local/perl5
--    LOCALLIB = $(LOCALROOT)/lib
-+   LOCALROOT = ${PREFIX}/lib/perl5
-+    LOCALLIB = $(LOCALROOT)/site_perl
-     LOCALMAN = $(LOCALROOT)/man/man$(MANSEC)
-   
-     HOMEROOT = $(HOME)
diff --git a/misc/p5-Array-PrintCols/pkg/PLIST b/misc/p5-Array-PrintCols/pkg/PLIST
index d9c9dd9b068..25b49cf6155 100644
--- a/misc/p5-Array-PrintCols/pkg/PLIST
+++ b/misc/p5-Array-PrintCols/pkg/PLIST
@@ -1,5 +1 @@
-@comment $NetBSD: PLIST,v 1.3 1998/07/28 11:48:10 frueauf Exp $
-lib/perl5/site_perl/Array/PrintCols-1.2.pm
-lib/perl5/site_perl/Array/PrintCols.pm
-lib/perl5/man/man3/Array::PrintCols.3p
-@dirrm lib/perl5/site_perl/Array
+@comment $NetBSD: PLIST,v 1.4 2000/08/27 07:11:15 jlam Exp $
diff --git a/misc/p5-Business-CreditCard/Makefile b/misc/p5-Business-CreditCard/Makefile
index 9df3ae81f35..ba179a61751 100644
--- a/misc/p5-Business-CreditCard/Makefile
+++ b/misc/p5-Business-CreditCard/Makefile
@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.7 2000/01/10 00:57:14 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/27 07:11:15 jlam Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/06/24 18:43:06 jfitz Exp
 #
 
 DISTNAME=		Business-CreditCard-0.1
-PKGNAME=		p5-Business-CreditCard-0.1
+PKGNAME=		p5-${DISTNAME}
 CATEGORIES=		misc perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Business/}
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/Business-CreditCard/CreditCard.html
 
-USE_PERL5=		YES
+USE_PERL5=		# defined
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Business/CreditCard/.packlist
 
-NO_BUILD=		YES
+pre-configure:
+	${CP} ${FILESDIR}/Makefile.PL ${WRKSRC}/Makefile.PL
 
-do-install:
-		@ ${CP} ${WRKSRC}/CreditCard.pm ${WRKSRC}/CreditCard-0.1.pm
-		@ ${MKDIR} ${PREFIX}/lib/perl5/site_perl/Business/
-		@ ${INSTALL_DATA} ${WRKSRC}/CreditCard-0.1.pm ${PREFIX}/lib/perl5/site_perl/Business/
-		@ ${LN} -sf ${PREFIX}/lib/perl5/site_perl/Business/CreditCard-0.1.pm ${PREFIX}/lib/perl5/site_perl/Business/CreditCard.pm
+do-configure:
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/p5-Business-CreditCard/files/Makefile.PL b/misc/p5-Business-CreditCard/files/Makefile.PL
new file mode 100644
index 00000000000..d91f2cc7ab6
--- /dev/null
+++ b/misc/p5-Business-CreditCard/files/Makefile.PL
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile.PL,v 1.1 2000/08/27 07:11:15 jlam Exp $
+use ExtUtils::MakeMaker;
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+WriteMakefile(
+    'NAME'	=> 'Business::CreditCard',
+    'DISTNAME'  => 'CreditCard.pm',
+    'VERSION'   => '0.1',
+    'linkext'   => { LINKTYPE=>'' },	# no link needed
+    'dist'      => {'COMPRESS'=>'gzip -9f', 'SUFFIX' => 'gz'}
+);
diff --git a/misc/p5-Business-CreditCard/pkg/PLIST b/misc/p5-Business-CreditCard/pkg/PLIST
index 7f53af881f7..91e9665ee61 100644
--- a/misc/p5-Business-CreditCard/pkg/PLIST
+++ b/misc/p5-Business-CreditCard/pkg/PLIST
@@ -1,4 +1 @@
-@comment $NetBSD: PLIST,v 1.2 1997/11/06 10:02:33 agc Exp $
-lib/perl5/site_perl/Business/CreditCard-0.1.pm
-lib/perl5/site_perl/Business/CreditCard.pm
-@dirrm lib/perl5/site_perl/Business
+@comment $NetBSD: PLIST,v 1.3 2000/08/27 07:11:16 jlam Exp $
diff --git a/misc/p5-Locale-Codes/Makefile b/misc/p5-Locale-Codes/Makefile
index 42d79f7ae3b..62f0ff1fea4 100644
--- a/misc/p5-Locale-Codes/Makefile
+++ b/misc/p5-Locale-Codes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/04/15 20:39:45 tron Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/27 07:11:16 jlam Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/06/27 01:51:12 jfitz Exp
 #
 
@@ -10,9 +10,10 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Locale/}
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/Locale-Codes/Locale/Country.html
 
-USE_PERL5=		YES
+USE_PERL5=		# defined
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Locale/.packlist
 
 do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PREFIX}/bin/perl Makefile.PL
+	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/p5-Locale-Codes/pkg/PLIST b/misc/p5-Locale-Codes/pkg/PLIST
index 8136818f2b1..c18609ad227 100644
--- a/misc/p5-Locale-Codes/pkg/PLIST
+++ b/misc/p5-Locale-Codes/pkg/PLIST
@@ -1,8 +1 @@
-@comment $NetBSD: PLIST,v 1.5 1999/04/08 18:51:56 agc Exp $
-lib/perl5/man/man3/Locale::Country.3.gz
-lib/perl5/man/man3/Locale::Language.3.gz
-lib/perl5/site_perl/Locale/Country.pm
-lib/perl5/site_perl/Locale/Language.pm
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Locale/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Locale
-@dirrm lib/perl5/site_perl/Locale
+@comment $NetBSD: PLIST,v 1.6 2000/08/27 07:11:16 jlam Exp $
diff --git a/misc/p5-Search/Makefile b/misc/p5-Search/Makefile
index 3a882d95af4..b93db743b18 100644
--- a/misc/p5-Search/Makefile
+++ b/misc/p5-Search/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/04/15 20:39:45 tron Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/27 07:11:16 jlam Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/06/24 18:43:31 jfitz Exp
 #
 
@@ -9,9 +9,10 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Search/}
 
 MAINTAINER=		packages@netbsd.org
 
-USE_PERL5=		YES
+USE_PERL5=		# defined
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Search/Text/.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/misc/p5-Search/pkg/PLIST b/misc/p5-Search/pkg/PLIST
index a1e36e29d88..c18609ad227 100644
--- a/misc/p5-Search/pkg/PLIST
+++ b/misc/p5-Search/pkg/PLIST
@@ -1,9 +1 @@
-@comment $NetBSD: PLIST,v 1.5 1999/04/08 18:51:56 agc Exp $
-lib/perl5/man/man3/Search::Base.3.gz
-lib/perl5/site_perl/Search/Base.pm
-lib/perl5/site_perl/Search/Glimpse.pm
-lib/perl5/site_perl/Search/TextSearch.pm
-@dirrm lib/perl5/site_perl/Search
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Search/Text/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Search/Text
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Search
+@comment $NetBSD: PLIST,v 1.6 2000/08/27 07:11:16 jlam Exp $