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.

4 files changed, 22 insertions, 4 deletions

diff --git a/chat/gaim/pkg/PLIST b/chat/gaim/pkg/PLIST
index 7d46b1a936c..2ed638f1808 100644
--- a/chat/gaim/pkg/PLIST
+++ b/chat/gaim/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/12/27 22:15:12 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:10:21 agc Exp $
 bin/gaim
 lib/gaim/autorecon.so
 lib/gaim/iconaway.so
@@ -6,15 +6,23 @@ lib/gaim/irc.so
 lib/gaim/lagmeter.so
 lib/gaim/libgaimicq.a
 lib/gaim/libgaimicq.la
+lib/gaim/libgaimicq.so
+lib/gaim/libgaimicq.so.0
 lib/gaim/libgaimicq.so.0.0
 lib/gaim/libjabber.a
 lib/gaim/libjabber.la
+lib/gaim/libjabber.so
+lib/gaim/libjabber.so.0
 lib/gaim/libjabber.so.0.0
 lib/gaim/libmsn.a
 lib/gaim/libmsn.la
+lib/gaim/libmsn.so
+lib/gaim/libmsn.so.0
 lib/gaim/libmsn.so.0.0
 lib/gaim/libyahoo.a
 lib/gaim/libyahoo.la
+lib/gaim/libyahoo.so
+lib/gaim/libyahoo.so.0
 lib/gaim/libyahoo.so.0.0
 lib/gaim/napster.so
 lib/gaim/notify.so
diff --git a/chat/icqlib/pkg/PLIST b/chat/icqlib/pkg/PLIST
index 6eadde9a152..874f3b19039 100644
--- a/chat/icqlib/pkg/PLIST
+++ b/chat/icqlib/pkg/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/15 00:36:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:21 agc Exp $
 include/icq.h
 lib/libicq.a
 lib/libicq.la
+lib/libicq.so
+lib/libicq.so.1
 lib/libicq.so.1.0
diff --git a/chat/kxicq/pkg/PLIST b/chat/kxicq/pkg/PLIST
index 77433c1a2b5..ea707e0cb4d 100644
--- a/chat/kxicq/pkg/PLIST
+++ b/chat/kxicq/pkg/PLIST
@@ -1,13 +1,19 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/15 00:36:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:21 agc Exp $
 bin/kxicq
 lib/kxicq/plugins/libesound.a
 lib/kxicq/plugins/libesound.la
+lib/kxicq/plugins/libesound.so
+lib/kxicq/plugins/libesound.so.0
 lib/kxicq/plugins/libesound.so.0.1
 lib/kxicq/plugins/liblastOnline.a
 lib/kxicq/plugins/liblastOnline.la
+lib/kxicq/plugins/liblastOnline.so
+lib/kxicq/plugins/liblastOnline.so.0
 lib/kxicq/plugins/liblastOnline.so.0.1
 lib/kxicq/plugins/librussianConverter.a
 lib/kxicq/plugins/librussianConverter.la
+lib/kxicq/plugins/librussianConverter.so
+lib/kxicq/plugins/librussianConverter.so.0
 lib/kxicq/plugins/librussianConverter.so.0.1
 share/doc/kde/HTML/en/kxicq/index-1.html
 share/doc/kde/HTML/en/kxicq/index-2.html
diff --git a/chat/libirc/pkg/PLIST b/chat/libirc/pkg/PLIST
index 7af6cab4ce8..d4a126c35b1 100644
--- a/chat/libirc/pkg/PLIST
+++ b/chat/libirc/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/15 00:36:31 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:21 agc Exp $
 lib/libirc.a
 lib/libirc.la
+lib/libirc.so
+lib/libirc.so.0
 lib/libirc.so.0.0
 include/btypes.h
 include/cmd.h