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.

29 files changed, 153 insertions, 30 deletions

diff --git a/x11/Xaw-Xpm/pkg/PLIST b/x11/Xaw-Xpm/pkg/PLIST
index 20b8b97f81d..6b206ac4808 100644
--- a/x11/Xaw-Xpm/pkg/PLIST
+++ b/x11/Xaw-Xpm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1998/07/15 10:42:31 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:58 agc Exp $
 include/X11/Xaw3d/AllWidgets.h
 include/X11/Xaw3d/AsciiSink.h
 include/X11/Xaw3d/AsciiSinkP.h
@@ -76,6 +76,8 @@ include/X11/Xaw3d/XawImP.h
 include/X11/Xaw3d/XawInit.h
 include/X11/Xaw3d/Xpm.h
 lib/libXaw3d.a
+lib/libXaw3d.so
+lib/libXaw3d.so.6
 lib/libXaw3d.so.6.1
 share/doc/Xaw-Xpm/README-XPM
 share/doc/Xaw-Xpm/defaults-XawXpm
diff --git a/x11/Xaw3d/pkg/PLIST b/x11/Xaw3d/pkg/PLIST
index a3c75e87018..b50425c851a 100644
--- a/x11/Xaw3d/pkg/PLIST
+++ b/x11/Xaw3d/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2000/12/14 18:21:28 abs Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/01/04 15:10:59 agc Exp $
 include/X11/Xaw3d/AllWidgets.h
 include/X11/Xaw3d/AsciiSink.h
 include/X11/Xaw3d/AsciiSinkP.h
@@ -75,6 +75,8 @@ include/X11/Xaw3d/ViewportP.h
 include/X11/Xaw3d/XawImP.h
 include/X11/Xaw3d/XawInit.h
 lib/libXaw3d.a
+lib/libXaw3d.so
+lib/libXaw3d.so.6
 lib/libXaw3d.so.${XAWREV}
 share/doc/Xaw3d/README.XAW3D
 @dirrm share/doc/Xaw3d
diff --git a/x11/Xbae/pkg/PLIST b/x11/Xbae/pkg/PLIST
index 5ddbf9aeef4..6700f931c79 100644
--- a/x11/Xbae/pkg/PLIST
+++ b/x11/Xbae/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/06/19 11:19:38 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:59 agc Exp $
 include/Xbae/Matrix.h
 include/Xbae/Input.h
 include/Xbae/Caption.h
@@ -10,6 +10,8 @@ include/Xbae/CaptionP.h
 include/Xbae/InputP.h
 lib/libXbae.a
 lib/libXbae.la
+lib/libXbae.so
+lib/libXbae.so.4
 lib/libXbae.so.4.8
 man/man3/XbaeCaption.3
 man/man3/XbaeInput.3
diff --git a/x11/XmHTML/pkg/PLIST b/x11/XmHTML/pkg/PLIST
index 8cb7c0773fb..f3b083cf1a0 100644
--- a/x11/XmHTML/pkg/PLIST
+++ b/x11/XmHTML/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/06/21 06:25:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:10:59 agc Exp $
 include/XmHTML/Balloon.h
 include/XmHTML/BalloonP.h
 include/XmHTML/HTML.h
@@ -14,5 +14,7 @@ include/XmHTML/tka.h
 include/XmHTML/toolkit.h
 lib/libXmHTML.a
 lib/libXmHTML.la
+lib/libXmHTML.so
+lib/libXmHTML.so.1
 lib/libXmHTML.so.1.2
 @dirrm include/XmHTML
diff --git a/x11/controlcenter/pkg/PLIST b/x11/controlcenter/pkg/PLIST
index ecfa2544461..227aa8e4fc4 100644
--- a/x11/controlcenter/pkg/PLIST
+++ b/x11/controlcenter/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2000/10/18 00:01:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2001/01/04 15:10:59 agc Exp $
 bin/background-properties-capplet
 bin/gnome-edit-properties-capplet
 bin/gnomecc
@@ -16,6 +16,8 @@ include/capplet-widget.h
 lib/cappletConf.sh
 lib/libcapplet.a
 lib/libcapplet.la
+lib/libcapplet.so
+lib/libcapplet.so.0
 lib/libcapplet.so.0.0
 share/control-center/.directory
 share/control-center/Desktop/.directory
diff --git a/x11/eterm/pkg/PLIST b/x11/eterm/pkg/PLIST
index 74c6743768c..d49896ddd78 100644
--- a/x11/eterm/pkg/PLIST
+++ b/x11/eterm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/08/16 00:41:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:59 agc Exp $
 bin/Esetroot
 bin/Etbg
 bin/Etcolors.sh
@@ -6,9 +6,13 @@ bin/Eterm
 bin/Etmenu.sh
 lib/libEterm.a
 lib/libEterm.la
+lib/libEterm.so
+lib/libEterm.so.8
 lib/libEterm.so.8.9
 lib/libmej.a
 lib/libmej.la
+lib/libmej.so
+lib/libmej.so.8
 lib/libmej.so.8.9
 man/man1/Eterm.1
 share/Eterm/pix/004.png
diff --git a/x11/fltk/pkg/PLIST b/x11/fltk/pkg/PLIST
index 057fa42ae7c..0f170c93381 100644
--- a/x11/fltk/pkg/PLIST
+++ b/x11/fltk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2001/01/02 22:11:18 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/01/04 15:11:00 agc Exp $
 bin/fluid
 include/FL/Enumerations.H
 include/FL/Enumerations.h
@@ -189,6 +189,8 @@ include/FL/x.H
 include/FL/x.h
 lib/libfltk.a
 lib/libfltk.la
+lib/libfltk.so
+lib/libfltk.so.${FLTK_MAJOR}
 lib/libfltk.so.${FLTK_MAJOR}.${FLTK_MINOR}
 share/doc/html/fltk/FL.gif
 share/doc/html/fltk/Fl_Adjuster.html
diff --git a/x11/gnome-core/pkg/PLIST b/x11/gnome-core/pkg/PLIST
index df690c25bc3..c1d01ffd4f0 100644
--- a/x11/gnome-core/pkg/PLIST
+++ b/x11/gnome-core/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2000/11/25 18:08:46 rh Exp $
+@comment $NetBSD: PLIST,v 1.22 2001/01/04 15:11:00 agc Exp $
 bin/deskguide_applet
 bin/gmenu
 bin/gnome-about
@@ -38,15 +38,23 @@ lib/appletsConf.sh
 lib/dockletsConf.sh
 lib/libfish_applet.a
 lib/libfish_applet.la
+lib/libfish_applet.so
+lib/libfish_applet.so.0
 lib/libfish_applet.so.0.0
 lib/libgen_util_applet.a
 lib/libgen_util_applet.la
+lib/libgen_util_applet.so
+lib/libgen_util_applet.so.0
 lib/libgen_util_applet.so.0.0
 lib/libpanel_applet.a
 lib/libpanel_applet.la
+lib/libpanel_applet.so
+lib/libpanel_applet.so.0
 lib/libpanel_applet.so.0.1
 lib/libpanel_status.a
 lib/libpanel_status.la
+lib/libpanel_status.so
+lib/libpanel_status.so.0
 lib/libpanel_status.so.0.0
 man/man1/gnome-session.1
 man/man1/gnome-wm.1
diff --git a/x11/gnome-libs/pkg/PLIST b/x11/gnome-libs/pkg/PLIST
index 8f8a27bdfcd..06c5d2cdbd9 100644
--- a/x11/gnome-libs/pkg/PLIST
+++ b/x11/gnome-libs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2000/11/29 17:27:43 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.35 2001/01/04 15:11:01 agc Exp $
 bin/dns-helper
 bin/gconfigger
 bin/gnome-bug
@@ -180,27 +180,43 @@ lib/gnomeConf.sh
 lib/libartConf.sh
 lib/libart_lgpl.a
 lib/libart_lgpl.la
+lib/libart_lgpl.so
+lib/libart_lgpl.so.4
 lib/libart_lgpl.so.4.0
 lib/libgnome.a
 lib/libgnome.la
+lib/libgnome.so
+lib/libgnome.so.36
 lib/libgnome.so.36.1
 lib/libgnomesupport.a
 lib/libgnomesupport.la
+lib/libgnomesupport.so
+lib/libgnomesupport.so.0
 lib/libgnomesupport.so.0.0
 lib/libgnomeui.a
 lib/libgnomeui.la
+lib/libgnomeui.so
+lib/libgnomeui.so.44
 lib/libgnomeui.so.44.1
 lib/libgnorba.a
 lib/libgnorba.la
+lib/libgnorba.so
+lib/libgnorba.so.28
 lib/libgnorba.so.28.8
 lib/libgnorbagtk.a
 lib/libgnorbagtk.la
+lib/libgnorbagtk.so
+lib/libgnorbagtk.so.0
 lib/libgnorbagtk.so.0.0
 lib/libgtkxmhtml.a
 lib/libgtkxmhtml.la
+lib/libgtkxmhtml.so
+lib/libgtkxmhtml.so.1
 lib/libgtkxmhtml.so.1.1
 lib/libzvt.a
 lib/libzvt.la
+lib/libzvt.so
+lib/libzvt.so.4
 lib/libzvt.so.4.9
 man/man1/gnome-config.1
 man/man1/gnome.1
diff --git a/x11/gtk+extra/pkg/PLIST b/x11/gtk+extra/pkg/PLIST
index 49ac26581c5..ddee00b75df 100644
--- a/x11/gtk+extra/pkg/PLIST
+++ b/x11/gtk+extra/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/10/15 12:25:51 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:11:01 agc Exp $
 bin/gtkextra-config
 include/gtkextra/gtkbordercombo.h
 include/gtkextra/gtkcheckitem.h
@@ -19,6 +19,8 @@ include/gtkextra/gtkplotprint.h
 include/gtkextra/gtkplotps.h
 include/gtkextra/gtkpsfont.h
 include/gtkextra/gtksheet.h
+lib/libgtkextra.so
+lib/libgtkextra.so.10
 lib/libgtkextra.so.10.1
 lib/libgtkextra.a
 lib/libgtkextra.la
diff --git a/x11/gtk--/pkg/PLIST b/x11/gtk--/pkg/PLIST
index 0ee9caea006..aabbc57dbc3 100644
--- a/x11/gtk--/pkg/PLIST
+++ b/x11/gtk--/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/07/15 09:48:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:11:01 agc Exp $
 bin/gtkmm-config
 bin/gtkmmconvert
 include/gdk--/bitmap.h
@@ -188,9 +188,13 @@ lib/gtkmm/proc/list.m4
 lib/gtkmm/proc/stage1.m4
 lib/libgdkmm.a
 lib/libgdkmm.la
+lib/libgdkmm.so
+lib/libgdkmm.so.1
 lib/libgdkmm.so.1.0
 lib/libgtkmm.a
 lib/libgtkmm.la
+lib/libgtkmm.so
+lib/libgtkmm.so.0
 lib/libgtkmm.so.0.1
 share/aclocal/gtk--.m4
 @exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gtk--.m4 ${LOCALBASE}/share/aclocal/gtk--.m4
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index 48a4d74aac2..6a8742e311d 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2000/06/05 01:12:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.28 2001/01/04 15:11:01 agc Exp $
 bin/gtk-config
 etc/gtk/gtkrc.cs
 etc/gtk/gtkrc.hr
@@ -168,9 +168,13 @@ include/gtk/gtklayout.h
 include/gtk/gtkplug.h
 include/gtk/gtksocket.h
 include/gtk/gtkthemes.h
+lib/libgdk.so
+lib/libgdk.so.12
 lib/libgdk.so.12.8
 lib/libgdk.a
 lib/libgdk.la
+lib/libgtk.so
+lib/libgtk.so.12
 lib/libgtk.so.12.8
 lib/libgtk.a
 lib/libgtk.la
diff --git a/x11/gtk10/pkg/PLIST b/x11/gtk10/pkg/PLIST
index efb2eeec716..1241e53c790 100644
--- a/x11/gtk10/pkg/PLIST
+++ b/x11/gtk10/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/08/16 02:12:30 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:11:01 agc Exp $
 bin/gtk10-config
 include/gtk10/gdk/gdk.h
 include/gtk10/gdk/gdkcursors.h
@@ -119,12 +119,18 @@ info/gtk10.info-5
 @exec install-info %D/info/gtk10.info %D/info/dir
 lib/libgdk10.a
 lib/libgdk10.la
+lib/libgdk10.so
+lib/libgdk10.so.1
 lib/libgdk10.so.1.6
 lib/libglib10.a
 lib/libglib10.la
+lib/libglib10.so
+lib/libglib10.so.1
 lib/libglib10.so.1.6
 lib/libgtk10.a
 lib/libgtk10.la
+lib/libgtk10.so
+lib/libgtk10.so.1
 lib/libgtk10.so.1.6
 man/man1/gtk10-config.1
 share/aclocal/gtk10.m4
diff --git a/x11/gtkglarea/pkg/PLIST b/x11/gtkglarea/pkg/PLIST
index 923358969aa..2c88a032b4c 100644
--- a/x11/gtkglarea/pkg/PLIST
+++ b/x11/gtkglarea/pkg/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2000/06/21 03:20:34 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/01/04 15:11:02 agc Exp $
 include/gtkgl/gdkgl.h
 include/gtkgl/gtkglarea.h
 @dirrm include/gtkgl
 lib/libgtkgl.a
 lib/libgtkgl.la
+lib/libgtkgl.so
+lib/libgtkgl.so.4
 lib/libgtkgl.so.4.0
 share/aclocal/gtkgl.m4
 share/doc/gtkglarea/HOWTO.txt
diff --git a/x11/kdelibs/pkg/PLIST b/x11/kdelibs/pkg/PLIST
index 7cf4e2f5db8..c291b9bb606 100644
--- a/x11/kdelibs/pkg/PLIST
+++ b/x11/kdelibs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 1999/09/15 18:26:05 tron Exp $
+@comment $NetBSD: PLIST,v 1.15 2001/01/04 15:11:02 agc Exp $
 include/addressbook.h
 include/bison2cpp.h
 include/booktoken.h
@@ -126,33 +126,53 @@ include/stl_headers.h
 include/xview.h
 lib/libjscript.a
 lib/libjscript.la
+lib/libjscript.so
+lib/libjscript.so.2
 lib/libjscript.so.2.0
 lib/libkab.a
 lib/libkab.la
+lib/libkab.so
+lib/libkab.so.2
 lib/libkab.so.2.0
 lib/libkdecore.a
 lib/libkdecore.la
+lib/libkdecore.so
+lib/libkdecore.so.2
 lib/libkdecore.so.2.0
 lib/libkdeui.a
 lib/libkdeui.la
+lib/libkdeui.so
+lib/libkdeui.so.2
 lib/libkdeui.so.2.0
 lib/libkfile.a
 lib/libkfile.la
+lib/libkfile.so
+lib/libkfile.so.2
 lib/libkfile.so.2.0
 lib/libkfm.a
 lib/libkfm.la
+lib/libkfm.so
+lib/libkfm.so.2
 lib/libkfm.so.2.0
 lib/libkhtmlw.a
 lib/libkhtmlw.la
+lib/libkhtmlw.so
+lib/libkhtmlw.so.2
 lib/libkhtmlw.so.2.0
 lib/libkimgio.a
 lib/libkimgio.la
+lib/libkimgio.so
+lib/libkimgio.so.2
 lib/libkimgio.so.2.0
 lib/libkspell.a
 lib/libkspell.la
+lib/libkspell.so
+lib/libkspell.so.2
 lib/libkspell.so.2.0
 lib/libmediatool.a
 lib/libmediatool.la
+lib/libmediatool.so
+lib/libmediatool.so.2
 lib/libmediatool.so.2.0
 share/doc/kde/HTML/en/kdelibs/kdebug.html
 share/doc/kde/HTML/en/kfiledialog/back.gif
diff --git a/x11/lesstif/pkg/PLIST b/x11/lesstif/pkg/PLIST
index 6a1b953e927..bfd4b93b6dc 100644
--- a/x11/lesstif/pkg/PLIST
+++ b/x11/lesstif/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2000/12/22 17:26:22 jlam Exp $
+@comment $NetBSD: PLIST,v 1.29 2001/01/04 15:11:02 agc Exp $
 bin/mwm
 bin/mxmkmf
 bin/uil
@@ -178,12 +178,18 @@ lib/X11/mwm/alt.map
 lib/X11/mwm/system.mwmrc
 lib/libMrm.a
 lib/libMrm.la
+lib/libMrm.so
+lib/libMrm.so.2
 lib/libMrm.so.2.0
 lib/libUil.a
 lib/libUil.la
+lib/libUil.so
+lib/libUil.so.2
 lib/libUil.so.2.0
 lib/libXm.a
 lib/libXm.la
+lib/libXm.so
+lib/libXm.so.2
 lib/libXm.so.2.0
 man/man1/lesstif.1
 man/man1/mwm.1
diff --git a/x11/lesstif12/pkg/PLIST b/x11/lesstif12/pkg/PLIST
index 38283b983a9..f007c116942 100644
--- a/x11/lesstif12/pkg/PLIST
+++ b/x11/lesstif12/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/12/22 17:26:22 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:11:02 agc Exp $
 LessTif/Motif1.2/include/Mrm/MrmAppl.h
 LessTif/Motif1.2/include/Mrm/MrmDecls.h
 LessTif/Motif1.2/include/Mrm/MrmPrivate.h
@@ -129,12 +129,18 @@ LessTif/Motif1.2/include/uil/UilSymDef.h
 LessTif/Motif1.2/include/uil/UilSymGl.h
 LessTif/Motif1.2/lib/libMrm.a
 LessTif/Motif1.2/lib/libMrm.la
+LessTif/Motif1.2/lib/libMrm.so
+LessTif/Motif1.2/lib/libMrm.so.1
 LessTif/Motif1.2/lib/libMrm.so.1.2
 LessTif/Motif1.2/lib/libUil.a
 LessTif/Motif1.2/lib/libUil.la
+LessTif/Motif1.2/lib/libUil.so
+LessTif/Motif1.2/lib/libUil.so.1
 LessTif/Motif1.2/lib/libUil.so.1.2
 LessTif/Motif1.2/lib/libXm.a
 LessTif/Motif1.2/lib/libXm.la
+LessTif/Motif1.2/lib/libXm.so
+LessTif/Motif1.2/lib/libXm.so.1
 LessTif/Motif1.2/lib/libXm.so.1.2
 @dirrm LessTif/Motif1.2/lib
 @dirrm LessTif/Motif1.2/include/uil
diff --git a/x11/openmotif/pkg/PLIST b/x11/openmotif/pkg/PLIST
index 82ec2d205cf..d41114f3f7c 100644
--- a/x11/openmotif/pkg/PLIST
+++ b/x11/openmotif/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/10/29 16:17:13 mjl Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:11:02 agc Exp $
 bin/DNDDemo
 bin/UTMXmText
 bin/aicon
@@ -335,10 +335,16 @@ lib/X11/uid/xmanimate.uid
 @dirrm lib/X11/uid/swedish
 @dirrm lib/X11/uid
 lib/libMrm.a
+lib/libMrm.so
+lib/libMrm.so.2
 lib/libMrm.so.2.1
 lib/libUil.a
+lib/libUil.so
+lib/libUil.so.2
 lib/libUil.so.2.1
 lib/libXm.a
+lib/libXm.so
+lib/libXm.so.2
 lib/libXm.so.2.1
 man/man1/mwm.1
 man/man1/uil.1
diff --git a/x11/qt1/pkg/PLIST b/x11/qt1/pkg/PLIST
index 39bab928a18..fbd1daaa423 100644
--- a/x11/qt1/pkg/PLIST
+++ b/x11/qt1/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2000/07/07 13:37:09 wulf Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/01/04 15:11:03 agc Exp $
 qt1/share/doc/qt/html/abstractwidgets.html
 qt1/share/doc/qt/html/aclock-aclock-cpp.html
 qt1/share/doc/qt/html/annotated.html
@@ -904,6 +904,8 @@ qt1/include/qwmatrix.h
 qt1/include/qxt.h
 qt1/lib/libqt.a
 qt1/lib/libqt.la
+qt1/lib/libqt.so
+qt1/lib/libqt.so.1
 qt1/lib/libqt.so.1.44
 qt1/man/man1/moc.1
 qt1/man/man3/QAccel.3
diff --git a/x11/qt2-designer/pkg/PLIST b/x11/qt2-designer/pkg/PLIST
index fc5272b3619..a3713b3e4a5 100644
--- a/x11/qt2-designer/pkg/PLIST
+++ b/x11/qt2-designer/pkg/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2000/12/26 13:00:14 skrll Exp $
-
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:11:03 agc Exp $
 qt2/bin/designer
 qt2/bin/uic
 qt2/lib/libqutil.a
 qt2/lib/libqutil.la
+qt2/lib/libqutil.so
+qt2/lib/libqutil.so.1
 qt2/lib/libqutil.so.1.0
diff --git a/x11/qt2-libs/pkg/PLIST b/x11/qt2-libs/pkg/PLIST
index 16d290e2a6f..5b2ebebb795 100644
--- a/x11/qt2-libs/pkg/PLIST
+++ b/x11/qt2-libs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/12/26 13:00:15 skrll Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:11:03 agc Exp $
 qt2/bin/moc
 qt2/include/jri.h
 qt2/include/jritypes.h
@@ -282,6 +282,8 @@ qt2/include/qxml.h
 qt2/include/qxt.h
 qt2/lib/libqt.a
 qt2/lib/libqt.la
+qt2/lib/libqt.so
+qt2/lib/libqt.so.2
 qt2/lib/libqt.so.2.2
 @dirrm qt2/lib
 @dirrm qt2/include
diff --git a/x11/qwspritefield/pkg/PLIST b/x11/qwspritefield/pkg/PLIST
index ec7499809a8..d5b99b0b0aa 100644
--- a/x11/qwspritefield/pkg/PLIST
+++ b/x11/qwspritefield/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2000/08/13 14:08:51 skrll Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:11:03 agc Exp $
 lib/libQwSpriteField.a
 lib/libQwSpriteField.la
+lib/libQwSpriteField.so
+lib/libQwSpriteField.so.6
 lib/libQwSpriteField.so.6.0
 qt1/include/Pix.h
 qt1/include/QwCluster.h
diff --git a/x11/qwt/pkg/PLIST b/x11/qwt/pkg/PLIST
index c423222848c..1b7befae0bd 100644
--- a/x11/qwt/pkg/PLIST
+++ b/x11/qwt/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/08/16 00:29:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:11:03 agc Exp $
 include/qwt/qwt.h
 include/qwt/qwt_arrbtn.h
 include/qwt/qwt_autoscl.h
@@ -31,6 +31,8 @@ include/qwt/qwt_thermo.h
 include/qwt/qwt_wheel.h
 lib/libqwt.a
 lib/libqwt.la
+lib/libqwt.so
+lib/libqwt.so.0
 lib/libqwt.so.0.2
 man/man3/Qwt.3
 man/man3/QwtArrowButton.3
diff --git a/x11/tix/pkg/PLIST b/x11/tix/pkg/PLIST
index f258df03846..6f878a5a1fb 100644
--- a/x11/tix/pkg/PLIST
+++ b/x11/tix/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2000/08/15 14:33:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/01/04 15:11:04 agc Exp $
 bin/tixindex
 bin/tixwish4.1.8.0
 bin/tixwish
@@ -19,9 +19,13 @@ include/tix/unix/tixUnixInt.h
 include/tix/unix/tixUnixPort.h
 lib/libtix4180.a
 lib/libtix4180.la
+lib/libtix4180.so
+lib/libtix4180.so.1
 lib/libtix4180.so.1.2
 lib/libtixsam4180.a
 lib/libtixsam4180.la
+lib/libtixsam4180.so
+lib/libtixsam4180.so.1
 lib/libtixsam4180.so.1.2
 man/mann/BtnBox.n.gz
 man/mann/Balloon.n.gz
diff --git a/x11/tk/pkg/PLIST b/x11/tk/pkg/PLIST
index b3c1a4e5d74..082885c3357 100644
--- a/x11/tk/pkg/PLIST
+++ b/x11/tk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/09/08 01:03:21 jwise Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:11:04 agc Exp $
 bin/wish
 bin/wish8.3
 include/tk.h
@@ -31,6 +31,8 @@ include/tk/unix/tkUnixDefault.h
 include/tk/unix/tkUnixInt.h
 include/tk/unix/tkUnixPort.h
 lib/libtk83.la
+lib/libtk83.so
+lib/libtk83.so.1
 lib/libtk83.so.1.0
 lib/libtk83.a
 lib/libtkstub83.a
diff --git a/x11/wxGTK/pkg/PLIST b/x11/wxGTK/pkg/PLIST
index 01f6bf4430e..4c7e0c7ce4a 100644
--- a/x11/wxGTK/pkg/PLIST
+++ b/x11/wxGTK/pkg/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2000/12/12 18:10:01 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:11:04 agc Exp $
 bin/wxgtk-config
 bin/wx-config
 lib/libwx_gtk.a
 lib/libwx_gtk.la
+lib/libwx_gtk.so
+lib/libwx_gtk.so.0
 lib/libwx_gtk.so.0.1
 lib/wx/include/wx/gtk/setup.h
 include/wx/accel.h
diff --git a/x11/xforms/pkg/PLIST.shlib b/x11/xforms/pkg/PLIST.shlib
index 58c0035fcb3..83df8a4bc09 100644
--- a/x11/xforms/pkg/PLIST.shlib
+++ b/x11/xforms/pkg/PLIST.shlib
@@ -1,3 +1,7 @@
-@comment $NetBSD: PLIST.shlib,v 1.1 1999/09/23 05:29:25 jlam Exp $
+@comment $NetBSD: PLIST.shlib,v 1.2 2001/01/04 15:11:04 agc Exp $
+lib/libforms.so
+lib/libforms.so.0
 lib/libforms.so.0.88
+lib/libxforms.so
+lib/libxforms.so.0
 lib/libxforms.so.0.88
diff --git a/x11/xmx/pkg/PLIST b/x11/xmx/pkg/PLIST
index 83094ba8556..ba7f30fcfff 100644
--- a/x11/xmx/pkg/PLIST
+++ b/x11/xmx/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/01/21 17:22:40 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:11:04 agc Exp $
 include/XMC/xmc.h
 include/XMC/xmcp.h
+lib/libXmc.so
+lib/libXmc.so.2
 lib/libXmc.so.2.0
 lib/libXmc_d.a
 bin/xmx
diff --git a/x11/xview-lib/pkg/PLIST b/x11/xview-lib/pkg/PLIST
index 083aee314d5..7c65a401070 100644
--- a/x11/xview-lib/pkg/PLIST
+++ b/x11/xview-lib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2000/11/29 23:12:58 tron Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/01/04 15:11:04 agc Exp $
 include/bitmaps/1x1
 include/bitmaps/2x2
 include/bitmaps/black
@@ -273,9 +273,13 @@ include/xview_private/xv_path_util.h
 @dirrm include/images
 @dirrm include/bitmaps
 lib/libolgx.a
+lib/libolgx.so
+lib/libolgx.so.3
 lib/libolgx.so.3.2
 lib/libxview.a
 lib/libxview.sa.3.2
+lib/libxview.so
+lib/libxview.so.3
 lib/libxview.so.3.2
 lib/.text_extras_menu
 lib/.textswrc