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.

5 files changed, 15 insertions, 5 deletions

diff --git a/comms/fidogate/pkg/PLIST b/comms/fidogate/pkg/PLIST
index a086f5cd1c8..189b532a475 100644
--- a/comms/fidogate/pkg/PLIST
+++ b/comms/fidogate/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2000/08/14 13:55:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/01/04 15:10:21 agc Exp $
 bin/pktdebug
 bin/pktmore
 bin/sumcrc
@@ -42,6 +42,8 @@ lib/fidogate/runout
 lib/fidogate/runtoss
 lib/fidogate/rununpack
 lib/libfidogate.la
+lib/libfidogate.so
+lib/libfidogate.so.0
 lib/libfidogate.so.0.0
 share/fidogate/inn/send-ffx
 share/fidogate/inn/send-fidogate
diff --git a/comms/jpilot-libplugin/pkg/PLIST b/comms/jpilot-libplugin/pkg/PLIST
index 036494d6c05..727993bd58d 100644
--- a/comms/jpilot-libplugin/pkg/PLIST
+++ b/comms/jpilot-libplugin/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/06/15 21:19:40 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:21 agc Exp $
 lib/libplugin.a
 lib/libplugin.la
+lib/libplugin.so
+lib/libplugin.so.0
 lib/libplugin.so.0.0
 include/jpilot/libplugin.h
 include/jpilot/prefs.h
diff --git a/comms/pilot-link/pkg/PLIST b/comms/pilot-link/pkg/PLIST
index 04110b76336..ca746ea829f 100644
--- a/comms/pilot-link/pkg/PLIST
+++ b/comms/pilot-link/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2000/06/08 23:33:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/01/04 15:10:22 agc Exp $
 bin/addresses
 bin/ccexample
 bin/debugsh
@@ -71,6 +71,8 @@ include/pi-version.h
 lib/libpicc.a
 lib/libpisock.a
 lib/libpisock.la
+lib/libpisock.so
+lib/libpisock.so.3
 lib/libpisock.so.3.1
 lib/pix/b1.gif
 lib/pix/b2.gif
diff --git a/comms/plp/pkg/PLIST b/comms/plp/pkg/PLIST
index 15484d52085..a858e304db0 100644
--- a/comms/plp/pkg/PLIST
+++ b/comms/plp/pkg/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2000/07/08 22:27:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:22 agc Exp $
 bin/ncp
 bin/rfsv
 lib/libplputils.a
 lib/libplputils.la
+lib/libplputils.so
+lib/libplputils.so.1
 lib/libplputils.so.1.7
 share/doc/plp/README
 @dirrm share/doc/plp
diff --git a/comms/plptools/pkg/PLIST b/comms/plptools/pkg/PLIST
index 6f7b6248ca9..a1c273b2f9d 100644
--- a/comms/plptools/pkg/PLIST
+++ b/comms/plptools/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2000/06/12 13:36:20 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:22 agc Exp $
 bin/plpftp
 lib/libplp.a
 lib/libplp.la
+lib/libplp.so
+lib/libplp.so.1
 lib/libplp.so.1.0
 sbin/ncpd
 sbin/plpnfsd