Oops. The PLIST-mi contents were in the PLIST-md.shared file and vice versa.

Fix this and also get rid of the lib/perl5/site_perl/Bundle/DBD directory
on deinstall.

3 files changed, 44 insertions, 42 deletions

diff --git a/databases/p5-DBI/pkg/PLIST-md.shared b/databases/p5-DBI/pkg/PLIST-md.shared
index 0c627cb9e54..bb0c2699cfb 100644
--- a/databases/p5-DBI/pkg/PLIST-md.shared
+++ b/databases/p5-DBI/pkg/PLIST-md.shared
@@ -1,39 +1,4 @@
-@comment $NetBSD: PLIST-md.shared,v 1.1.1.1 1999/06/10 12:46:35 bad Exp $
-bin/dbiproxy
-bin/dbish
-man/man1/dbiproxy.1
-man/man1/dbish.1
-lib/perl5/man/man3/Bundle::DBI.3
-lib/perl5/man/man3/DBD::ADO.3
-lib/perl5/man/man3/DBD::Proxy.3
-lib/perl5/man/man3/DBI.3
-lib/perl5/man/man3/DBI::DBD.3
-lib/perl5/man/man3/DBI::FAQ.3
-lib/perl5/man/man3/DBI::Format.3
-lib/perl5/man/man3/DBI::ProxyServer.3
-lib/perl5/man/man3/DBI::Shell.3
-lib/perl5/man/man3/DBI::W32ODBC.3
-lib/perl5/man/man3/Win32::DBIODBC.3
-lib/perl5/site_perl/Bundle/DBI.pm
-lib/perl5/site_perl/DBD/ADO.pm
-lib/perl5/site_perl/DBD/ExampleP.pm
-lib/perl5/site_perl/DBD/NullP.pm
-lib/perl5/site_perl/DBD/Proxy.pm
-lib/perl5/site_perl/DBD/Sponge.pm
-@dirrm lib/perl5/site_perl/DBD
-lib/perl5/site_perl/DBI.pm
-lib/perl5/site_perl/DBI/DBD.pm
-lib/perl5/site_perl/DBI/FAQ.pm
-lib/perl5/site_perl/DBI/Format.pm
-lib/perl5/site_perl/DBI/ProxyServer.pm
-lib/perl5/site_perl/DBI/Shell.pm
-lib/perl5/site_perl/DBI/W32ODBC.pm
-@dirrm lib/perl5/site_perl/DBI
-lib/perl5/site_perl/Win32/DBIODBC.pm
-@dirrm lib/perl5/site_perl/Win32
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI/Driver.xst
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI/dbd_xsh.h
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI/dbi_sql.h
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI/DBIXS.h
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI/.packlist
+@comment $NetBSD: PLIST-md.shared,v 1.2 1999/06/10 18:28:19 bad Exp $
+lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI/DBI.bs
+lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI/DBI.so
 @dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI
diff --git a/databases/p5-DBI/pkg/PLIST-md.static b/databases/p5-DBI/pkg/PLIST-md.static
index 376abe8de20..b2a2d85f9d9 100644
--- a/databases/p5-DBI/pkg/PLIST-md.static
+++ b/databases/p5-DBI/pkg/PLIST-md.static
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST-md.static,v 1.1.1.1 1999/06/10 12:46:35 bad Exp $
+@comment $NetBSD: PLIST-md.static,v 1.2 1999/06/10 18:28:19 bad Exp $
 lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI/DBI.a
 lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI/extralibs.ld
+@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI
diff --git a/databases/p5-DBI/pkg/PLIST-mi b/databases/p5-DBI/pkg/PLIST-mi
index 0eaaf45b893..e7c99fb238d 100644
--- a/databases/p5-DBI/pkg/PLIST-mi
+++ b/databases/p5-DBI/pkg/PLIST-mi
@@ -1,3 +1,39 @@
-@comment $NetBSD: PLIST-mi,v 1.1.1.1 1999/06/10 12:46:35 bad Exp $
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI/DBI.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI/DBI.so
+@comment $NetBSD: PLIST-mi,v 1.2 1999/06/10 18:28:19 bad Exp $
+bin/dbiproxy
+bin/dbish
+man/man1/dbiproxy.1
+man/man1/dbish.1
+lib/perl5/man/man3/Bundle::DBI.3
+lib/perl5/man/man3/DBD::ADO.3
+lib/perl5/man/man3/DBD::Proxy.3
+lib/perl5/man/man3/DBI.3
+lib/perl5/man/man3/DBI::DBD.3
+lib/perl5/man/man3/DBI::FAQ.3
+lib/perl5/man/man3/DBI::Format.3
+lib/perl5/man/man3/DBI::ProxyServer.3
+lib/perl5/man/man3/DBI::Shell.3
+lib/perl5/man/man3/DBI::W32ODBC.3
+lib/perl5/man/man3/Win32::DBIODBC.3
+lib/perl5/site_perl/Bundle/DBI.pm
+@unexec rmdir %D/lib/perl5/site_perl/Bundle/DBD 2>/dev/null || true
+lib/perl5/site_perl/DBD/ADO.pm
+lib/perl5/site_perl/DBD/ExampleP.pm
+lib/perl5/site_perl/DBD/NullP.pm
+lib/perl5/site_perl/DBD/Proxy.pm
+lib/perl5/site_perl/DBD/Sponge.pm
+@dirrm lib/perl5/site_perl/DBD
+lib/perl5/site_perl/DBI.pm
+lib/perl5/site_perl/DBI/DBD.pm
+lib/perl5/site_perl/DBI/FAQ.pm
+lib/perl5/site_perl/DBI/Format.pm
+lib/perl5/site_perl/DBI/ProxyServer.pm
+lib/perl5/site_perl/DBI/Shell.pm
+lib/perl5/site_perl/DBI/W32ODBC.pm
+@dirrm lib/perl5/site_perl/DBI
+lib/perl5/site_perl/Win32/DBIODBC.pm
+@dirrm lib/perl5/site_perl/Win32
+lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI/Driver.xst
+lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI/dbd_xsh.h
+lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI/dbi_sql.h
+lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI/DBIXS.h
+lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/DBI/.packlist