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".

19 files changed, 19 insertions, 222 deletions

diff --git a/www/cgic/PLIST b/www/cgic/PLIST
index c40789c4a29..de5abbbd441 100644
--- a/www/cgic/PLIST
+++ b/www/cgic/PLIST
@@ -1,10 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/20 21:44:29 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:56 jlam Exp $
 include/cgic.h
-lib/libcgic.a
 lib/libcgic.la
-lib/libcgic.so
-lib/libcgic.so.0
-lib/libcgic.so.0.0
 libexec/cgi-bin/capture
 libexec/cgi-bin/cgictest
 share/doc/html/cgiclib/cgic.html
diff --git a/www/cgicc/PLIST b/www/cgicc/PLIST
index a6f0c637c18..92388c41627 100644
--- a/www/cgicc/PLIST
+++ b/www/cgicc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/03/11 15:30:39 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:56 jlam Exp $
 bin/cgicc-config
 include/cgicc/CgiDefs.h
 include/cgicc/CgiEnvironment.h
@@ -12,9 +12,5 @@ include/cgicc/HTMLElements.h
 include/cgicc/HTMLGeneric.h
 include/cgicc/HTTPHeaders.h
 include/cgicc/MStreamable.h
-lib/libcgicc.a
 lib/libcgicc.la
-lib/libcgicc.so
-lib/libcgicc.so.2
-lib/libcgicc.so.2.3
 @dirrm include/cgicc
diff --git a/www/cgilib/PLIST b/www/cgilib/PLIST
index 61e0095fa78..7f28e77750b 100644
--- a/www/cgilib/PLIST
+++ b/www/cgilib/PLIST
@@ -1,10 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/10 13:59:33 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:56 jlam Exp $
 include/cgi.h
-lib/libcgi.a
 lib/libcgi.la
-lib/libcgi.so
-lib/libcgi.so.0
-lib/libcgi.so.0.0
 libexec/cgi-bin/cgitest
 libexec/cgi-bin/jumpto
 share/doc/html/cgilib/cgi.5.html
diff --git a/www/curl/PLIST b/www/curl/PLIST
index 0ee0c2d2608..c22d4c679ea 100644
--- a/www/curl/PLIST
+++ b/www/curl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2004/08/21 11:31:00 recht Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/09/22 08:09:56 jlam Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
@@ -8,11 +8,7 @@ include/curl/mprintf.h
 include/curl/multi.h
 include/curl/stdcheaders.h
 include/curl/types.h
-lib/libcurl.a
 lib/libcurl.la
-lib/libcurl.so
-lib/libcurl.so.3
-lib/libcurl.so.3.0
 man/man1/curl-config.1
 man/man1/curl.1
 man/man3/curl_easy_cleanup.3
diff --git a/www/epiphany-extensions/PLIST b/www/epiphany-extensions/PLIST
index 46aca267d9b..4c184fa7c7c 100644
--- a/www/epiphany-extensions/PLIST
+++ b/www/epiphany-extensions/PLIST
@@ -1,39 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/21 17:21:53 jmmv Exp $
-lib/epiphany-1.4/extensions/libcertificatesextension.a
+@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:56 jlam Exp $
 lib/epiphany-1.4/extensions/libcertificatesextension.la
-lib/epiphany-1.4/extensions/libcertificatesextension.so
-lib/epiphany-1.4/extensions/libcertificatesextension.so.0
-lib/epiphany-1.4/extensions/libcertificatesextension.so.0.0
-lib/epiphany-1.4/extensions/liberrorviewerextension.a
 lib/epiphany-1.4/extensions/liberrorviewerextension.la
-lib/epiphany-1.4/extensions/liberrorviewerextension.so
-lib/epiphany-1.4/extensions/liberrorviewerextension.so.0
-lib/epiphany-1.4/extensions/liberrorviewerextension.so.0.0
-lib/epiphany-1.4/extensions/libgesturesextension.a
 lib/epiphany-1.4/extensions/libgesturesextension.la
-lib/epiphany-1.4/extensions/libgesturesextension.so
-lib/epiphany-1.4/extensions/libgesturesextension.so.0
-lib/epiphany-1.4/extensions/libgesturesextension.so.0.0
-lib/epiphany-1.4/extensions/libpageinfoextension.a
 lib/epiphany-1.4/extensions/libpageinfoextension.la
-lib/epiphany-1.4/extensions/libpageinfoextension.so
-lib/epiphany-1.4/extensions/libpageinfoextension.so.0
-lib/epiphany-1.4/extensions/libpageinfoextension.so.0.0
-lib/epiphany-1.4/extensions/libselectstylesheetextension.a
 lib/epiphany-1.4/extensions/libselectstylesheetextension.la
-lib/epiphany-1.4/extensions/libselectstylesheetextension.so
-lib/epiphany-1.4/extensions/libselectstylesheetextension.so.0
-lib/epiphany-1.4/extensions/libselectstylesheetextension.so.0.0
-lib/epiphany-1.4/extensions/libsmartbookmarksextension.a
 lib/epiphany-1.4/extensions/libsmartbookmarksextension.la
-lib/epiphany-1.4/extensions/libsmartbookmarksextension.so
-lib/epiphany-1.4/extensions/libsmartbookmarksextension.so.0
-lib/epiphany-1.4/extensions/libsmartbookmarksextension.so.0.0
-lib/epiphany-1.4/extensions/libtabsmenuextension.a
 lib/epiphany-1.4/extensions/libtabsmenuextension.la
-lib/epiphany-1.4/extensions/libtabsmenuextension.so
-lib/epiphany-1.4/extensions/libtabsmenuextension.so.0
-lib/epiphany-1.4/extensions/libtabsmenuextension.so.0.0
 share/epiphany-extensions/ephy-gestures.xml
 share/epiphany-extensions/glade/error-viewer.glade
 share/epiphany-extensions/glade/page-info.glade
diff --git a/www/fcgi/PLIST b/www/fcgi/PLIST
index 9008b24ccf5..60d6b4e508e 100644
--- a/www/fcgi/PLIST
+++ b/www/fcgi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/24 19:32:08 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:56 jlam Exp $
 bin/cgi-fcgi
 include/fastcgi.h
 include/fcgi_stdio.h
@@ -7,13 +7,5 @@ include/fcgios.h
 include/fcgiapp.h
 include/fcgimisc.h
 include/fcgi_config.h
-lib/libfcgi.a
 lib/libfcgi.la
-lib/libfcgi.so
-lib/libfcgi.so.0
-lib/libfcgi.so.0.0
-lib/libfcgi++.a
 lib/libfcgi++.la
-lib/libfcgi++.so
-lib/libfcgi++.so.0
-lib/libfcgi++.so.0.0
diff --git a/www/galeon/PLIST b/www/galeon/PLIST
index 4126dee22ad..a49acb1d015 100644
--- a/www/galeon/PLIST
+++ b/www/galeon/PLIST
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.21 2004/07/20 17:37:23 abs Exp $
+@comment $NetBSD: PLIST,v 1.22 2004/09/22 08:09:56 jlam Exp $
 bin/galeon
 bin/galeon-bin
 bin/galeon-config-tool
 lib/bonobo/servers/GNOME_Galeon_Automation.server
 lib/bonobo/servers/GNOME_Galeon_NautilusView.server
-lib/galeon/components/libgaleon-xpcom.a
 lib/galeon/components/libgaleon-xpcom.la
-lib/galeon/components/libgaleon-xpcom.so
 man/man1/galeon.1
 share/applications/galeon.desktop
 share/examples/galeon/sound/events/galeon.soundlist
diff --git a/www/galeon12/PLIST b/www/galeon12/PLIST
index 59c3f0aba71..331504bbd5c 100644
--- a/www/galeon12/PLIST
+++ b/www/galeon12/PLIST
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/20 17:34:03 abs Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:56 jlam Exp $
 bin/galeon
 bin/galeon-bin
 bin/galeon-config-tool
 etc/gconf/schemas/galeon.schemas
 etc/sound/events/galeon.soundlist
-lib/galeon/components/libgaleon-xpcom.a
 lib/galeon/components/libgaleon-xpcom.la
-lib/galeon/components/libgaleon-xpcom.so
 man/man1/galeon.1
 share/galeon/CloseTab.png
 share/galeon/FAQ.html
diff --git a/www/glibwww/PLIST b/www/glibwww/PLIST
index e6fe39b691a..748176c49cd 100644
--- a/www/glibwww/PLIST
+++ b/www/glibwww/PLIST
@@ -1,9 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:44 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:56 jlam Exp $
 include/glibwww/glibwww.h
 lib/glibwwwConf.sh
-lib/libglibwww.a
 lib/libglibwww.la
-lib/libglibwww.so
-lib/libglibwww.so.1
-lib/libglibwww.so.1.0
 @dirrm include/glibwww
diff --git a/www/gtkhtml/PLIST b/www/gtkhtml/PLIST
index e143af4286e..0072eba92f3 100644
--- a/www/gtkhtml/PLIST
+++ b/www/gtkhtml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/09/13 21:01:29 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:57 jlam Exp $
 bin/ebrowser
 bin/gnome-gtkhtml-editor-1.1
 bin/gtkhtml-properties-capplet
@@ -89,14 +89,8 @@ include/gtkhtml-1.1/gtkhtml/htmltypes.h
 include/gtkhtml-1.1/gtkhtml/htmlundo-action.h
 include/gtkhtml-1.1/gtkhtml/htmlundo.h
 include/gtkhtml-1.1/gtkhtml/htmlvspace.h
-lib/bonobo/plugin/libstorage_http.a
 lib/bonobo/plugin/libstorage_http.la
-lib/bonobo/plugin/libstorage_http.so
-lib/libgtkhtml-1.1.a
 lib/libgtkhtml-1.1.la
-lib/libgtkhtml-1.1.so
-lib/libgtkhtml-1.1.so.3
-lib/libgtkhtml-1.1.so.3.5
 lib/pkgconfig/gtkhtml-1.1.pc
 share/control-center/Documents/gtkhtml-properties.desktop
 share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
diff --git a/www/gtkhtml3/PLIST b/www/gtkhtml3/PLIST
index cf0e3999c53..c3cebce5e4a 100644
--- a/www/gtkhtml3/PLIST
+++ b/www/gtkhtml3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/21 16:52:41 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:57 jlam Exp $
 include/libgtkhtml-3.1/gtkhtml/gtkhtml-compat.h
 include/libgtkhtml-3.1/gtkhtml/gtkhtml-embedded.h
 include/libgtkhtml-3.1/gtkhtml/gtkhtml-enums.h
@@ -84,14 +84,8 @@ include/libgtkhtml-3.1/gtkhtml/htmltypes.h
 include/libgtkhtml-3.1/gtkhtml/htmlundo-action.h
 include/libgtkhtml-3.1/gtkhtml/htmlundo.h
 lib/bonobo/servers/GNOME_GtkHTML_Editor-3.1.server
-lib/gtkhtml/libgnome-gtkhtml-editor-3.1.a
 lib/gtkhtml/libgnome-gtkhtml-editor-3.1.la
-lib/gtkhtml/libgnome-gtkhtml-editor-3.1.so
-lib/libgtkhtml-3.1.a
 lib/libgtkhtml-3.1.la
-lib/libgtkhtml-3.1.so
-lib/libgtkhtml-3.1.so.11
-lib/libgtkhtml-3.1.so.11.4
 lib/pkgconfig/libgtkhtml-3.1.pc
 share/gtkhtml-3.1/Editor.idl
 share/gtkhtml-3.1/GNOME_GtkHTML_Editor-emacs.xml
diff --git a/www/kdewebdev3/PLIST b/www/kdewebdev3/PLIST
index e3a1d17b9bb..32f1f699d88 100644
--- a/www/kdewebdev3/PLIST
+++ b/www/kdewebdev3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/21 15:24:06 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:57 jlam Exp $
 bin/kimagemapeditor
 bin/klinkstatus
 bin/kmdr-editor
@@ -11,27 +11,13 @@ include/kommanderfactory.h
 include/kommanderplugin.h
 include/kommanderwidget.h
 lib/kde3/libkfilereplacepart.la
-lib/kde3/libkfilereplacepart.so
 lib/kde3/libkimagemapeditor.la
-lib/kde3/libkimagemapeditor.so
 lib/kde3/libklinkstatuspart.la
-lib/kde3/libklinkstatuspart.so
 lib/kde3/libkxsldbgpart.la
-lib/kde3/libkxsldbgpart.so
 lib/kde3/quantadebuggergubed.la
-lib/kde3/quantadebuggergubed.so
 lib/libkommanderplugin.la
-lib/libkommanderplugin.so
-lib/libkommanderplugin.so.0
-lib/libkommanderplugin.so.0.0
 lib/libkommanderwidget.la
-lib/libkommanderwidget.so
-lib/libkommanderwidget.so.0
-lib/libkommanderwidget.so.0.0
 lib/libkommanderwidgets.la
-lib/libkommanderwidgets.so
-lib/libkommanderwidgets.so.0
-lib/libkommanderwidgets.so.0.0
 share/doc/kde/HTML/en/klinkstatus/common
 share/doc/kde/HTML/en/klinkstatus/index.cache.bz2
 share/doc/kde/HTML/en/klinkstatus/index.docbook
diff --git a/www/libghttp/PLIST b/www/libghttp/PLIST
index 92759975836..1a3a3530627 100644
--- a/www/libghttp/PLIST
+++ b/www/libghttp/PLIST
@@ -1,9 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:17:16 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:57 jlam Exp $
 include/ghttp.h
 include/ghttp_constants.h
 lib/ghttpConf.sh
-lib/libghttp.a
 lib/libghttp.la
-lib/libghttp.so
-lib/libghttp.so.1
-lib/libghttp.so.1.0
diff --git a/www/libgtkhtml/PLIST b/www/libgtkhtml/PLIST
index 40c30572e2a..b8b457fa20e 100644
--- a/www/libgtkhtml/PLIST
+++ b/www/libgtkhtml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/02 22:44:49 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:57 jlam Exp $
 include/gtkhtml-2.0/libgtkhtml/css/cssmatcher.h
 include/gtkhtml-2.0/libgtkhtml/css/cssparser.h
 include/gtkhtml-2.0/libgtkhtml/css/cssstylesheet.h
@@ -68,11 +68,7 @@ include/gtkhtml-2.0/libgtkhtml/util/rfc1738.h
 include/gtkhtml-2.0/libgtkhtml/view/htmlevent.h
 include/gtkhtml-2.0/libgtkhtml/view/htmlselection.h
 include/gtkhtml-2.0/libgtkhtml/view/htmlview.h
-lib/libgtkhtml-2.a
 lib/libgtkhtml-2.la
-lib/libgtkhtml-2.so
-lib/libgtkhtml-2.so.0
-lib/libgtkhtml-2.so.0.0
 lib/pkgconfig/libgtkhtml-2.0.pc
 @dirrm include/gtkhtml-2.0/libgtkhtml/view
 @dirrm include/gtkhtml-2.0/libgtkhtml/util
diff --git a/www/libwww/PLIST b/www/libwww/PLIST
index 0e03f1223b3..7e029494b4f 100644
--- a/www/libwww/PLIST
+++ b/www/libwww/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/11/19 20:54:11 reinoud Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:57 jlam Exp $
 bin/libwww-config
 bin/w3c
 bin/webbot
@@ -163,126 +163,30 @@ include/w3c-libwww/WWWXML.h
 include/w3c-libwww/WWWZip.h
 include/w3c-libwww/wwwsys.h
 include/w3c-libwww/xmlparse.h
-${MD5LIB}lib/libmd5.a
 ${MD5LIB}lib/libmd5.la
-${MD5LIB}lib/libmd5.so
-${MD5LIB}lib/libmd5.so.1
-${MD5LIB}lib/libmd5.so.1.0
-lib/libpics.a
 lib/libpics.la
-lib/libpics.so
-lib/libpics.so.0
-lib/libpics.so.0.0
-lib/libwwwapp.a
 lib/libwwwapp.la
-lib/libwwwapp.so
-lib/libwwwapp.so.1
-lib/libwwwapp.so.1.0
-lib/libwwwcache.a
 lib/libwwwcache.la
-lib/libwwwcache.so
-lib/libwwwcache.so.1
-lib/libwwwcache.so.1.0
-lib/libwwwcore.a
 lib/libwwwcore.la
-lib/libwwwcore.so
-lib/libwwwcore.so.1
-lib/libwwwcore.so.1.0
-lib/libwwwdir.a
 lib/libwwwdir.la
-lib/libwwwdir.so
-lib/libwwwdir.so.1
-lib/libwwwdir.so.1.0
-lib/libwwwfile.a
 lib/libwwwfile.la
-lib/libwwwfile.so
-lib/libwwwfile.so.1
-lib/libwwwfile.so.1.0
-lib/libwwwftp.a
 lib/libwwwftp.la
-lib/libwwwftp.so
-lib/libwwwftp.so.1
-lib/libwwwftp.so.1.0
-lib/libwwwgopher.a
 lib/libwwwgopher.la
-lib/libwwwgopher.so
-lib/libwwwgopher.so.1
-lib/libwwwgopher.so.1.0
-lib/libwwwhttp.a
 lib/libwwwhttp.la
-lib/libwwwhttp.so
-lib/libwwwhttp.so.1
-lib/libwwwhttp.so.1.0
-lib/libwwwhtml.a
 lib/libwwwhtml.la
-lib/libwwwhtml.so
-lib/libwwwhtml.so.1
-lib/libwwwhtml.so.1.0
-lib/libwwwinit.a
 lib/libwwwinit.la
-lib/libwwwinit.so
-lib/libwwwinit.so.1
-lib/libwwwinit.so.1.0
-lib/libwwwmime.a
 lib/libwwwmime.la
-lib/libwwwmime.so
-lib/libwwwmime.so.1
-lib/libwwwmime.so.1.0
-lib/libwwwmux.a
 lib/libwwwmux.la
-lib/libwwwmux.so
-lib/libwwwmux.so.1
-lib/libwwwmux.so.1.0
-lib/libwwwnews.a
 lib/libwwwnews.la
-lib/libwwwnews.so
-lib/libwwwnews.so.1
-lib/libwwwnews.so.1.0
-lib/libwwwssl.a
 lib/libwwwssl.la
-lib/libwwwssl.so
-lib/libwwwssl.so.1
-lib/libwwwssl.so.1.0
-lib/libwwwstream.a
 lib/libwwwstream.la
-lib/libwwwstream.so
-lib/libwwwstream.so.1
-lib/libwwwstream.so.1.0
-lib/libwwwtelnet.a
 lib/libwwwtelnet.la
-lib/libwwwtelnet.so
-lib/libwwwtelnet.so.1
-lib/libwwwtelnet.so.1.0
-lib/libwwwtrans.a
 lib/libwwwtrans.la
-lib/libwwwtrans.so
-lib/libwwwtrans.so.1
-lib/libwwwtrans.so.1.0
-lib/libwwwutils.a
 lib/libwwwutils.la
-lib/libwwwutils.so
-lib/libwwwutils.so.1
-lib/libwwwutils.so.1.0
-lib/libwwwxml.a
 lib/libwwwxml.la
-lib/libwwwxml.so
-lib/libwwwxml.so.1
-lib/libwwwxml.so.1.0
-lib/libwwwzip.a
 lib/libwwwzip.la
-lib/libwwwzip.so
-lib/libwwwzip.so.1
-lib/libwwwzip.so.1.0
-lib/libxmlparse.a
 lib/libxmlparse.la
-lib/libxmlparse.so
-lib/libxmlparse.so.1
-lib/libxmlparse.so.1.0
-lib/libxmltok.a
 lib/libxmltok.la
-lib/libxmltok.so
-lib/libxmltok.so.1
-lib/libxmltok.so.1.0
 share/w3c-libwww/back.xbm
 share/w3c-libwww/binary.xbm
 share/w3c-libwww/binhex.xbm
diff --git a/www/liferea/PLIST b/www/liferea/PLIST
index c9cbed2af14..505fd3ae4fc 100644
--- a/www/liferea/PLIST
+++ b/www/liferea/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2004/07/01 17:06:27 minskim Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:57 jlam Exp $
 bin/liferea
 bin/liferea-bin
 lib/liferea/liblihtmlg.la
-lib/liferea/liblihtmlg.so
 man/man1/liferea.1
 share/applications/liferea.desktop
 share/liferea/css/liferea.css
diff --git a/www/neon/PLIST b/www/neon/PLIST
index 066eba7e7b5..689084df069 100644
--- a/www/neon/PLIST
+++ b/www/neon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2004/07/14 16:20:30 epg Exp $
+@comment $NetBSD: PLIST,v 1.14 2004/09/22 08:09:57 jlam Exp $
 bin/neon-config
 include/neon/ne_207.h
 include/neon/ne_acl.h
@@ -22,11 +22,7 @@ include/neon/ne_string.h
 include/neon/ne_uri.h
 include/neon/ne_utils.h
 include/neon/ne_xml.h
-lib/libneon.a
 lib/libneon.la
-lib/libneon.so
-lib/libneon.so.24
-lib/libneon.so.24.7
 lib/pkgconfig/neon.pc
 man/man1/neon-config.1
 man/man3/ne_add_request_header.3
diff --git a/www/p5-libapreq2/PLIST b/www/p5-libapreq2/PLIST
index 9d9d503505b..456ea533c1d 100644
--- a/www/p5-libapreq2/PLIST
+++ b/www/p5-libapreq2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/12 18:18:29 kim Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:57 jlam Exp $
 include/apreq2/apreq.h
 include/apreq2/apreq_cookie.h
 include/apreq2/apreq_env.h
@@ -6,9 +6,5 @@ include/apreq2/apreq_params.h
 include/apreq2/apreq_parsers.h
 include/apreq2/apreq_version.h
 lib/httpd/mod_apreq.so
-lib/libapreq2.a
 lib/libapreq2.la
-lib/libapreq2.so
-lib/libapreq2.so.2
-lib/libapreq2.so.2.2
 @dirrm include/apreq2
diff --git a/www/swish-e/PLIST b/www/swish-e/PLIST
index ff5a6d11f32..19acc1d79b6 100644
--- a/www/swish-e/PLIST
+++ b/www/swish-e/PLIST
@@ -1,12 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2004/01/22 15:17:07 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:57 jlam Exp $
 bin/swish-e
 bin/swish-filter-test
 include/swish-e.h
-lib/libswish-e.a
 lib/libswish-e.la
-lib/libswish-e.so
-lib/libswish-e.so.2
-${LIBSWISH_E}lib/libswish-e.so.2.0
 lib/swish-e/DirTree.pl
 lib/swish-e/perl/SWISH/DateRanges.pm
 lib/swish-e/perl/SWISH/DefaultHighlight.pm