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, 9 insertions, 36 deletions

diff --git a/www/ap-Embperl/Makefile b/www/ap-Embperl/Makefile
index 58ea9dc6aeb..1bc6478b9a4 100644
--- a/www/ap-Embperl/Makefile
+++ b/www/ap-Embperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/12/02 20:46:35 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/27 10:37:03 jlam Exp $
 #
 
 DISTNAME=       HTML-Embperl-1.2.0
@@ -12,14 +12,14 @@ HOMEPAGE=	http://perl.apache.org/embperl/
 DEPENDS+=	ap-perl-*:../../www/ap-perl
 DEPENDS+=	p5-HTML-Parser-*:../../www/p5-HTML-Parser
 
-USE_PERL5=	YES
+USE_PERL5=	# defined
+PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/HTML/Embperl/.packlist
+
+MAKE_ENV+=	APACHE_SRC=${PREFIX}/include/httpd
+MAKE_ENV+=	APACHE_MODULES=${PREFIX}/lib/httpd
+MAKE_ENV+=	APACHE=${PREFIX}/sbin/httpd
 
 do-configure:
-	@cd ${WRKSRC}; ${SETENV} \
-		${MAKE_ENV} \
-		APACHE_SRC=${PREFIX}/include/httpd \
-		APACHE_MODULES=${PREFIX}/lib/httpd \
-		APACHE=${PREFIX}/sbin/httpd \
-		${PREFIX}/bin/perl Makefile.PL
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-Embperl/pkg/PLIST b/www/ap-Embperl/pkg/PLIST
new file mode 100644
index 00000000000..a19488daa45
--- /dev/null
+++ b/www/ap-Embperl/pkg/PLIST
@@ -0,0 +1 @@
+@comment $NetBSD: PLIST,v 1.1 2000/08/27 10:37:03 jlam Exp $
diff --git a/www/ap-Embperl/pkg/PLIST-md.shared b/www/ap-Embperl/pkg/PLIST-md.shared
deleted file mode 100644
index 1b7e3d76e79..00000000000
--- a/www/ap-Embperl/pkg/PLIST-md.shared
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-md.shared,v 1.1.1.1 1999/12/02 20:46:35 rh Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/HTML/Embperl/Embperl.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/HTML/Embperl/Embperl.bs
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/HTML/Embperl
diff --git a/www/ap-Embperl/pkg/PLIST-md.static b/www/ap-Embperl/pkg/PLIST-md.static
deleted file mode 100644
index 79df1f510e2..00000000000
--- a/www/ap-Embperl/pkg/PLIST-md.static
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-md.static,v 1.1.1.1 1999/12/02 20:46:35 rh Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/HTML/Embperl/Embperl.a
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/HTML/Embperl/extralibs.ld
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/HTML/Embperl
diff --git a/www/ap-Embperl/pkg/PLIST-mi b/www/ap-Embperl/pkg/PLIST-mi
deleted file mode 100644
index dd7e48806ec..00000000000
--- a/www/ap-Embperl/pkg/PLIST-mi
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST-mi,v 1.1.1.1 1999/12/02 20:46:35 rh Exp $
-lib/perl5/site_perl/HTML/Features.pod
-lib/perl5/site_perl/HTML/IntroD.pod
-lib/perl5/site_perl/HTML/embpcgi.pl
-lib/perl5/site_perl/HTML/Embperl.pm
-lib/perl5/site_perl/HTML/embpexec.pl
-lib/perl5/site_perl/HTML/FeaturesD.pod
-lib/perl5/site_perl/HTML/Embperl/Session.pm
-lib/perl5/site_perl/HTML/Embperl/Module.pm
-lib/perl5/site_perl/HTML/INSTALL.pod
-lib/perl5/site_perl/HTML/Embperl.pod
-lib/perl5/site_perl/HTML/Faq.pod
-lib/perl5/site_perl/HTML/Changes.pod
-lib/perl5/site_perl/HTML/EmbperlD.pod
-lib/perl5/site_perl/HTML/Intro.pod
-lib/perl5/site_perl/HTML/embpcgi.test.pl
-lib/perl5/man/man3/HTML::Embperl.3
-lib/perl5/man/man3/HTML::EmbperlD.3
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/HTML/Embperl/.packlist
-@dirrm lib/perl5/site_perl/HTML/Embperl