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, 26 insertions, 39 deletions

diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index 8c9ab6102c0..18c5cfc27ec 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -1,29 +1,36 @@
-# $NetBSD: Makefile,v 1.6 2000/05/25 08:08:30 rh Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/27 10:37:00 jlam Exp $
 #
 
-DISTNAME=	Msql-Mysql-modules-1.2214
-PKGNAME=	p5-DBD-mysql-1.2214
-CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBD/}
+DISTNAME=		Msql-Mysql-modules-1.2214
+PKGNAME=		p5-DBD-mysql-1.2214
+CATEGORIES=		databases perl5
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=DBD/}
 
-MAINTAINER=	bad@netbsd.org
-HOMEPAGE=	http://www.mysql.com.org/
+MAINTAINER=		bad@netbsd.org
+HOMEPAGE=		http://www.mysql.com.org/
 
-DEPENDS+=	mysql-client-3.22.32:../../databases/mysql-client
-DEPENDS+=	p5-DBI-1.13:../../databases/p5-DBI
-DEPENDS+=	p5-Data-Dumper>=2.101:../../devel/p5-Data-Dumper
-DEPENDS+=	p5-Data-ShowTable-3.3:../../devel/p5-Data-ShowTable
+DEPENDS+=		mysql-client-3.22.32:../../databases/mysql-client
+DEPENDS+=		p5-DBI-1.13:../../databases/p5-DBI
+DEPENDS+=		p5-Data-Dumper>=2.101:../../devel/p5-Data-Dumper
+DEPENDS+=		p5-Data-ShowTable-3.3:../../devel/p5-Data-ShowTable
 
-USE_PERL5=	YES
+USE_PERL5=		# defined
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Msql-Mysql-modules/.packlist
 
-MYSQL_HEADERDIR= ${PREFIX}/include/mysql
-MYSQL_LIBDIR=	${PREFIX}/lib/mysql
+MYSQL_HEADERDIR=	${PREFIX}/include/mysql
+MYSQL_LIBDIR=		${PREFIX}/lib/mysql
 
-CONFIGURE_ENV+=	MYSQL_HEADERDIR="${MYSQL_HEADERDIR}"
-CONFIGURE_ENV+=	MYSQL_LIBDIR="${MYSQL_LIBDIR}"
-CONFIGURE_ENV+=	IN_MYSQL_DISTRIBUTION=1
+MAKE_ENV+=		MYSQL_HEADERDIR="${MYSQL_HEADERDIR}"
+MAKE_ENV+=		MYSQL_LIBDIR="${MYSQL_LIBDIR}"
+MAKE_ENV+=		IN_MYSQL_DISTRIBUTION=1
+
+MAKE_PARAMS+=		--noprompt
+MAKE_PARAMS+=		--mysql-install
+MAKE_PARAMS+=		--nomsql-install --nomsql1-install 
+MAKE_PARAMS+=		--mysql-incdir=${MYSQL_HEADERDIR}
+MAKE_PARAMS+=		--mysql-libdir=${MYSQL_LIBDIR}
 
 do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL --noprompt --mysql-install --nomsql-install --nomsql1-install --mysql-incdir=${MYSQL_HEADERDIR} --mysql-libdir=${MYSQL_LIBDIR}
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/p5-DBD-mysql/pkg/PLIST b/databases/p5-DBD-mysql/pkg/PLIST
new file mode 100644
index 00000000000..e2220f64fd7
--- /dev/null
+++ b/databases/p5-DBD-mysql/pkg/PLIST
@@ -0,0 +1 @@
+@comment $NetBSD: PLIST,v 1.1 2000/08/27 10:37:00 jlam Exp $
diff --git a/databases/p5-DBD-mysql/pkg/PLIST-md.shared b/databases/p5-DBD-mysql/pkg/PLIST-md.shared
deleted file mode 100644
index 4486f8c92f7..00000000000
--- a/databases/p5-DBD-mysql/pkg/PLIST-md.shared
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-md.shared,v 1.1.1.1 1999/06/10 18:32:37 bad Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBD/mysql/mysql.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBD/mysql/mysql.so
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBD/mysql
diff --git a/databases/p5-DBD-mysql/pkg/PLIST-md.static b/databases/p5-DBD-mysql/pkg/PLIST-md.static
deleted file mode 100644
index fec62efc811..00000000000
--- a/databases/p5-DBD-mysql/pkg/PLIST-md.static
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-md.static,v 1.1.1.1 1999/06/10 18:32:36 bad Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBD/mysql/mysql.a
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBD/mysql/extralibs.ld
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBD/mysql
diff --git a/databases/p5-DBD-mysql/pkg/PLIST-mi b/databases/p5-DBD-mysql/pkg/PLIST-mi
deleted file mode 100644
index af87f7cb929..00000000000
--- a/databases/p5-DBD-mysql/pkg/PLIST-mi
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST-mi,v 1.2 1999/08/25 21:42:40 bad Exp $
-bin/dbimon
-man/man1/dbimon.1
-lib/perl5/man/man3/Bundle::DBD::mysql.3
-lib/perl5/man/man3/DBD::mysql.3
-lib/perl5/man/man3/Mysql.3
-lib/perl5/site_perl/Bundle/DBD/mysql.pm
-lib/perl5/site_perl/DBD/mysql.pm
-lib/perl5/site_perl/Mysql.pm
-lib/perl5/site_perl/Mysql/Statement.pm
-@dirrm lib/perl5/site_perl/Mysql
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Msql-Mysql-modules/.packlist
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Msql-Mysql-modules