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.

11 files changed, 72 insertions, 14 deletions

diff --git a/print/a2ps/pkg/PLIST b/print/a2ps/pkg/PLIST
index d2f578a6ac6..7705e846016 100644
--- a/print/a2ps/pkg/PLIST
+++ b/print/a2ps/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2000/06/21 07:07:44 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2001/01/04 15:10:53 agc Exp $
 bin/a2ps
 bin/card
 bin/composeglyphs
@@ -32,6 +32,8 @@ info/regex.info-3
 @exec install-info %D/info/regex.info %D/info/dir
 lib/liba2ps.a
 lib/liba2ps.la
+lib/liba2ps.so
+lib/liba2ps.so.1
 lib/liba2ps.so.1.0
 man/man1/a2ps.1.gz
 man/man1/card.1.gz
diff --git a/print/acroread/pkg/PLIST.alpha b/print/acroread/pkg/PLIST.alpha
index 9560aa58d23..1402dc075a9 100644
--- a/print/acroread/pkg/PLIST.alpha
+++ b/print/acroread/pkg/PLIST.alpha
@@ -1,8 +1,16 @@
-@comment $NetBSD: PLIST.alpha,v 1.3 2000/11/29 15:22:33 tron Exp $
+@comment $NetBSD: PLIST.alpha,v 1.4 2001/01/04 15:10:53 agc Exp $
 Acrobat4/Reader/help/search.pdf
+Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
+Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3
 Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
+Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so
+Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1
 Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1.0
+Acrobat4/Reader/${PLATFORM}/lib/libICC.so
+Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1
 Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1.0
+Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so
+Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4
 Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4.0
 Acrobat4/Reader/${PLATFORM}/plug_ins/autoIndx.api
 Acrobat4/Reader/${PLATFORM}/plug_ins/search.api
diff --git a/print/acroread/pkg/PLIST.i386 b/print/acroread/pkg/PLIST.i386
index ab541bfb123..3e8cbf27fbf 100644
--- a/print/acroread/pkg/PLIST.i386
+++ b/print/acroread/pkg/PLIST.i386
@@ -1,6 +1,14 @@
-@comment $NetBSD: PLIST.i386,v 1.2 2000/11/29 15:22:33 tron Exp $
+@comment $NetBSD: PLIST.i386,v 1.3 2001/01/04 15:10:53 agc Exp $
 lib/netscape/plugins/nppdf.so
+Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
+Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3
 Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
+Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so
+Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1
 Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1.0
+Acrobat4/Reader/${PLATFORM}/lib/libICC.so
+Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1
 Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1.0
+Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so
+Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4
 Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4.0
diff --git a/print/acroread/pkg/PLIST.sparc b/print/acroread/pkg/PLIST.sparc
index d93fcb4e05e..33587f46459 100644
--- a/print/acroread/pkg/PLIST.sparc
+++ b/print/acroread/pkg/PLIST.sparc
@@ -1,13 +1,21 @@
-@comment $NetBSD: PLIST.sparc,v 1.2 2000/11/29 15:22:33 tron Exp $
+@comment $NetBSD: PLIST.sparc,v 1.3 2001/01/04 15:10:53 agc Exp $
 lib/netscape/plugins/nppdf.so
 Acrobat4/Reader/desktop/olwm/acroread.cetable
 Acrobat4/Reader/desktop/olwm/acroread.deskinstall
 Acrobat4/Reader/desktop/olwm/acroread.prog.icon
 Acrobat4/Reader/desktop/olwm/pdf.icon
 Acrobat4/Reader/help/search.pdf
+Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
+Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3
 Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
+Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so
+Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1
 Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1.0
+Acrobat4/Reader/${PLATFORM}/lib/libICC.so
+Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1
 Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1.0
+Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so
+Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4
 Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4.0
 Acrobat4/Reader/${PLATFORM}/plug_ins/autoIndx.api
 Acrobat4/Reader/${PLATFORM}/plug_ins/search.api
diff --git a/print/acroread3/pkg/PLIST.netbsd-alpha b/print/acroread3/pkg/PLIST.netbsd-alpha
index 709a1a2e3c6..3d69249756d 100644
--- a/print/acroread3/pkg/PLIST.netbsd-alpha
+++ b/print/acroread3/pkg/PLIST.netbsd-alpha
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST.netbsd-alpha,v 1.1.1.1 2000/01/14 15:19:28 dmcmahill Exp $
-Acrobat3/Reader/${PLATFORM}/lib/libagm.so.2.0
+@comment $NetBSD: PLIST.netbsd-alpha,v 1.2 2001/01/04 15:10:53 agc Exp $
 Acrobat3/Reader/${PLATFORM}/lib/libagm.so
-Acrobat3/Reader/${PLATFORM}/lib/libpfs.so.2.5
+Acrobat3/Reader/${PLATFORM}/lib/libagm.so.2
+Acrobat3/Reader/${PLATFORM}/lib/libagm.so.2.0
 Acrobat3/Reader/${PLATFORM}/lib/libpfs.so
-Acrobat3/Reader/${PLATFORM}/lib/libreadcore.so.3.0
+Acrobat3/Reader/${PLATFORM}/lib/libpfs.so.2
+Acrobat3/Reader/${PLATFORM}/lib/libpfs.so.2.5
 Acrobat3/Reader/${PLATFORM}/lib/libreadcore.so
+Acrobat3/Reader/${PLATFORM}/lib/libreadcore.so.3
+Acrobat3/Reader/${PLATFORM}/lib/libreadcore.so.3.0
diff --git a/print/acroread3/pkg/PLIST.netbsd-i386 b/print/acroread3/pkg/PLIST.netbsd-i386
index 505454087de..cdcc2cc9808 100644
--- a/print/acroread3/pkg/PLIST.netbsd-i386
+++ b/print/acroread3/pkg/PLIST.netbsd-i386
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST.netbsd-i386,v 1.1.1.1 2000/01/14 15:19:28 dmcmahill Exp $
+@comment $NetBSD: PLIST.netbsd-i386,v 1.2 2001/01/04 15:10:54 agc Exp $
 Acrobat3/Reader/${PLATFORM}/lib/libagm.so.2.0
+Acrobat3/Reader/${PLATFORM}/lib/libagm.so.2
 Acrobat3/Reader/${PLATFORM}/lib/libagm.so
 Acrobat3/Reader/${PLATFORM}/lib/libpfs.so.2.5
+Acrobat3/Reader/${PLATFORM}/lib/libpfs.so.2
 Acrobat3/Reader/${PLATFORM}/lib/libpfs.so
 Acrobat3/Reader/${PLATFORM}/lib/libreadcore.so.3.0
+Acrobat3/Reader/${PLATFORM}/lib/libreadcore.so.3
 Acrobat3/Reader/${PLATFORM}/lib/libreadcore.so
diff --git a/print/acroread3/pkg/PLIST.netbsd-sparc b/print/acroread3/pkg/PLIST.netbsd-sparc
index 598619938a8..62e46c4bbcb 100644
--- a/print/acroread3/pkg/PLIST.netbsd-sparc
+++ b/print/acroread3/pkg/PLIST.netbsd-sparc
@@ -1,14 +1,26 @@
-@comment $NetBSD: PLIST.netbsd-sparc,v 1.1.1.1 2000/01/14 15:19:28 dmcmahill Exp $
+@comment $NetBSD: PLIST.netbsd-sparc,v 1.2 2001/01/04 15:10:54 agc Exp $
 Acrobat3/Reader/desktop/olwm/acroread.cetable
 Acrobat3/Reader/desktop/olwm/acroread.deskinstall
 Acrobat3/Reader/desktop/olwm/acroread.prog.icon
 Acrobat3/Reader/desktop/olwm/pdf.icon
+Acrobat3/Reader/${PLATFORM}/lib/libX11.so
+Acrobat3/Reader/${PLATFORM}/lib/libX11.so.4
 Acrobat3/Reader/${PLATFORM}/lib/libX11.so.4.10
+Acrobat3/Reader/${PLATFORM}/lib/libXext.so
+Acrobat3/Reader/${PLATFORM}/lib/libXext.so.4
 Acrobat3/Reader/${PLATFORM}/lib/libXext.so.4.10
 Acrobat3/Reader/${PLATFORM}/lib/libXt.sa.4.10
+Acrobat3/Reader/${PLATFORM}/lib/libXt.so
+Acrobat3/Reader/${PLATFORM}/lib/libXt.so.4
 Acrobat3/Reader/${PLATFORM}/lib/libXt.so.4.10
+Acrobat3/Reader/${PLATFORM}/lib/libagm.so
+Acrobat3/Reader/${PLATFORM}/lib/libagm.so.2
 Acrobat3/Reader/${PLATFORM}/lib/libagm.so.2.0
+Acrobat3/Reader/${PLATFORM}/lib/libpfs.so
+Acrobat3/Reader/${PLATFORM}/lib/libpfs.so.2
 Acrobat3/Reader/${PLATFORM}/lib/libpfs.so.2.5
+Acrobat3/Reader/${PLATFORM}/lib/libreadcore.so
+Acrobat3/Reader/${PLATFORM}/lib/libreadcore.so.3
 Acrobat3/Reader/${PLATFORM}/lib/libreadcore.so.3.0
 Acrobat3/Reader/${PLATFORM}/lib/nls/local_im_tbl/lt_LN.bit8
 Acrobat3/Reader/${PLATFORM}/lib/nls/lt_LN.bit8
diff --git a/print/acroread3/pkg/PLIST.sunos-sparc b/print/acroread3/pkg/PLIST.sunos-sparc
index b8d8c9c36ff..61ad6474966 100644
--- a/print/acroread3/pkg/PLIST.sunos-sparc
+++ b/print/acroread3/pkg/PLIST.sunos-sparc
@@ -1,12 +1,18 @@
-@comment $NetBSD: PLIST.sunos-sparc,v 1.1.1.1 2000/01/14 15:19:28 dmcmahill Exp $
+@comment $NetBSD: PLIST.sunos-sparc,v 1.2 2001/01/04 15:10:54 agc Exp $
 Acrobat3/Reader/desktop/olwm/acroread.cetable
 Acrobat3/Reader/desktop/olwm/acroread.deskinstall
 Acrobat3/Reader/desktop/olwm/acroread.prog.icon
 Acrobat3/Reader/desktop/olwm/pdf.icon
 Acrobat3/Reader/${PLATFORM}/lib/libXm.so.3
 Acrobat3/Reader/${PLATFORM}/lib/libXm.so
+Acrobat3/Reader/${PLATFORM}/lib/libagm.so
+Acrobat3/Reader/${PLATFORM}/lib/libagm.so.2
 Acrobat3/Reader/${PLATFORM}/lib/libagm.so.2.0
+Acrobat3/Reader/${PLATFORM}/lib/libpfs.so
+Acrobat3/Reader/${PLATFORM}/lib/libpfs.so.2
 Acrobat3/Reader/${PLATFORM}/lib/libpfs.so.2.5
+Acrobat3/Reader/${PLATFORM}/lib/libreadcore.so
+Acrobat3/Reader/${PLATFORM}/lib/libreadcore.so.3
 Acrobat3/Reader/${PLATFORM}/lib/libreadcore.so.3.0
 @dirrm Acrobat3/Reader/desktop/olwm
 @dirrm Acrobat3/Reader/desktop
diff --git a/print/cups/pkg/PLIST b/print/cups/pkg/PLIST
index 0329eb62d27..ecf42a7c85c 100644
--- a/print/cups/pkg/PLIST
+++ b/print/cups/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/12/21 14:59:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:54 agc Exp $
 bin/cancel
 bin/disable
 bin/enable
@@ -19,9 +19,13 @@ include/cups/ppd.h
 include/cups/raster.h
 lib/libcups.a
 lib/libcups.la
+lib/libcups.so
+lib/libcups.so.2
 lib/libcups.so.2.0
 lib/libcupsimage.a
 lib/libcupsimage.la
+lib/libcupsimage.so
+lib/libcupsimage.so.2
 lib/libcupsimage.so.2.0
 libexec/cups/backend/http
 libexec/cups/backend/ipp
diff --git a/print/gnome-print/pkg/PLIST b/print/gnome-print/pkg/PLIST
index 2a40651b045..0cf974e3705 100644
--- a/print/gnome-print/pkg/PLIST
+++ b/print/gnome-print/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2000/11/25 13:53:08 rh Exp $
+@comment $NetBSD: PLIST,v 1.17 2001/01/04 15:10:54 agc Exp $
 bin/gnome-font-install
 include/libgnomeprint/gnome-font-dialog.h
 include/libgnomeprint/gnome-font-face.h
@@ -24,6 +24,8 @@ include/libgnomeprint/gnome-rfont.h
 include/libgnomeprint/gnome-text.h
 lib/libgnomeprint.a
 lib/libgnomeprint.la
+lib/libgnomeprint.so
+lib/libgnomeprint.so.13
 lib/libgnomeprint.so.13.4
 lib/printConf.sh
 share/fonts/afms/adobe/pagd8a.afm
diff --git a/print/pdflib/pkg/PLIST b/print/pdflib/pkg/PLIST
index 714c6b73293..843dd6101aa 100644
--- a/print/pdflib/pkg/PLIST
+++ b/print/pdflib/pkg/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2000/08/15 00:54:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/01/04 15:10:54 agc Exp $
 lib/libpdf.a
 lib/libpdf.la
+lib/libpdf.so
+lib/libpdf.so.0
 lib/libpdf.so.0.0
 include/pdflib.h