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.

13 files changed, 125 insertions, 13 deletions

diff --git a/net/ORBit/pkg/PLIST b/net/ORBit/pkg/PLIST
index 7ec6f428f2d..4f33cc79fa1 100644
--- a/net/ORBit/pkg/PLIST
+++ b/net/ORBit/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2000/12/31 12:19:46 rh Exp $
+@comment $NetBSD: PLIST,v 1.19 2001/01/04 15:10:50 agc Exp $
 bin/libIDL-config
 bin/name-client
 bin/old-name-server
@@ -75,19 +75,29 @@ info/libIDL.info
 @exec install-info %D/info/libIDL.info %D/info/dir
 lib/libIDL.a
 lib/libIDL.la
+lib/libIDL.so
+lib/libIDL.so.0
 lib/libIDL.so.0.6
 lib/libIDLConf.sh
 lib/libIIOP.a
 lib/libIIOP.la
+lib/libIIOP.so
+lib/libIIOP.so.5
 lib/libIIOP.so.5.6
 lib/libORBit.a
 lib/libORBit.la
+lib/libORBit.so
+lib/libORBit.so.5
 lib/libORBit.so.5.6
 lib/libORBitCosNaming.a
 lib/libORBitCosNaming.la
+lib/libORBitCosNaming.so
+lib/libORBitCosNaming.so.5
 lib/libORBitCosNaming.so.5.6
 lib/libORBitutil.a
 lib/libORBitutil.la
+lib/libORBitutil.so
+lib/libORBitutil.so.5
 lib/libORBitutil.so.5.6
 lib/libname-server.a
 lib/liborbit-c-backend.a
diff --git a/net/bind9-current/pkg/PLIST b/net/bind9-current/pkg/PLIST
index 46856027886..a229e048014 100644
--- a/net/bind9-current/pkg/PLIST
+++ b/net/bind9-current/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/01/03 17:15:51 itojun Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:51 agc Exp $
 bin/dig
 bin/host
 bin/isc-config.sh
@@ -168,15 +168,23 @@ include/omapi/result.h
 include/omapi/types.h
 lib/libdns.a
 lib/libdns.la
+lib/libdns.so
+lib/libdns.so.3
 lib/libdns.so.3.0
 lib/libisc.a
 lib/libisc.la
+lib/libisc.so
+lib/libisc.so.3
 lib/libisc.so.3.0
 lib/liblwres.a
 lib/liblwres.la
+lib/liblwres.so
+lib/liblwres.so.2
 lib/liblwres.so.2.0
 lib/libomapi.a
 lib/libomapi.la
+lib/libomapi.so
+lib/libomapi.so.3
 lib/libomapi.so.3.0
 sbin/dnssec-keygen
 sbin/dnssec-makekeyset
diff --git a/net/bind9/pkg/PLIST b/net/bind9/pkg/PLIST
index fec63fe31e5..c7519f45df0 100644
--- a/net/bind9/pkg/PLIST
+++ b/net/bind9/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2000/11/13 04:43:24 itojun Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/01/04 15:10:51 agc Exp $
 bin/dig
 bin/host
 bin/isc-config.sh
@@ -166,15 +166,23 @@ include/omapi/result.h
 include/omapi/types.h
 lib/libdns.a
 lib/libdns.la
+lib/libdns.so
+lib/libdns.so.2
 lib/libdns.so.2.0
 lib/libisc.a
 lib/libisc.la
+lib/libisc.so
+lib/libisc.so.2
 lib/libisc.so.2.0
 lib/liblwres.a
 lib/liblwres.la
+lib/liblwres.so
+lib/liblwres.so.1
 lib/liblwres.so.1.0
 lib/libomapi.a
 lib/libomapi.la
+lib/libomapi.so
+lib/libomapi.so.1
 lib/libomapi.so.1.0
 sbin/dnssec-keygen
 sbin/dnssec-makekeyset
diff --git a/net/dante/pkg/PLIST b/net/dante/pkg/PLIST
index 396fdb30979..b1809d0012a 100644
--- a/net/dante/pkg/PLIST
+++ b/net/dante/pkg/PLIST
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/10/15 17:29:14 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:51 agc Exp $
 bin/socksify
 lib/libdsocks.a
 lib/libdsocks.la
+lib/libdsocks.so
+lib/libdsocks.so.1
 lib/libdsocks.so.1.0
 lib/libsocks.a
 lib/libsocks.la
+lib/libsocks.so
+lib/libsocks.so.1
 lib/libsocks.so.1.0
 man/man5/sockd.conf.5
 man/man5/socks.conf.5
diff --git a/net/freewais-sf/pkg/PLIST b/net/freewais-sf/pkg/PLIST
index 11e6bba81e2..4e83ec2551e 100644
--- a/net/freewais-sf/pkg/PLIST
+++ b/net/freewais-sf/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/08/14 23:11:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:51 agc Exp $
 bin/catalog
 bin/check-sources
 bin/dictionary
@@ -18,6 +18,8 @@ bin/waisserver
 bin/ws
 lib/libwais.a
 lib/libwais.la
+lib/libwais.so
+lib/libwais.so.2
 lib/libwais.so.2.2
 lib/emacs/lisp/wais.el
 include/wais.h
diff --git a/net/kdenetwork/pkg/PLIST-SunOS b/net/kdenetwork/pkg/PLIST-SunOS
index 9ed00f7f3ad..a75466088de 100644
--- a/net/kdenetwork/pkg/PLIST-SunOS
+++ b/net/kdenetwork/pkg/PLIST-SunOS
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST-SunOS,v 1.2 2000/03/23 11:58:32 agc Exp $
+@comment $NetBSD: PLIST-SunOS,v 1.3 2001/01/04 15:10:51 agc Exp $
 bin/dsirc
 bin/karchie
 bin/kbiff
@@ -19,52 +19,84 @@ bin/mathpod
 bin/newkrn
 lib/ksirc/libksirclistbox.a
 lib/ksirc/libksirclistbox.la
+lib/ksirc/libksirclistbox.so
+lib/ksirc/libksirclistbox.so.0
 lib/ksirc/libksirclistbox.so.0.0
 lib/ksirc/libpalistbox.a
 lib/ksirc/libpalistbox.la
+lib/ksirc/libpalistbox.so
+lib/ksirc/libpalistbox.so.0
 lib/ksirc/libpalistbox.so.0.0
 lib/ksirc/libpbutton.a
 lib/ksirc/libpbutton.la
+lib/ksirc/libpbutton.so
+lib/ksirc/libpbutton.so.0
 lib/ksirc/libpbutton.so.0.0
 lib/ksirc/libpframe.a
 lib/ksirc/libpframe.la
+lib/ksirc/libpframe.so
+lib/ksirc/libpframe.so.0
 lib/ksirc/libpframe.so.0.0
 lib/ksirc/libpkfiledialog.a
 lib/ksirc/libpkfiledialog.la
+lib/ksirc/libpkfiledialog.so
+lib/ksirc/libpkfiledialog.so.0
 lib/ksirc/libpkfiledialog.so.0.0
 lib/ksirc/libplabel.a
 lib/ksirc/libplabel.la
+lib/ksirc/libplabel.so
+lib/ksirc/libplabel.so.0
 lib/ksirc/libplabel.so.0.0
 lib/ksirc/libplined.a
 lib/ksirc/libplined.la
+lib/ksirc/libplined.so
+lib/ksirc/libplined.so.0
 lib/ksirc/libplined.so.0.0
 lib/ksirc/libplistbox.a
 lib/ksirc/libplistbox.la
+lib/ksirc/libplistbox.so
+lib/ksirc/libplistbox.so.0
 lib/ksirc/libplistbox.so.0.0
 lib/ksirc/libpmenudta.a
 lib/ksirc/libpmenudta.la
+lib/ksirc/libpmenudta.so
+lib/ksirc/libpmenudta.so.0
 lib/ksirc/libpmenudta.so.0.0
 lib/ksirc/libpobjfinder.a
 lib/ksirc/libpobjfinder.la
+lib/ksirc/libpobjfinder.so
+lib/ksirc/libpobjfinder.so.0
 lib/ksirc/libpobjfinder.so.0.0
 lib/ksirc/libppopmenu.a
 lib/ksirc/libppopmenu.la
+lib/ksirc/libppopmenu.so
+lib/ksirc/libppopmenu.so.0
 lib/ksirc/libppopmenu.so.0.0
 lib/ksirc/libpprogress.a
 lib/ksirc/libpprogress.la
+lib/ksirc/libpprogress.so
+lib/ksirc/libpprogress.so.0
 lib/ksirc/libpprogress.so.0.0
 lib/ksirc/libppushbt.a
 lib/ksirc/libppushbt.la
+lib/ksirc/libppushbt.so
+lib/ksirc/libppushbt.so.0
 lib/ksirc/libppushbt.so.0.0
 lib/ksirc/libptabdialog.a
 lib/ksirc/libptabdialog.la
+lib/ksirc/libptabdialog.so
+lib/ksirc/libptabdialog.so.0
 lib/ksirc/libptabdialog.so.0.0
 lib/ksirc/libptablevw.a
 lib/ksirc/libptablevw.la
+lib/ksirc/libptablevw.so
+lib/ksirc/libptablevw.so.0
 lib/ksirc/libptablevw.so.0.0
 lib/libkplunger.a
 lib/libpuke.a
 lib/libpuke.la
+lib/libpuke.so
+lib/libpuke.so.0
 lib/libpuke.so.0.1
 share/doc/kde/HTML/el/ktalkd/ktalkd-1.html
 share/doc/kde/HTML/el/ktalkd/ktalkd-2.html
diff --git a/net/kdenetwork/pkg/PLIST.egcs b/net/kdenetwork/pkg/PLIST.egcs
index e9a03b90b61..f3bd8faccef 100644
--- a/net/kdenetwork/pkg/PLIST.egcs
+++ b/net/kdenetwork/pkg/PLIST.egcs
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.egcs,v 1.3 1999/09/15 18:26:04 tron Exp $
+@comment $NetBSD: PLIST.egcs,v 1.4 2001/01/04 15:10:51 agc Exp $
 bin/dsirc
 bin/karchie
 bin/kbiff
@@ -21,52 +21,84 @@ bin/mathpod
 bin/newkrn
 lib/ksirc/libksirclistbox.a
 lib/ksirc/libksirclistbox.la
+lib/ksirc/libksirclistbox.so
+lib/ksirc/libksirclistbox.so.0
 lib/ksirc/libksirclistbox.so.0.0
 lib/ksirc/libpalistbox.a
 lib/ksirc/libpalistbox.la
+lib/ksirc/libpalistbox.so
+lib/ksirc/libpalistbox.so.0
 lib/ksirc/libpalistbox.so.0.0
 lib/ksirc/libpbutton.a
 lib/ksirc/libpbutton.la
+lib/ksirc/libpbutton.so
+lib/ksirc/libpbutton.so.0
 lib/ksirc/libpbutton.so.0.0
 lib/ksirc/libpframe.a
 lib/ksirc/libpframe.la
+lib/ksirc/libpframe.so
+lib/ksirc/libpframe.so.0
 lib/ksirc/libpframe.so.0.0
 lib/ksirc/libpkfiledialog.a
 lib/ksirc/libpkfiledialog.la
+lib/ksirc/libpkfiledialog.so
+lib/ksirc/libpkfiledialog.so.0
 lib/ksirc/libpkfiledialog.so.0.0
 lib/ksirc/libplabel.a
 lib/ksirc/libplabel.la
+lib/ksirc/libplabel.so
+lib/ksirc/libplabel.so.0
 lib/ksirc/libplabel.so.0.0
 lib/ksirc/libplined.a
 lib/ksirc/libplined.la
+lib/ksirc/libplined.so
+lib/ksirc/libplined.so.0
 lib/ksirc/libplined.so.0.0
 lib/ksirc/libplistbox.a
 lib/ksirc/libplistbox.la
+lib/ksirc/libplistbox.so
+lib/ksirc/libplistbox.so.0
 lib/ksirc/libplistbox.so.0.0
 lib/ksirc/libpmenudta.a
 lib/ksirc/libpmenudta.la
+lib/ksirc/libpmenudta.so
+lib/ksirc/libpmenudta.so.0
 lib/ksirc/libpmenudta.so.0.0
 lib/ksirc/libpobjfinder.a
 lib/ksirc/libpobjfinder.la
+lib/ksirc/libpobjfinder.so
+lib/ksirc/libpobjfinder.so.0
 lib/ksirc/libpobjfinder.so.0.0
 lib/ksirc/libppopmenu.a
 lib/ksirc/libppopmenu.la
+lib/ksirc/libppopmenu.so
+lib/ksirc/libppopmenu.so.0
 lib/ksirc/libppopmenu.so.0.0
 lib/ksirc/libpprogress.a
 lib/ksirc/libpprogress.la
+lib/ksirc/libpprogress.so
+lib/ksirc/libpprogress.so.0
 lib/ksirc/libpprogress.so.0.0
 lib/ksirc/libppushbt.a
 lib/ksirc/libppushbt.la
+lib/ksirc/libppushbt.so
+lib/ksirc/libppushbt.so.0
 lib/ksirc/libppushbt.so.0.0
 lib/ksirc/libptabdialog.a
 lib/ksirc/libptabdialog.la
+lib/ksirc/libptabdialog.so
+lib/ksirc/libptabdialog.so.0
 lib/ksirc/libptabdialog.so.0.0
 lib/ksirc/libptablevw.a
 lib/ksirc/libptablevw.la
+lib/ksirc/libptablevw.so
+lib/ksirc/libptablevw.so.0
 lib/ksirc/libptablevw.so.0.0
 lib/libkplunger.a
 lib/libpuke.a
 lib/libpuke.la
+lib/libpuke.so
+lib/libpuke.so.0
 lib/libpuke.so.0.1
 share/doc/kde/HTML/el/ktalkd/ktalkd-1.html
 share/doc/kde/HTML/el/ktalkd/ktalkd-2.html
diff --git a/net/libsscript/pkg/PLIST b/net/libsscript/pkg/PLIST
index 069d0bbb2cb..998fc4ec2ba 100644
--- a/net/libsscript/pkg/PLIST
+++ b/net/libsscript/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2000/08/14 23:23:40 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:52 agc Exp $
 include/libsscript/sscript.h
 lib/libsscript.a
 lib/libsscript.la
+lib/libsscript.so
+lib/libsscript.so.2
 lib/libsscript.so.2.0
 share/doc/libsscript/sscript-lib.doc
 @dirrm share/doc/libsscript
diff --git a/net/netatalk/pkg/PLIST b/net/netatalk/pkg/PLIST
index 4ae65f65f89..7d37305d6f3 100644
--- a/net/netatalk/pkg/PLIST
+++ b/net/netatalk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/08/23 23:45:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:52 agc Exp $
 bin/aecho
 bin/getzones
 bin/hqx2bin
@@ -27,6 +27,8 @@ include/atalk/paths.h
 include/atalk/rtmp.h
 include/atalk/zip.h
 lib/libatalk.a
+lib/libatalk.so
+lib/libatalk.so.1
 lib/libatalk.so.1.0
 lib/libatalk_pic.a
 libexec/psa
diff --git a/net/socks5/pkg/PLIST b/net/socks5/pkg/PLIST
index 1362530b163..f48447d1602 100644
--- a/net/socks5/pkg/PLIST
+++ b/net/socks5/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2000/05/03 17:44:29 rh Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/01/04 15:10:52 agc Exp $
 bin/socks5
 bin/runsocks
 bin/stopsocks
@@ -18,4 +18,6 @@ man/man5/libsocks5.conf.5.gz
 man/man5/socks5.conf.5.gz
 man/man5/socks5.passwd.5
 lib/libsocks5.a
+lib/libsocks5_sh.so
+lib/libsocks5_sh.so.0
 lib/libsocks5_sh.so.0.0
diff --git a/net/tcl-scotty/pkg/PLIST b/net/tcl-scotty/pkg/PLIST
index 619c372baf5..19661b1c816 100644
--- a/net/tcl-scotty/pkg/PLIST
+++ b/net/tcl-scotty/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/09/07 17:38:43 jwise Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:52 agc Exp $
 bin/scotty2.1.10
 bin/scotty
 bin/ntping
@@ -203,6 +203,8 @@ lib/tcl/tnm2.1.10/examples/pcnfs
 lib/tcl/tnm2.1.10/examples/pcnfs.n
 lib/tcl/tnm2.1.10/examples/mibgrep
 lib/tcl/tnm2.1.10/examples/mibgrep.n
+lib/libtnm.so
+lib/libtnm.so.1
 lib/libtnm.so.1.0
 lib/libtnm.la
 lib/libtnm.a
diff --git a/net/tkined/pkg/PLIST b/net/tkined/pkg/PLIST
index 224eeb59923..cf84866d7e7 100644
--- a/net/tkined/pkg/PLIST
+++ b/net/tkined/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/09/07 17:44:13 jwise Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:52 agc Exp $
 bin/tkined1.4.10
 bin/tkined
 man/man1/tkined.1
+lib/libtkined.so
+lib/libtkined.so.1
 lib/libtkined.so.1.0
 lib/libtkined.la
 lib/libtkined.a
diff --git a/net/ucd-snmp/pkg/PLIST b/net/ucd-snmp/pkg/PLIST
index 7aff4af3ebf..a4e16a68c3d 100644
--- a/net/ucd-snmp/pkg/PLIST
+++ b/net/ucd-snmp/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2000/10/13 18:16:01 kim Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/01/04 15:10:52 agc Exp $
 bin/encode_keychange
 bin/snmpbulkget
 bin/snmpbulkwalk
@@ -56,12 +56,18 @@ include/ucd-snmp/var_struct.h
 include/ucd-snmp/version.h
 lib/libsnmp.a
 lib/libsnmp.la
+lib/libsnmp.so
+lib/libsnmp.so.0
 lib/libsnmp.so.0.0
 lib/libucdagent.a
 lib/libucdagent.la
+lib/libucdagent.so
+lib/libucdagent.so.0
 lib/libucdagent.so.0.0
 lib/libucdmibs.a
 lib/libucdmibs.la
+lib/libucdmibs.so
+lib/libucdmibs.so.0
 lib/libucdmibs.so.0.0
 man/man1/snmpbulkget.1
 man/man1/snmpbulkwalk.1