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.

36 files changed, 218 insertions, 38 deletions

diff --git a/graphics/GMT/pkg/PLIST b/graphics/GMT/pkg/PLIST
index 26740231097..67a369267ab 100644
--- a/graphics/GMT/pkg/PLIST
+++ b/graphics/GMT/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/12/14 00:44:08 jtb Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:36 agc Exp $
 bin/blockmean
 bin/blockmedian
 bin/blockmode
@@ -80,9 +80,13 @@ include/gmt/gmt_unique.h
 include/gmt/pslib.h
 lib/libgmt.a
 lib/libgmt.la
+lib/libgmt.so
+lib/libgmt.so.0
 lib/libgmt.so.0.0
 lib/libpsl.a
 lib/libpsl.la
+lib/libpsl.so
+lib/libpsl.so.0
 lib/libpsl.so.0.0
 share/gmt/.gmtdefaults_SI
 share/gmt/.gmtdefaults_SI.orig
diff --git a/graphics/ImageMagick/pkg/PLIST b/graphics/ImageMagick/pkg/PLIST
index 2099c42cd20..37ebad7eed4 100644
--- a/graphics/ImageMagick/pkg/PLIST
+++ b/graphics/ImageMagick/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2000/08/10 08:57:23 tron Exp $
+@comment $NetBSD: PLIST,v 1.26 2001/01/04 15:10:36 agc Exp $
 bin/Magick-config
 bin/animate
 bin/combine
@@ -32,6 +32,8 @@ include/magick/version.h
 include/magick/xwindows.h
 lib/libMagick.a
 lib/libMagick.la
+lib/libMagick.so
+lib/libMagick.so.5
 lib/libMagick.so.5.22
 @exec mkdir -p %D/lib/ImageMagick/modules/coders
 man/man1/ImageMagick.1
diff --git a/graphics/Mesa-glx/pkg/PLIST b/graphics/Mesa-glx/pkg/PLIST
index b2824160258..4384b701b24 100644
--- a/graphics/Mesa-glx/pkg/PLIST
+++ b/graphics/Mesa-glx/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2000/04/11 22:36:39 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:36 agc Exp $
 etc/glx.conf.default
 @exec test -f %D/etc/glx.conf || cp %D/etc/glx.conf.default %D/etc/glx.conf
 etc/mesa.conf
@@ -14,12 +14,18 @@ include/GL/osmesa.h
 include/GL/xmesa.h
 include/GL/xmesa_x.h
 include/GL/xmesa_xf86.h
+lib/libGL.so
+lib/libGL.so.3
 lib/libGL.so.3.0
 lib/libGL.a
 lib/libGL.la
+lib/libGLU.so
+lib/libGLU.so.3
 lib/libGLU.so.3.0
 lib/libGLU.a
 lib/libGLU.la
+lib/libglut.so
+lib/libglut.so.10
 lib/libglut.so.10.0
 lib/libglut.a
 lib/libglut.la
diff --git a/graphics/MesaLib/pkg/PLIST b/graphics/MesaLib/pkg/PLIST
index 23947d91515..2549ac16938 100644
--- a/graphics/MesaLib/pkg/PLIST
+++ b/graphics/MesaLib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/12/12 19:16:56 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:10:36 agc Exp $
 etc/mesa.conf
 include/GL/gl.h
 include/GL/gl_mangle.h
@@ -9,6 +9,8 @@ include/GL/osmesa.h
 include/GL/xmesa.h
 include/GL/xmesa_x.h
 include/GL/xmesa_xf86.h
+lib/libGL.so
+lib/libGL.so.3
 lib/libGL.so.3.4
 lib/libGL.a
 lib/libGL.la
diff --git a/graphics/clanlib/pkg/PLIST b/graphics/clanlib/pkg/PLIST
index 8c5cf28c56c..e6f07b01819 100644
--- a/graphics/clanlib/pkg/PLIST
+++ b/graphics/clanlib/pkg/PLIST
@@ -1,10 +1,28 @@
-@comment $NetBSD: PLIST,v 1.3 2000/12/15 03:13:07 garbled Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:10:37 agc Exp $
 bin/clanlib-config
+lib/libclanCore.so
+lib/libclanCore.so.0
+lib/libclanCore.so.0.4
 lib/libclanCore.so.0.4.4
+lib/ClanLib/libclan-input-tty.so
+lib/ClanLib/libclan-input-tty.so.0
+lib/ClanLib/libclan-input-tty.so.0.4
 lib/ClanLib/libclan-input-tty.so.0.4.4
+lib/ClanLib/libclan-display-x11.so
+lib/ClanLib/libclan-display-x11.so.0
+lib/ClanLib/libclan-display-x11.so.0.4
 lib/ClanLib/libclan-display-x11.so.0.4.4
+lib/ClanLib/libclan-display-glx.so
+lib/ClanLib/libclan-display-glx.so.0
+lib/ClanLib/libclan-display-glx.so.0.4
 lib/ClanLib/libclan-display-glx.so.0.4.4
+lib/ClanLib/libclan-sound.so
+lib/ClanLib/libclan-sound.so.0
+lib/ClanLib/libclan-sound.so.0.4
 lib/ClanLib/libclan-sound.so.0.4.4
+lib/ClanLib/libclan-network.so
+lib/ClanLib/libclan-network.so.0
+lib/ClanLib/libclan-network.so.0.4
 lib/ClanLib/libclan-network.so.0.4.4
 include/ClanLib/Core/Display/cliprect.h
 include/ClanLib/Core/Display/display.h
diff --git a/graphics/fnlib/pkg/PLIST b/graphics/fnlib/pkg/PLIST
index bdc6242d7ae..a19345bffff 100644
--- a/graphics/fnlib/pkg/PLIST
+++ b/graphics/fnlib/pkg/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2000/06/21 01:02:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/01/04 15:10:37 agc Exp $
 etc/fnrc
 include/Fnlib.h
 include/Fnlib_types.h
 lib/libFnlib.a
 lib/libFnlib.la
+lib/libFnlib.so
+lib/libFnlib.so.5
 lib/libFnlib.so.5.0
 share/doc/fnlib/fontinfo.README
 share/fnlib_fonts/e/17/032.png
diff --git a/graphics/freetype-lib/pkg/PLIST b/graphics/freetype-lib/pkg/PLIST
index 719ff0e662f..82eb4717f6c 100644
--- a/graphics/freetype-lib/pkg/PLIST
+++ b/graphics/freetype-lib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/07/22 08:12:40 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:10:37 agc Exp $
 include/freetype/freetype.h
 include/freetype/fterrid.h
 include/freetype/ftnameid.h
@@ -15,6 +15,8 @@ include/freetype/ftxsbit.h
 include/freetype/ftxwidth.h
 lib/libttf.a
 lib/libttf.la
+lib/libttf.so
+lib/libttf.so.4
 lib/libttf.so.4.0
 share/locale/cs/LC_MESSAGES/freetype.mo
 share/locale/de/LC_MESSAGES/freetype.mo
diff --git a/graphics/freetype2/pkg/PLIST b/graphics/freetype2/pkg/PLIST
index e82b66e1331..3782f6ebe36 100644
--- a/graphics/freetype2/pkg/PLIST
+++ b/graphics/freetype2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/12/24 02:27:41 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:37 agc Exp $
 bin/freetype-config
 include/freetype2/freetype/cache/ftcchunk.h
 include/freetype2/freetype/cache/ftcglyph.h
@@ -51,6 +51,8 @@ include/freetype2/freetype/tttables.h
 include/freetype2/freetype/tttags.h
 lib/libfreetype.a
 lib/libfreetype.la
+lib/libfreetype.so
+lib/libfreetype.so.6
 lib/libfreetype.so.6.1
 @dirrm include/freetype2/freetype/internal
 @dirrm include/freetype2/freetype/config
diff --git a/graphics/g3d/pkg/PLIST b/graphics/g3d/pkg/PLIST
index 36925af2731..6a1c4f56ee3 100644
--- a/graphics/g3d/pkg/PLIST
+++ b/graphics/g3d/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/08/14 18:32:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:37 agc Exp $
 bin/g3d
 include/b3d/b3d.h
 include/b3d/btex.h
@@ -9,6 +9,8 @@ include/b3d/sgi.h
 include/b3d/transform.h
 lib/libb3d.a
 lib/libb3d.la
+lib/libb3d.so
+lib/libb3d.so.0
 lib/libb3d.so.0.1
 share/pixmaps/g3d/exit.xpm
 share/pixmaps/g3d/file.xpm
diff --git a/graphics/gd/pkg/PLIST b/graphics/gd/pkg/PLIST
index a01d07fc7a4..7449ab1a56d 100644
--- a/graphics/gd/pkg/PLIST
+++ b/graphics/gd/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2000/06/21 00:55:09 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/01/04 15:10:37 agc Exp $
 bin/bdftogd
 bin/gd2copypal
 bin/gd2topng
@@ -17,4 +17,6 @@ include/gdfonts.h
 include/gdfontt.h
 lib/libgd.a
 lib/libgd.la
+lib/libgd.so
+lib/libgd.so.1
 lib/libgd.so.1.9
diff --git a/graphics/gdk-pixbuf-gnome/pkg/PLIST b/graphics/gdk-pixbuf-gnome/pkg/PLIST
index e1b8327eef9..c6e16b622c0 100644
--- a/graphics/gdk-pixbuf-gnome/pkg/PLIST
+++ b/graphics/gdk-pixbuf-gnome/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/29 17:23:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:38 agc Exp $
 include/gdk-pixbuf/gnome-canvas-pixbuf.h
 lib/gnomecanvaspixbufConf.sh
 lib/libgnomecanvaspixbuf.a
 lib/libgnomecanvaspixbuf.la
+lib/libgnomecanvaspixbuf.so
+lib/libgnomecanvaspixbuf.so.1
 lib/libgnomecanvaspixbuf.so.1.0
diff --git a/graphics/gdk-pixbuf/pkg/PLIST b/graphics/gdk-pixbuf/pkg/PLIST
index b3feeb5fe4b..081d32a472a 100644
--- a/graphics/gdk-pixbuf/pkg/PLIST
+++ b/graphics/gdk-pixbuf/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2000/12/06 19:46:10 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/01/04 15:10:38 agc Exp $
 bin/gdk-pixbuf-config
 include/gdk-pixbuf/gdk-pixbuf-features.h
 include/gdk-pixbuf/gdk-pixbuf-loader.h
@@ -36,9 +36,13 @@ lib/gdk_pixbufConf.sh
 lib/gdk_pixbuf_xlibConf.sh
 lib/libgdk_pixbuf.a
 lib/libgdk_pixbuf.la
+lib/libgdk_pixbuf.so
+lib/libgdk_pixbuf.so.2
 lib/libgdk_pixbuf.so.2.0
 lib/libgdk_pixbuf_xlib.a
 lib/libgdk_pixbuf_xlib.la
+lib/libgdk_pixbuf_xlib.so
+lib/libgdk_pixbuf_xlib.so.2
 lib/libgdk_pixbuf_xlib.so.2.0
 share/aclocal/gdk-pixbuf.m4
 share/gnome/html/gdk-pixbuf-decl.txt
diff --git a/graphics/giflib/pkg/PLIST b/graphics/giflib/pkg/PLIST
index 38c0eaab96b..7c410971ce3 100644
--- a/graphics/giflib/pkg/PLIST
+++ b/graphics/giflib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2000/12/06 17:14:12 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2001/01/04 15:10:38 agc Exp $
 bin/gif2epsn
 bin/gif2ps
 bin/gif2rgb
@@ -30,6 +30,8 @@ bin/gifburst
 include/gif_lib.h
 lib/libgif.a
 lib/libgif.la
+lib/libgif.so
+lib/libgif.so.5
 lib/libgif.so.5.0
 share/doc/giflib/COPYING
 share/doc/giflib/PATENT_PROBLEMS
diff --git a/graphics/gimp-current/pkg/PLIST b/graphics/gimp-current/pkg/PLIST
index 37a1439fcca..79802048795 100644
--- a/graphics/gimp-current/pkg/PLIST
+++ b/graphics/gimp-current/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2000/11/30 04:13:27 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.15 2001/01/04 15:10:38 agc Exp $
 bin/escputil
 bin/gimp
 bin/gimp-config
@@ -262,12 +262,18 @@ lib/gimp/1.1/plug-ins/xwd
 lib/gimp/1.1/plug-ins/zealouscrop
 lib/libgck.a
 lib/libgck.la
+lib/libgck.so
+lib/libgck.so.29
 lib/libgck.so.29.0
 lib/libgimp.a
 lib/libgimp.la
+lib/libgimp.so
+lib/libgimp.so.29
 lib/libgimp.so.29.0
 lib/libgimpui.a
 lib/libgimpui.la
+lib/libgimpui.so
+lib/libgimpui.so.29
 lib/libgimpui.so.29.0
 man/man1/escputil.1
 man/man1/gimp.1
diff --git a/graphics/gimp/pkg/PLIST b/graphics/gimp/pkg/PLIST
index 976144986b3..1bfb53dd705 100644
--- a/graphics/gimp/pkg/PLIST
+++ b/graphics/gimp/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2001/01/02 09:49:33 veego Exp $
+@comment $NetBSD: PLIST,v 1.23 2001/01/04 15:10:38 agc Exp $
 bin/escputil
 bin/gimp
 bin/gimp-config
@@ -255,12 +255,18 @@ lib/gimp/1.2/plug-ins/xjt
 lib/gimp/1.2/plug-ins/xpm
 lib/gimp/1.2/plug-ins/xwd
 lib/gimp/1.2/plug-ins/zealouscrop
+lib/libgck-1.2.so
+lib/libgck-1.2.so.0
 lib/libgck-1.2.so.0.0
 lib/libgck.a
 lib/libgck.la
+lib/libgimp-1.2.so
+lib/libgimp-1.2.so.0
 lib/libgimp-1.2.so.0.0
 lib/libgimp.a
 lib/libgimp.la
+lib/libgimpui-1.2.so
+lib/libgimpui-1.2.so.0
 lib/libgimpui-1.2.so.0.0
 lib/libgimpui.a
 lib/libgimpui.la
diff --git a/graphics/glu/pkg/PLIST b/graphics/glu/pkg/PLIST
index a4ea4faaea4..0ef0309d4fd 100644
--- a/graphics/glu/pkg/PLIST
+++ b/graphics/glu/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2000/12/12 17:22:40 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:39 agc Exp $
 include/GL/glu.h
 include/GL/glu_mangle.h
+lib/libGLU.so
+lib/libGLU.so.3
 lib/libGLU.so.3.4
 lib/libGLU.a
 lib/libGLU.la
diff --git a/graphics/glut/pkg/PLIST b/graphics/glut/pkg/PLIST
index 07c7aa92235..56cc13a163f 100644
--- a/graphics/glut/pkg/PLIST
+++ b/graphics/glut/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/10/15 11:48:44 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:39 agc Exp $
 include/GL/glut.h
 include/GL/glutf90.h
+lib/libglut.so
+lib/libglut.so.3
 lib/libglut.so.3.7
 lib/libglut.a
 lib/libglut.la
diff --git a/graphics/gphoto/pkg/PLIST b/graphics/gphoto/pkg/PLIST
index 21fb753285f..155452170d8 100644
--- a/graphics/gphoto/pkg/PLIST
+++ b/graphics/gphoto/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2000/08/14 19:00:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/01/04 15:10:39 agc Exp $
 bin/dc21x_cam
 bin/gphoto
 bin/gphoto-exifdump
@@ -7,54 +7,88 @@ bin/qmxxx
 bin/rsony
 lib/libgphoto_canon.a
 lib/libgphoto_canon.la
+lib/libgphoto_canon.so
+lib/libgphoto_canon.so.0
 lib/libgphoto_canon.so.0.0
 lib/libgphoto_casio_qv.a
 lib/libgphoto_casio_qv.la
+lib/libgphoto_casio_qv.so
+lib/libgphoto_casio_qv.so.0
 lib/libgphoto_casio_qv.so.0.0
 lib/libgphoto_coolpix600.a
 lib/libgphoto_coolpix600.la
+lib/libgphoto_coolpix600.so
+lib/libgphoto_coolpix600.so.0
 lib/libgphoto_coolpix600.so.0.0
 lib/libgphoto_dimage_v.a
 lib/libgphoto_dimage_v.la
+lib/libgphoto_dimage_v.so
+lib/libgphoto_dimage_v.so.0
 lib/libgphoto_dimage_v.so.0.0
 lib/libgphoto_dir.a
 lib/libgphoto_dir.la
+lib/libgphoto_dir.so
+lib/libgphoto_dir.so.0
 lib/libgphoto_dir.so.0.0
 lib/libgphoto_fuji.a
 lib/libgphoto_fuji.la
+lib/libgphoto_fuji.so
+lib/libgphoto_fuji.so.0
 lib/libgphoto_fuji.so.0.0
 lib/libgphoto_kodak_dc2x.a
 lib/libgphoto_kodak_dc2x.la
+lib/libgphoto_kodak_dc2x.so
+lib/libgphoto_kodak_dc2x.so.0
 lib/libgphoto_kodak_dc2x.so.0.0
 lib/libgphoto_kodak_generic.a
 lib/libgphoto_kodak_generic.la
+lib/libgphoto_kodak_generic.so
+lib/libgphoto_kodak_generic.so.0
 lib/libgphoto_kodak_generic.so.0.0
 lib/libgphoto_konica_qm100.a
 lib/libgphoto_konica_qm100.la
+lib/libgphoto_konica_qm100.so
+lib/libgphoto_konica_qm100.so.0
 lib/libgphoto_konica_qm100.so.0.0
 lib/libgphoto_konica_qmxxx.a
 lib/libgphoto_konica_qmxxx.la
+lib/libgphoto_konica_qmxxx.so
+lib/libgphoto_konica_qmxxx.so.0
 lib/libgphoto_konica_qmxxx.so.0.0
 lib/libgphoto_mustek_mdc800.a
 lib/libgphoto_mustek_mdc800.la
+lib/libgphoto_mustek_mdc800.so
+lib/libgphoto_mustek_mdc800.so.1
 lib/libgphoto_mustek_mdc800.so.1.0
 lib/libgphoto_philips.a
 lib/libgphoto_philips.la
+lib/libgphoto_philips.so
+lib/libgphoto_philips.so.0
 lib/libgphoto_philips.so.0.5
 lib/libgphoto_photopc.a
 lib/libgphoto_photopc.la
+lib/libgphoto_photopc.so
+lib/libgphoto_photopc.so.0
 lib/libgphoto_photopc.so.0.0
 lib/libgphoto_ricoh300z.a
 lib/libgphoto_ricoh300z.la
+lib/libgphoto_ricoh300z.so
+lib/libgphoto_ricoh300z.so.0
 lib/libgphoto_ricoh300z.so.0.0
 lib/libgphoto_samsung.a
 lib/libgphoto_samsung.la
+lib/libgphoto_samsung.so
+lib/libgphoto_samsung.so.0
 lib/libgphoto_samsung.so.0.0
 lib/libgphoto_sony_dscf1.a
 lib/libgphoto_sony_dscf1.la
+lib/libgphoto_sony_dscf1.so
+lib/libgphoto_sony_dscf1.so.0
 lib/libgphoto_sony_dscf1.so.0.0
 lib/libgphoto_sony_dscf55.a
 lib/libgphoto_sony_dscf55.la
+lib/libgphoto_sony_dscf55.so
+lib/libgphoto_sony_dscf55.so.0
 lib/libgphoto_sony_dscf55.so.0.0
 man/man1/gphoto.1
 share/gnome/apps/Graphics/gphoto.desktop
diff --git a/graphics/hermes/pkg/PLIST b/graphics/hermes/pkg/PLIST
index d04f4406ace..824751816ae 100644
--- a/graphics/hermes/pkg/PLIST
+++ b/graphics/hermes/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/12/15 00:38:44 garbled Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:39 agc Exp $
 include/Hermes/H_Clear.h
 include/Hermes/H_Config.h
 include/Hermes/H_Conv.h
@@ -10,5 +10,7 @@ include/Hermes/Types.h
 include/Hermes/H_Blit.h
 lib/libHermes.a
 lib/libHermes.la
+lib/libHermes.so
+lib/libHermes.so.1
 lib/libHermes.so.1.0
 @dirrm include/Hermes
diff --git a/graphics/imlib/pkg/PLIST b/graphics/imlib/pkg/PLIST
index 9bf5ef45e5b..593032075c1 100644
--- a/graphics/imlib/pkg/PLIST
+++ b/graphics/imlib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2000/11/26 11:34:56 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.12 2001/01/04 15:10:39 agc Exp $
 bin/imlib_config
 bin/imlib-config
 etc/imrc
@@ -13,9 +13,13 @@ include/Imlib_private.h
 include/Imlib_types.h
 lib/libImlib.a
 lib/libImlib.la
+lib/libImlib.so
+lib/libImlib.so.10
 lib/libImlib.so.10.8
 lib/libgdk_imlib.a
 lib/libgdk_imlib.la
+lib/libgdk_imlib.so
+lib/libgdk_imlib.so.10
 lib/libgdk_imlib.so.10.8
 lib/libimlib-bmp.a
 lib/libimlib-bmp.la
diff --git a/graphics/jpeg/pkg/PLIST b/graphics/jpeg/pkg/PLIST
index 42820294c56..684268f68ab 100644
--- a/graphics/jpeg/pkg/PLIST
+++ b/graphics/jpeg/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2000/06/03 19:17:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/01/04 15:10:40 agc Exp $
 bin/cjpeg
 bin/djpeg
 bin/jpegtran
@@ -10,6 +10,8 @@ include/jmorecfg.h
 include/jerror.h
 lib/libjpeg.a
 lib/libjpeg.la
+lib/libjpeg.so
+lib/libjpeg.so.62
 lib/libjpeg.so.62.0
 man/man1/cjpeg.1.gz
 man/man1/djpeg.1.gz
diff --git a/graphics/libflash/pkg/PLIST b/graphics/libflash/pkg/PLIST
index 86474f76562..a19fcc3d4fd 100644
--- a/graphics/libflash/pkg/PLIST
+++ b/graphics/libflash/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/08/28 17:33:50 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:40 agc Exp $
 include/flash/adpcm.h
 include/flash/cxform.h
 include/flash/graphic.h
@@ -21,5 +21,7 @@ include/flash/sprite.h
 include/flash/movie.h
 lib/libflash.a
 lib/libflash.la
+lib/libflash.so
+lib/libflash.so.0
 lib/libflash.so.0.4
 @dirrm include/flash
diff --git a/graphics/libgdgeda/pkg/PLIST b/graphics/libgdgeda/pkg/PLIST
index 587d2b75571..1a53043d9a3 100644
--- a/graphics/libgdgeda/pkg/PLIST
+++ b/graphics/libgdgeda/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/08/14 19:14:41 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:40 agc Exp $
 bin/libgdgeda-config
 include/gdgeda/gd.h
 include/gdgeda/gd_io.h
@@ -11,5 +11,7 @@ include/gdgeda/mtables.h
 include/gdgeda/gdcache.h
 lib/libgdgeda.a
 lib/libgdgeda.la
+lib/libgdgeda.so
+lib/libgdgeda.so.3
 lib/libgdgeda.so.3.0
 @dirrm include/gdgeda
diff --git a/graphics/libggi/pkg/PLIST b/graphics/libggi/pkg/PLIST
index 904c7f3ca69..384521db52d 100644
--- a/graphics/libggi/pkg/PLIST
+++ b/graphics/libggi/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/04/16 17:42:26 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:40 agc Exp $
 man/man7/libggi.7
 man/man6/cube3d.6
 man/man3/ggiResourceMustAcquire.3
@@ -75,8 +75,12 @@ man/man3/ggiCheckMode.3
 man/man3/ggiCheckGraphMode.3
 man/man3/ggiAddFlags.3
 lib/libggimisc.la
+lib/libggimisc.so
+lib/libggimisc.so.2
 lib/libggimisc.so.2.0
 lib/libggi.la
+lib/libggi.so
+lib/libggi.so.2
 lib/libggi.so.2.0
 lib/ggi/default/iplanar_2p.la
 lib/ggi/default/iplanar_2p.so
diff --git a/graphics/libgii/pkg/PLIST b/graphics/libgii/pkg/PLIST
index 4f448edf461..73ccde3cac7 100644
--- a/graphics/libgii/pkg/PLIST
+++ b/graphics/libgii/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/07/24 02:31:30 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:40 agc Exp $
 man/man3/giiSetEventMask.3
 man/man3/giiRemoveEventMask.3
 man/man3/giiPanic.3
@@ -14,8 +14,12 @@ man/man3/giiClose.3
 man/man3/giiAddEventMask.3
 man/man1/mhub.1
 lib/libgii.la
+lib/libgii.so
+lib/libgii.so.0
 lib/libgii.so.0.6
 lib/libgg.la
+lib/libgg.so
+lib/libgg.so.0
 lib/libgg.so.0.6
 lib/ggi/filter/save.la
 lib/ggi/filter/save.so
diff --git a/graphics/libungif/pkg/PLIST b/graphics/libungif/pkg/PLIST
index 2c8d70a3e59..d64a005b670 100644
--- a/graphics/libungif/pkg/PLIST
+++ b/graphics/libungif/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/12/06 17:14:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:41 agc Exp $
 bin/gif2epsn
 bin/gif2ps
 bin/gif2rgb
@@ -29,9 +29,13 @@ bin/gifcompose
 bin/gifburst
 include/gif_lib.h
 lib/libgif.a
+lib/libgif.so
+lib/libgif.so.5
 lib/libgif.so.5.0
 lib/libungif.a
 lib/libungif.la
+lib/libungif.so
+lib/libungif.so.5
 lib/libungif.so.5.0
 share/doc/html/libungif/GifFileType.png
 share/doc/html/libungif/gif2bgi.html
diff --git a/graphics/mgl/pkg/PLIST b/graphics/mgl/pkg/PLIST
index b9d02f34031..71d98e41b90 100644
--- a/graphics/mgl/pkg/PLIST
+++ b/graphics/mgl/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/11/03 01:08:30 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:41 agc Exp $
 bin/kill_mgl.sh
 bin/mcalc
 bin/mdate
@@ -11,6 +11,8 @@ bin/set_mgl.sh
 bin/start_mgl.sh
 include/mgl2.h
 include/mglcol.h
+lib/libmgl2.so
+lib/libmgl2.so.2
 lib/libmgl2.so.2.0
 lib/mgl2/imsoft.so
 lib/mgl2/instcap.sh
diff --git a/graphics/mpeg-lib/pkg/PLIST b/graphics/mpeg-lib/pkg/PLIST
index f119d93f966..8a5234a9447 100644
--- a/graphics/mpeg-lib/pkg/PLIST
+++ b/graphics/mpeg-lib/pkg/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2000/06/21 04:03:35 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/01/04 15:10:43 agc Exp $
 include/mpeg.h
 lib/libmpeg.a
 lib/libmpeg.la
+lib/libmpeg.so
+lib/libmpeg.so.1
 lib/libmpeg.so.1.2
diff --git a/graphics/netpbm/pkg/PLIST b/graphics/netpbm/pkg/PLIST
index 5210ebcf608..7982dd26553 100644
--- a/graphics/netpbm/pkg/PLIST
+++ b/graphics/netpbm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2000/08/10 10:44:10 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2001/01/04 15:10:43 agc Exp $
 bin/anytopnm
 bin/asciitopgm
 bin/atktopbm
@@ -223,16 +223,24 @@ include/ppmcmap.h
 include/shhopt.h
 lib/libpbm.a
 lib/libpbm.la
+lib/libpbm.so
+lib/libpbm.so.9
 lib/libpbm.so.9.5
 lib/libpgm.a
 lib/libpgm.la
-lib/libpgm.so.${VERS}
+lib/libpgm.so
+lib/libpgm.so.9
+lib/libpgm.so.9.7
 lib/libpnm.a
 lib/libpnm.la
+lib/libpnm.so
+lib/libpnm.so.9
 lib/libpnm.so.9.5
 lib/libppm.a
 lib/libppm.la
-lib/libppm.so.${VERS}
+lib/libppm.so
+lib/libppm.so.9
+lib/libppm.so.9.7
 man/man1/anytopnm.1
 man/man1/asciitopgm.1
 man/man1/atktopbm.1
diff --git a/graphics/openptc/pkg/PLIST b/graphics/openptc/pkg/PLIST
index 924a8e6f2e7..f7afef633c9 100644
--- a/graphics/openptc/pkg/PLIST
+++ b/graphics/openptc/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/08/14 19:23:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:44 agc Exp $
 bin/ptc-config
 include/ptc/Core/Area.h
 include/ptc/Core/Base.h
@@ -26,6 +26,8 @@ include/ptc/X11/ptconfig.h
 include/ptc/ptc.h
 lib/libptc.1.0.a
 lib/libptc.a
+lib/libptc.so
+lib/libptc.so.1
 lib/libptc.so.1.0
 @dirrm include/ptc/Core
 @dirrm include/ptc/X11
diff --git a/graphics/plotutils/pkg/PLIST b/graphics/plotutils/pkg/PLIST
index ed6fe7a60e5..e743fa40c8d 100644
--- a/graphics/plotutils/pkg/PLIST
+++ b/graphics/plotutils/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2000/08/24 00:03:49 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/01/04 15:10:44 agc Exp $
 bin/double
 bin/graph
 bin/ode
@@ -12,9 +12,13 @@ include/plotcompat.h
 include/plotter.h
 lib/libplot.a
 lib/libplot.la
+lib/libplot.so
+lib/libplot.so.4
 lib/libplot.so.4.1
 lib/libplotter.a
 lib/libplotter.la
+lib/libplotter.so
+lib/libplotter.so.4
 lib/libplotter.so.4.0
 man/man1/ode.1
 man/man1/plot.1
diff --git a/graphics/png/pkg/PLIST b/graphics/png/pkg/PLIST
index 05c9c21679e..f83cad69f91 100644
--- a/graphics/png/pkg/PLIST
+++ b/graphics/png/pkg/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.13 2000/06/03 19:46:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2001/01/04 15:10:44 agc Exp $
 include/png.h
 include/pngconf.h
 lib/libpng.a
 lib/libpng.la
+lib/libpng.so
+lib/libpng.so.1
 lib/libpng.so.1.3
 man/man3/libpng.3
 man/man3/libpngpf.3
diff --git a/graphics/sane/pkg/PLIST b/graphics/sane/pkg/PLIST
index d6097cda3af..0181a6ff5d1 100644
--- a/graphics/sane/pkg/PLIST
+++ b/graphics/sane/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2000/11/15 00:03:37 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/01/04 15:10:44 agc Exp $
 bin/sane-config
 bin/scanimage
 bin/xcam
@@ -44,122 +44,152 @@ include/sane/sanei_wire.h
 include/sane/saneopts.h
 lib/libsane.a
 lib/libsane.la
+lib/libsane.so
 lib/libsane.so.1
 lib/libsane.so.1.3
 lib/sane/libsane-abaton.a
 lib/sane/libsane-abaton.la
+lib/sane/libsane-abaton.so
 lib/sane/libsane-abaton.so.1
 lib/sane/libsane-abaton.so.1.3
 lib/sane/libsane-agfafocus.a
 lib/sane/libsane-agfafocus.la
+lib/sane/libsane-agfafocus.so
 lib/sane/libsane-agfafocus.so.1
 lib/sane/libsane-agfafocus.so.1.3
 lib/sane/libsane-apple.a
 lib/sane/libsane-apple.la
+lib/sane/libsane-apple.so
 lib/sane/libsane-apple.so.1
 lib/sane/libsane-apple.so.1.3
 lib/sane/libsane-artec.a
 lib/sane/libsane-artec.la
+lib/sane/libsane-artec.so
 lib/sane/libsane-artec.so.1
 lib/sane/libsane-artec.so.1.3
 lib/sane/libsane-avision.a
 lib/sane/libsane-avision.la
+lib/sane/libsane-avision.so
 lib/sane/libsane-avision.so.1
 lib/sane/libsane-avision.so.1.3
 lib/sane/libsane-canon.a
 lib/sane/libsane-canon.la
+lib/sane/libsane-canon.so
 lib/sane/libsane-canon.so.1
 lib/sane/libsane-canon.so.1.3
 lib/sane/libsane-coolscan.a
 lib/sane/libsane-coolscan.la
+lib/sane/libsane-coolscan.so
 lib/sane/libsane-coolscan.so.1
 lib/sane/libsane-coolscan.so.1.3
 lib/sane/libsane-dc25.a
 lib/sane/libsane-dc25.la
+lib/sane/libsane-dc25.so
 lib/sane/libsane-dc25.so.1
 lib/sane/libsane-dc25.so.1.3
 lib/sane/libsane-dll.a
 lib/sane/libsane-dll.la
+lib/sane/libsane-dll.so
 lib/sane/libsane-dll.so.1
 lib/sane/libsane-dll.so.1.3
 lib/sane/libsane-dmc.a
 lib/sane/libsane-dmc.la
+lib/sane/libsane-dmc.so
 lib/sane/libsane-dmc.so.1
 lib/sane/libsane-dmc.so.1.3
 lib/sane/libsane-epson.a
 lib/sane/libsane-epson.la
+lib/sane/libsane-epson.so
 lib/sane/libsane-epson.so.1
 lib/sane/libsane-epson.so.1.3
 lib/sane/libsane-hp.a
 lib/sane/libsane-hp.la
+lib/sane/libsane-hp.so
 lib/sane/libsane-hp.so.1
 lib/sane/libsane-hp.so.1.3
 lib/sane/libsane-m3096g.a
 lib/sane/libsane-m3096g.la
+lib/sane/libsane-m3096g.so
 lib/sane/libsane-m3096g.so.1
 lib/sane/libsane-m3096g.so.1.3
 lib/sane/libsane-microtek.a
 lib/sane/libsane-microtek.la
+lib/sane/libsane-microtek.so
 lib/sane/libsane-microtek.so.1
 lib/sane/libsane-microtek.so.1.3
 lib/sane/libsane-microtek2.a
 lib/sane/libsane-microtek2.la
+lib/sane/libsane-microtek2.so
 lib/sane/libsane-microtek2.so.1
 lib/sane/libsane-microtek2.so.1.3
 lib/sane/libsane-mustek.a
 lib/sane/libsane-mustek.la
+lib/sane/libsane-mustek.so
 lib/sane/libsane-mustek.so.1
 lib/sane/libsane-mustek.so.1.3
+lib/sane/libsane-mustek_pp.so
 lib/sane/libsane-mustek_pp.so.1
 lib/sane/libsane-mustek_pp.so.1.3
 lib/sane/libsane-mustek_pp.la
 lib/sane/libsane-mustek_pp.a
 lib/sane/libsane-net.a
 lib/sane/libsane-net.la
+lib/sane/libsane-net.so
 lib/sane/libsane-net.so.1
 lib/sane/libsane-net.so.1.3
 lib/sane/libsane-pint.a
 lib/sane/libsane-pint.la
+lib/sane/libsane-pint.so
 lib/sane/libsane-pint.so.1
 lib/sane/libsane-pint.so.1.3
+lib/sane/libsane-plustek.so
 lib/sane/libsane-plustek.so.1
 lib/sane/libsane-plustek.so.1.3
 lib/sane/libsane-plustek.la
 lib/sane/libsane-plustek.a
 lib/sane/libsane-pnm.a
 lib/sane/libsane-pnm.la
+lib/sane/libsane-pnm.so
 lib/sane/libsane-pnm.so.1
 lib/sane/libsane-pnm.so.1.3
 lib/sane/libsane-ricoh.a
 lib/sane/libsane-ricoh.la
+lib/sane/libsane-ricoh.so
 lib/sane/libsane-ricoh.so.1
 lib/sane/libsane-ricoh.so.1.3
 lib/sane/libsane-s9036.a
 lib/sane/libsane-s9036.la
+lib/sane/libsane-s9036.so
 lib/sane/libsane-s9036.so.1
 lib/sane/libsane-s9036.so.1.3
 lib/sane/libsane-sharp.a
 lib/sane/libsane-sharp.la
+lib/sane/libsane-sharp.so
 lib/sane/libsane-sharp.so.1
 lib/sane/libsane-sharp.so.1.3
 lib/sane/libsane-snapscan.a
 lib/sane/libsane-snapscan.la
+lib/sane/libsane-snapscan.so
 lib/sane/libsane-snapscan.so.1
 lib/sane/libsane-snapscan.so.1.3
 lib/sane/libsane-sp15c.a
 lib/sane/libsane-sp15c.la
+lib/sane/libsane-sp15c.so
 lib/sane/libsane-sp15c.so.1
 lib/sane/libsane-sp15c.so.1.3
+lib/sane/libsane-st400.so
 lib/sane/libsane-st400.so.1
 lib/sane/libsane-st400.so.1.3
 lib/sane/libsane-st400.la
 lib/sane/libsane-st400.a
 lib/sane/libsane-tamarack.a
 lib/sane/libsane-tamarack.la
+lib/sane/libsane-tamarack.so
 lib/sane/libsane-tamarack.so.1
 lib/sane/libsane-tamarack.so.1.3
 lib/sane/libsane-umax.a
 lib/sane/libsane-umax.la
+lib/sane/libsane-umax.so
 lib/sane/libsane-umax.so.1
 lib/sane/libsane-umax.so.1.3
 man/man1/saned.1
diff --git a/graphics/tiff/pkg/PLIST b/graphics/tiff/pkg/PLIST
index 592d41fef97..decac958d33 100644
--- a/graphics/tiff/pkg/PLIST
+++ b/graphics/tiff/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2000/12/06 16:59:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2001/01/04 15:10:44 agc Exp $
 bin/fax2ps
 bin/fax2tiff
 bin/gif2tiff
@@ -22,6 +22,8 @@ include/tiffconf.h
 include/tiffio.h
 lib/libtiff.a
 lib/libtiff.la
+lib/libtiff.so
+lib/libtiff.so.3
 lib/libtiff.so.3.5
 man/man1/fax2ps.1
 man/man1/fax2tiff.1
diff --git a/graphics/urt/pkg/PLIST b/graphics/urt/pkg/PLIST
index 42b0576c20e..73facfd5e82 100644
--- a/graphics/urt/pkg/PLIST
+++ b/graphics/urt/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 1998/08/24 16:55:38 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:44 agc Exp $
 bin/aliastorle
 bin/applymap
 bin/avg4
@@ -75,6 +75,8 @@ include/rle_config.h
 include/rle_put.h
 include/rle_raw.h
 lib/librle.a
+lib/librle.so
+lib/librle.so.1
 lib/librle.so.1.0
 man/man1/aliastorle.1
 man/man1/applymap.1
diff --git a/graphics/xpm/pkg/PLIST b/graphics/xpm/pkg/PLIST
index 7b5a91de8ce..0ab52bcc4b8 100644
--- a/graphics/xpm/pkg/PLIST
+++ b/graphics/xpm/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.9 1998/07/15 11:26:21 agc Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/01/04 15:10:44 agc Exp $
 bin/cxpm
 bin/sxpm
 lib/libXpm.a
+lib/libXpm.so
+lib/libXpm.so.4
 lib/libXpm.so.4.11
 include/X11/xpm.h
 man/cat1/cxpm.0.gz