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.

10 files changed, 32 insertions, 12 deletions

diff --git a/audio/esound/pkg/PLIST b/audio/esound/pkg/PLIST
index c2cfdc3f02b..8febab5604e 100644
--- a/audio/esound/pkg/PLIST
+++ b/audio/esound/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2000/10/15 03:04:54 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/01/04 15:10:19 agc Exp $
 bin/esd
 bin/esd-config
 bin/esdcat
@@ -13,5 +13,7 @@ etc/esd.conf
 include/esd.h
 lib/libesd.a
 lib/libesd.la
+lib/libesd.so
+lib/libesd.so.2
 lib/libesd.so.2.20
 share/aclocal/esd.m4
diff --git a/audio/gsm/pkg/PLIST b/audio/gsm/pkg/PLIST
index 677659cc33d..99004074900 100644
--- a/audio/gsm/pkg/PLIST
+++ b/audio/gsm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2000/08/15 13:43:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2001/01/04 15:10:19 agc Exp $
 bin/tcat
 bin/toast
 bin/untoast
@@ -8,6 +8,8 @@ include/gsm/proto.h
 include/gsm/unproto.h
 lib/libgsm.a
 lib/libgsm.la
+lib/libgsm.so
+lib/libgsm.so.1
 lib/libgsm.so.1.10
 man/man1/toast.1
 man/man3/gsm.3
diff --git a/audio/libaudiofile/pkg/PLIST b/audio/libaudiofile/pkg/PLIST
index 62309d21c43..1ab231ee362 100644
--- a/audio/libaudiofile/pkg/PLIST
+++ b/audio/libaudiofile/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2000/10/15 03:04:28 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/01/04 15:10:19 agc Exp $
 bin/audiofile-config
 bin/sfconvert
 bin/sfinfo
@@ -7,6 +7,8 @@ include/audiofile.h
 include/aupvlist.h
 lib/libaudiofile.a
 lib/libaudiofile.la
+lib/libaudiofile.so
+lib/libaudiofile.so.0
 lib/libaudiofile.so.0.0
 share/aclocal/audiofile.m4
 share/doc/libaudiofile/afCloseFile
diff --git a/audio/libcdaudio/pkg/PLIST b/audio/libcdaudio/pkg/PLIST
index 84fdbbd1af1..3fee1ede055 100644
--- a/audio/libcdaudio/pkg/PLIST
+++ b/audio/libcdaudio/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2000/12/28 03:25:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:10:19 agc Exp $
 bin/libcdaudio-config
 include/cdaudio.h
+lib/libcdaudio.so
+lib/libcdaudio.so.1
 lib/libcdaudio.so.1.0
 lib/libcdaudio.a
 lib/libcdaudio.la
diff --git a/audio/libmikmod/pkg/PLIST b/audio/libmikmod/pkg/PLIST
index 09975b662ba..818584303b7 100644
--- a/audio/libmikmod/pkg/PLIST
+++ b/audio/libmikmod/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/06/09 07:53:04 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:19 agc Exp $
 bin/libmikmod-config
 include/mikmod.h
 @unexec install-info --delete %D/info/mikmod.info %D/info/dir
@@ -6,6 +6,8 @@ info/mikmod.info
 @exec install-info %D/info/mikmod.info %D/info/dir
 lib/libmikmod.a
 lib/libmikmod.la
+lib/libmikmod.so
+lib/libmikmod.so.2
 lib/libmikmod.so.2.2
 man/man1/libmikmod-config.1
 share/aclocal/libmikmod.m4
diff --git a/audio/libsidplay/pkg/PLIST b/audio/libsidplay/pkg/PLIST
index 86ecc883f82..68218716315 100644
--- a/audio/libsidplay/pkg/PLIST
+++ b/audio/libsidplay/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/06/19 22:45:59 pooka Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:19 agc Exp $
 include/sidplay/compconf.h
 include/sidplay/libcfg.h
 include/sidplay/emucfg.h
@@ -9,7 +9,9 @@ include/sidplay/mytypes.h
 include/sidplay/player.h
 include/sidplay/sidtune.h
 include/sidplay/version.h
-lib/libsidplay.so.1.0
-lib/libsidplay.la
 lib/libsidplay.a
+lib/libsidplay.la
+lib/libsidplay.so
+lib/libsidplay.so.1
+lib/libsidplay.so.1.0
 @dirrm include/sidplay
diff --git a/audio/madplay/pkg/PLIST b/audio/madplay/pkg/PLIST
index 0587dafad0b..551ebad9288 100644
--- a/audio/madplay/pkg/PLIST
+++ b/audio/madplay/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2000/12/04 22:04:48 rh Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:19 agc Exp $
 bin/abxtest
 bin/madplay
 include/mad.h
+lib/libmad.so
+lib/libmad.so.0
 lib/libmad.so.0.0
 lib/libmad.a
 lib/libmad.la
diff --git a/audio/nas/pkg/PLIST.clients b/audio/nas/pkg/PLIST.clients
index 610d73f7fd4..027f38c33e7 100644
--- a/audio/nas/pkg/PLIST.clients
+++ b/audio/nas/pkg/PLIST.clients
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.clients,v 1.1 2000/09/13 18:03:31 fredb Exp $
+@comment $NetBSD: PLIST.clients,v 1.2 2001/01/04 15:10:20 agc Exp $
 bin/auconvert
 bin/auctl
 bin/audemo
@@ -39,6 +39,8 @@ include/audio/voc.h
 include/audio/wave.h
 lib/X11/AuErrorDB
 lib/libaudio.a
+lib/libaudio.so
+lib/libaudio.so.1
 lib/libaudio.so.1.4
 man/cat1/auconvert.0
 man/cat1/auctl.0
diff --git a/audio/rplay/pkg/PLIST b/audio/rplay/pkg/PLIST
index 566b6e92ffc..387bc0c393f 100644
--- a/audio/rplay/pkg/PLIST
+++ b/audio/rplay/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2000/06/21 03:37:23 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/01/04 15:10:20 agc Exp $
 etc/rc.d/rplayd.sh
 bin/rplay
 bin/rptp
@@ -17,6 +17,8 @@ info/rplay.info
 @exec	install-info %D/info/rplay.info %D/info/dir
 lib/librplay.a
 lib/librplay.la
+lib/librplay.so
+lib/librplay.so.0
 lib/librplay.so.0.0
 man/man1/rplay.1
 man/man1/rptp.1
diff --git a/audio/xmms/pkg/PLIST b/audio/xmms/pkg/PLIST
index 34be131f12a..88505892567 100644
--- a/audio/xmms/pkg/PLIST
+++ b/audio/xmms/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2000/11/27 18:38:08 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/01/04 15:10:20 agc Exp $
 bin/wmxmms
 bin/xmms
 bin/xmms-config
@@ -11,6 +11,8 @@ include/xmms/util.h
 include/xmms/xmmsctrl.h
 lib/libxmms.a
 lib/libxmms.la
+lib/libxmms.so
+lib/libxmms.so.1
 lib/libxmms.so.1.0
 lib/xmms/Effect/libecho.la
 lib/xmms/Effect/libecho.a