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

diff --git a/converters/kdesupport/pkg/PLIST b/converters/kdesupport/pkg/PLIST
index 43bda8d32df..4796f8a1c73 100644
--- a/converters/kdesupport/pkg/PLIST
+++ b/converters/kdesupport/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2000/08/16 00:38:50 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.13 2001/01/04 15:10:22 agc Exp $
 include/mimelib/address.h
 include/mimelib/addrlist.h
 include/mimelib/body.h
@@ -35,5 +35,7 @@ include/mimelib/uuencode.h
 include/mimelib/binhex.h
 lib/libmimelib.a
 lib/libmimelib.la
+lib/libmimelib.so
+lib/libmimelib.so.1
 lib/libmimelib.so.1.0
 @dirrm include/mimelib
diff --git a/converters/libiconv/pkg/PLIST b/converters/libiconv/pkg/PLIST
index 79afb9401b9..84fd565964d 100644
--- a/converters/libiconv/pkg/PLIST
+++ b/converters/libiconv/pkg/PLIST
@@ -1,13 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/01/01 17:29:20 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:23 agc Exp $
 bin/iconv
 include/iconv.h
 include/libcharset.h
 lib/charset.alias
 lib/libcharset.a
 lib/libcharset.la
+lib/libcharset.so
+lib/libcharset.so.1
 lib/libcharset.so.1.0
 lib/libiconv.a
 lib/libiconv.la
+lib/libiconv.so
+lib/libiconv.so.2
 lib/libiconv.so.2.2
 man/man1/iconv.1
 man/man3/iconv.3
diff --git a/converters/psiconv/pkg/PLIST b/converters/psiconv/pkg/PLIST
index 78c3e3ebce5..2b8c5cdf1c5 100644
--- a/converters/psiconv/pkg/PLIST
+++ b/converters/psiconv/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/07/08 23:17:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:23 agc Exp $
 bin/psiconv
 include/psiconv/data.h
 include/psiconv/list.h
@@ -6,6 +6,8 @@ include/psiconv/parse.h
 include/psiconv/parse_routines.h
 lib/libpsiconv.a
 lib/libpsiconv.la
+lib/libpsiconv.so
+lib/libpsiconv.so.3
 lib/libpsiconv.so.3.0
 share/doc/psiconv/ascii
 share/doc/psiconv/html
diff --git a/converters/recode/pkg/PLIST b/converters/recode/pkg/PLIST
index 1bae1af3a53..34660818ce8 100644
--- a/converters/recode/pkg/PLIST
+++ b/converters/recode/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/01/10 20:54:27 rh Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:10:23 agc Exp $
 bin/recode
 include/recode.h
 include/recodext.h
@@ -10,9 +10,11 @@ info/recode.info-3
 info/recode.info-4
 info/recode.info-5
 @exec install-info %D/info/recode.info %D/info/dir
-lib/librecode.so.0.0
-lib/librecode.la
 lib/librecode.a
+lib/librecode.la
+lib/librecode.so
+lib/librecode.so.0
+lib/librecode.so.0.0
 man/man1/recode.1
 share/locale/fr/LC_MESSAGES/recode.mo
 share/locale/sv/LC_MESSAGES/recode.mo
diff --git a/converters/uulib/pkg/PLIST b/converters/uulib/pkg/PLIST
index 49bf332149e..fdd4aedcd41 100644
--- a/converters/uulib/pkg/PLIST
+++ b/converters/uulib/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2000/06/20 21:58:01 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:23 agc Exp $
 include/uu.h
 lib/libuu.a
 lib/libuu.la
+lib/libuu.so
+lib/libuu.so.1
 lib/libuu.so.1.0
 man/man3/uulib.3
 share/doc/uulib/HISTORY