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

22 files changed, 60 insertions, 195 deletions

diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index b616ab78d23..5de309fbb90 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/03/17 23:31:48 tron Exp $
+# $NetBSD: Makefile,v 1.17 2000/08/27 07:11:16 jlam Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/12/16 19:42:17 vanilla Exp
 #
 
@@ -18,10 +18,10 @@ HOMEPAGE=	http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html
 
 DEPENDS=	gd>=1.8.1:../../graphics/gd
 
-USE_PERL5=	YES
-USE_X11=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+= --with-gd-inc=${LOCALBASE}/include \
+USE_PERL5=	# defined
+USE_X11=	# defined
+GNU_CONFIGURE=	# defined
+CONFIGURE_ARGS= --with-gd-inc=${LOCALBASE}/include \
 		--with-gd-lib=${LOCALBASE}/lib
 
 .include "../../mk/bsd.prefs.mk"
@@ -60,9 +60,10 @@ do-install:
 	done
 	${INSTALL_PROGRAM} ${WRKSRC}/run/rateup ${PREFIX}/libexec/
 	${INSTALL_SCRIPT} ${WRKSRC}/run/mrtg ${PREFIX}/bin/
+	${INSTALL_DATA_DIR} ${PERL5_SITELIB}
 	${INSTALL_SCRIPT} ${WRKSRC}/run/BER.pm ${WRKSRC}/run/SNMP_Session.pm \
 		${WRKSRC}/run/SNMP_util.pm ${WRKSRC}/run/locales_mrtg.pm \
-		${PREFIX}/lib/perl5/site_perl/
+		${PERL5_SITELIB}
 	for file in cfgmaker cfgmaker_ip indexmaker; do \
 		${INSTALL_SCRIPT} ${WRKSRC}/run/$$file \
 			${PREFIX}/bin/mrtg$$file; \
diff --git a/net/mrtg/pkg/PLIST b/net/mrtg/pkg/PLIST
index 4171fb6bbab..98ed3f1ac9b 100644
--- a/net/mrtg/pkg/PLIST
+++ b/net/mrtg/pkg/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.7 2000/03/05 07:35:18 kim Exp $
+@comment $NetBSD: PLIST,v 1.8 2000/08/27 07:11:16 jlam Exp $
 bin/mrtg
 bin/mrtgcfgmaker
 bin/mrtgcfgmaker_ip
 bin/mrtgindexmaker
 etc/mrtg/mrtg.conf.example
-lib/perl5/site_perl/BER.pm
-lib/perl5/site_perl/SNMP_Session.pm
-lib/perl5/site_perl/SNMP_util.pm
-lib/perl5/site_perl/locales_mrtg.pm
+${PERL5_SITELIB}/BER.pm
+${PERL5_SITELIB}/SNMP_Session.pm
+${PERL5_SITELIB}/SNMP_util.pm
+${PERL5_SITELIB}/locales_mrtg.pm
 libexec/netstat2mrtg
 libexec/rateup
 libexec/sys2mrtg
diff --git a/net/p5-Net-DNS/Makefile b/net/p5-Net-DNS/Makefile
index b631bba55e2..1cfea90dd02 100644
--- a/net/p5-Net-DNS/Makefile
+++ b/net/p5-Net-DNS/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/11/08 01:06:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 07:11:17 jlam Exp $
 #
 
 DISTNAME=		Net-DNS-0.12
-PKGNAME=		p5-Net-DNS-0.12
+PKGNAME=		p5-${DISTNAME}
 CATEGORIES=		net perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Net/}
 
 MAINTAINER=		hubertf@netbsd.org
 
-USE_PERL5=		YES
+USE_PERL5=		# defined
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/DNS/.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/net/p5-Net-DNS/pkg/PLIST b/net/p5-Net-DNS/pkg/PLIST
index 5ca248af9a7..256babf995a 100644
--- a/net/p5-Net-DNS/pkg/PLIST
+++ b/net/p5-Net-DNS/pkg/PLIST
@@ -1,73 +1 @@
-@comment $NetBSD: PLIST,v 1.2 1999/12/20 04:14:23 simonb Exp $
-lib/perl5/site_perl/Net/DNS.pm
-lib/perl5/site_perl/Net/DNS/Header.pm
-lib/perl5/site_perl/Net/DNS/Packet.pm
-lib/perl5/site_perl/Net/DNS/Question.pm
-lib/perl5/site_perl/Net/DNS/RR.pm
-lib/perl5/site_perl/Net/DNS/Resolver.pm
-lib/perl5/site_perl/Net/DNS/Update.pm
-lib/perl5/site_perl/Net/DNS/RR/A.pm
-lib/perl5/site_perl/Net/DNS/RR/AAAA.pm
-lib/perl5/site_perl/Net/DNS/RR/AFSDB.pm
-lib/perl5/site_perl/Net/DNS/RR/CNAME.pm
-lib/perl5/site_perl/Net/DNS/RR/EID.pm
-lib/perl5/site_perl/Net/DNS/RR/HINFO.pm
-lib/perl5/site_perl/Net/DNS/RR/ISDN.pm
-lib/perl5/site_perl/Net/DNS/RR/LOC.pm
-lib/perl5/site_perl/Net/DNS/RR/MB.pm
-lib/perl5/site_perl/Net/DNS/RR/MG.pm
-lib/perl5/site_perl/Net/DNS/RR/MINFO.pm
-lib/perl5/site_perl/Net/DNS/RR/MR.pm
-lib/perl5/site_perl/Net/DNS/RR/MX.pm
-lib/perl5/site_perl/Net/DNS/RR/NAPTR.pm
-lib/perl5/site_perl/Net/DNS/RR/NIMLOC.pm
-lib/perl5/site_perl/Net/DNS/RR/NS.pm
-lib/perl5/site_perl/Net/DNS/RR/NSAP.pm
-lib/perl5/site_perl/Net/DNS/RR/NULL.pm
-lib/perl5/site_perl/Net/DNS/RR/PTR.pm
-lib/perl5/site_perl/Net/DNS/RR/PX.pm
-lib/perl5/site_perl/Net/DNS/RR/RP.pm
-lib/perl5/site_perl/Net/DNS/RR/RT.pm
-lib/perl5/site_perl/Net/DNS/RR/SOA.pm
-lib/perl5/site_perl/Net/DNS/RR/SRV.pm
-lib/perl5/site_perl/Net/DNS/RR/TXT.pm
-lib/perl5/site_perl/Net/DNS/RR/X25.pm
-lib/perl5/man/man3/Net::DNS::RR::EID.3
-lib/perl5/man/man3/Net::DNS::RR::NSAP.3
-lib/perl5/man/man3/Net::DNS::RR::PTR.3
-lib/perl5/man/man3/Net::DNS::RR::MINFO.3
-lib/perl5/man/man3/Net::DNS::RR::NULL.3
-lib/perl5/man/man3/Net::DNS::RR::LOC.3
-lib/perl5/man/man3/Net::DNS.3
-lib/perl5/man/man3/Net::DNS::Resolver.3
-lib/perl5/man/man3/Net::DNS::RR::MR.3
-lib/perl5/man/man3/Net::DNS::RR::TXT.3
-lib/perl5/man/man3/Net::DNS::RR::RP.3
-lib/perl5/man/man3/Net::DNS::RR::CNAME.3
-lib/perl5/man/man3/Net::DNS::RR::MX.3
-lib/perl5/man/man3/Net::DNS::RR::NAPTR.3
-lib/perl5/man/man3/Net::DNS::Packet.3
-lib/perl5/man/man3/Net::DNS::RR::RT.3
-lib/perl5/man/man3/Net::DNS::RR::PX.3
-lib/perl5/man/man3/Net::DNS::Update.3
-lib/perl5/man/man3/Net::DNS::RR.3
-lib/perl5/man/man3/Net::DNS::RR::HINFO.3
-lib/perl5/man/man3/Net::DNS::RR::MG.3
-lib/perl5/man/man3/Net::DNS::Header.3
-lib/perl5/man/man3/Net::DNS::RR::SRV.3
-lib/perl5/man/man3/Net::DNS::RR::X25.3
-lib/perl5/man/man3/Net::DNS::RR::AFSDB.3
-lib/perl5/man/man3/Net::DNS::RR::A.3
-lib/perl5/man/man3/Net::DNS::RR::NS.3
-lib/perl5/man/man3/Net::DNS::RR::NIMLOC.3
-lib/perl5/man/man3/Net::DNS::RR::SOA.3
-lib/perl5/man/man3/Net::DNS::RR::AAAA.3
-lib/perl5/man/man3/Net::DNS::Question.3
-lib/perl5/man/man3/Net::DNS::RR::ISDN.3
-lib/perl5/man/man3/Net::DNS::RR::MB.3
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Net/DNS/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Net/DNS
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Net
-@dirrm lib/perl5/site_perl/Net/DNS/RR
-@dirrm lib/perl5/site_perl/Net/DNS
-@dirrm lib/perl5/site_perl/Net
+@comment $NetBSD: PLIST,v 1.3 2000/08/27 07:11:17 jlam Exp $
diff --git a/net/p5-Net-Telnet/Makefile b/net/p5-Net-Telnet/Makefile
index 853ed01dd7e..d706b23afe0 100644
--- a/net/p5-Net-Telnet/Makefile
+++ b/net/p5-Net-Telnet/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.1 2000/05/11 15:04:59 he Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 07:11:17 jlam Exp $
 #
 
 DISTNAME=	Net-Telnet-3.01
-PKGNAME=	p5-Net-Telnet-3.01
+PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
 
 MAINTAINER=	packages@netbsd.org
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Net/Telnet/.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/net/p5-Net-Telnet/pkg/PLIST b/net/p5-Net-Telnet/pkg/PLIST
index 1b904a011d2..84a1579ec78 100644
--- a/net/p5-Net-Telnet/pkg/PLIST
+++ b/net/p5-Net-Telnet/pkg/PLIST
@@ -1,7 +1 @@
-@comment $NetBSD: PLIST,v 1.1 2000/05/11 15:05:01 he Exp $
-lib/perl5/site_perl/Net/Telnet.pm
-lib/perl5/man/man3/Net::Telnet.3
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Net/Telnet/.packlist
-@dirrm lib/perl5/site_perl/Net
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Net/Telnet
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Net
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:17 jlam Exp $
diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index f8a2888d95e..d4b7fc493e7 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/07/03 11:30:20 mjl Exp $
+# $NetBSD: Makefile,v 1.16 2000/08/27 07:11:17 jlam Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/06/27 18:38:15 jfitz Exp
 #
 
@@ -12,9 +12,10 @@ HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/libnet/FAQ.html
 
 DEPENDS+= 	p5-Data-Dumper-*:../../devel/p5-Data-Dumper
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Net/.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/net/p5-Net/pkg/PLIST b/net/p5-Net/pkg/PLIST
index 1fdb489c988..ffdfce1cfe8 100644
--- a/net/p5-Net/pkg/PLIST
+++ b/net/p5-Net/pkg/PLIST
@@ -1,36 +1 @@
-@comment $NetBSD: PLIST,v 1.7 2000/07/03 11:30:22 mjl Exp $
-lib/perl5/man/man3/Net::Cmd.3
-lib/perl5/man/man3/Net::Domain.3
-lib/perl5/man/man3/Net::DummyInetd.3
-lib/perl5/man/man3/Net::FTP.3
-lib/perl5/man/man3/Net::NNTP.3
-lib/perl5/man/man3/Net::Netrc.3
-lib/perl5/man/man3/Net::PH.3
-lib/perl5/man/man3/Net::POP3.3
-lib/perl5/man/man3/Net::SMTP.3
-lib/perl5/man/man3/Net::SNPP.3
-lib/perl5/man/man3/Net::Time.3
-lib/perl5/man/man3/Net::libnetFAQ.3
-lib/perl5/site_perl/Net/Cmd.pm
-lib/perl5/site_perl/Net/Config.pm
-lib/perl5/site_perl/Net/Domain.pm
-lib/perl5/site_perl/Net/DummyInetd.pm
-lib/perl5/site_perl/Net/FTP.pm
-lib/perl5/site_perl/Net/FTP/A.pm
-lib/perl5/site_perl/Net/FTP/E.pm
-lib/perl5/site_perl/Net/FTP/I.pm
-lib/perl5/site_perl/Net/FTP/L.pm
-lib/perl5/site_perl/Net/FTP/dataconn.pm
-lib/perl5/site_perl/Net/NNTP.pm
-lib/perl5/site_perl/Net/Netrc.pm
-lib/perl5/site_perl/Net/PH.pm
-lib/perl5/site_perl/Net/POP3.pm
-lib/perl5/site_perl/Net/SMTP.pm
-lib/perl5/site_perl/Net/SNPP.pm
-lib/perl5/site_perl/Net/Time.pm
-lib/perl5/site_perl/Net/libnet.cfg
-lib/perl5/site_perl/Net/libnetFAQ.pod
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Net/.packlist
-@dirrm lib/perl5/site_perl/Net/FTP
-@dirrm lib/perl5/site_perl/Net
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Net
+@comment $NetBSD: PLIST,v 1.8 2000/08/27 07:11:17 jlam Exp $
diff --git a/net/p5-SNMP/Makefile b/net/p5-SNMP/Makefile
index 2e52787cc5e..355fe1d16e2 100644
--- a/net/p5-SNMP/Makefile
+++ b/net/p5-SNMP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/04/09 18:32:23 tron Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/27 07:11:17 jlam Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/06/27 01:53:13 jfitz Exp
 #
 
@@ -11,12 +11,14 @@ MAINTAINER=	packages@netbsd.org
 
 DEPENDS=	ucd-snmp>=4.0.1:../../net/ucd-snmp
 
-USE_PERL5=	yes
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/SNMP/.packlist
 
 do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 post-install:
-		@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/lib/perl5/site_perl/README.SNMP
+	@${INSTALL_DATA} ${WRKSRC}/README \
+		${PREFIX}/lib/perl5/site_perl/README.SNMP
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-SNMP/pkg/PLIST b/net/p5-SNMP/pkg/PLIST
new file mode 100644
index 00000000000..e52964024e4
--- /dev/null
+++ b/net/p5-SNMP/pkg/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2000/08/27 07:11:18 jlam Exp $
+lib/perl5/site_perl/README.SNMP
diff --git a/net/p5-SNMP/pkg/PLIST-md.shared b/net/p5-SNMP/pkg/PLIST-md.shared
deleted file mode 100644
index 6fcefaf5d44..00000000000
--- a/net/p5-SNMP/pkg/PLIST-md.shared
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-md.shared,v 1.2 1999/04/08 18:51:57 agc Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/SNMP/SNMP.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/SNMP/SNMP.so
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/SNMP
diff --git a/net/p5-SNMP/pkg/PLIST-md.static b/net/p5-SNMP/pkg/PLIST-md.static
deleted file mode 100644
index 53efdaa2467..00000000000
--- a/net/p5-SNMP/pkg/PLIST-md.static
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-md.static,v 1.2 1999/04/08 18:51:57 agc Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/SNMP/SNMP.a
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/SNMP/extralibs.ld
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/SNMP
diff --git a/net/p5-SNMP/pkg/PLIST-mi b/net/p5-SNMP/pkg/PLIST-mi
deleted file mode 100644
index d01e578915f..00000000000
--- a/net/p5-SNMP/pkg/PLIST-mi
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST-mi,v 1.2 1999/04/08 18:51:57 agc Exp $
-lib/perl5/site_perl/auto/SNMP/autosplit.ix
-lib/perl5/site_perl/SNMP.pm
-lib/perl5/site_perl/README.SNMP
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/SNMP/.packlist
-@dirrm lib/perl5/site_perl/auto/SNMP
diff --git a/net/p5-Socket6/Makefile b/net/p5-Socket6/Makefile
index 50398fba1b1..c3dcccf10b1 100644
--- a/net/p5-Socket6/Makefile
+++ b/net/p5-Socket6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/06/04 13:11:45 itojun Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/27 07:11:18 jlam Exp $
 #
 
 DISTNAME=		Socket6-0.07
@@ -9,14 +9,17 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Socket6/}
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/libnet/FAQ.html
 
-USE_PERL5=		YES
+USE_PERL5=		# defined
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Socket6/.packlist
 
-# supports IPv6 (actually, af independent)
 .include "../../mk/bsd.prefs.mk"
-BUILD_DEFS+=	USE_INET6
+
+# supports IPv6 (actually, af independent)
+BUILD_DEFS+=		USE_INET6
+
+MAKE_ENV+=		CCFLAGS="${CFLAGS} ${CPPFLAGS}"
 
 do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL \
-		CCFLAGS="${CFLAGS} ${CPPFLAGS}"
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/p5-Socket6/pkg/PLIST b/net/p5-Socket6/pkg/PLIST
index 3553408fd5c..035cdcc1651 100644
--- a/net/p5-Socket6/pkg/PLIST
+++ b/net/p5-Socket6/pkg/PLIST
@@ -1,6 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/05/26 14:55:57 itojun Exp $
-lib/perl5/site_perl/Socket6.pm
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Socket6/.packlist
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Socket6/Socket6.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Socket6/Socket6.so
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Socket6
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:18 jlam Exp $
diff --git a/net/p5-Wais/Makefile b/net/p5-Wais/Makefile
index 28bb5861a8e..0fe57d4d513 100644
--- a/net/p5-Wais/Makefile
+++ b/net/p5-Wais/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/05/11 14:05:05 bad Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/27 07:11:18 jlam Exp $
 #
 
 DISTNAME=	Wais-2.311
@@ -11,9 +11,10 @@ MAINTAINER=	bad@netbsd.org
 DEPENDS+=	freewais-sf-2.2.12:../../net/freewais-sf
 DEPENDS+=	p5-Curses-1.02:../../devel/p5-Curses
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Wais/.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/net/p5-Wais/pkg/PLIST b/net/p5-Wais/pkg/PLIST
new file mode 100644
index 00000000000..ec4a0427da2
--- /dev/null
+++ b/net/p5-Wais/pkg/PLIST
@@ -0,0 +1 @@
+@comment $NetBSD: PLIST,v 1.1 2000/08/27 07:11:19 jlam Exp $
diff --git a/net/p5-Wais/pkg/PLIST-md.shared b/net/p5-Wais/pkg/PLIST-md.shared
deleted file mode 100644
index 58422cd2cfa..00000000000
--- a/net/p5-Wais/pkg/PLIST-md.shared
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-md.shared,v 1.1.1.1 1999/05/11 14:03:13 bad Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Wais/Wais.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Wais/Wais.so
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Wais
diff --git a/net/p5-Wais/pkg/PLIST-md.static b/net/p5-Wais/pkg/PLIST-md.static
deleted file mode 100644
index b9c1caf54a5..00000000000
--- a/net/p5-Wais/pkg/PLIST-md.static
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-md.static,v 1.1.1.1 1999/05/11 14:03:13 bad Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Wais/Wais.a
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Wais/extralibs.ld
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Wais
diff --git a/net/p5-Wais/pkg/PLIST-mi b/net/p5-Wais/pkg/PLIST-mi
deleted file mode 100644
index b9f63b043ed..00000000000
--- a/net/p5-Wais/pkg/PLIST-mi
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST-mi,v 1.1.1.1 1999/05/11 14:03:13 bad Exp $
-bin/inspect
-man/man1/inspect.1
-lib/perl5/man/man3/Wais.3
-lib/perl5/site_perl/Wais.pm
-lib/perl5/site_perl/Wais/Dict.pm
-@dirrm lib/perl5/site_perl/Wais
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Wais/.packlist
diff --git a/net/pfnet/Makefile b/net/pfnet/Makefile
index 8e7ba2af98a..54d41d346b3 100644
--- a/net/pfnet/Makefile
+++ b/net/pfnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/11/22 22:30:07 tv Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 07:11:19 jlam Exp $
 #
 
 DISTNAME=	fnet.pl-1.4
@@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ftp.abattoir.com/pub/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.abattoir.com/~banshee/Tech/
 
-USE_PERL5=	yes
+USE_PERL5=	# defined
 
 WRKSRC=		${WRKDIR}/fnet-1.4
 
@@ -17,8 +17,8 @@ do-build:
 	${SED} -e 's,/usr/local,${PREFIX},g' ${WRKSRC}/fnet.pl >${WRKSRC}/pfnet
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/CMDLINE.pm ${WRKSRC}/FNET.pm \
-		${PREFIX}/lib/perl5/site_perl/
-	${INSTALL_SCRIPT} ${WRKSRC}/pfnet ${PREFIX}/bin/
+	${INSTALL_DATA_DIR} ${PERL5_SITELIB}
+	${INSTALL_DATA} ${WRKSRC}/CMDLINE.pm ${WRKSRC}/FNET.pm ${PERL5_SITELIB}
+	${INSTALL_SCRIPT} ${WRKSRC}/pfnet ${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/pfnet/pkg/PLIST b/net/pfnet/pkg/PLIST
index b8cf9a22cbc..7eadabbae47 100644
--- a/net/pfnet/pkg/PLIST
+++ b/net/pfnet/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1998/11/22 22:30:08 tv Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/08/27 07:11:19 jlam Exp $
 bin/pfnet
-lib/perl5/site_perl/CMDLINE.pm
-lib/perl5/site_perl/FNET.pm
+${PERL5_SITELIB}/CMDLINE.pm
+${PERL5_SITELIB}/FNET.pm