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.

7 files changed, 67 insertions, 7 deletions

diff --git a/www/communicator/pkg/PLIST.netbsd-sparc b/www/communicator/pkg/PLIST.netbsd-sparc
index 36362474e3b..566a43ff65e 100644
--- a/www/communicator/pkg/PLIST.netbsd-sparc
+++ b/www/communicator/pkg/PLIST.netbsd-sparc
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST.netbsd-sparc,v 1.1 1999/08/13 21:24:13 abs Exp $
+@comment $NetBSD: PLIST.netbsd-sparc,v 1.2 2001/01/04 15:10:57 agc Exp $
 bin/communicator-${NS_VERS}_nis
 bin/netscape_nis
 lib/netscape/communicator-${NS_VERS}/netscape_nis
+lib/netscape/communicator-${NS_VERS}/libjsd.so
+lib/netscape/communicator-${NS_VERS}/libjsd.so.1
 lib/netscape/communicator-${NS_VERS}/libjsd.so.1.0
 lib/netscape/communicator-${NS_VERS}/dynfonts/libTrueDoc.so
 lib/netscape/communicator-${NS_VERS}/plugins/libnullplugin.so
diff --git a/www/communicator/pkg/PLIST.sunos-sparc b/www/communicator/pkg/PLIST.sunos-sparc
index 1246237e88e..cadc880771a 100644
--- a/www/communicator/pkg/PLIST.sunos-sparc
+++ b/www/communicator/pkg/PLIST.sunos-sparc
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST.sunos-sparc,v 1.1 2000/05/09 13:23:20 abs Exp $
+@comment $NetBSD: PLIST.sunos-sparc,v 1.2 2001/01/04 15:10:57 agc Exp $
 bin/${BINNAME}-${NS_VERS}_nis
 bin/netscape_nis
 lib/netscape/${BINNAME}-${NS_VERS}/netscape_nis
+lib/netscape/${BINNAME}-${NS_VERS}/libjsd.so
+lib/netscape/${BINNAME}-${NS_VERS}/libjsd.so.1
 lib/netscape/${BINNAME}-${NS_VERS}/libjsd.so.1.0
 lib/netscape/${BINNAME}-${NS_VERS}/dynfonts/libTrueDoc.so
 lib/netscape/${BINNAME}-${NS_VERS}/plugins/libnullplugin.so
diff --git a/www/glibwww/pkg/PLIST b/www/glibwww/pkg/PLIST
index eb03a5612b9..7c4f2886e6a 100644
--- a/www/glibwww/pkg/PLIST
+++ b/www/glibwww/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/07 05:09:18 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:57 agc Exp $
 include/glibwww/glibwww.h
 lib/glibwwwConf.sh
 lib/libglibwww.a
 lib/libglibwww.la
+lib/libglibwww.so
+lib/libglibwww.so.1
 lib/libglibwww.so.1.0
 @dirrm include/glibwww
diff --git a/www/gtkhtml/pkg/PLIST b/www/gtkhtml/pkg/PLIST
index 64106f52b19..98a6e585f35 100644
--- a/www/gtkhtml/pkg/PLIST
+++ b/www/gtkhtml/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/12/31 14:04:44 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:58 agc Exp $
 bin/ebrowser
 bin/gnome-gtkhtml-editor
 bin/gtkhtml-properties-capplet
@@ -95,6 +95,8 @@ lib/bonobo/plugin/libstorage_http.so
 lib/gtkhtmlConf.sh
 lib/libgtkhtml.a
 lib/libgtkhtml.la
+lib/libgtkhtml.so
+lib/libgtkhtml.so.6
 lib/libgtkhtml.so.6.0
 share/control-center/Documents/gtkhtml-properties.desktop
 share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
diff --git a/www/libghttp/pkg/PLIST b/www/libghttp/pkg/PLIST
index 4dac80e86bc..45aa09706eb 100644
--- a/www/libghttp/pkg/PLIST
+++ b/www/libghttp/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2000/11/25 17:22:16 rh Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:10:58 agc Exp $
 include/ghttp.h
 include/ghttp_constants.h
 lib/ghttpConf.sh
 lib/libghttp.a
 lib/libghttp.la
+lib/libghttp.so
+lib/libghttp.so.1
 lib/libghttp.so.1.0
diff --git a/www/libwww/pkg/PLIST b/www/libwww/pkg/PLIST
index 5faa69ee84a..c5e76b03f25 100644
--- a/www/libwww/pkg/PLIST
+++ b/www/libwww/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2000/08/06 01:11:39 fredb Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/01/04 15:10:58 agc Exp $
 bin/libwww-config
 bin/w3c
 bin/webbot
@@ -164,75 +164,123 @@ include/w3c-libwww/wwwsys.h
 include/w3c-libwww/xmlparse.h
 lib/libmd5.a
 lib/libmd5.la
+lib/libmd5.so
+lib/libmd5.so.1
 lib/libmd5.so.1.0
 lib/libpics.a
 lib/libpics.la
+lib/libpics.so
+lib/libpics.so.0
 lib/libpics.so.0.0
 lib/libwwwapp.a
 lib/libwwwapp.la
+lib/libwwwapp.so
+lib/libwwwapp.so.1
 lib/libwwwapp.so.1.0
 lib/libwwwcache.a
 lib/libwwwcache.la
+lib/libwwwcache.so
+lib/libwwwcache.so.1
 lib/libwwwcache.so.1.0
 lib/libwwwcore.a
 lib/libwwwcore.la
+lib/libwwwcore.so
+lib/libwwwcore.so.1
 lib/libwwwcore.so.1.0
 lib/libwwwdir.a
 lib/libwwwdir.la
+lib/libwwwdir.so
+lib/libwwwdir.so.1
 lib/libwwwdir.so.1.0
 lib/libwwwfile.a
 lib/libwwwfile.la
+lib/libwwwfile.so
+lib/libwwwfile.so.1
 lib/libwwwfile.so.1.0
 lib/libwwwftp.a
 lib/libwwwftp.la
+lib/libwwwftp.so
+lib/libwwwftp.so.1
 lib/libwwwftp.so.1.0
 lib/libwwwgopher.a
 lib/libwwwgopher.la
+lib/libwwwgopher.so
+lib/libwwwgopher.so.1
 lib/libwwwgopher.so.1.0
 lib/libwwwhttp.a
 lib/libwwwhttp.la
+lib/libwwwhttp.so
+lib/libwwwhttp.so.1
 lib/libwwwhttp.so.1.0
 lib/libwwwhtml.a
 lib/libwwwhtml.la
+lib/libwwwhtml.so
+lib/libwwwhtml.so.1
 lib/libwwwhtml.so.1.0
 lib/libwwwinit.a
 lib/libwwwinit.la
+lib/libwwwinit.so
+lib/libwwwinit.so.1
 lib/libwwwinit.so.1.0
 lib/libwwwmime.a
 lib/libwwwmime.la
+lib/libwwwmime.so
+lib/libwwwmime.so.1
 lib/libwwwmime.so.1.0
 lib/libwwwmux.a
 lib/libwwwmux.la
+lib/libwwwmux.so
+lib/libwwwmux.so.1
 lib/libwwwmux.so.1.0
 lib/libwwwnews.a
 lib/libwwwnews.la
+lib/libwwwnews.so
+lib/libwwwnews.so.1
 lib/libwwwnews.so.1.0
 lib/libwwwssl.a
 lib/libwwwssl.la
+lib/libwwwssl.so
+lib/libwwwssl.so.1
 lib/libwwwssl.so.1.0
 lib/libwwwstream.a
 lib/libwwwstream.la
+lib/libwwwstream.so
+lib/libwwwstream.so.1
 lib/libwwwstream.so.1.0
 lib/libwwwtelnet.a
 lib/libwwwtelnet.la
+lib/libwwwtelnet.so
+lib/libwwwtelnet.so.1
 lib/libwwwtelnet.so.1.0
 lib/libwwwtrans.a
 lib/libwwwtrans.la
+lib/libwwwtrans.so
+lib/libwwwtrans.so.1
 lib/libwwwtrans.so.1.0
 lib/libwwwutils.a
 lib/libwwwutils.la
+lib/libwwwutils.so
+lib/libwwwutils.so.1
 lib/libwwwutils.so.1.0
 lib/libwwwxml.a
 lib/libwwwxml.la
+lib/libwwwxml.so
+lib/libwwwxml.so.1
 lib/libwwwxml.so.1.0
 lib/libwwwzip.a
 lib/libwwwzip.la
+lib/libwwwzip.so
+lib/libwwwzip.so.1
 lib/libwwwzip.so.1.0
 lib/libxmlparse.a
 lib/libxmlparse.la
+lib/libxmlparse.so
+lib/libxmlparse.so.1
 lib/libxmlparse.so.1.0
 lib/libxmltok.a
 lib/libxmltok.la
+lib/libxmltok.so
+lib/libxmltok.so.1
 lib/libxmltok.so.1.0
 share/w3c-libwww/back.xbm
 share/w3c-libwww/binary.xbm
diff --git a/www/php4/pkg/PLIST b/www/php4/pkg/PLIST
index 65e93e62cd2..4e9a78f791a 100644
--- a/www/php4/pkg/PLIST
+++ b/www/php4/pkg/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2000/12/17 21:33:55 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:58 agc Exp $
 bin/php
 etc/php.ini-dist
 etc/php.ini-optimized
 lib/libphp4.a
 lib/libphp4.la
+lib/libphp4.so
+lib/libphp4.so.0
 lib/libphp4.so.0.0
 libexec/cgi-bin/php
 share/php4/php4.gif