The way that shared objects were handled in the PLISTs and bsd.pkg.mk was

out of date - it was based on a.out OBJECT_FMT, and added entries in the
generated PLISTs to reflect the symlinks that ELF packages uses. It also
tried to be clever, and removed and recreated any symbolic links that were
created, which has resulted in some fun, especially with packages which
use dlopen(3) to load modules. Some recent changes to our ld.so to bring
it more into line with other Operating Systems also exposed some cracks.

+ Modify bsd.pkg.mk and its shared object handling, so that PLISTs now contain
the ELF symlinks.
+ Don't mess about with file system entries when handling shared objects in
bsd.pkg.mk, since it's likely that libtool and the BSD *.mk processing will
have got it right, and have a much better idea than we do.
+ Modify PLISTs to contain "ELF symlinks"
+ On a.out platforms, delete any "ELF symlinks" from the generated PLISTs
+ On ELF platforms, no extra processing needs to be done in bsd.pkg.mk
+ Modify print-PLIST target in bsd.pkg.mk to add dummy symlink entries on
a.out platforms
+ Update the documentation in Packages.txt

With many thanks to Thomas Klausner for keeping me honest with this.

11 files changed, 47 insertions, 13 deletions

diff --git a/databases/db/pkg/PLIST b/databases/db/pkg/PLIST
index 3fe630fed09..067d102ead1 100644
--- a/databases/db/pkg/PLIST
+++ b/databases/db/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/07/27 14:18:03 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:10:23 agc Exp $
 bin/db_load
 bin/db_dump
 bin/db_deadlock
@@ -12,6 +12,8 @@ include/db2/db_cxx.h
 include/db2/db.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
diff --git a/databases/freetds/pkg/PLIST b/databases/freetds/pkg/PLIST
index 8c37ff2f79a..0e4192b94bd 100644
--- a/databases/freetds/pkg/PLIST
+++ b/databases/freetds/pkg/PLIST
@@ -1,10 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2000/07/07 17:30:27 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:24 agc Exp $
+freetds/lib/libtds.so
+freetds/lib/libtds.so.0
 freetds/lib/libtds.so.0.0
 freetds/lib/libtds.la
 freetds/lib/libtds.a
+freetds/lib/libct.so
+freetds/lib/libct.so.0
 freetds/lib/libct.so.0.0
 freetds/lib/libct.la
 freetds/lib/libct.a
+freetds/lib/libsybdb.so
+freetds/lib/libsybdb.so.0
 freetds/lib/libsybdb.so.0.0
 freetds/lib/libsybdb.la
 freetds/lib/libsybdb.a
diff --git a/databases/gdbm/pkg/PLIST b/databases/gdbm/pkg/PLIST
index faab3154b51..45c415ec6f7 100644
--- a/databases/gdbm/pkg/PLIST
+++ b/databases/gdbm/pkg/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2000/06/13 01:46:54 fredb Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/01/04 15:10:24 agc Exp $
 include/gdbm.h
 @unexec install-info --delete %D/info/gdbm.info %D/info/dir
 info/gdbm.info
 @exec   install-info          %D/info/gdbm.info %D/info/dir
 lib/libgdbm.a
 lib/libgdbm.la
+lib/libgdbm.so
+lib/libgdbm.so.2
 lib/libgdbm.so.2.0
 man/man3/gdbm.3
diff --git a/databases/iodbc/pkg/PLIST b/databases/iodbc/pkg/PLIST
index 998bba21013..f1abedd4a24 100644
--- a/databases/iodbc/pkg/PLIST
+++ b/databases/iodbc/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/08/14 15:07:31 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:24 agc Exp $
 include/isql.h
 include/isqlext.h
 include/isqltypes.h
@@ -7,6 +7,8 @@ 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
diff --git a/databases/mysql-client/pkg/PLIST b/databases/mysql-client/pkg/PLIST
index 7f176116fbe..6f6feca6b3c 100644
--- a/databases/mysql-client/pkg/PLIST
+++ b/databases/mysql-client/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/08/16 01:54:10 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:24 agc Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_zap
@@ -36,6 +36,8 @@ info/mysql.info
 @exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.la
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.6
 lib/mysql/libmysqlclient.so.6.0
 share/mysql/binary-configure
 share/mysql/make_binary_distribution
diff --git a/databases/openldap/pkg/PLIST.common b/databases/openldap/pkg/PLIST.common
index 622d950c1a9..a8cefdf784c 100644
--- a/databases/openldap/pkg/PLIST.common
+++ b/databases/openldap/pkg/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.3 2000/08/28 23:02:18 wiz Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2001/01/04 15:10:24 agc Exp $
 bin/ud
 bin/ldapsearch
 bin/ldapmodify
@@ -8,9 +8,13 @@ bin/ldappasswd
 bin/ldapadd
 lib/liblber.a
 lib/liblber.la
+lib/liblber.so
+lib/liblber.so.1
 lib/liblber.so.1.0
 lib/libldap.a
 lib/libldap.la
+lib/libldap.so
+lib/libldap.so.1
 lib/libldap.so.1.0
 man/man1/ldapadd.1
 man/man1/ldapdelete.1
diff --git a/databases/postgresql/pkg/PLIST b/databases/postgresql/pkg/PLIST
index 26d1e4f7d42..c4a44ddd2d9 100644
--- a/databases/postgresql/pkg/PLIST
+++ b/databases/postgresql/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2000/09/21 14:34:56 jlam Exp $
+@comment $NetBSD: PLIST,v 1.17 2001/01/04 15:10:24 agc Exp $
 ${PGUSER}/.profile.pgsql
 ${PGUSER}/post-install-notes
 bin/createdb
@@ -56,12 +56,20 @@ include/pgsql/utils/geo_decls.h
 include/pgsql/utils/mcxt.h
 include/pgsql/utils/palloc.h
 lib/libecpg.a
+lib/libecpg.so
+lib/libecpg.so.3
 lib/libecpg.so.3.1
 lib/libpgeasy.a
+lib/libpgeasy.so
+lib/libpgeasy.so.2
 lib/libpgeasy.so.2.1
 lib/libpq++.a
+lib/libpq++.so
+lib/libpq++.so.3
 lib/libpq++.so.3.1
 lib/libpq.a
+lib/libpq.so
+lib/libpq.so.2
 lib/libpq.so.2.1
 lib/plpgsql.so
 man/man1/createdb.1
diff --git a/databases/rrdtool/pkg/PLIST b/databases/rrdtool/pkg/PLIST
index c85a91d1fb1..61dcf706ca1 100644
--- a/databases/rrdtool/pkg/PLIST
+++ b/databases/rrdtool/pkg/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.8 2000/12/15 19:21:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/01/04 15:10:25 agc Exp $
 bin/rrdcgi
 bin/rrdtool
 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
diff --git a/databases/sdbm/pkg/PLIST b/databases/sdbm/pkg/PLIST
index ca13fc21b08..aa539abde42 100644
--- a/databases/sdbm/pkg/PLIST
+++ b/databases/sdbm/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 1999/06/30 09:46:45 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:25 agc Exp $
 include/sdbm.h
 lib/libsdbm.a
 lib/libsdbm_p.a
 lib/libsdbm_pic.a
+lib/libsdbm.so
+lib/libsdbm.so.1
 lib/libsdbm.so.1.0
 man/man3/sdbm.3
diff --git a/databases/tcl-gdbm/pkg/PLIST b/databases/tcl-gdbm/pkg/PLIST
index 30a5f6e414f..44b0fdf32cc 100644
--- a/databases/tcl-gdbm/pkg/PLIST
+++ b/databases/tcl-gdbm/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2000/08/29 21:05:50 jwise Exp $
-lib/tcl/tclgdbm/libtclgdbm.so.0.0
-lib/tcl/tclgdbm/libtclgdbm.la
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:25 agc Exp $
 lib/tcl/tclgdbm/libtclgdbm.a
+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/tcl-postgresql/pkg/PLIST b/databases/tcl-postgresql/pkg/PLIST
index 19695cfaeff..9a26ea86d64 100644
--- a/databases/tcl-postgresql/pkg/PLIST
+++ b/databases/tcl-postgresql/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2000/05/20 19:35:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:10:25 agc Exp $
 bin/pgtclsh
 include/pgsql/libpgtcl.h
 lib/libpgtcl.a
+lib/libpgtcl.so
+lib/libpgtcl.so.2
 lib/libpgtcl.so.2.1
 lib/pltcl.so
 man/man1/pgtclsh.1