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, 19 insertions, 5 deletions

diff --git a/japanese/canna-lib/pkg/PLIST b/japanese/canna-lib/pkg/PLIST
index de3dff28daa..852243a3a4a 100644
--- a/japanese/canna-lib/pkg/PLIST
+++ b/japanese/canna-lib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/08/26 17:18:22 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:10:45 agc Exp $
 @cwd ${DICT_DIR}
 @cwd ${DICT_DIR}
 canna/default.cbp
@@ -21,12 +21,20 @@ include/canna/jrkanji.h
 include/canna/keydef.h
 include/canna/mfdef.h
 lib/libRKC.a
+lib/libRKC.so
+lib/libRKC.so.1
 lib/libRKC.so.1.0
 lib/libRKC16.a
+lib/libRKC16.so
+lib/libRKC16.so.1
 lib/libRKC16.so.1.0
 lib/libcanna.a
+lib/libcanna.so
+lib/libcanna.so.1
 lib/libcanna.so.1.0
 lib/libcanna16.a
+lib/libcanna16.so
+lib/libcanna16.so.1
 lib/libcanna16.so.1.0
 man/ja_JP.EUC/man3/RkCloseRoma.3
 man/ja_JP.EUC/man3/RkCvtEuc.3
diff --git a/japanese/kakasi/pkg/PLIST b/japanese/kakasi/pkg/PLIST
index 033817434ee..22519487d74 100644
--- a/japanese/kakasi/pkg/PLIST
+++ b/japanese/kakasi/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2000/09/12 17:13:29 kei Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/01/04 15:10:45 agc Exp $
 bin/atoc_conv
 bin/kakasi
 bin/mkkanwa
@@ -7,6 +7,8 @@ bin/wx2_conv
 include/libkakasi.h
 lib/libkakasi.a
 lib/libkakasi.la
+lib/libkakasi.so
+lib/libkakasi.so.2
 lib/libkakasi.so.2.2
 man/ja_JP.EUC/cat1/kakasi.cat
 man/ja_JP.EUC/man1/kakasi.1
diff --git a/japanese/mh/pkg/PLIST b/japanese/mh/pkg/PLIST
index 906ae3012ce..a78d0113d43 100644
--- a/japanese/mh/pkg/PLIST
+++ b/japanese/mh/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1999/11/01 04:03:11 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:45 agc Exp $
 bin/ali
 bin/anno
 bin/bbc
@@ -33,6 +33,8 @@ bin/show
 bin/sortm
 bin/whatnow
 bin/whom
+lib/libmh.so
+lib/libmh.so.3
 lib/libmh.so.3.2
 libexec/mh/MailAliases
 libexec/mh/ap
diff --git a/japanese/vflib-lib/pkg/PLIST b/japanese/vflib-lib/pkg/PLIST
index 300e74d1359..e9a66ab8244 100644
--- a/japanese/vflib-lib/pkg/PLIST
+++ b/japanese/vflib-lib/pkg/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2000/07/14 06:53:58 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:10:45 agc Exp $
 bin/bdfindex
 bin/fwindex
 bin/ttindex
 include/VF.h
 lib/libVFlib2.a
 lib/libVFlib2.la
-lib/libVFlib2.so.${VFLIB_SO_VERSION}
+lib/libVFlib2.so
+lib/libVFlib2.so.24
+lib/libVFlib2.so.24.2
 share/VFlib/${VFLIB_VERSION}/COPYING
 share/VFlib/${VFLIB_VERSION}/COPYING.LIB
 share/VFlib/${VFLIB_VERSION}/QA-english.tex