Convert packages to use PERL5_PACKLIST (part 2). These are the database and

Apache perl modules, and each compiled and installed/de-installed apparently
correctly.

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

5 files changed, 15 insertions, 110 deletions

diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index 912d8a80ee5..8f18e63a1ab 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/12/02 21:03:35 rh Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/27 10:37:04 jlam Exp $
 #
 
 DISTNAME=       	mod_perl-1.19
@@ -12,16 +12,23 @@ HOMEPAGE=		http://perl.apache.org/
 DEPENDS+=		libperl-5.*:../../lang/libperl
 DEPENDS+=		apache-1.3.*:../../www/apache
 
-USE_PERL5=		yes
+USE_PERL5=		# defined
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/mod_perl/.packlist
 
-MAKE_ENV=		DYNALOADER_OBJ_PIC="${PREFIX}/lib/perl5/${MACHINE_ARCH}-${LOWER_OPSYS}/5.00404/DynaLoader_pic.o"
+MAKE_PARAMS+=		USE_APXS=1
+MAKE_PARAMS+=		WITH_APXS=${PREFIX}/sbin/apxs
+MAKE_PARAMS+=		EVERYTHING=1
 
 do-configure:
-	@cd ${WRKSRC} && ${PREFIX}/bin/perl Makefile.PL USE_APXS=1 \
-		WITH_APXS=${PREFIX}/sbin/apxs EVERYTHING=1
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		${PERL5} Makefile.PL ${MAKE_PARAMS}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/htdocs/manual/mod/mod_perl.html \
 		${PREFIX}/share/httpd/htdocs/manual/mod/
 
 .include "../../mk/bsd.pkg.mk"
+
+.if exists(${PERL5_ARCHLIB}/DynaLoader_pic.o)
+MAKE_ENV+=		DYNALOADER_OBJ_PIC="${PERL5_ARCHLIB}/DynaLoader_pic.o"
+.endif
diff --git a/www/ap-perl/pkg/PLIST b/www/ap-perl/pkg/PLIST
new file mode 100644
index 00000000000..c0f645173f3
--- /dev/null
+++ b/www/ap-perl/pkg/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.8 2000/08/27 10:37:04 jlam Exp $
+lib/httpd/mod_perl.so
+share/httpd/htdocs/manual/mod/mod_perl.html
diff --git a/www/ap-perl/pkg/PLIST-md.shared b/www/ap-perl/pkg/PLIST-md.shared
deleted file mode 100644
index 769b8bd093c..00000000000
--- a/www/ap-perl/pkg/PLIST-md.shared
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST-md.shared,v 1.1 1999/12/02 21:16:28 rh Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Leak/Leak.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Leak/Leak.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Symbol/Symbol.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Symbol/Symbol.so
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Leak
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Symbol
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache
diff --git a/www/ap-perl/pkg/PLIST-md.static b/www/ap-perl/pkg/PLIST-md.static
deleted file mode 100644
index 2895c6ac776..00000000000
--- a/www/ap-perl/pkg/PLIST-md.static
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST-md.static,v 1.1 1999/12/02 21:16:28 rh Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Leak/Leak.a
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Leak/extralibs.ld
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Symbol/Symbol.a
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Symbol/extralibs.ld
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Leak
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache/Symbol
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Apache
diff --git a/www/ap-perl/pkg/PLIST-mi b/www/ap-perl/pkg/PLIST-mi
deleted file mode 100644
index 3d73892dd82..00000000000
--- a/www/ap-perl/pkg/PLIST-mi
+++ /dev/null
@@ -1,89 +0,0 @@
-@comment $NetBSD: PLIST-mi,v 1.1 1999/12/02 21:16:28 rh Exp $
-lib/httpd/mod_perl.so
-lib/perl5/man/man3/Apache.3
-lib/perl5/man/man3/Apache::Constants.3
-lib/perl5/man/man3/Apache::Debug.3
-lib/perl5/man/man3/Apache::ExtUtils.3
-lib/perl5/man/man3/Apache::FakeRequest.3
-lib/perl5/man/man3/Apache::Include.3
-lib/perl5/man/man3/Apache::Leak.3
-lib/perl5/man/man3/Apache::Log.3
-lib/perl5/man/man3/Apache::Options.3
-lib/perl5/man/man3/Apache::PerlRun.3
-lib/perl5/man/man3/Apache::PerlRunXS.3
-lib/perl5/man/man3/Apache::PerlSections.3
-lib/perl5/man/man3/Apache::RedirectLogFix.3
-lib/perl5/man/man3/Apache::Registry.3
-lib/perl5/man/man3/Apache::RegistryLoader.3
-lib/perl5/man/man3/Apache::Resource.3
-lib/perl5/man/man3/Apache::SIG.3
-lib/perl5/man/man3/Apache::SizeLimit.3
-lib/perl5/man/man3/Apache::StatINC.3
-lib/perl5/man/man3/Apache::Status.3
-lib/perl5/man/man3/Apache::Symbol.3
-lib/perl5/man/man3/Apache::Symdump.3
-lib/perl5/man/man3/Apache::Table.3
-lib/perl5/man/man3/Apache::URI.3
-lib/perl5/man/man3/Apache::Util.3
-lib/perl5/man/man3/Apache::httpd_conf.3
-lib/perl5/man/man3/Apache::src.3
-lib/perl5/man/man3/Bundle::Apache.3
-lib/perl5/man/man3/cgi_to_mod_perl.3
-lib/perl5/man/man3/mod_perl.3
-lib/perl5/man/man3/mod_perl_cvs.3
-lib/perl5/man/man3/mod_perl_method_handlers.3
-lib/perl5/man/man3/mod_perl_traps.3
-lib/perl5/man/man3/mod_perl_tuning.3
-lib/perl5/site_perl/Apache.pm
-lib/perl5/site_perl/Apache/Connection.pm
-lib/perl5/site_perl/Apache/Constants.pm
-lib/perl5/site_perl/Apache/Constants/Exports.pm
-lib/perl5/site_perl/Apache/Debug.pm
-lib/perl5/site_perl/Apache/ExtUtils.pm
-lib/perl5/site_perl/Apache/FakeRequest.pm
-lib/perl5/site_perl/Apache/File.pm
-lib/perl5/site_perl/Apache/Include.pm
-lib/perl5/site_perl/Apache/Leak.pm
-lib/perl5/site_perl/Apache/Log.pm
-lib/perl5/site_perl/Apache/ModuleConfig.pm
-lib/perl5/site_perl/Apache/MyConfig.pm
-lib/perl5/site_perl/Apache/Opcode.pm
-lib/perl5/site_perl/Apache/Options.pm
-lib/perl5/site_perl/Apache/PerlRun.pm
-lib/perl5/site_perl/Apache/PerlRunXS.pm
-lib/perl5/site_perl/Apache/PerlSections.pm
-lib/perl5/site_perl/Apache/RedirectLogFix.pm
-lib/perl5/site_perl/Apache/Registry.pm
-lib/perl5/site_perl/Apache/RegistryBB.pm
-lib/perl5/site_perl/Apache/RegistryLoader.pm
-lib/perl5/site_perl/Apache/RegistryNG.pm
-lib/perl5/site_perl/Apache/Resource.pm
-lib/perl5/site_perl/Apache/SIG.pm
-lib/perl5/site_perl/Apache/Server.pm
-lib/perl5/site_perl/Apache/SizeLimit.pm
-lib/perl5/site_perl/Apache/StatINC.pm
-lib/perl5/site_perl/Apache/Status.pm
-lib/perl5/site_perl/Apache/Symbol.pm
-lib/perl5/site_perl/Apache/Symdump.pm
-lib/perl5/site_perl/Apache/Table.pm
-lib/perl5/site_perl/Apache/URI.pm
-lib/perl5/site_perl/Apache/Util.pm
-lib/perl5/site_perl/Apache/httpd_conf.pm
-lib/perl5/site_perl/Apache/src.pm
-lib/perl5/site_perl/Apache/test.pm
-lib/perl5/site_perl/Bundle/Apache.pm
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/mod_perl/.packlist
-lib/perl5/site_perl/cgi_to_mod_perl.pod
-lib/perl5/site_perl/mod_perl.pm
-lib/perl5/site_perl/mod_perl.pod
-lib/perl5/site_perl/mod_perl_cvs.pod
-lib/perl5/site_perl/mod_perl_hooks.pm
-lib/perl5/site_perl/mod_perl_hooks.pm.PL
-lib/perl5/site_perl/mod_perl_method_handlers.pod
-lib/perl5/site_perl/mod_perl_traps.pod
-lib/perl5/site_perl/mod_perl_tuning.pod
-share/httpd/htdocs/manual/mod/mod_perl.html
-@dirrm lib/perl5/site_perl/Apache/Constants
-@dirrm lib/perl5/site_perl/Apache
-@unexec rmdir %D/lib/perl5/site_perl/Bundle 2>/dev/null || true
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/mod_perl