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

10 files changed, 29 insertions, 86 deletions

diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index ee09ca3e3be..f39d3c42c2f 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/14 08:53:13 rh Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/27 07:11:12 jlam Exp $
 #
 
 DISTNAME=	GD-1.30
@@ -11,9 +11,10 @@ HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/GD/GD.html
 
 DEPENDS+=	gd>=1.8.3:../../graphics/gd
 
-USE_PERL5=	yes
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/GD/.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/graphics/p5-GD/pkg/PLIST b/graphics/p5-GD/pkg/PLIST
index 82bf2dbb332..d20c409d764 100644
--- a/graphics/p5-GD/pkg/PLIST
+++ b/graphics/p5-GD/pkg/PLIST
@@ -1,9 +1 @@
-@comment $NetBSD: PLIST,v 1.2 1999/09/03 17:35:21 kim Exp $
-lib/perl5/man/man3/GD.3
-lib/perl5/site_perl/GD.pm
-lib/perl5/site_perl/auto/GD/autosplit.ix
-lib/perl5/site_perl/qd.pl
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/GD/.packlist
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/GD/GD.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/GD/GD.so
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/GD
+@comment $NetBSD: PLIST,v 1.3 2000/08/27 07:11:12 jlam Exp $
diff --git a/graphics/p5-GDGraph/Makefile b/graphics/p5-GDGraph/Makefile
index 54465a49ece..127b80fac03 100644
--- a/graphics/p5-GDGraph/Makefile
+++ b/graphics/p5-GDGraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/07/16 20:24:42 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 07:11:12 jlam Exp $
 #
 
 DISTNAME=	GDGraph-1.32
@@ -11,9 +11,10 @@ HOMEPAGE=	http://theoryx5.uwinnipeg.ca/CPAN/data/GDGraph/Graph.html
 
 DEPENDS+=       p5-GDTextUtil>=0.75:../../graphics/p5-GDTextUtil
 
-USE_PERL5=      yes
+USE_PERL5=      # defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/GD/Graph/.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/graphics/p5-GDGraph/pkg/PLIST b/graphics/p5-GDGraph/pkg/PLIST
index 22d4d4951e9..b31ae52f582 100644
--- a/graphics/p5-GDGraph/pkg/PLIST
+++ b/graphics/p5-GDGraph/pkg/PLIST
@@ -1,23 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/07/16 20:24:42 rh Exp $
-
-lib/perl5/site_perl/GD/Graph/colour.pm
-lib/perl5/site_perl/GD/Graph/mixed.pm
-lib/perl5/site_perl/GD/Graph/bars.pm
-lib/perl5/site_perl/GD/Graph/linespoints.pm
-lib/perl5/site_perl/GD/Graph/area.pm
-lib/perl5/site_perl/GD/Graph/Error.pm
-lib/perl5/site_perl/GD/Graph/Data.pm
-lib/perl5/site_perl/GD/Graph/lines.pm
-lib/perl5/site_perl/GD/Graph/points.pm
-lib/perl5/site_perl/GD/Graph/FAQ.pod
-lib/perl5/site_perl/GD/Graph/pie.pm
-lib/perl5/site_perl/GD/Graph/utils.pm
-lib/perl5/site_perl/GD/Graph/axestype.pm
-lib/perl5/site_perl/GD/Graph.pm
-lib/perl5/man/man3/GD::Graph::colour.3
-lib/perl5/man/man3/GD::Graph::FAQ.3
-lib/perl5/man/man3/GD::Graph.3
-lib/perl5/man/man3/GD::Graph::Data.3
-lib/perl5/man/man3/GD::Graph::Error.3
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/GD/Graph/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/GD/Graph
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:12 jlam Exp $
diff --git a/graphics/p5-GDTextUtil/Makefile b/graphics/p5-GDTextUtil/Makefile
index 5b049d9a4f9..b21017e2b2e 100644
--- a/graphics/p5-GDTextUtil/Makefile
+++ b/graphics/p5-GDTextUtil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/07/16 20:17:39 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 07:11:12 jlam Exp $
 #
 
 DISTNAME=	GDTextUtil-0.75
@@ -11,9 +11,10 @@ HOMEPAGE=	http://theoryx5.uwinnipeg.ca/CPAN/data/GDTextUtil/Text.html
 
 DEPENDS+=	p5-GD>=1.30:../../graphics/p5-GD
 
-USE_PERL5=	yes
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/GD/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/graphics/p5-GDTextUtil/pkg/PLIST b/graphics/p5-GDTextUtil/pkg/PLIST
index 1aaa8906cba..b31ae52f582 100644
--- a/graphics/p5-GDTextUtil/pkg/PLIST
+++ b/graphics/p5-GDTextUtil/pkg/PLIST
@@ -1,10 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/07/16 20:17:40 rh Exp $
-
-lib/perl5/site_perl/GD/Text.pm
-lib/perl5/site_perl/GD/Text/Align.pm
-lib/perl5/site_perl/GD/Text/Wrap.pm
-lib/perl5/man/man3/GD::Text::Align.3
-lib/perl5/man/man3/GD::Text.3
-lib/perl5/man/man3/GD::Text::Wrap.3
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/GD/Text/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/GD/Text
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:12 jlam Exp $
diff --git a/graphics/p5-Image-Size/Makefile b/graphics/p5-Image-Size/Makefile
index 1a6f6790c04..df396cc0079 100644
--- a/graphics/p5-Image-Size/Makefile
+++ b/graphics/p5-Image-Size/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/09/03 17:08:51 kim Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 07:11:13 jlam Exp $
 #
 
 DISTNAME=	Image-Size-2.901
@@ -9,9 +9,10 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Image/}
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/Image-Size/
 
-USE_PERL5=	yes
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Image/Size/.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/graphics/p5-Image-Size/pkg/PLIST b/graphics/p5-Image-Size/pkg/PLIST
index 09fd3261da4..08f0605eafa 100644
--- a/graphics/p5-Image-Size/pkg/PLIST
+++ b/graphics/p5-Image-Size/pkg/PLIST
@@ -1,16 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/09/03 17:08:52 kim Exp $
-bin/imgsize
-man/man1/imgsize.1
-lib/perl5/man/man3/Image::Size.3
-lib/perl5/site_perl/Image/Size.pm
-lib/perl5/site_perl/auto/Image/Size/autosplit.ix
-lib/perl5/site_perl/auto/Image/Size/bmpsize.al
-lib/perl5/site_perl/auto/Image/Size/gifsize.al
-lib/perl5/site_perl/auto/Image/Size/jpegsize.al
-lib/perl5/site_perl/auto/Image/Size/pngsize.al
-lib/perl5/site_perl/auto/Image/Size/ppmsize.al
-lib/perl5/site_perl/auto/Image/Size/tiffsize.al
-lib/perl5/site_perl/auto/Image/Size/xbmsize.al
-lib/perl5/site_perl/auto/Image/Size/xpmsize.al
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Image/Size/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Image/Size
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:13 jlam Exp $
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index 7ced38e7948..7ed314aa21c 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:35 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/27 07:11:13 jlam Exp $
 
 DISTNAME=		ImageMagick-5.2.2
 PKGNAME=		p5-PerlMagick-5.2.2
@@ -25,22 +25,23 @@ WRKSRC=			${WRKDIR}/${DISTNAME}/PerlMagick
 
 #EXTRACT_AFTER_ARGS+=	${WRKSRC}
 
-USE_LIBTOOL=		yes
+USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-USE_PERL5=		yes
-GNU_CONFIGURE=		yes
 
-PERL5_BIN=		${LOCALBASE}/bin/perl
+USE_PERL5=		# defined
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Image/Magick/.packlist
+
+GNU_CONFIGURE=		yes
 
 # These need to coordinate with the ImageMagick package.
 # Just leave out "--without-perl".
 
-CONFIGURE_ARGS+=	--with-perl=${PERL5_BIN} \
+CONFIGURE_ARGS+=	--with-perl=${PERL5} \
 			--without-dps --without-fpx \
 			--without-hdf --without-jbig --without-threads \
 			--without-ttf --without-xml
 
 post-configure:
-	cd ${WRKSRC} && ${PERL5_BIN} Makefile.PL
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/p5-PerlMagick/pkg/PLIST b/graphics/p5-PerlMagick/pkg/PLIST
index ee4e5c02779..08f0605eafa 100644
--- a/graphics/p5-PerlMagick/pkg/PLIST
+++ b/graphics/p5-PerlMagick/pkg/PLIST
@@ -1,9 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/04/23 01:59:58 kim Exp $
-lib/perl5/man/man3/Image::Magick.3
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Image/Magick/.packlist
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Image/Magick/Magick.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Image/Magick/Magick.so
-lib/perl5/site_perl/Image/Magick.pm
-lib/perl5/site_perl/auto/Image/Magick/autosplit.ix
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Image/Magick
-@dirrm lib/perl5/site_perl/auto/Image/Magick
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:13 jlam Exp $