Mechanical changes to package PLISTs to make use of LIBTOOLIZE_PLIST.

All library names listed by *.la files no longer need to be listed
in the PLIST, e.g., instead of:

	lib/libfoo.a
	lib/libfoo.la
	lib/libfoo.so
	lib/libfoo.so.0
	lib/libfoo.so.0.1

one simply needs:

	lib/libfoo.la

and bsd.pkg.mk will automatically ensure that the additional library
names are listed in the installed package +CONTENTS file.

Also make LIBTOOLIZE_PLIST default to "yes".

27 files changed, 27 insertions, 328 deletions

diff --git a/databases/bdb-xml/PLIST b/databases/bdb-xml/PLIST
index 3b724972e1e..7403206c576 100644
--- a/databases/bdb-xml/PLIST
+++ b/databases/bdb-xml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/31 17:15:58 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:22 jlam Exp $
 bin/dbxml_dump
 bin/dbxml_load
 include/dbxml/DbXml.hpp
@@ -16,12 +16,7 @@ include/dbxml/XmlResolver.hpp
 include/dbxml/XmlResults.hpp
 include/dbxml/XmlUpdateContext.hpp
 include/dbxml/XmlValue.hpp
-lib/libdbxml-1.2.a
 lib/libdbxml-1.2.la
-lib/libdbxml-1.2.so
-lib/libdbxml-1.so
-lib/libdbxml.a
-lib/libdbxml.so
 share/doc/dbxml/api_c/api_index.html
 share/doc/dbxml/api_c/c_pindex.html
 share/doc/dbxml/api_c/db_associate.html
diff --git a/databases/db/PLIST b/databases/db/PLIST
index d6553776662..05254ee0053 100644
--- a/databases/db/PLIST
+++ b/databases/db/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/11/19 09:59:18 tron Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:22 jlam Exp $
 bin/db_archive
 bin/db_checkpoint
 bin/db_deadlock
@@ -10,11 +10,7 @@ bin/db_stat
 include/db2/db.h
 include/db2/db_185.h
 include/db2/db_cxx.h
-lib/libdb2.a
 lib/libdb2.la
-lib/libdb2.so
-lib/libdb2.so.2
-lib/libdb2.so.2.7
 share/doc/html/db/api_c/Db/close.html
 share/doc/html/db/api_c/Db/cursor.html
 share/doc/html/db/api_c/Db/del.html
diff --git a/databases/db3/PLIST b/databases/db3/PLIST
index 3ecdc14363b..1f1da803099 100644
--- a/databases/db3/PLIST
+++ b/databases/db3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/06/28 22:11:37 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:09:22 jlam Exp $
 bin/db3_archive
 bin/db3_checkpoint
 bin/db3_deadlock
@@ -14,16 +14,8 @@ include/db3/cxx_except.h
 include/db3/db.h
 include/db3/db_185.h
 include/db3/db_cxx.h
-lib/libdb3.a
 lib/libdb3.la
-lib/libdb3.so
-lib/libdb3.so.3
-lib/libdb3.so.3.11
-lib/libdb3_cxx.a
 lib/libdb3_cxx.la
-lib/libdb3_cxx.so
-lib/libdb3_cxx.so.3
-lib/libdb3_cxx.so.3.11
 share/doc/html/db3/api_c/c_index.html
 share/doc/html/db3/api_c/c_pindex.html
 share/doc/html/db3/api_c/db_associate.html
diff --git a/databases/db4/PLIST b/databases/db4/PLIST
index edbb754215c..ab7d9ba07ce 100644
--- a/databases/db4/PLIST
+++ b/databases/db4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/06/28 22:11:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:22 jlam Exp $
 bin/berkeley_db4_svc
 bin/db4_archive
 bin/db4_checkpoint
@@ -13,20 +13,8 @@ bin/db4_verify
 include/db4/db.h
 include/db4/db_185.h
 include/db4/db_cxx.h
-lib/libdb4-4.2.a
 lib/libdb4-4.2.la
-lib/libdb4-4.2.so
-lib/libdb4-4.2.so.2
-lib/libdb4-4.2.so.2.52
-lib/libdb4-4.so
-lib/libdb4.a
-lib/libdb4.so
-lib/libdb4_cxx-4.2.a
 lib/libdb4_cxx-4.2.la
-lib/libdb4_cxx-4.2.so
-lib/libdb4_cxx-4.so
-lib/libdb4_cxx.a
-lib/libdb4_cxx.so
 share/doc/html/db4/api_c/api_index.html
 share/doc/html/db4/api_c/c_pindex.html
 share/doc/html/db4/api_c/db_associate.html
diff --git a/databases/dbh/PLIST b/databases/dbh/PLIST
index d4344045af7..8e405f6d6dc 100644
--- a/databases/dbh/PLIST
+++ b/databases/dbh/PLIST
@@ -1,12 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2004/02/05 20:14:05 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:22 jlam Exp $
 include/dbh.h
 include/dbh_config.h
 include/dbh_functions.h
-lib/libdbh-1.0.so.1
-lib/libdbh-1.0.so.1.0
-lib/libdbh.a
 lib/libdbh.la
-lib/libdbh.so
 lib/pkgconfig/dbh-1.0.pc
 share/doc/dbh/AUTHORS
 share/doc/dbh/COPYING
diff --git a/databases/edb/PLIST b/databases/edb/PLIST
index 418002d5277..51b08da2e7c 100644
--- a/databases/edb/PLIST
+++ b/databases/edb/PLIST
@@ -1,10 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2002/11/08 23:23:10 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:22 jlam Exp $
 bin/edb-config
 bin/edb_ed
 bin/edb_gtk_ed
 include/Edb.h
-lib/libedb.a
 lib/libedb.la
-lib/libedb.so
-lib/libedb.so.1
-lib/libedb.so.1.3
diff --git a/databases/freetds/PLIST b/databases/freetds/PLIST
index 2369d6596e0..ae4835946ec 100644
--- a/databases/freetds/PLIST
+++ b/databases/freetds/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/06/11 13:24:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:22 jlam Exp $
 freetds/bin/freebcp
 freetds/bin/tdspool
 freetds/bin/tsql
@@ -18,26 +18,10 @@ freetds/include/tds_sysdep_public.h
 freetds/include/tdsconvert.h
 freetds/include/tdssrv.h
 freetds/include/tdsver.h
-freetds/lib/libct.a
 freetds/lib/libct.la
-freetds/lib/libct.so
-freetds/lib/libct.so.1
-freetds/lib/libct.so.1.0
-freetds/lib/libsybdb.a
 freetds/lib/libsybdb.la
-freetds/lib/libsybdb.so
-freetds/lib/libsybdb.so.3
-freetds/lib/libsybdb.so.3.0
-freetds/lib/libtds.a
 freetds/lib/libtds.la
-freetds/lib/libtds.so
-freetds/lib/libtds.so.2
-freetds/lib/libtds.so.2.0
-freetds/lib/libtdssrv.a
 freetds/lib/libtdssrv.la
-freetds/lib/libtdssrv.so
-freetds/lib/libtdssrv.so.1
-freetds/lib/libtdssrv.so.1.0
 freetds/man/man1/freebcp.1
 freetds/man/man1/tsql.1
 share/examples/freetds/freetds.conf
diff --git a/databases/gdbm/PLIST b/databases/gdbm/PLIST
index 197bc60a890..d9234edb7af 100644
--- a/databases/gdbm/PLIST
+++ b/databases/gdbm/PLIST
@@ -1,8 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/01/20 18:45:24 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:22 jlam Exp $
 include/gdbm.h
-lib/libgdbm.a
 lib/libgdbm.la
-lib/libgdbm.so
-lib/libgdbm.so.3
-lib/libgdbm.so.3.0
 man/man3/gdbm.3
diff --git a/databases/guile-pg/PLIST b/databases/guile-pg/PLIST
index 0b6d9a94ca2..3c279051357 100644
--- a/databases/guile-pg/PLIST
+++ b/databases/guile-pg/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2004/01/20 18:45:24 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:22 jlam Exp $
 share/guile/database/postgres.scm
 @dirrm share/guile/database
-lib/libpostgres.a
 lib/libpostgres.la
-lib/libpostgres.so.2.0
 bin/guile-pg
diff --git a/databases/iodbc/PLIST b/databases/iodbc/PLIST
index 118fe3a8074..f6b53b5d4ff 100644
--- a/databases/iodbc/PLIST
+++ b/databases/iodbc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:11:46 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:22 jlam Exp $
 bin/odbctest
 include/isql.h
 include/isqlext.h
@@ -6,11 +6,7 @@ include/isqltypes.h
 include/sql.h
 include/sqlext.h
 include/sqltypes.h
-lib/libiodbc.a
 lib/libiodbc.la
-lib/libiodbc.so
-lib/libiodbc.so.2
-lib/libiodbc.so.2.50
 share/doc/iodbc/COPYING
 share/doc/iodbc/README
 share/examples/iodbc/odbc.ini
diff --git a/databases/java-db3/PLIST b/databases/java-db3/PLIST
index f28d967708c..ec75d538600 100644
--- a/databases/java-db3/PLIST
+++ b/databases/java-db3/PLIST
@@ -1,7 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/30 11:58:31 martti Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:22 jlam Exp $
 lib/db3.jar
-lib/libdb3_java.a
 lib/libdb3_java.la
-lib/libdb3_java.so
-lib/libdb3_java.so.3
-lib/libdb3_java.so.3.11
diff --git a/databases/libgda-postgres/PLIST b/databases/libgda-postgres/PLIST
index caa0e7b1b4d..159531817ee 100644
--- a/databases/libgda-postgres/PLIST
+++ b/databases/libgda-postgres/PLIST
@@ -1,5 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/05/06 11:17:26 jmmv Exp $
-lib/libgda/providers/libgda-postgres.a
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:22 jlam Exp $
 lib/libgda/providers/libgda-postgres.la
-lib/libgda/providers/libgda-postgres.so
 @comment in libgda: @dirrm lib/libgda/providers
diff --git a/databases/libgda/PLIST b/databases/libgda/PLIST
index ae1de19c91d..db54336385f 100644
--- a/databases/libgda/PLIST
+++ b/databases/libgda/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/04/20 16:15:48 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/09/22 08:09:22 jlam Exp $
 bin/gda-report-test
 bin/gda-run
 bin/gda-test
@@ -66,24 +66,10 @@ include/libgda/gda-xql-utils.h
 include/libgda/gda-xql-value.h
 include/libgda/gda-xql-valueref.h
 include/libgda/libgda.h
-lib/libgda-2.a
 lib/libgda-2.la
-lib/libgda-2.so
-lib/libgda-2.so.2
-lib/libgda-2.so.2.0
-lib/libgda-report-2.a
 lib/libgda-report-2.la
-lib/libgda-report-2.so
-lib/libgda-report-2.so.2
-lib/libgda-report-2.so.2.0
-lib/libgda/providers/libgda-xml.a
 lib/libgda/providers/libgda-xml.la
-lib/libgda/providers/libgda-xml.so
-lib/libgdasql.a
 lib/libgdasql.la
-lib/libgdasql.so
-lib/libgdasql.so.0
-lib/libgdasql.so.0.0
 lib/pkgconfig/libgda.pc
 share/doc/html/libgda/architecture.html
 share/doc/html/libgda/c694.html
diff --git a/databases/libgnomedb/PLIST b/databases/libgnomedb/PLIST
index 9edc5d3db84..f85dfaeaab7 100644
--- a/databases/libgnomedb/PLIST
+++ b/databases/libgnomedb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/04/20 16:26:01 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/09/22 08:09:22 jlam Exp $
 bin/gnome-database-properties
 include/libgnomedb/gnome-db-browser.h
 include/libgnomedb/gnome-db-combo.h
@@ -29,19 +29,11 @@ include/libgnomedb/gnome-db-stock.h
 include/libgnomedb/gnome-db-table-editor.h
 include/libgnomedb/gnome-db-util.h
 include/libgnomedb/libgnomedb.h
-lib/bonobo/monikers/libmoniker_database.a
 lib/bonobo/monikers/libmoniker_database.la
-lib/bonobo/monikers/libmoniker_database.so
 lib/bonobo/servers/GNOME_Database_Components.server
 lib/bonobo/servers/GNOME_Database_Monikers.server
-lib/libglade/2.0/libgnomedb.a
 lib/libglade/2.0/libgnomedb.la
-lib/libglade/2.0/libgnomedb.so
-lib/libgnomedb-2.a
 lib/libgnomedb-2.la
-lib/libgnomedb-2.so
-lib/libgnomedb-2.so.3
-lib/libgnomedb-2.so.3.0
 lib/pkgconfig/libgnomedb.pc
 libexec/gnome-database-components
 share/control-center-2.0/capplets/database-properties.desktop
diff --git a/databases/libpqxx/PLIST b/databases/libpqxx/PLIST
index 5e5c1bc1840..c31b247a5db 100644
--- a/databases/libpqxx/PLIST
+++ b/databases/libpqxx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2004/01/07 11:08:53 is Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:22 jlam Exp $
 include/pqxx/all.h
 include/pqxx/binarystring
 include/pqxx/binarystring.hxx
@@ -62,9 +62,6 @@ include/pqxx/trigger.hxx
 include/pqxx/util
 include/pqxx/util.h
 include/pqxx/util.hxx
-lib/${PKGNAME}.so
-lib/libpqxx.a
 lib/libpqxx.la
-lib/libpqxx.so
 lib/pkgconfig/libpqxx.pc
 @dirrm include/pqxx
diff --git a/databases/mergeant/PLIST b/databases/mergeant/PLIST
index 6ab3f8a00ce..ad6384fa7f8 100644
--- a/databases/mergeant/PLIST
+++ b/databases/mergeant/PLIST
@@ -1,20 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2003/06/10 14:21:25 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:22 jlam Exp $
 bin/mergeant
-lib/mergeant/plugins/libPnetaddr.a
 lib/mergeant/plugins/libPnetaddr.la
-lib/mergeant/plugins/libPnetaddr.so
-lib/mergeant/plugins/libPnetaddr.so.0
-lib/mergeant/plugins/libPnetaddr.so.0.0
-lib/mergeant/plugins/libPpicts.a
 lib/mergeant/plugins/libPpicts.la
-lib/mergeant/plugins/libPpicts.so
-lib/mergeant/plugins/libPpicts.so.0
-lib/mergeant/plugins/libPpicts.so.0.0
-lib/mergeant/plugins/libPsample.a
 lib/mergeant/plugins/libPsample.la
-lib/mergeant/plugins/libPsample.so
-lib/mergeant/plugins/libPsample.so.0
-lib/mergeant/plugins/libPsample.so.0.0
 share/application-registry/mergeant.applications
 share/applications/mergeant.desktop
 share/gnome/help/mergeant/C/c137.html
diff --git a/databases/metakit-lib/PLIST b/databases/metakit-lib/PLIST
index c1278eea745..125ce7c1377 100644
--- a/databases/metakit-lib/PLIST
+++ b/databases/metakit-lib/PLIST
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/04 18:47:15 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:22 jlam Exp $
 include/mk4.h
 include/mk4.inl
 include/mk4io.h
 include/mk4str.h
 include/mk4str.inl
-lib/libmk4.a
 lib/libmk4.la
-lib/libmk4.so
diff --git a/databases/myodbc/PLIST b/databases/myodbc/PLIST
index 6a05ab485b4..ab38d028adb 100644
--- a/databases/myodbc/PLIST
+++ b/databases/myodbc/PLIST
@@ -1,8 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:11:51 zuntum Exp $
-lib/libmyodbc-2.50.36.so
-lib/libmyodbc.so
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:22 jlam Exp $
 lib/libmyodbc.la
-lib/libmyodbc.a
 share/doc/myodbc/INSTALL
 share/doc/myodbc/README-WIN32
 @dirrm share/doc/myodbc
diff --git a/databases/mysql-client/PLIST b/databases/mysql-client/PLIST
index e9210d58001..08b0bc71e44 100644
--- a/databases/mysql-client/PLIST
+++ b/databases/mysql-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2004/01/20 18:45:24 seb Exp $
+@comment $NetBSD: PLIST,v 1.11 2004/09/22 08:09:22 jlam Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysqlcheck
@@ -39,11 +39,7 @@ include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-usage.h
 include/mysql/sslopt-vars.h
-lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.la
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.10
-lib/mysql/libmysqlclient.so.10.0
 man/man1/isamchk.1
 man/man1/isamlog.1
 man/man1/mysql.1
diff --git a/databases/mysql4-client/PLIST b/databases/mysql4-client/PLIST
index 1506d55f6b0..2208f9d3b0b 100644
--- a/databases/mysql4-client/PLIST
+++ b/databases/mysql4-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/06/20 18:48:44 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:22 jlam Exp $
 bin/make_win_binary_distribution
 bin/make_win_src_distribution
 bin/msql2mysql
@@ -51,11 +51,7 @@ include/mysql/raid.h
 include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
-lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.la
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.12
-lib/mysql/libmysqlclient.so.12.0
 man/man1/isamchk.1
 man/man1/isamlog.1
 man/man1/mysql.1
diff --git a/databases/openldap/PLIST b/databases/openldap/PLIST
index 6e69504a1b7..0a2d3c9740b 100644
--- a/databases/openldap/PLIST
+++ b/databases/openldap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2004/07/24 03:32:24 jlam Exp $
+@comment $NetBSD: PLIST,v 1.18 2004/09/22 08:09:23 jlam Exp $
 bin/ldapadd
 bin/ldapcompare
 bin/ldapdelete
@@ -15,61 +15,17 @@ include/ldap_features.h
 include/ldap_schema.h
 include/ldap_utf8.h
 include/slapi-plugin.h
-lib/liblber-2.2.so.7.6
-lib/liblber-2.2.so.7
-lib/liblber.a
 lib/liblber.la
-lib/liblber.so
-lib/libldap-2.2.so.7.6
-lib/libldap-2.2.so.7
-lib/libldap.a
 lib/libldap.la
-lib/libldap.so
-lib/libldap_r-2.2.so.7.6
-lib/libldap_r-2.2.so.7
-lib/libldap_r.a
 lib/libldap_r.la
-lib/libldap_r.so
-${DYNAMIC_MOD}lib/openldap/back_hdb-2.2.so.7
-${DYNAMIC_MOD}lib/openldap/back_hdb-2.2.so.7.6
-${DYNAMIC_MOD}lib/openldap/back_hdb.a
 ${DYNAMIC_MOD}lib/openldap/back_hdb.la
-${DYNAMIC_MOD}lib/openldap/back_hdb.so
-${DYNAMIC_MOD}lib/openldap/back_ldap-2.2.so.7
-${DYNAMIC_MOD}lib/openldap/back_ldap-2.2.so.7.6
-${DYNAMIC_MOD}lib/openldap/back_ldap.a
 ${DYNAMIC_MOD}lib/openldap/back_ldap.la
-${DYNAMIC_MOD}lib/openldap/back_ldap.so
-${DYNAMIC_MOD}lib/openldap/back_ldbm-2.2.so.7
-${DYNAMIC_MOD}lib/openldap/back_ldbm-2.2.so.7.6
-${DYNAMIC_MOD}lib/openldap/back_ldbm.a
 ${DYNAMIC_MOD}lib/openldap/back_ldbm.la
-${DYNAMIC_MOD}lib/openldap/back_ldbm.so
-${DYNAMIC_MOD}lib/openldap/back_meta-2.2.so.7
-${DYNAMIC_MOD}lib/openldap/back_meta-2.2.so.7.6
-${DYNAMIC_MOD}lib/openldap/back_meta.a
 ${DYNAMIC_MOD}lib/openldap/back_meta.la
-${DYNAMIC_MOD}lib/openldap/back_meta.so
-${DYNAMIC_MOD}lib/openldap/back_monitor-2.2.so.7
-${DYNAMIC_MOD}lib/openldap/back_monitor-2.2.so.7.6
-${DYNAMIC_MOD}lib/openldap/back_monitor.a
 ${DYNAMIC_MOD}lib/openldap/back_monitor.la
-${DYNAMIC_MOD}lib/openldap/back_monitor.so
-${DYNAMIC_MOD}lib/openldap/back_null-2.2.so.7
-${DYNAMIC_MOD}lib/openldap/back_null-2.2.so.7.6
-${DYNAMIC_MOD}lib/openldap/back_null.a
 ${DYNAMIC_MOD}lib/openldap/back_null.la
-${DYNAMIC_MOD}lib/openldap/back_null.so
-${DYNAMIC_MOD}lib/openldap/back_passwd-2.2.so.7
-${DYNAMIC_MOD}lib/openldap/back_passwd-2.2.so.7.6
-${DYNAMIC_MOD}lib/openldap/back_passwd.a
 ${DYNAMIC_MOD}lib/openldap/back_passwd.la
-${DYNAMIC_MOD}lib/openldap/back_passwd.so
-${DYNAMIC_MOD}lib/openldap/back_shell-2.2.so.7
-${DYNAMIC_MOD}lib/openldap/back_shell-2.2.so.7.6
-${DYNAMIC_MOD}lib/openldap/back_shell.a
 ${DYNAMIC_MOD}lib/openldap/back_shell.la
-${DYNAMIC_MOD}lib/openldap/back_shell.so
 libexec/slapd
 ${SLURPD_COMMENT}libexec/slurpd
 man/man1/ldapadd.1
diff --git a/databases/rrdtool/PLIST b/databases/rrdtool/PLIST
index 4a5e2c52c93..627db85c81f 100644
--- a/databases/rrdtool/PLIST
+++ b/databases/rrdtool/PLIST
@@ -1,14 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/16 23:08:55 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:23 jlam Exp $
 bin/rrdcgi
 bin/rrdtool
 bin/rrdupdate
 bin/trytime
 include/rrd.h
-lib/librrd.a
 lib/librrd.la
-lib/librrd.so
-lib/librrd.so.0
-lib/librrd.so.0.0
 man/man1/RRDp.1
 man/man1/RRDs.1
 man/man1/bin_dec_hex.1
diff --git a/databases/sqlite/PLIST b/databases/sqlite/PLIST
index 297d983954c..79c0e5b2995 100644
--- a/databases/sqlite/PLIST
+++ b/databases/sqlite/PLIST
@@ -1,10 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2004/06/30 08:37:11 pooka Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:23 jlam Exp $
 bin/sqlite
 include/sqlite.h
-lib/libsqlite.a
 lib/libsqlite.la
-lib/libsqlite.so
-lib/libsqlite.so.8
-lib/libsqlite.so.8.6
 lib/pkgconfig/sqlite.pc
 man/man1/sqlite.1
diff --git a/databases/sqlrelay/PLIST b/databases/sqlrelay/PLIST
index a19e6a9e3b0..eadce4a8d19 100644
--- a/databases/sqlrelay/PLIST
+++ b/databases/sqlrelay/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/15 10:37:24 grant Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:23 jlam Exp $
 bin/backupschema
 bin/fields
 bin/fields-debug
@@ -99,46 +99,14 @@ include/sqlrelay/private/sqlrdefines.h
 include/sqlrelay/private/sqlrincludes.h
 include/sqlrelay/sqlrclient.h
 include/sqlrelay/sqlrclientwrapper.h
-lib/libsqlrclient-${PKGVERSION}.so.1
-lib/libsqlrclient-${PKGVERSION}.so.1.0.0
-lib/libsqlrclient.a
 lib/libsqlrclient.la
-lib/libsqlrclient.so
-lib/libsqlrclient_p-${PKGVERSION}.so.1
-lib/libsqlrclient_p-${PKGVERSION}.so.1.0.0
-lib/libsqlrclient_p.a
 lib/libsqlrclient_p.la
-lib/libsqlrclient_p.so
-lib/libsqlrclientwrapper-${PKGVERSION}.so.1
-lib/libsqlrclientwrapper-${PKGVERSION}.so.1.0.0
-lib/libsqlrclientwrapper.a
 lib/libsqlrclientwrapper.la
-lib/libsqlrclientwrapper.so
-lib/libsqlrclientwrapper_p-${PKGVERSION}.so.1
-lib/libsqlrclientwrapper_p-${PKGVERSION}.so.1.0.0
-lib/libsqlrclientwrapper_p.a
 lib/libsqlrclientwrapper_p.la
-lib/libsqlrclientwrapper_p.so
-lib/libsqlrconnection-${PKGVERSION}.so.1
-lib/libsqlrconnection-${PKGVERSION}.so.1.0.0
-lib/libsqlrconnection.a
 lib/libsqlrconnection.la
-lib/libsqlrconnection.so
-lib/libsqlrconnection_p-${PKGVERSION}.so.1
-lib/libsqlrconnection_p-${PKGVERSION}.so.1.0.0
-lib/libsqlrconnection_p.a
 lib/libsqlrconnection_p.la
-lib/libsqlrconnection_p.so
-lib/libsqlrutil-${PKGVERSION}.so.1
-lib/libsqlrutil-${PKGVERSION}.so.1.0.0
-lib/libsqlrutil.a
 lib/libsqlrutil.la
-lib/libsqlrutil.so
-lib/libsqlrutil_p-${PKGVERSION}.so.1
-lib/libsqlrutil_p-${PKGVERSION}.so.1.0.0
-lib/libsqlrutil_p.a
 lib/libsqlrutil_p.la
-lib/libsqlrutil_p.so
 man/man1/fields.1
 man/man1/query.1
 man/man1/query.py.1
diff --git a/databases/tcl-gdbm/PLIST b/databases/tcl-gdbm/PLIST
index 73c468251cf..c212c3a8eec 100644
--- a/databases/tcl-gdbm/PLIST
+++ b/databases/tcl-gdbm/PLIST
@@ -1,9 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:54 zuntum Exp $
-lib/tcl/tclgdbm/libtclgdbm.a
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:23 jlam Exp $
 lib/tcl/tclgdbm/libtclgdbm.la
-lib/tcl/tclgdbm/libtclgdbm.so
-lib/tcl/tclgdbm/libtclgdbm.so.0
-lib/tcl/tclgdbm/libtclgdbm.so.0.0
 lib/tcl/tclgdbm/pkgIndex.tcl
 man/mann/tclgdbm.n
 @dirrm lib/tcl/tclgdbm
diff --git a/databases/tdb/PLIST b/databases/tdb/PLIST
index ae651e72c27..aeb16a1cfb7 100644
--- a/databases/tdb/PLIST
+++ b/databases/tdb/PLIST
@@ -1,12 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/29 19:19:12 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:23 jlam Exp $
 bin/tdbdump
 bin/tdbtool
 include/tdb.h
-lib/libtdb.a
 lib/libtdb.la
-lib/libtdb.so
-lib/libtdb.so.1
-lib/libtdb.so.1.0
 man/man3/tdb.3
 man/man3/tdb_chainlock.3
 man/man3/tdb_close.3
diff --git a/databases/unixodbc/PLIST b/databases/unixodbc/PLIST
index f203413c70f..8ed3a73e28f 100644
--- a/databases/unixodbc/PLIST
+++ b/databases/unixodbc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/11/06 04:08:33 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:23 jlam Exp $
 bin/dltest
 bin/isql
 bin/odbcinst
@@ -10,118 +10,28 @@ include/sqlext.h
 include/sqltypes.h
 include/sqlucode.h
 include/uodbc_stats.h
-lib/libboundparam.a
 lib/libboundparam.la
-lib/libboundparam.so
-lib/libboundparam.so.1
-lib/libboundparam.so.1.0
-lib/libgtrtst.a
 lib/libgtrtst.la
-lib/libgtrtst.so
-lib/libgtrtst.so.1
-lib/libgtrtst.so.1.0
-lib/libodbc.a
 lib/libodbc.la
-lib/libodbc.so
-lib/libodbc.so.1
-lib/libodbc.so.1.0
-lib/libodbccr.a
 lib/libodbccr.la
-lib/libodbccr.so
-lib/libodbccr.so.1
-lib/libodbccr.so.1.0
-lib/libodbcextras.a
 lib/libodbcextras.la
-lib/libodbcextras.so
-lib/libodbcextras.so.1
-lib/libodbcextras.so.1.0
-lib/libodbcinst.a
 lib/libodbcinst.la
-lib/libodbcinst.so
-lib/libodbcinst.so.1
-lib/libodbcinst.so.1.0
-${UNIXODBC_DRIVERS_DIR}/libesoobS.a
 ${UNIXODBC_DRIVERS_DIR}/libesoobS.la
-${UNIXODBC_DRIVERS_DIR}/libesoobS.so
-${UNIXODBC_DRIVERS_DIR}/libesoobS.so.1
-${UNIXODBC_DRIVERS_DIR}/libesoobS.so.1.0
-${UNIXODBC_DRIVERS_DIR}/libnn.a
 ${UNIXODBC_DRIVERS_DIR}/libnn.la
-${UNIXODBC_DRIVERS_DIR}/libnn.so
-${UNIXODBC_DRIVERS_DIR}/libnn.so.1
-${UNIXODBC_DRIVERS_DIR}/libnn.so.1.0
-${UNIXODBC_DRIVERS_DIR}/libodbcdrvcfg1S.a
 ${UNIXODBC_DRIVERS_DIR}/libodbcdrvcfg1S.la
-${UNIXODBC_DRIVERS_DIR}/libodbcdrvcfg1S.so
-${UNIXODBC_DRIVERS_DIR}/libodbcdrvcfg1S.so.1
-${UNIXODBC_DRIVERS_DIR}/libodbcdrvcfg1S.so.1.0
-${UNIXODBC_DRIVERS_DIR}/libodbcdrvcfg2S.a
 ${UNIXODBC_DRIVERS_DIR}/libodbcdrvcfg2S.la
-${UNIXODBC_DRIVERS_DIR}/libodbcdrvcfg2S.so
-${UNIXODBC_DRIVERS_DIR}/libodbcdrvcfg2S.so.1
-${UNIXODBC_DRIVERS_DIR}/libodbcdrvcfg2S.so.1.0
-${UNIXODBC_DRIVERS_DIR}/libodbcminiS.a
 ${UNIXODBC_DRIVERS_DIR}/libodbcminiS.la
-${UNIXODBC_DRIVERS_DIR}/libodbcminiS.so
-${UNIXODBC_DRIVERS_DIR}/libodbcminiS.so.1
-${UNIXODBC_DRIVERS_DIR}/libodbcminiS.so.1.0
-${UNIXODBC_DRIVERS_DIR}/libodbcmyS.a
 ${UNIXODBC_DRIVERS_DIR}/libodbcmyS.la
-${UNIXODBC_DRIVERS_DIR}/libodbcmyS.so
-${UNIXODBC_DRIVERS_DIR}/libodbcmyS.so.1
-${UNIXODBC_DRIVERS_DIR}/libodbcmyS.so.1.0
-${UNIXODBC_DRIVERS_DIR}/libodbcnnS.a
 ${UNIXODBC_DRIVERS_DIR}/libodbcnnS.la
-${UNIXODBC_DRIVERS_DIR}/libodbcnnS.so
-${UNIXODBC_DRIVERS_DIR}/libodbcnnS.so.1
-${UNIXODBC_DRIVERS_DIR}/libodbcnnS.so.1.0
-${UNIXODBC_DRIVERS_DIR}/libodbcpsql.a
 ${UNIXODBC_DRIVERS_DIR}/libodbcpsql.la
-${UNIXODBC_DRIVERS_DIR}/libodbcpsql.so
-${UNIXODBC_DRIVERS_DIR}/libodbcpsql.so.1
-${UNIXODBC_DRIVERS_DIR}/libodbcpsql.so.1.0
-${UNIXODBC_DRIVERS_DIR}/libodbcpsql.so.2
-${UNIXODBC_DRIVERS_DIR}/libodbcpsql.so.2.0
-${UNIXODBC_DRIVERS_DIR}/libodbcpsqlS.a
 ${UNIXODBC_DRIVERS_DIR}/libodbcpsqlS.la
-${UNIXODBC_DRIVERS_DIR}/libodbcpsqlS.so
-${UNIXODBC_DRIVERS_DIR}/libodbcpsqlS.so.1
-${UNIXODBC_DRIVERS_DIR}/libodbcpsqlS.so.1.0
-${UNIXODBC_DRIVERS_DIR}/libodbctxt.a
 ${UNIXODBC_DRIVERS_DIR}/libodbctxt.la
-${UNIXODBC_DRIVERS_DIR}/libodbctxt.so
-${UNIXODBC_DRIVERS_DIR}/libodbctxt.so.1
-${UNIXODBC_DRIVERS_DIR}/libodbctxt.so.1.0
-${UNIXODBC_DRIVERS_DIR}/libodbctxtS.a
 ${UNIXODBC_DRIVERS_DIR}/libodbctxtS.la
-${UNIXODBC_DRIVERS_DIR}/libodbctxtS.so
-${UNIXODBC_DRIVERS_DIR}/libodbctxtS.so.1
-${UNIXODBC_DRIVERS_DIR}/libodbctxtS.so.1.0
-${UNIXODBC_DRIVERS_DIR}/liboplodbcS.a
 ${UNIXODBC_DRIVERS_DIR}/liboplodbcS.la
-${UNIXODBC_DRIVERS_DIR}/liboplodbcS.so
-${UNIXODBC_DRIVERS_DIR}/liboplodbcS.so.1
-${UNIXODBC_DRIVERS_DIR}/liboplodbcS.so.1.0
-${UNIXODBC_DRIVERS_DIR}/liboraodbcS.a
 ${UNIXODBC_DRIVERS_DIR}/liboraodbcS.la
-${UNIXODBC_DRIVERS_DIR}/liboraodbcS.so
-${UNIXODBC_DRIVERS_DIR}/liboraodbcS.so.1
-${UNIXODBC_DRIVERS_DIR}/liboraodbcS.so.1.0
-${UNIXODBC_DRIVERS_DIR}/libsapdbS.a
 ${UNIXODBC_DRIVERS_DIR}/libsapdbS.la
-${UNIXODBC_DRIVERS_DIR}/libsapdbS.so
-${UNIXODBC_DRIVERS_DIR}/libsapdbS.so.1
-${UNIXODBC_DRIVERS_DIR}/libsapdbS.so.1.0
-${UNIXODBC_DRIVERS_DIR}/libtdsS.a
 ${UNIXODBC_DRIVERS_DIR}/libtdsS.la
-${UNIXODBC_DRIVERS_DIR}/libtdsS.so
-${UNIXODBC_DRIVERS_DIR}/libtdsS.so.1
-${UNIXODBC_DRIVERS_DIR}/libtdsS.so.1.0
-${UNIXODBC_DRIVERS_DIR}/libtemplate.a
 ${UNIXODBC_DRIVERS_DIR}/libtemplate.la
-${UNIXODBC_DRIVERS_DIR}/libtemplate.so
-${UNIXODBC_DRIVERS_DIR}/libtemplate.so.1
-${UNIXODBC_DRIVERS_DIR}/libtemplate.so.1.0
 share/examples/${PKGBASE}/odbcinst.ini
 @dirrm share/examples/${PKGBASE}
 @dirrm ${UNIXODBC_DRIVERS_DIR}