Mechanical changes to package PLISTs to make use of LIBTOOLIZE_PLIST.

All library names listed by *.la files no longer need to be listed
in the PLIST, e.g., instead of:

	lib/libfoo.a
	lib/libfoo.la
	lib/libfoo.so
	lib/libfoo.so.0
	lib/libfoo.so.0.1

one simply needs:

	lib/libfoo.la

and bsd.pkg.mk will automatically ensure that the additional library
names are listed in the installed package +CONTENTS file.

Also make LIBTOOLIZE_PLIST default to "yes".

28 files changed, 28 insertions, 263 deletions

diff --git a/sysutils/amanda-client/PLIST b/sysutils/amanda-client/PLIST
index 206ac7c76be..62372a7899c 100644
--- a/sysutils/amanda-client/PLIST
+++ b/sysutils/amanda-client/PLIST
@@ -1,8 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2004/05/12 18:45:25 bouyer Exp $
-lib/libamclient.a
+@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:53 jlam Exp $
 lib/libamclient.la
-lib/libamclient.so
-lib/libamclient-2.4.4p2.so
 libexec/amandad
 libexec/amqde
 libexec/calcsize
diff --git a/sysutils/amanda-common/PLIST b/sysutils/amanda-common/PLIST
index e247e8f995a..0d0994ee99c 100644
--- a/sysutils/amanda-common/PLIST
+++ b/sysutils/amanda-common/PLIST
@@ -1,12 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2004/05/12 18:45:25 bouyer Exp $
-lib/libamanda-2.4.4p2.so
-lib/libamanda.a
+@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:53 jlam Exp $
 lib/libamanda.la
-lib/libamanda.so
-lib/libamtape-2.4.4p2.so
-lib/libamtape.a
 lib/libamtape.la
-lib/libamtape.so
 man/man8/amanda.8
 share/doc/amanda/COPYRIGHT
 share/doc/amanda/COPYRIGHT-APACHE
diff --git a/sysutils/amanda-server/PLIST b/sysutils/amanda-server/PLIST
index 488398a0206..3cb7285fccd 100644
--- a/sysutils/amanda-server/PLIST
+++ b/sysutils/amanda-server/PLIST
@@ -1,8 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2004/05/12 18:45:25 bouyer Exp $
-lib/libamserver-2.4.4p2.so
-lib/libamserver.a
+@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:53 jlam Exp $
 lib/libamserver.la
-lib/libamserver.so
 libexec/amcleanupdisk
 libexec/amidxtaped
 libexec/amindexd
diff --git a/sysutils/fakeroot/PLIST b/sysutils/fakeroot/PLIST
index 4bf79653fe9..8bf66071d80 100644
--- a/sysutils/fakeroot/PLIST
+++ b/sysutils/fakeroot/PLIST
@@ -1,11 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/20 11:23:54 lonewolf Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:53 jlam Exp $
 bin/faked
 bin/fakeroot
-lib/libfakeroot.a
 lib/libfakeroot.la
-lib/libfakeroot.so
-lib/libfakeroot.so.0
-lib/libfakeroot.so.0.1
 man/fr/man1/fakeroot.1
 man/man1/faked.1
 man/man1/fakeroot.1
diff --git a/sysutils/fam/PLIST b/sysutils/fam/PLIST
index 9e18cfb9e25..e6033ba9238 100644
--- a/sysutils/fam/PLIST
+++ b/sysutils/fam/PLIST
@@ -1,10 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2004/03/28 22:00:05 minskim Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:53 jlam Exp $
 include/fam.h
-lib/libfam.a
 lib/libfam.la
-lib/libfam.so
-lib/libfam.so.0
-lib/libfam.so.0.0
 man/man3/fam.3
 man/man5/famd.conf.5
 man/man8/famd.8
diff --git a/sysutils/file/PLIST b/sysutils/file/PLIST
index 924efcf8fd2..f7a88081be9 100644
--- a/sysutils/file/PLIST
+++ b/sysutils/file/PLIST
@@ -1,11 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/13 10:24:27 cjep Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:53 jlam Exp $
 bin/file
 include/magic.h
-lib/libmagic.a
 lib/libmagic.la
-lib/libmagic.so
-lib/libmagic.so.1
-lib/libmagic.so.1.0
 man/man1/file.1
 man/man3/libmagic.3
 man/man5/magic.5
diff --git a/sysutils/gnome-vfs/PLIST b/sysutils/gnome-vfs/PLIST
index 981de05d823..55e1dbfcea5 100644
--- a/sysutils/gnome-vfs/PLIST
+++ b/sysutils/gnome-vfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2003/03/25 11:22:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/09/22 08:09:53 jlam Exp $
 bin/gnome-vfs-config
 etc/vfs/modules/default-modules.conf
 include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-application-registry.h
@@ -49,14 +49,8 @@ include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-utils.h
 include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-xfer.h
 include/gnome-vfs-1.0/libgnomevfs/gnome-vfs.h
 lib/gnome-vfs-1.0/include/gnome-vfs-file-size.h
-lib/libgnomevfs-pthread.a
 lib/libgnomevfs-pthread.la
-lib/libgnomevfs-pthread.so
-lib/libgnomevfs.a
 lib/libgnomevfs.la
-lib/libgnomevfs.so
-lib/libgnomevfs.so.0
-lib/libgnomevfs.so.0.0
 lib/vfs/extfs/README
 lib/vfs/extfs/a
 lib/vfs/extfs/ar
@@ -74,39 +68,17 @@ lib/vfs/extfs/tar
 lib/vfs/extfs/trpm
 lib/vfs/extfs/zip
 lib/vfs/extfs/zoo
-lib/vfs/modules/libbzip2.a
 lib/vfs/modules/libbzip2.la
-lib/vfs/modules/libbzip2.so
-lib/vfs/modules/libdesktop.a
 lib/vfs/modules/libdesktop.la
-lib/vfs/modules/libdesktop.so
-lib/vfs/modules/libextfs.a
 lib/vfs/modules/libextfs.la
-lib/vfs/modules/libextfs.so
-lib/vfs/modules/libfile.a
 lib/vfs/modules/libfile.la
-lib/vfs/modules/libfile.so
-lib/vfs/modules/libftp.a
 lib/vfs/modules/libftp.la
-lib/vfs/modules/libftp.so
-lib/vfs/modules/libgzip.a
 lib/vfs/modules/libgzip.la
-lib/vfs/modules/libgzip.so
-lib/vfs/modules/libhttp.a
 lib/vfs/modules/libhttp.la
-lib/vfs/modules/libhttp.so
-lib/vfs/modules/libnntp.a
 lib/vfs/modules/libnntp.la
-lib/vfs/modules/libnntp.so
-lib/vfs/modules/libvfs-pipe.a
 lib/vfs/modules/libvfs-pipe.la
-lib/vfs/modules/libvfs-pipe.so
-lib/vfs/modules/libvfs-test.a
 lib/vfs/modules/libvfs-test.la
-lib/vfs/modules/libvfs-test.so
-lib/vfs/modules/libvfs-translate.a
 lib/vfs/modules/libvfs-translate.la
-lib/vfs/modules/libvfs-translate.so
 lib/vfsConf.sh
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-vfs.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-vfs.mo
diff --git a/sysutils/gnome-vfs2/PLIST b/sysutils/gnome-vfs2/PLIST
index deebb21a910..1e03d6d3589 100644
--- a/sysutils/gnome-vfs2/PLIST
+++ b/sysutils/gnome-vfs2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2004/09/21 16:45:47 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/09/22 08:09:53 jlam Exp $
 bin/gnomevfs-cat
 bin/gnomevfs-copy
 bin/gnomevfs-info
@@ -50,62 +50,26 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket-buffer.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h
-lib/bonobo/monikers/libmoniker_gnome_vfs_std.a
 lib/bonobo/monikers/libmoniker_gnome_vfs_std.la
-lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
 lib/bonobo/servers/GNOME_VFS_Daemon.server
 lib/bonobo/servers/GNOME_VFS_Moniker_std.server
 lib/gnome-vfs-2.0/include/gnome-vfs-file-size.h
-lib/gnome-vfs-2.0/modules/libbzip2.a
 lib/gnome-vfs-2.0/modules/libbzip2.la
-lib/gnome-vfs-2.0/modules/libbzip2.so
-lib/gnome-vfs-2.0/modules/libcomputer.a
 lib/gnome-vfs-2.0/modules/libcomputer.la
-lib/gnome-vfs-2.0/modules/libcomputer.so
-lib/gnome-vfs-2.0/modules/libdns-sd.a
 lib/gnome-vfs-2.0/modules/libdns-sd.la
-lib/gnome-vfs-2.0/modules/libdns-sd.so
-lib/gnome-vfs-2.0/modules/libfile.a
 lib/gnome-vfs-2.0/modules/libfile.la
-lib/gnome-vfs-2.0/modules/libfile.so
-lib/gnome-vfs-2.0/modules/libftp.a
 lib/gnome-vfs-2.0/modules/libftp.la
-lib/gnome-vfs-2.0/modules/libftp.so
-lib/gnome-vfs-2.0/modules/libgzip.a
 lib/gnome-vfs-2.0/modules/libgzip.la
-lib/gnome-vfs-2.0/modules/libgzip.so
-lib/gnome-vfs-2.0/modules/libhttp.a
 lib/gnome-vfs-2.0/modules/libhttp.la
-lib/gnome-vfs-2.0/modules/libhttp.so
-lib/gnome-vfs-2.0/modules/libnetwork.a
 lib/gnome-vfs-2.0/modules/libnetwork.la
-lib/gnome-vfs-2.0/modules/libnetwork.so
-lib/gnome-vfs-2.0/modules/libnntp.a
 lib/gnome-vfs-2.0/modules/libnntp.la
-lib/gnome-vfs-2.0/modules/libnntp.so
-lib/gnome-vfs-2.0/modules/libsftp.a
 lib/gnome-vfs-2.0/modules/libsftp.la
-lib/gnome-vfs-2.0/modules/libsftp.so
-lib/gnome-vfs-2.0/modules/libtar.a
 lib/gnome-vfs-2.0/modules/libtar.la
-lib/gnome-vfs-2.0/modules/libtar.so
-lib/gnome-vfs-2.0/modules/libvfolder-desktop.a
 lib/gnome-vfs-2.0/modules/libvfolder-desktop.la
-lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
-lib/gnome-vfs-2.0/modules/libvfs-pipe.a
 lib/gnome-vfs-2.0/modules/libvfs-pipe.la
-lib/gnome-vfs-2.0/modules/libvfs-pipe.so
-lib/gnome-vfs-2.0/modules/libvfs-test.a
 lib/gnome-vfs-2.0/modules/libvfs-test.la
-lib/gnome-vfs-2.0/modules/libvfs-test.so
-lib/gnome-vfs-2.0/modules/libvfs-translate.a
 lib/gnome-vfs-2.0/modules/libvfs-translate.la
-lib/gnome-vfs-2.0/modules/libvfs-translate.so
-lib/libgnomevfs-2.a
 lib/libgnomevfs-2.la
-lib/libgnomevfs-2.so
-lib/libgnomevfs-2.so.800
-lib/libgnomevfs-2.so.800.0
 lib/pkgconfig/gnome-vfs-2.0.pc
 lib/pkgconfig/gnome-vfs-module-2.0.pc
 libexec/gnome-vfs-daemon
diff --git a/sysutils/gnome-vfsmm26/PLIST b/sysutils/gnome-vfsmm26/PLIST
index a7438b6d294..200b2401da1 100644
--- a/sysutils/gnome-vfsmm26/PLIST
+++ b/sysutils/gnome-vfsmm26/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/04 13:54:29 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:53 jlam Exp $
 include/gnome-vfsmm-2.6/libgnomevfsmm.h
 include/gnome-vfsmm-2.6/libgnomevfsmm/application-registry.h
 include/gnome-vfsmm-2.6/libgnomevfsmm/async-handle.h
@@ -38,11 +38,7 @@ include/gnome-vfsmm-2.6/libgnomevfsmm/wrap_init.h
 lib/gnome-vfsmm-2.6/include/libgnomevfsmmconfig.h
 lib/gnome-vfsmm-2.6/proc/m4/convert.m4
 lib/gnome-vfsmm-2.6/proc/m4/convert_gnome_vfsmm.m4
-lib/libgnomevfsmm-2.6.a
 lib/libgnomevfsmm-2.6.la
-lib/libgnomevfsmm-2.6.so
-lib/libgnomevfsmm-2.6.so.1
-lib/libgnomevfsmm-2.6.so.1.1
 lib/pkgconfig/gnome-vfsmm-2.6.pc
 @dirrm lib/gnome-vfsmm-2.6/proc/m4
 @dirrm lib/gnome-vfsmm-2.6/proc
diff --git a/sysutils/gst-plugins-gnomevfs/PLIST b/sysutils/gst-plugins-gnomevfs/PLIST
index 6016e755f46..625f3e84af6 100644
--- a/sysutils/gst-plugins-gnomevfs/PLIST
+++ b/sysutils/gst-plugins-gnomevfs/PLIST
@@ -1,5 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2004/04/15 21:24:29 jmmv Exp $
-lib/gstreamer-0.8/libgstgnomevfs.a
+@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:53 jlam Exp $
 lib/gstreamer-0.8/libgstgnomevfs.la
-lib/gstreamer-0.8/libgstgnomevfs.so
 @comment in gstreamer: @dirrm lib/gstreamer-0.8
diff --git a/sysutils/krusader/PLIST b/sysutils/krusader/PLIST
index 8c28d0a9a71..cf56817db7f 100644
--- a/sysutils/krusader/PLIST
+++ b/sysutils/krusader/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/03 13:16:45 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:53 jlam Exp $
 bin/krusader
 lib/kde3/kio_krarc.la
-lib/kde3/kio_krarc.so
 man/man1/krusader.1
 share/doc/kde/HTML/en/krusader/bookmanadd.png
 share/doc/kde/HTML/en/krusader/bookmanedit.png
diff --git a/sysutils/libgtop/PLIST b/sysutils/libgtop/PLIST
index 215c4cd9597..de7c7e9d020 100644
--- a/sysutils/libgtop/PLIST
+++ b/sysutils/libgtop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/02 12:10:12 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:53 jlam Exp $
 bin/libgtop-config
 bin/libgtop_daemon
 bin/libgtop_server
@@ -47,37 +47,13 @@ include/libgtop-1.0/glibtop_machine.h
 include/libgtop-1.0/glibtop_server.h
 include/libgtop-1.0/glibtop_suid.h
 lib/libgtop-features.def
-lib/libgtop.a
 lib/libgtop.la
-lib/libgtop.so
-lib/libgtop.so.1
-lib/libgtop.so.1.12
 lib/libgtopConf.sh
-lib/libgtop_common.a
 lib/libgtop_common.la
-lib/libgtop_common.so
-lib/libgtop_common.so.1
-lib/libgtop_common.so.1.12
-lib/libgtop_names.a
 lib/libgtop_names.la
-lib/libgtop_names.so
-lib/libgtop_names.so.1
-lib/libgtop_names.so.1.12
-lib/libgtop_suid_common.a
 lib/libgtop_suid_common.la
-lib/libgtop_suid_common.so
-lib/libgtop_suid_common.so.1
-lib/libgtop_suid_common.so.1.12
-lib/libgtop_sysdeps.a
 lib/libgtop_sysdeps.la
-lib/libgtop_sysdeps.so
-lib/libgtop_sysdeps.so.1
-lib/libgtop_sysdeps.so.1.12
-lib/libgtop_sysdeps_suid.a
 lib/libgtop_sysdeps_suid.la
-lib/libgtop_sysdeps_suid.so
-lib/libgtop_sysdeps_suid.so.1
-lib/libgtop_sysdeps_suid.so.1.12
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgtop.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgtop.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgtop.mo
diff --git a/sysutils/libgtop2/PLIST b/sysutils/libgtop2/PLIST
index 1ba8b328791..68142426149 100644
--- a/sysutils/libgtop2/PLIST
+++ b/sysutils/libgtop2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/21 16:49:46 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:53 jlam Exp $
 bin/libgtop_daemon2
 ${LIBGTOP_SERVER}bin/libgtop_server2
 include/libgtop-2.0/glibtop.h
@@ -44,11 +44,7 @@ include/libgtop-2.0/glibtop/write.h
 include/libgtop-2.0/glibtop_machine.h
 include/libgtop-2.0/glibtop_server.h
 ${LIBGTOP_SERVER}include/libgtop-2.0/glibtop_suid.h
-lib/libgtop-2.0.a
 lib/libgtop-2.0.la
-lib/libgtop-2.0.so
-lib/libgtop-2.0.so.4
-lib/libgtop-2.0.so.4.0
 lib/pkgconfig/libgtop-2.0.pc
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgtop-2.0.mo
diff --git a/sysutils/libol/PLIST b/sysutils/libol/PLIST
index d54ebbdce5a..e2295f73d23 100644
--- a/sysutils/libol/PLIST
+++ b/sysutils/libol/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/29 00:54:16 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:54 jlam Exp $
 bin/libol-config
 bin/make_class
 include/libol/abstract_io.h
@@ -30,9 +30,5 @@ include/libol/resource.h.x
 include/libol/stream_buffer.h
 include/libol/werror.h
 include/libol/xalloc.h
-lib/libol.a
 lib/libol.la
-lib/libol.so
-lib/libol.so.0
-lib/libol.so.0.0
 @dirrm include/libol
diff --git a/sysutils/medusa/PLIST b/sysutils/medusa/PLIST
index dc0a2df91bd..b0e5d42c753 100644
--- a/sysutils/medusa/PLIST
+++ b/sysutils/medusa/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:27 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:54 jlam Exp $
 bin/medusa-config
 bin/medusa-idled
 bin/medusa-indexd
@@ -30,19 +30,9 @@ include/libmedusa/medusa-system-state.h
 include/libmedusa/medusa-unindexed-search.h
 include/libmedusa/medusa-unsearched-locations.h
 include/libmedusa/medusa-utils.h
-lib/libmedusa-index.a
 lib/libmedusa-index.la
-lib/libmedusa-index.so
-lib/libmedusa-index.so.0
-lib/libmedusa-index.so.0.0
-lib/libmedusa.a
 lib/libmedusa.la
-lib/libmedusa.so
-lib/libmedusa.so.0
-lib/libmedusa.so.0.0
-lib/vfs/modules/libvfs-search.a
 lib/vfs/modules/libvfs-search.la
-lib/vfs/modules/libvfs-search.so
 man/man1/medusa-config.1
 man/man1/medusa-idled.1
 man/man1/msearch.1
diff --git a/sysutils/nautilus-cd-burner/PLIST b/sysutils/nautilus-cd-burner/PLIST
index 363abf731ae..b4959ae8b81 100644
--- a/sysutils/nautilus-cd-burner/PLIST
+++ b/sysutils/nautilus-cd-burner/PLIST
@@ -1,21 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/21 17:15:35 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:54 jlam Exp $
 bin/nautilus-cd-burner
 include/libnautilus-burn/bacon-cd-selection.h
 include/libnautilus-burn/cd-drive.h
 include/libnautilus-burn/cd-recorder.h
-lib/gnome-vfs-2.0/modules/libmapping.a
 lib/gnome-vfs-2.0/modules/libmapping.la
-lib/gnome-vfs-2.0/modules/libmapping.so
-lib/libnautilus-burn.a
 lib/libnautilus-burn.la
-lib/libnautilus-burn.so
-lib/libnautilus-burn.so.0
-lib/libnautilus-burn.so.0.0
-lib/nautilus/extensions-1.0/libnautilus-burn-extension.a
 lib/nautilus/extensions-1.0/libnautilus-burn-extension.la
-lib/nautilus/extensions-1.0/libnautilus-burn-extension.so
-lib/nautilus/extensions-1.0/libnautilus-burn-extension.so.0
-lib/nautilus/extensions-1.0/libnautilus-burn-extension.so.0.0
 lib/pkgconfig/libnautilus-burn.pc
 libexec/mapping-daemon
 share/examples/nautilus-cd-burner/gnome-vfs-2.0/modules/mapping-modules.conf
diff --git a/sysutils/nautilus/PLIST b/sysutils/nautilus/PLIST
index bab1af0c541..8e271164ba8 100644
--- a/sysutils/nautilus/PLIST
+++ b/sysutils/nautilus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/21 16:54:57 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/09/22 08:09:54 jlam Exp $
 bin/nautilus
 bin/nautilus-file-management-properties
 include/libnautilus/libnautilus.h
@@ -21,18 +21,10 @@ include/nautilus/libnautilus-extension/nautilus-menu-item.h
 include/nautilus/libnautilus-extension/nautilus-menu-provider.h
 include/nautilus/libnautilus-extension/nautilus-property-page-provider.h
 include/nautilus/libnautilus-extension/nautilus-property-page.h
-lib/bonobo/libnautilus-emblem-view.a
 lib/bonobo/libnautilus-emblem-view.la
-lib/bonobo/libnautilus-emblem-view.so
-lib/bonobo/libnautilus-history-view.a
 lib/bonobo/libnautilus-history-view.la
-lib/bonobo/libnautilus-history-view.so
-lib/bonobo/libnautilus-image-properties-view.a
 lib/bonobo/libnautilus-image-properties-view.la
-lib/bonobo/libnautilus-image-properties-view.so
-lib/bonobo/libnautilus-notes-view.a
 lib/bonobo/libnautilus-notes-view.la
-lib/bonobo/libnautilus-notes-view.so
 lib/bonobo/servers/Nautilus_ComponentAdapterFactory_std.server
 lib/bonobo/servers/Nautilus_Control_throbber.server
 lib/bonobo/servers/Nautilus_View_emblem.server
@@ -41,26 +33,10 @@ lib/bonobo/servers/Nautilus_View_image_properties.server
 lib/bonobo/servers/Nautilus_View_notes.server
 lib/bonobo/servers/Nautilus_View_text.server
 lib/bonobo/servers/Nautilus_shell.server
-lib/libnautilus-adapter.a
 lib/libnautilus-adapter.la
-lib/libnautilus-adapter.so
-lib/libnautilus-adapter.so.2
-lib/libnautilus-adapter.so.2.0
-lib/libnautilus-extension.a
 lib/libnautilus-extension.la
-lib/libnautilus-extension.so
-lib/libnautilus-extension.so.1
-lib/libnautilus-extension.so.1.0
-lib/libnautilus-private.a
 lib/libnautilus-private.la
-lib/libnautilus-private.so
-lib/libnautilus-private.so.2
-lib/libnautilus-private.so.2.0
-lib/libnautilus.a
 lib/libnautilus.la
-lib/libnautilus.so
-lib/libnautilus.so.2
-lib/libnautilus.so.2.0
 lib/pkgconfig/libnautilus-extension.pc
 lib/pkgconfig/libnautilus.pc
 libexec/nautilus-adapter
diff --git a/sysutils/storage-manager/PLIST b/sysutils/storage-manager/PLIST
index 4079a9d29fa..1663cd3f744 100644
--- a/sysutils/storage-manager/PLIST
+++ b/sysutils/storage-manager/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:49 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:54 jlam Exp $
 etc/rc.d/dptelog
 etc/rc.d/dpteng
 lib/dpt/dptcom
@@ -13,13 +13,7 @@ lib/dpt/dptmgr.rsc
 lib/dpt/dptscom
 lib/dpt/dptsig
 lib/dpt/libMrm.la
-lib/dpt/libMrm.so
-lib/dpt/libMrm.so.1
-lib/dpt/libMrm.so.1.0.2
 lib/dpt/libXm.la
-lib/dpt/libXm.so
-lib/dpt/libXm.so.1
-lib/dpt/libXm.so.1.0.2
 lib/dpt/raidutil
 lib/dpt/read.me
 man/man8/raidutil.8
diff --git a/sysutils/vcdimager-devel/PLIST b/sysutils/vcdimager-devel/PLIST
index ba0c3f8dd39..0b3f3177558 100644
--- a/sysutils/vcdimager-devel/PLIST
+++ b/sysutils/vcdimager-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/04/09 10:34:52 recht Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:54 jlam Exp $
 bin/cdxa2mpeg
 bin/vcd-info
 bin/vcdimager
@@ -14,11 +14,7 @@ include/libvcd/logging.h
 include/libvcd/sector.h
 include/libvcd/types.h
 include/libvcd/version.h
-lib/libvcdinfo.a
 lib/libvcdinfo.la
-lib/libvcdinfo.so
-lib/libvcdinfo.so.0
-lib/libvcdinfo.so.0.1
 lib/pkgconfig/libvcdinfo.pc
 man/man1/cdxa2mpeg.1
 man/man1/vcd-info.1
diff --git a/sysutils/xfce4-cpugraph-plugin/PLIST b/sysutils/xfce4-cpugraph-plugin/PLIST
index df995657b8d..aff17907e9f 100644
--- a/sysutils/xfce4-cpugraph-plugin/PLIST
+++ b/sysutils/xfce4-cpugraph-plugin/PLIST
@@ -1,4 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/21 06:06:11 martti Exp $
-lib/xfce4/panel-plugins/libcpugraph.a
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:54 jlam Exp $
 lib/xfce4/panel-plugins/libcpugraph.la
-lib/xfce4/panel-plugins/libcpugraph.so
diff --git a/sysutils/xfce4-diskperf-plugin/PLIST b/sysutils/xfce4-diskperf-plugin/PLIST
index 98748c5f048..6f95563bc63 100644
--- a/sysutils/xfce4-diskperf-plugin/PLIST
+++ b/sysutils/xfce4-diskperf-plugin/PLIST
@@ -1,4 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/03 05:07:32 martti Exp $
-lib/xfce4/panel-plugins/libdiskperf.a
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:54 jlam Exp $
 lib/xfce4/panel-plugins/libdiskperf.la
-lib/xfce4/panel-plugins/libdiskperf.so
diff --git a/sysutils/xfce4-fm/PLIST b/sysutils/xfce4-fm/PLIST
index b309dd67a70..c096aba4988 100644
--- a/sysutils/xfce4-fm/PLIST
+++ b/sysutils/xfce4-fm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/07/12 08:25:11 martti Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:09:54 jlam Exp $
 bin/fgr
 bin/scramble
 bin/xfapps
@@ -13,55 +13,17 @@ bin/xfglob4
 bin/xfsamba4
 bin/xftrash4
 bin/xftree4
-lib/libxffm.a
 lib/libxffm.la
-lib/libxffm.so
-lib/libxffm.so.0
-lib/libxffm.so.0.0
-lib/libxffm_actions.a
 lib/libxffm_actions.la
-lib/libxffm_actions.so
-lib/libxffm_actions.so.0
-lib/libxffm_actions.so.0.0
-lib/libxffm_apps.a
 lib/libxffm_apps.la
-lib/libxffm_apps.so
-lib/libxffm_apps.so.0
-lib/libxffm_apps.so.0.0
-lib/libxffm_book.a
 lib/libxffm_book.la
-lib/libxffm_book.so
-lib/libxffm_book.so.0
-lib/libxffm_book.so.0.0
-lib/libxffm_calls.a
 lib/libxffm_calls.la
-lib/libxffm_calls.so
-lib/libxffm_calls.so.0
-lib/libxffm_calls.so.0.0
-lib/libxffm_fgr.a
 lib/libxffm_fgr.la
-lib/libxffm_fgr.so
-lib/libxffm_fgr.so.0
-lib/libxffm_fgr.so.0.0
-lib/libxffm_fstab.a
 lib/libxffm_fstab.la
-lib/libxffm_fstab.so
-lib/libxffm_fstab.so.0
-lib/libxffm_fstab.so.0.0
-lib/libxffm_tubo.a
 lib/libxffm_tubo.la
-lib/libxffm_tubo.so
-lib/libxffm_tubo.so.0
-lib/libxffm_tubo.so.0.0
-lib/libxffmsmb.a
 lib/libxffmsmb.la
-lib/libxffmsmb.so
-lib/libxffmsmb.so.0
-lib/libxffmsmb.so.0.0
 lib/pkgconfig/xffm-1.0.pc
-lib/xfce4/mcs-plugins/libxffmsettings.a
 lib/xfce4/mcs-plugins/libxffmsettings.la
-lib/xfce4/mcs-plugins/libxffmsettings.so
 man/man1/fgr.1
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xffm.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xffm.mo
diff --git a/sysutils/xfce4-minicmd-plugin/PLIST b/sysutils/xfce4-minicmd-plugin/PLIST
index 8b4108c611d..261770df079 100644
--- a/sysutils/xfce4-minicmd-plugin/PLIST
+++ b/sysutils/xfce4-minicmd-plugin/PLIST
@@ -1,4 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/26 10:33:36 martti Exp $
-lib/xfce4/panel-plugins/libminicmd.a
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:54 jlam Exp $
 lib/xfce4/panel-plugins/libminicmd.la
-lib/xfce4/panel-plugins/libminicmd.so
diff --git a/sysutils/xfce4-netload-plugin/PLIST b/sysutils/xfce4-netload-plugin/PLIST
index 7f0d1af9572..54b396f91b6 100644
--- a/sysutils/xfce4-netload-plugin/PLIST
+++ b/sysutils/xfce4-netload-plugin/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2003/12/03 05:25:14 martti Exp $
-lib/xfce4/panel-plugins/libnetload.a
+@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:54 jlam Exp $
 lib/xfce4/panel-plugins/libnetload.la
-lib/xfce4/panel-plugins/libnetload.so
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xfce4-netload.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfce4-netload.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xfce4-netload.mo
diff --git a/sysutils/xfce4-showdesktop-plugin/PLIST b/sysutils/xfce4-showdesktop-plugin/PLIST
index c7733d2c810..6423f83db5e 100644
--- a/sysutils/xfce4-showdesktop-plugin/PLIST
+++ b/sysutils/xfce4-showdesktop-plugin/PLIST
@@ -1,4 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/26 10:34:53 martti Exp $
-lib/xfce4/panel-plugins/libshowdesktop.a
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:54 jlam Exp $
 lib/xfce4/panel-plugins/libshowdesktop.la
-lib/xfce4/panel-plugins/libshowdesktop.so
diff --git a/sysutils/xfce4-systemload-plugin/PLIST b/sysutils/xfce4-systemload-plugin/PLIST
index c5a208157d2..1e2fdd3e2d2 100644
--- a/sysutils/xfce4-systemload-plugin/PLIST
+++ b/sysutils/xfce4-systemload-plugin/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2003/12/03 05:26:44 martti Exp $
-lib/xfce4/panel-plugins/libsystemload.a
+@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:54 jlam Exp $
 lib/xfce4/panel-plugins/libsystemload.la
-lib/xfce4/panel-plugins/libsystemload.so
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xfce4-systemload.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfce4-systemload.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xfce4-systemload.mo
diff --git a/sysutils/xfce4-systray/PLIST b/sysutils/xfce4-systray/PLIST
index e15c2d8a4c6..e0e4c367864 100644
--- a/sysutils/xfce4-systray/PLIST
+++ b/sysutils/xfce4-systray/PLIST
@@ -1,4 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/26 10:36:06 martti Exp $
-lib/xfce4/panel-plugins/libsystray.a
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:54 jlam Exp $
 lib/xfce4/panel-plugins/libsystray.la
-lib/xfce4/panel-plugins/libsystray.so
diff --git a/sysutils/xfce4-xkb-plugin/PLIST b/sysutils/xfce4-xkb-plugin/PLIST
index 202538acd03..ea091aef77f 100644
--- a/sysutils/xfce4-xkb-plugin/PLIST
+++ b/sysutils/xfce4-xkb-plugin/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/21 06:08:34 martti Exp $
-lib/xfce4/panel-plugins/libxkb.a
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:54 jlam Exp $
 lib/xfce4/panel-plugins/libxkb.la
-lib/xfce4/panel-plugins/libxkb.so
 share/xfce4/xkb/flags/ae.png
 share/xfce4/xkb/flags/am.png
 share/xfce4/xkb/flags/ar.png