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.

12 files changed, 87 insertions, 15 deletions

diff --git a/lang/cim/pkg/PLIST b/lang/cim/pkg/PLIST
index e32c08a360d..0cc69940349 100644
--- a/lang/cim/pkg/PLIST
+++ b/lang/cim/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/25 21:59:30 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:45 agc Exp $
 bin/cim
 bin/cim2latex
 bin/cim2ps
@@ -10,5 +10,7 @@ info/cim.info
 lib/libcim-atr.a
 lib/libcim.a
 lib/libcim.la
+lib/libcim.so
+lib/libcim.so.3
 lib/libcim.so.3.0
 man/man1/cim.1
diff --git a/lang/gb/pkg/PLIST b/lang/gb/pkg/PLIST
index df4691306e9..799791005e6 100644
--- a/lang/gb/pkg/PLIST
+++ b/lang/gb/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/12/30 18:41:21 rh Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:10:45 agc Exp $
 bin/gb
 include/gb/gb-constants.h
 include/gb/gb-eval.h
@@ -27,9 +27,13 @@ include/gbrun/objects/libgbobj.h
 lib/gbConf.sh
 lib/libgb.a
 lib/libgb.la
+lib/libgb.so
+lib/libgb.so.0
 lib/libgb.so.0.0
 lib/libgbrun.a
 lib/libgbrun.la
+lib/libgbrun.so
+lib/libgbrun.so.0
 lib/libgbrun.so.0.0
 @dirrm include/gbrun/objects
 @dirrm include/gbrun
diff --git a/lang/guile/pkg/PLIST b/lang/guile/pkg/PLIST
index 8fd41481d6d..0409564fae0 100644
--- a/lang/guile/pkg/PLIST
+++ b/lang/guile/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2000/07/15 02:31:40 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/01/04 15:10:46 agc Exp $
 bin/guile
 bin/guile-config
 bin/guile-doc-snarf
@@ -97,9 +97,13 @@ info/data-rep.info
 @exec install-info %D/info/data-rep.info %D/info/dir
 lib/libguile.a
 lib/libguile.la
+lib/libguile.so
+lib/libguile.so.9
 lib/libguile.so.9.0
 lib/libguilereadline.a
 lib/libguilereadline.la
+lib/libguilereadline.so
+lib/libguilereadline.so.0
 lib/libguilereadline.so.0.0
 share/aclocal/guile.m4
 share/guile/1.4/ice-9/and-let*.scm
diff --git a/lang/japhar/pkg/PLIST b/lang/japhar/pkg/PLIST
index 45ca5c275bf..8ff4471975e 100644
--- a/lang/japhar/pkg/PLIST
+++ b/lang/japhar/pkg/PLIST
@@ -1,55 +1,91 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/10/28 09:51:43 agc Exp $
-lib/libarch.so.1.0
-lib/libarch.la
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:46 agc Exp $
 lib/libarch.a
+lib/libarch.la
+lib/libarch.so
+lib/libarch.so.1
+lib/libarch.so.1.0
+lib/libffi.so
+lib/libffi.so.2
 lib/libffi.so.2.3
 lib/libffi.la
 lib/libffi.a
+lib/libjni.so
+lib/libjni.so.1
 lib/libjni.so.1.0
 lib/libjni.la
 lib/libjni.a
+lib/libjvmdi.so
+lib/libjvmdi.so.1
 lib/libjvmdi.so.1.0
 lib/libjvmdi.la
 lib/libjvmdi.a
+lib/libruntime.so
+lib/libruntime.so.1
 lib/libruntime.so.1.0
 lib/libruntime.la
 lib/libruntime.a
+lib/libjaphar_lang.so
+lib/libjaphar_lang.so.1
 lib/libjaphar_lang.so.1.0
 lib/libjaphar_lang.la
 lib/libjaphar_lang.a
+lib/libjaphar_reflect.so
+lib/libjaphar_reflect.so.1
 lib/libjaphar_reflect.so.1.0
 lib/libjaphar_reflect.la
 lib/libjaphar_reflect.a
+lib/libjaphar_io.so
+lib/libjaphar_io.so.1
 lib/libjaphar_io.so.1.0
 lib/libjaphar_io.la
 lib/libjaphar_io.a
+lib/libjaphar_net.so
+lib/libjaphar_net.so.1
 lib/libjaphar_net.so.1.0
 lib/libjaphar_net.la
 lib/libjaphar_net.a
+lib/libjaphar_security.so
+lib/libjaphar_security.so.1
 lib/libjaphar_security.so.1.0
 lib/libjaphar_security.la
 lib/libjaphar_security.a
+lib/libjaphar_util.so
+lib/libjaphar_util.so.1
 lib/libjaphar_util.so.1.0
 lib/libjaphar_util.la
 lib/libjaphar_util.a
+lib/libjaphar_zip-1.1.so
+lib/libjaphar_zip-1.1.so.1
 lib/libjaphar_zip-1.1.so.1.0
 lib/libjaphar_zip-1.1.la
 lib/libjaphar_zip-1.1.a
+lib/libjaphar_zip.so
+lib/libjaphar_zip.so.1
 lib/libjaphar_zip.so.1.0
 lib/libjaphar_zip.la
 lib/libjaphar_zip.a
+lib/libjaphar_sysresource.so
+lib/libjaphar_sysresource.so.1
 lib/libjaphar_sysresource.so.1.0
 lib/libjaphar_sysresource.la
 lib/libjaphar_sysresource.a
+lib/libjaphar_agent.so
+lib/libjaphar_agent.so.1
 lib/libjaphar_agent.so.1.0
 lib/libjaphar_agent.la
 lib/libjaphar_agent.a
+lib/libjaphar_mmedia.so
+lib/libjaphar_mmedia.so.1
 lib/libjaphar_mmedia.so.1.0
 lib/libjaphar_mmedia.la
 lib/libjaphar_mmedia.a
+lib/libjaphar_awt.so
+lib/libjaphar_awt.so.1
 lib/libjaphar_awt.so.1.0
 lib/libjaphar_awt.la
 lib/libjaphar_awt.a
+lib/libjaphar_fontmanager.so
+lib/libjaphar_fontmanager.so.1
 lib/libjaphar_fontmanager.so.1.0
 lib/libjaphar_fontmanager.la
 lib/libjaphar_fontmanager.a
diff --git a/lang/kaffe/pkg/PLIST b/lang/kaffe/pkg/PLIST
index c18a00125c5..49ac4395f07 100644
--- a/lang/kaffe/pkg/PLIST
+++ b/lang/kaffe/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 1999/11/10 18:03:26 drochner Exp $
+@comment $NetBSD: PLIST,v 1.13 2001/01/04 15:10:46 agc Exp $
 kaffe/bin/appletviewer
 kaffe/bin/install-jar
 kaffe/bin/jar
@@ -32,28 +32,40 @@ kaffe/lib/kaffe/libawt.a
 kaffe/lib/kaffe/libawt.la
 kaffe/lib/kaffe/libio-1.0.5.so.0.0
 kaffe/lib/kaffe/libio.la
+kaffe/lib/kaffe/libio.so
+kaffe/lib/kaffe/libio.so.0
 kaffe/lib/kaffe/libio.so.0.0
 kaffe/lib/kaffe/libmanagement-1.0.5.so.0.0
 kaffe/lib/kaffe/libmanagement.la
+kaffe/lib/kaffe/libmanagement.so
+kaffe/lib/kaffe/libmanagement.so.0
 kaffe/lib/kaffe/libmanagement.so.0.0
 kaffe/lib/kaffe/libmath.a
 kaffe/lib/kaffe/libmath.la
 kaffe/lib/kaffe/libmicrosoft-1.0.5.so.0.0
 kaffe/lib/kaffe/libmicrosoft.la
+kaffe/lib/kaffe/libmicrosoft.so
+kaffe/lib/kaffe/libmicrosoft.so.0
 kaffe/lib/kaffe/libmicrosoft.so.0.0
 kaffe/lib/kaffe/libnative.a
 kaffe/lib/kaffe/libnative.la
 kaffe/lib/kaffe/libnet-1.0.5.so.0.0
 kaffe/lib/kaffe/libnet.la
+kaffe/lib/kaffe/libnet.so
+kaffe/lib/kaffe/libnet.so.0
 kaffe/lib/kaffe/libnet.so.0.0
 kaffe/lib/kaffe/libsecurity-1.0.5.so.0.0
 kaffe/lib/kaffe/libsecurity.la
+kaffe/lib/kaffe/libsecurity.so
+kaffe/lib/kaffe/libsecurity.so.0
 kaffe/lib/kaffe/libsecurity.so.0.0
 kaffe/lib/kaffe/libzip.a
 kaffe/lib/kaffe/libzip.la
 kaffe/lib/kaffe/security/java.security
 kaffe/lib/libkaffevm-1.0.5.so.0.0
 kaffe/lib/libkaffevm.la
+kaffe/lib/libkaffevm.so
+kaffe/lib/libkaffevm.so.0
 kaffe/lib/libkaffevm.so.0.0
 kaffe/libexec/Kaffe
 kaffe/man/man1/kaffe.1
diff --git a/lang/librep/pkg/PLIST b/lang/librep/pkg/PLIST
index a59a85b1846..fb45e085228 100644
--- a/lang/librep/pkg/PLIST
+++ b/lang/librep/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2000/11/27 17:51:07 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/01/04 15:10:46 agc Exp $
 bin/rep
 bin/rep-config
 bin/rep-remote
@@ -21,6 +21,8 @@ info/librep.info-8
 @exec install-info --info-dir=%D/info %D/info/librep.info
 lib/librep.a
 lib/librep.la
+lib/librep.so
+lib/librep.so.10
 lib/librep.so.10.1
 libexec/rep/${MACHINE_GNU_PLATFORM}/install-aliases
 libexec/rep/${MACHINE_GNU_PLATFORM}/libtool
diff --git a/lang/ruby/pkg/PLIST b/lang/ruby/pkg/PLIST
index b287934aa14..ed31ab7a43e 100644
--- a/lang/ruby/pkg/PLIST
+++ b/lang/ruby/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 2000/07/03 07:31:37 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/01/04 15:10:46 agc Exp $
 bin/ruby
-lib/libruby.so.${RUBY_VERSION}
+lib/libruby.so
+lib/libruby.so.1
+lib/libruby.so.1.4
 lib/ruby/${RUBY_VERSION}/English.rb
 lib/ruby/${RUBY_VERSION}/Env.rb
 lib/ruby/${RUBY_VERSION}/base64.rb
diff --git a/lang/tcl-expect/pkg/PLIST b/lang/tcl-expect/pkg/PLIST
index bf48cb6125e..cf353272b58 100644
--- a/lang/tcl-expect/pkg/PLIST
+++ b/lang/tcl-expect/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/09/05 16:20:30 jwise Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:47 agc Exp $
 bin/expect
 include/expect.h
 include/expect_comm.h
@@ -7,6 +7,8 @@ include/tcldbg.h
 lib/tcl/expect5.32/pkgIndex.tcl
 lib/libexpect532.a
 lib/libexpect532.la
+lib/libexpect532.so
+lib/libexpect532.so.1
 lib/libexpect532.so.1.0
 man/man1/expect.1.gz
 man/man3/libexpect.3.gz
diff --git a/lang/tcl-tclX/pkg/PLIST b/lang/tcl-tclX/pkg/PLIST
index 9dad239d5be..32d206abfaa 100644
--- a/lang/tcl-tclX/pkg/PLIST
+++ b/lang/tcl-tclX/pkg/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/09/06 16:40:17 jwise Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:47 agc Exp $
 bin/tcl
 include/tclExtend.h
 lib/libtclx82.a
 lib/libtclx82.la
+lib/libtclx82.so
+lib/libtclx82.so.1
 lib/libtclx82.so.1.0
 lib/tcl/tclX8.2/autoload.tcl
 lib/tcl/tclX8.2/buildidx.tcl
diff --git a/lang/tcl/pkg/PLIST b/lang/tcl/pkg/PLIST
index 8acdbf32ce3..749654129b5 100644
--- a/lang/tcl/pkg/PLIST
+++ b/lang/tcl/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/08/24 19:53:34 jwise Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:47 agc Exp $
 bin/tclsh
 bin/tclsh8.3
 include/tcl.h
@@ -108,6 +108,8 @@ lib/tcl8.3/tclAppInit.c
 lib/tcl8.3/ldAix
 lib/tclConfig.sh
 lib/libtclstub83.a
+lib/libtcl83.so
+lib/libtcl83.so.1
 lib/libtcl83.so.1.0
 lib/libtcl83.la
 lib/libtcl83.a
diff --git a/lang/tk-tclX/pkg/PLIST b/lang/tk-tclX/pkg/PLIST
index dceafb71bcb..03a6253cbd1 100644
--- a/lang/tk-tclX/pkg/PLIST
+++ b/lang/tk-tclX/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/09/06 16:43:34 jwise Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:47 agc Exp $
 bin/wishx
 bin/tclhelp
 lib/tkxConfig.sh
+lib/libtkx82.so
+lib/libtkx82.so.1
 lib/libtkx82.so.1.0
 lib/libtkx82.la
 lib/libtkx82.a
diff --git a/lang/vslisp/pkg/PLIST b/lang/vslisp/pkg/PLIST
index 1ab8bc2fa23..522bcfb4c88 100644
--- a/lang/vslisp/pkg/PLIST
+++ b/lang/vslisp/pkg/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/04 23:47:35 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:47 agc Exp $
 bin/VSLisp
 include/l_defs.h
 lib/libvslisp4.a
 lib/libvslisp4.la
+lib/libvslisp4.so
+lib/libvslisp4.so.4
 lib/libvslisp4.so.4.1
 share/doc/vslisp/Colors.txt
 share/doc/vslisp/ColorsDemo.txt