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

54 files changed, 138 insertions, 265 deletions

diff --git a/devel/p5-AtExit/Makefile b/devel/p5-AtExit/Makefile
index 1d8ff8466c0..0d5aade0669 100644
--- a/devel/p5-AtExit/Makefile
+++ b/devel/p5-AtExit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/05/12 19:24:47 bad Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/27 07:11:01 jlam Exp $
 #
 
 DISTNAME=	AtExit-2.01
@@ -8,9 +8,10 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=AtExit/}
 
 MAINTAINER=	packages@netbsd.org
 
-USE_PERL5=	yes
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_ARCHLIB}/auto/AtExit/.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/devel/p5-AtExit/pkg/PLIST b/devel/p5-AtExit/pkg/PLIST
index a3c62b2dc38..6031f601be5 100644
--- a/devel/p5-AtExit/pkg/PLIST
+++ b/devel/p5-AtExit/pkg/PLIST
@@ -1,4 +1 @@
-@comment $NetBSD: PLIST,v 1.2 1999/05/12 19:36:03 bad Exp $
-lib/perl5/AtExit.pm
-lib/perl5/man/man3/AtExit.3
-lib/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/5.00404/auto/AtExit/.packlist
+@comment $NetBSD: PLIST,v 1.3 2000/08/27 07:11:01 jlam Exp $
diff --git a/devel/p5-Bit-Vector/Makefile b/devel/p5-Bit-Vector/Makefile
index b2f6d13f07f..0b7fa9d3e48 100644
--- a/devel/p5-Bit-Vector/Makefile
+++ b/devel/p5-Bit-Vector/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/09/03 17:16:40 kim Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 07:11:01 jlam Exp $
 #
 
 DISTNAME=	Bit-Vector-5.7
@@ -9,9 +9,10 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Bit/}
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/Bit-Vector/Vector.html
 
-USE_PERL5=	yes
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Bit/Vector/.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/devel/p5-Bit-Vector/pkg/PLIST b/devel/p5-Bit-Vector/pkg/PLIST
index ea6bde2a9d5..3c051fd0c08 100644
--- a/devel/p5-Bit-Vector/pkg/PLIST
+++ b/devel/p5-Bit-Vector/pkg/PLIST
@@ -1,7 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/09/03 17:16:41 kim Exp $
-lib/perl5/man/man3/Bit::Vector.3
-lib/perl5/site_perl/Bit/Vector.pm
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Bit/Vector/Vector.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Bit/Vector/Vector.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Bit/Vector/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Bit/Vector
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:01 jlam Exp $
diff --git a/devel/p5-Curses/Makefile b/devel/p5-Curses/Makefile
index e06087f3bc2..5b48626ae15 100644
--- a/devel/p5-Curses/Makefile
+++ b/devel/p5-Curses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/01/15 18:46:25 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/27 07:11:02 jlam Exp $
 # FreeBSD Id: Makefile,v 1.8 1998/04/04 13:58:26 vanilla Exp
 #
 
@@ -12,10 +12,11 @@ HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/Curses/Curses.html
 
 DEPENDS=	ncurses>=4.2:../../devel/ncurses
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Curses/.packlist
 
 do-configure:
-		@${LN} -sf ${WRKSRC}/hints/c-netbsd.ncurses.h ${WRKSRC}/c-config.h
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+	@${LN} -sf ${WRKSRC}/hints/c-netbsd.ncurses.h ${WRKSRC}/c-config.h
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Curses/pkg/PLIST b/devel/p5-Curses/pkg/PLIST
index 26ac7072fe4..88fcab3091c 100644
--- a/devel/p5-Curses/pkg/PLIST
+++ b/devel/p5-Curses/pkg/PLIST
@@ -1,7 +1 @@
-@comment $NetBSD: PLIST,v 1.3 1999/04/08 18:51:49 agc Exp $
-lib/perl5/man/man3/Curses.3
-lib/perl5/site_perl/Curses.pm
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Curses/Curses.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Curses/Curses.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Curses/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Curses
+@comment $NetBSD: PLIST,v 1.4 2000/08/27 07:11:02 jlam Exp $
diff --git a/devel/p5-Data-Dumper/Makefile b/devel/p5-Data-Dumper/Makefile
index e19276f702e..e0e017ca34b 100644
--- a/devel/p5-Data-Dumper/Makefile
+++ b/devel/p5-Data-Dumper/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.10 2000/03/28 16:36:31 tron Exp $
+# $NetBSD: Makefile,v 1.11 2000/08/27 07:11:02 jlam Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/06/24 18:43:11 jfitz Exp
 
-DISTNAME=		Data-Dumper-2.101
-PKGNAME=		p5-Data-Dumper-2.101
-CATEGORIES=		devel perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Data/}
+DISTNAME=	Data-Dumper-2.101
+PKGNAME=	p5-Data-Dumper-2.101
+CATEGORIES=	devel perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Data/}
 
-MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/Data-Dumper/Dumper.html
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/Data-Dumper/Dumper.html
 
-USE_PERL5=		yes
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Data/Dumper/.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/devel/p5-Data-Dumper/pkg/PLIST b/devel/p5-Data-Dumper/pkg/PLIST
new file mode 100644
index 00000000000..c139d728f94
--- /dev/null
+++ b/devel/p5-Data-Dumper/pkg/PLIST
@@ -0,0 +1 @@
+@comment $NetBSD: PLIST,v 1.3 2000/08/27 07:11:02 jlam Exp $
diff --git a/devel/p5-Data-Dumper/pkg/PLIST-md.shared b/devel/p5-Data-Dumper/pkg/PLIST-md.shared
deleted file mode 100644
index d85c919a9c0..00000000000
--- a/devel/p5-Data-Dumper/pkg/PLIST-md.shared
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-md.shared,v 1.3 1999/04/08 18:51:49 agc Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Data/Dumper/Dumper.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Data/Dumper/Dumper.so
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Data/Dumper
diff --git a/devel/p5-Data-Dumper/pkg/PLIST-md.static b/devel/p5-Data-Dumper/pkg/PLIST-md.static
deleted file mode 100644
index dbea512d289..00000000000
--- a/devel/p5-Data-Dumper/pkg/PLIST-md.static
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-md.static,v 1.3 1999/04/08 18:51:50 agc Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Data/Dumper/Dumper.a
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Data/Dumper/extralibs.ld
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Data/Dumper
diff --git a/devel/p5-Data-ShowTable/Makefile b/devel/p5-Data-ShowTable/Makefile
index 22e365e7d6f..aec9a748f05 100644
--- a/devel/p5-Data-ShowTable/Makefile
+++ b/devel/p5-Data-ShowTable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/06/10 15:30:29 bad Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 07:11:02 jlam Exp $
 #
 
 DISTNAME=		Data-ShowTable-3.3
@@ -8,9 +8,10 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Data/}
 
 MAINTAINER=		bad@netbsd.org
 
-USE_PERL5=		yes
+USE_PERL5=		# defined
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Data/ShowTable/.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/devel/p5-Data-ShowTable/pkg/PLIST b/devel/p5-Data-ShowTable/pkg/PLIST
index 6519980b7c1..c29fb65575f 100644
--- a/devel/p5-Data-ShowTable/pkg/PLIST
+++ b/devel/p5-Data-ShowTable/pkg/PLIST
@@ -1,8 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/06/10 15:30:30 bad Exp $
-bin/showtable
-lib/perl5/man/man3/Data::ShowTable.3
-lib/perl5/site_perl/Data/ShowTable.pm
-man/man1/showtable.1
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Data/ShowTable/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Data/ShowTable
-@unexec rmdir %D/lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Data 2>/dev/null || true
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:03 jlam Exp $
diff --git a/devel/p5-Date-Calc/Makefile b/devel/p5-Date-Calc/Makefile
index 5407c9d5eaf..accde1bdbb3 100644
--- a/devel/p5-Date-Calc/Makefile
+++ b/devel/p5-Date-Calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/12/28 12:08:17 simonb Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 07:11:03 jlam Exp $
 #
 
 DISTNAME=     	Date-Calc-4.2
@@ -9,9 +9,10 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Date/}
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.engelschall.com/u/sb/download/
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Date/Calc/.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/devel/p5-Date-Calc/pkg/PLIST b/devel/p5-Date-Calc/pkg/PLIST
new file mode 100644
index 00000000000..390f29cb59a
--- /dev/null
+++ b/devel/p5-Date-Calc/pkg/PLIST
@@ -0,0 +1 @@
+@comment $NetBSD: PLIST,v 1.1 2000/08/27 07:11:03 jlam Exp $
diff --git a/devel/p5-Date-Calc/pkg/PLIST-md.shared b/devel/p5-Date-Calc/pkg/PLIST-md.shared
deleted file mode 100644
index e4d92e7fed5..00000000000
--- a/devel/p5-Date-Calc/pkg/PLIST-md.shared
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST-md.shared,v 1.1.1.1 1999/12/28 12:08:17 simonb Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Date/Calc/.packlist
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Date/Calc/Calc.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Date/Calc/Calc.so
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Date/Calc
diff --git a/devel/p5-Date-Calc/pkg/PLIST-md.static b/devel/p5-Date-Calc/pkg/PLIST-md.static
deleted file mode 100644
index bd664b3ff90..00000000000
--- a/devel/p5-Date-Calc/pkg/PLIST-md.static
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-md.static,v 1.1.1.1 1999/12/28 12:08:17 simonb Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Date/Calc/Calc.a
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Date/Calc/extralibs.ld
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Date/Calc
diff --git a/devel/p5-Date-Calc/pkg/PLIST-mi b/devel/p5-Date-Calc/pkg/PLIST-mi
deleted file mode 100644
index 4d788c842bf..00000000000
--- a/devel/p5-Date-Calc/pkg/PLIST-mi
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-mi,v 1.1.1.1 1999/12/28 12:08:17 simonb Exp $
-lib/perl5/man/man3/Date::Calc.3
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Date/Calc/.packlist
-lib/perl5/site_perl/Date/Calc.pm
diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile
index cf3609533c9..4440aa5a1e5 100644
--- a/devel/p5-Date-Manip/Makefile
+++ b/devel/p5-Date-Manip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/03/07 23:21:36 jwise Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/27 07:11:03 jlam Exp $
 #
 
 DISTNAME=     	DateManip-5.37
@@ -9,9 +9,10 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Date/}
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://www.cpan.org/
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Date/Manip/.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/devel/p5-Date-Manip/pkg/PLIST b/devel/p5-Date-Manip/pkg/PLIST
index 121ab0e7405..be0c47fad12 100644
--- a/devel/p5-Date-Manip/pkg/PLIST
+++ b/devel/p5-Date-Manip/pkg/PLIST
@@ -1,6 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/03/07 23:15:58 jwise Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Date/Manip/.packlist
-lib/perl5/site_perl/Date/Manip.pm
-lib/perl5/site_perl/Date/Manip.pod
-lib/perl5/man/man3/Date::Manip.3
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Date/Manip/
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:04 jlam Exp $
diff --git a/devel/p5-Devel-DProf/Makefile b/devel/p5-Devel-DProf/Makefile
index 258b3c1def6..f3828d81a3d 100644
--- a/devel/p5-Devel-DProf/Makefile
+++ b/devel/p5-Devel-DProf/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:41 tron Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/27 07:11:04 jlam Exp $
 #
 
 DISTNAME=		DProf-19970614
-PKGNAME=		p5-Devel-DProf-19970614
+PKGNAME=		p5-Devel-${DISTNAME}
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Devel/}
 
 MAINTAINER=		bad@netbsd.org
 
-USE_PERL5=		yes
-
-WRKSRC=			${WRKDIR}/DProf-19970614
+USE_PERL5=		# defined
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Devel/DProf/.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/devel/p5-Devel-DProf/pkg/PLIST b/devel/p5-Devel-DProf/pkg/PLIST
new file mode 100644
index 00000000000..42cd142cbac
--- /dev/null
+++ b/devel/p5-Devel-DProf/pkg/PLIST
@@ -0,0 +1 @@
+@comment $NetBSD: PLIST,v 1.1 2000/08/27 07:11:04 jlam Exp $
diff --git a/devel/p5-Devel-DProf/pkg/PLIST-md.shared b/devel/p5-Devel-DProf/pkg/PLIST-md.shared
deleted file mode 100644
index 881e3cb544a..00000000000
--- a/devel/p5-Devel-DProf/pkg/PLIST-md.shared
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-md.shared,v 1.2 1999/04/08 18:51:50 agc Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Devel/DProf/DProf.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Devel/DProf/DProf.so
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Devel/DProf
diff --git a/devel/p5-Devel-DProf/pkg/PLIST-md.static b/devel/p5-Devel-DProf/pkg/PLIST-md.static
deleted file mode 100644
index 7232df7df4c..00000000000
--- a/devel/p5-Devel-DProf/pkg/PLIST-md.static
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-md.static,v 1.2 1999/04/08 18:51:50 agc Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Devel/DProf/DProf.a
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Devel/DProf/extralibs.ld
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Devel/DProf
diff --git a/devel/p5-Devel-DProf/pkg/PLIST-mi b/devel/p5-Devel-DProf/pkg/PLIST-mi
deleted file mode 100644
index adb65e15cba..00000000000
--- a/devel/p5-Devel-DProf/pkg/PLIST-mi
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST-mi,v 1.2 1999/04/08 18:51:50 agc Exp $
-bin/dprofpp
-lib/perl5/man/man3/Devel::DProf.3
-lib/perl5/site_perl/Devel/DProf.pm
-man/man1/dprofpp.1
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Devel/DProf/.packlist
diff --git a/devel/p5-Devel-SmallProf/Makefile b/devel/p5-Devel-SmallProf/Makefile
index 9a26c6419f6..2dbc4444504 100644
--- a/devel/p5-Devel-SmallProf/Makefile
+++ b/devel/p5-Devel-SmallProf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:41 tron Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/27 07:11:05 jlam Exp $
 #
 
 DISTNAME=		Devel-SmallProf-0.5
-PKGNAME=		p5-Devel-SmallProf-0.5
+PKGNAME=		p5-${DISTNAME}
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Devel/}
 
@@ -10,9 +10,10 @@ MAINTAINER=		bad@netbsd.org
 
 DEPENDS=		p5-Time-HiRes-01.19:../../devel/p5-Time-HiRes
 
-USE_PERL5=		yes
+USE_PERL5=		# defined
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Devel/SmallProf/.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/devel/p5-Devel-SmallProf/pkg/PLIST b/devel/p5-Devel-SmallProf/pkg/PLIST
index b6229c9afb5..bc49ec86974 100644
--- a/devel/p5-Devel-SmallProf/pkg/PLIST
+++ b/devel/p5-Devel-SmallProf/pkg/PLIST
@@ -1,5 +1 @@
-@comment $NetBSD: PLIST,v 1.2 1999/04/08 18:51:51 agc Exp $
-lib/perl5/man/man3/Devel::SmallProf.3
-lib/perl5/site_perl/Devel/SmallProf.pm
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Devel/SmallProf/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Devel/SmallProf
+@comment $NetBSD: PLIST,v 1.3 2000/08/27 07:11:05 jlam Exp $
diff --git a/devel/p5-Devel-Symdump/Makefile b/devel/p5-Devel-Symdump/Makefile
index feefa14ef62..7781f93da58 100644
--- a/devel/p5-Devel-Symdump/Makefile
+++ b/devel/p5-Devel-Symdump/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/12/06 08:34:24 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 07:11:05 jlam Exp $
 #
 
 DISTNAME=	Devel-Symdump-2.00
-PKGNAME=	p5-Devel-Symdump-2.00
+PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Devel/}
 
 MAINTAINER=	packages@netbsd.org
 
-USE_PERL5=	yes
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Devel/Symdump/.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/devel/p5-Devel-Symdump/pkg/PLIST b/devel/p5-Devel-Symdump/pkg/PLIST
index 58f289b9333..fbea739b555 100644
--- a/devel/p5-Devel-Symdump/pkg/PLIST
+++ b/devel/p5-Devel-Symdump/pkg/PLIST
@@ -1,7 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/12/06 08:34:24 rh Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Devel/Symdump/.packlist
-lib/perl5/site_perl/Devel/Symdump/Export.pm
-lib/perl5/site_perl/Devel/Symdump.pm
-lib/perl5/man/man3/Devel::Symdump.3
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Devel/Symdump
-@dirrm lib/perl5/site_perl/Devel/Symdump
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:05 jlam Exp $
diff --git a/devel/p5-Expect/Makefile b/devel/p5-Expect/Makefile
index e6543d03048..2257e11acdb 100644
--- a/devel/p5-Expect/Makefile
+++ b/devel/p5-Expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/07/16 21:32:47 thorpej Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/27 07:11:05 jlam Exp $
 
 DISTNAME=	Expect.pm-1.07
 PKGNAME=	p5-expect-1.07
@@ -7,9 +7,10 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Expect/}
 
 MAINTAINER=	packages@netbsd.org
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Expect/.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/devel/p5-Expect/pkg/PLIST b/devel/p5-Expect/pkg/PLIST
index c26e2d96c1b..fbea739b555 100644
--- a/devel/p5-Expect/pkg/PLIST
+++ b/devel/p5-Expect/pkg/PLIST
@@ -1,8 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/07/16 01:04:07 thorpej Exp $
-lib/perl5/site_perl/Expect.pod
-lib/perl5/site_perl/Expect.pm
-lib/perl5/site_perl/Expect_intro.pod
-lib/perl5/site_perl/term-filter.pl
-lib/perl5/man/man3/Expect.3
-lib/perl5/man/man3/Expect_intro.3
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Expect/.packlist
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:05 jlam Exp $
diff --git a/devel/p5-File-PathConvert/Makefile b/devel/p5-File-PathConvert/Makefile
index 0007af45e21..84901652785 100644
--- a/devel/p5-File-PathConvert/Makefile
+++ b/devel/p5-File-PathConvert/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/09/03 17:15:27 kim Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 07:11:05 jlam Exp $
 #
 
 DISTNAME=	File-PathConvert-0.85
@@ -9,9 +9,10 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=File/}
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/File-PathConvert/
 
-USE_PERL5=	yes
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/File/PathConvert/.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/devel/p5-File-PathConvert/pkg/PLIST b/devel/p5-File-PathConvert/pkg/PLIST
index 295208dd27c..9632ea2961e 100644
--- a/devel/p5-File-PathConvert/pkg/PLIST
+++ b/devel/p5-File-PathConvert/pkg/PLIST
@@ -1,5 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/09/03 17:15:27 kim Exp $
-lib/perl5/man/man3/File::PathConvert.3
-lib/perl5/site_perl/File/PathConvert.pm
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/File/PathConvert/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/File/PathConvert
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:06 jlam Exp $
diff --git a/devel/p5-FileKGlob/Makefile b/devel/p5-FileKGlob/Makefile
index 5b3e7bb2bc1..a4f48bf2954 100644
--- a/devel/p5-FileKGlob/Makefile
+++ b/devel/p5-FileKGlob/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/05/12 20:47:13 bad Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 07:11:06 jlam Exp $
 #
 
 DISTNAME=	FileKGlob
@@ -9,12 +9,15 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=File/}
 
 MAINTAINER=	packages@netbsd.org
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/File/KGlob/.packlist
+
+DIST_SUBDIR=	${PKGNAME}
 
 pre-configure:
 	${CP} ${FILESDIR}/Makefile.PL ${WRKSRC}/Makefile.PL
 
 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/devel/p5-FileKGlob/files/md5 b/devel/p5-FileKGlob/files/md5
index a1b02c8f41b..56859179d6a 100644
--- a/devel/p5-FileKGlob/files/md5
+++ b/devel/p5-FileKGlob/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/05/12 20:47:13 bad Exp $
+$NetBSD: md5,v 1.2 2000/08/27 07:11:06 jlam Exp $
 
-MD5 (FileKGlob.tar.gz) = d56bd5397f0835cc083b9fa78a1a2275
+MD5 (p5-FileKGlob-1.2/FileKGlob.tar.gz) = d56bd5397f0835cc083b9fa78a1a2275
diff --git a/devel/p5-FileKGlob/pkg/PLIST b/devel/p5-FileKGlob/pkg/PLIST
index 6ec74d332ae..9632ea2961e 100644
--- a/devel/p5-FileKGlob/pkg/PLIST
+++ b/devel/p5-FileKGlob/pkg/PLIST
@@ -1,4 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/05/12 20:47:13 bad Exp $
-lib/perl5/site_perl/File/KGlob.pm
-lib/perl5/site_perl/File/KGlob2RE.pm
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/File/KGlob/.packlist
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:06 jlam Exp $
diff --git a/devel/p5-IO-Stty/Makefile b/devel/p5-IO-Stty/Makefile
index fb0de79c761..e5ff6827397 100644
--- a/devel/p5-IO-Stty/Makefile
+++ b/devel/p5-IO-Stty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/07/16 17:11:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/27 07:11:06 jlam Exp $
 
 DISTNAME=	IO-Stty-.02
 PKGNAME=	p5-IO-stty-0.02
@@ -7,9 +7,10 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=IO/}
 
 MAINTAINER=	packages@netbsd.org
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/IO/Stty/.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/devel/p5-IO-Stty/pkg/PLIST b/devel/p5-IO-Stty/pkg/PLIST
index 005151869d3..9632ea2961e 100644
--- a/devel/p5-IO-Stty/pkg/PLIST
+++ b/devel/p5-IO-Stty/pkg/PLIST
@@ -1,6 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/07/16 00:39:59 thorpej Exp $
-lib/perl5/site_perl/IO/stty.pl
-lib/perl5/site_perl/IO/Stty.pm
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/IO/Stty/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/IO/Stty
-@dirrm lib/perl5/site_perl/IO
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:06 jlam Exp $
diff --git a/devel/p5-IO-Tty/Makefile b/devel/p5-IO-Tty/Makefile
index 60631068186..37465088dcc 100644
--- a/devel/p5-IO-Tty/Makefile
+++ b/devel/p5-IO-Tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/07/16 17:12:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/27 07:11:06 jlam Exp $
 
 DISTNAME=	IO-Tty-0.03
 PKGNAME=	p5-${DISTNAME:C/T/t/}
@@ -7,9 +7,10 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=IO/}
 
 MAINTAINER=	packages@netbsd.org
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/IO/Tty/.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/devel/p5-IO-Tty/pkg/PLIST b/devel/p5-IO-Tty/pkg/PLIST
index 8f3862e339b..de8b3970df2 100644
--- a/devel/p5-IO-Tty/pkg/PLIST
+++ b/devel/p5-IO-Tty/pkg/PLIST
@@ -1,9 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/07/16 00:52:14 thorpej Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/IO/Tty/Tty.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/IO/Tty/Tty.bs
-lib/perl5/site_perl/IO/Pty.pm
-lib/perl5/site_perl/IO/Tty.pm
-lib/perl5/man/man3/IO::Pty.3
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/IO/Tty/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/IO/Tty
-@dirrm lib/perl5/site_perl/IO
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:07 jlam Exp $
diff --git a/devel/p5-IO-stringy/Makefile b/devel/p5-IO-stringy/Makefile
index ef375576fb1..25808ea31a2 100644
--- a/devel/p5-IO-stringy/Makefile
+++ b/devel/p5-IO-stringy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/16 01:13:33 mjl Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/27 07:11:07 jlam Exp $
 #
 
 DISTNAME=	IO-stringy-1.212
@@ -8,9 +8,10 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=IO/}
 
 MAINTAINER=	packages@netbsd.org
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/IO-stringy/.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/devel/p5-IO-stringy/pkg/PLIST b/devel/p5-IO-stringy/pkg/PLIST
index a26a7fb2c8e..de8b3970df2 100644
--- a/devel/p5-IO-stringy/pkg/PLIST
+++ b/devel/p5-IO-stringy/pkg/PLIST
@@ -1,18 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/12/03 08:27:29 rh Exp $
-lib/perl5/site_perl/IO/Stringy.pm
-lib/perl5/site_perl/IO/Wrap.pm
-lib/perl5/site_perl/IO/Lines.pm
-lib/perl5/site_perl/IO/WrapTie.pm
-lib/perl5/site_perl/IO/ScalarArray.pm
-lib/perl5/site_perl/IO/AtomicFile.pm
-lib/perl5/site_perl/IO/Scalar.pm
-lib/perl5/man/man3/IO::Stringy.3
-lib/perl5/man/man3/IO::Wrap.3
-lib/perl5/man/man3/IO::Lines.3
-lib/perl5/man/man3/IO::WrapTie.3
-lib/perl5/man/man3/IO::AtomicFile.3
-lib/perl5/man/man3/IO::ScalarArray.3
-lib/perl5/man/man3/IO::Scalar.3
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/IO-stringy/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/IO-stringy
-@dirrm lib/perl5/site_perl/IO
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:07 jlam Exp $
diff --git a/devel/p5-LDAP/Makefile b/devel/p5-LDAP/Makefile
index b91a0dd4b70..8971302a019 100644
--- a/devel/p5-LDAP/Makefile
+++ b/devel/p5-LDAP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/05/24 08:32:35 hwr Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 07:11:07 jlam Exp $
 #
 
 DISTNAME=	perldap-1.2.2
@@ -12,11 +12,16 @@ HOMEPAGE=	http://www.mozilla.org/directory/perldap.html
 
 DEPENDS+=	ldapsdk-12311998:../../devel/ldapsdk
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Mozilla/LDAP/API/.packlist
 
 WRKSRC=		${WRKDIR}/perldap
 
+MAKE_ENV+=	LDAPSDKDIR=${LOCALBASE}
+MAKE_ENV+=	LDAPSDKSSL="no"
+MAKE_ENV+=	LDAPV3ON="yes"
+
 do-configure:
-	@cd ${WRKSRC}; ${SETENV} LDAPSDKDIR=${LOCALBASE} LDAPSDKSSL="no" LDAPV3ON=yes ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-LDAP/pkg/PLIST b/devel/p5-LDAP/pkg/PLIST
index 4bca573830a..125ec09ee55 100644
--- a/devel/p5-LDAP/pkg/PLIST
+++ b/devel/p5-LDAP/pkg/PLIST
@@ -1,18 +1 @@
-@comment $NetBSD: PLIST,v 1.3 2000/01/08 04:26:50 wiz Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Mozilla/LDAP/API/API.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Mozilla/LDAP/API/API.bs
-lib/perl5/site_perl/Mozilla/LDAP/Conn.pm
-lib/perl5/site_perl/Mozilla/LDAP/LDIF.pm
-lib/perl5/site_perl/Mozilla/LDAP/Utils.pm
-lib/perl5/site_perl/Mozilla/LDAP/API.pm
-lib/perl5/site_perl/Mozilla/LDAP/Entry.pm
-lib/perl5/site_perl/auto/Mozilla/LDAP/API/autosplit.ix
-lib/perl5/man/man3/Mozilla::LDAP::Conn.3
-lib/perl5/man/man3/Mozilla::LDAP::LDIF.3
-lib/perl5/man/man3/Mozilla::LDAP::Utils.3
-lib/perl5/man/man3/Mozilla::LDAP::Entry.3
-lib/perl5/man/man3/Mozilla::LDAP::API.3
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Mozilla/LDAP/API/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Mozilla/LDAP/API
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Mozilla/LDAP
-@dirrm lib/perl5/site_perl/Mozilla/LDAP
+@comment $NetBSD: PLIST,v 1.4 2000/08/27 07:11:07 jlam Exp $
diff --git a/devel/p5-MLDBM/Makefile b/devel/p5-MLDBM/Makefile
index 07100b425e7..8ebf3836dad 100644
--- a/devel/p5-MLDBM/Makefile
+++ b/devel/p5-MLDBM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/02/28 01:04:12 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/27 07:11:07 jlam Exp $
 #
 
 DISTNAME=		MLDBM-2.00
@@ -11,9 +11,10 @@ HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/MLDBM/MLDBM.html
 
 DEPENDS+= 		p5-Data-Dumper-*:../../devel/p5-Data-Dumper
 
-USE_PERL5=		YES
+USE_PERL5=		# defined
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/MLDBM/.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/devel/p5-MLDBM/pkg/PLIST b/devel/p5-MLDBM/pkg/PLIST
index f72c5ce8a80..125ec09ee55 100644
--- a/devel/p5-MLDBM/pkg/PLIST
+++ b/devel/p5-MLDBM/pkg/PLIST
@@ -1,10 +1 @@
-@comment $NetBSD: PLIST,v 1.3 1999/04/08 18:51:51 agc Exp $
-lib/perl5/man/man3/MLDBM.3
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/MLDBM/.packlist
-lib/perl5/site_perl/MLDBM.pm
-lib/perl5/site_perl/MLDBM/Serializer/Data/Dumper.pm
-lib/perl5/site_perl/MLDBM/Serializer/FreezeThaw.pm
-lib/perl5/site_perl/MLDBM/Serializer/Storable.pm
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/MLDBM
-@dirrm lib/perl5/site_perl/MLDBM/Serializer/Data
-@dirrm lib/perl5/site_perl/MLDBM/Serializer
+@comment $NetBSD: PLIST,v 1.4 2000/08/27 07:11:07 jlam Exp $
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index 082c2e1bd42..bb12ce03384 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/04/16 14:37:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/27 07:11:07 jlam Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/06/24 18:43:28 jfitz Exp
 #
 
@@ -12,13 +12,22 @@ MAINTAINER=	packages@netbsd.org
 
 DEPENDS+=	p5-Curses-1.02:../../devel/p5-Curses
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/PV/.packlist
 
-NO_WRKSUBDIR=	YES
-NO_BUILD=	YES
+NO_WRKSUBDIR=	# defined
+DOCDIR=		${PREFIX}/share/doc/PerlVision
 
-do-install:
-	${INSTALL_DATA} ${WRKDIR}/PV.pm ${PREFIX}/lib/perl5/site_perl
-	${INSTALL_DATA} ${WRKDIR}/PerlVision.doc ${PREFIX}/lib/perl5/site_perl
+pre-configure:
+	${RM} -f ${WRKSRC}/Makefile
+	${CP} ${FILESDIR}/Makefile.PL ${WRKSRC}/Makefile.PL
+
+do-configure:
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+
+post-install:
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIR}/PerlVision.doc ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIR}/README ${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-PV/pkg/PLIST b/devel/p5-PV/pkg/PLIST
index ff1dfa97a20..a7d6ee98ad1 100644
--- a/devel/p5-PV/pkg/PLIST
+++ b/devel/p5-PV/pkg/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1998/07/13 16:55:59 tv Exp $
-lib/perl5/site_perl/PV.pm
-lib/perl5/site_perl/PerlVision.doc
+@comment $NetBSD: PLIST,v 1.3 2000/08/27 07:11:08 jlam Exp $
+share/doc/PerlVision/PerlVision.doc
+share/doc/PerlVision/README
+@dirrm share/doc/PerlVision
diff --git a/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile
index fd3f0443290..bbf789de1ee 100644
--- a/devel/p5-Time-HiRes/Makefile
+++ b/devel/p5-Time-HiRes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:41 tron Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/27 07:11:08 jlam Exp $
 #
 
 DISTNAME=		Time-HiRes-01.19
@@ -8,11 +8,12 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Time/}
 
 MAINTAINER=		bad@netbsd.org
 
-USE_PERL5=		yes
+USE_PERL5=		# defined
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Time/HiRes/.packlist
 
 WRKSRC=			${WRKDIR}/Time-HiRes-01.19
 
 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/devel/p5-Time-HiRes/pkg/PLIST b/devel/p5-Time-HiRes/pkg/PLIST
new file mode 100644
index 00000000000..d7ef803d80b
--- /dev/null
+++ b/devel/p5-Time-HiRes/pkg/PLIST
@@ -0,0 +1 @@
+@comment $NetBSD: PLIST,v 1.1 2000/08/27 07:11:08 jlam Exp $
diff --git a/devel/p5-Time-HiRes/pkg/PLIST-md.shared b/devel/p5-Time-HiRes/pkg/PLIST-md.shared
deleted file mode 100644
index f265bd320b0..00000000000
--- a/devel/p5-Time-HiRes/pkg/PLIST-md.shared
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-md.shared,v 1.2 1999/04/08 18:51:51 agc Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Time/HiRes/HiRes.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Time/HiRes/HiRes.so
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Time/HiRes
diff --git a/devel/p5-Time-HiRes/pkg/PLIST-md.static b/devel/p5-Time-HiRes/pkg/PLIST-md.static
deleted file mode 100644
index 69ecbc73ef8..00000000000
--- a/devel/p5-Time-HiRes/pkg/PLIST-md.static
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-md.static,v 1.2 1999/04/08 18:51:51 agc Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Time/HiRes/HiRes.a
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Time/HiRes/extralibs.ld
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Time/HiRes
diff --git a/devel/p5-Time-HiRes/pkg/PLIST-mi b/devel/p5-Time-HiRes/pkg/PLIST-mi
deleted file mode 100644
index f16e7edaa65..00000000000
--- a/devel/p5-Time-HiRes/pkg/PLIST-mi
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-mi,v 1.2 1999/04/08 18:51:51 agc Exp $
-lib/perl5/man/man3/Time::HiRes.3
-lib/perl5/site_perl/Time/HiRes.pm
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Time/HiRes/.packlist
diff --git a/devel/p5-TimeDate/Makefile b/devel/p5-TimeDate/Makefile
index 7a365088fe2..4445c9618d6 100644
--- a/devel/p5-TimeDate/Makefile
+++ b/devel/p5-TimeDate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/12/28 12:51:27 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/27 07:11:11 jlam Exp $
 #
 
 DISTNAME=      	TimeDate-1.08
@@ -8,9 +8,10 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Date/}
 
 MAINTAINER=	packages@netbsd.org
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/TimeDate/.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/devel/p5-TimeDate/pkg/PLIST b/devel/p5-TimeDate/pkg/PLIST
index aa27c60f983..31cd854657f 100644
--- a/devel/p5-TimeDate/pkg/PLIST
+++ b/devel/p5-TimeDate/pkg/PLIST
@@ -1,12 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/12/03 08:47:25 rh Exp $
-lib/perl5/site_perl/Date/Format.pm
-lib/perl5/site_perl/Date/Parse.pm
-lib/perl5/site_perl/Date/Language.pm
-lib/perl5/site_perl/Time/Zone.pm
-lib/perl5/man/man3/Date::Format.3
-lib/perl5/man/man3/Date::Parse.3
-lib/perl5/man/man3/Time::Zone.3
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/TimeDate/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/TimeDate
-@dirrm lib/perl5/site_perl/Date
-@dirrm lib/perl5/site_perl/Time
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:11 jlam Exp $