Remove @dirrm entries from PLISTs

44 files changed, 44 insertions, 225 deletions

diff --git a/comms/asterisk-sounds-extra/PLIST b/comms/asterisk-sounds-extra/PLIST
index 4baaac351d8..d0ce1657179 100644
--- a/comms/asterisk-sounds-extra/PLIST
+++ b/comms/asterisk-sounds-extra/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/01/25 18:41:14 riz Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:38:38 joerg Exp $
 libdata/asterisk/sounds/1-for-am-2-for-pm.gsm
 libdata/asterisk/sounds/1-yes-2-no.gsm
 libdata/asterisk/sounds/T-changed-to.gsm
@@ -1324,8 +1324,5 @@ libdata/asterisk/sounds/your-msg-is-too-short.gsm
 libdata/asterisk/sounds/your-temp-greeting.gsm
 libdata/asterisk/sounds/your.gsm
 libdata/asterisk/sounds/zip-code.gsm
-@dirrm libdata/asterisk/sounds/wx
-@dirrm libdata/asterisk/sounds/silence
-@dirrm libdata/asterisk/sounds/ha
 @unexec ${RMDIR} %D/libdata/asterisk/sounds/phonetic 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/libdata/asterisk/sounds 2>/dev/null || ${TRUE}
diff --git a/comms/asterisk/PLIST.common_end b/comms/asterisk/PLIST.common_end
index 9f8f700b436..78165948bc5 100644
--- a/comms/asterisk/PLIST.common_end
+++ b/comms/asterisk/PLIST.common_end
@@ -1,18 +1 @@
-@comment $NetBSD: PLIST.common_end,v 1.6 2009/01/22 12:19:49 obache Exp $
-@dirrm share/examples/asterisk
-@dirrm libdata/asterisk/sounds/silence
-@dirrm libdata/asterisk/sounds/phonetic
-@dirrm libdata/asterisk/sounds/letters
-@dirrm libdata/asterisk/sounds/digits
-@dirrm libdata/asterisk/sounds/dictate
-@comment @dirrm libdata/asterisk/sounds
-@dirrm libdata/asterisk/mohmp3
-@dirrm libdata/asterisk/keys
-@dirrm libdata/asterisk/images
-@dirrm libdata/asterisk/firmware/iax
-@dirrm libdata/asterisk/firmware
-@dirrm libdata/asterisk/agi-bin
-@comment @dirrm libdata/asterisk
-@dirrm lib/asterisk/modules
-@dirrm lib/asterisk
-@dirrm include/asterisk
+@comment $NetBSD: PLIST.common_end,v 1.7 2009/06/14 17:38:38 joerg Exp $
diff --git a/comms/asterisk16/PLIST b/comms/asterisk16/PLIST
index c0994f24970..13714581724 100644
--- a/comms/asterisk16/PLIST
+++ b/comms/asterisk16/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/06/12 09:04:56 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:38 joerg Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -1103,29 +1103,5 @@ share/examples/asterisk/users.conf
 share/examples/asterisk/voicemail.conf
 share/examples/asterisk/vpb.conf
 share/examples/rc.d/asterisk
-@dirrm share/examples/asterisk
-@dirrm libexec/agi-bin
-@dirrm libdata/asterisk/static-http/docs
-@dirrm libdata/asterisk/static-http
 @exec ${MKDIR} %D/libdata/asterisk/sounds/fr
-@dirrm libdata/asterisk/sounds/fr
 @exec ${MKDIR} %D/libdata/asterisk/sounds/es
-@dirrm libdata/asterisk/sounds/es
-@dirrm libdata/asterisk/sounds/en/silence
-@dirrm libdata/asterisk/sounds/en/phonetic
-@dirrm libdata/asterisk/sounds/en/letters
-@dirrm libdata/asterisk/sounds/en/followme
-@dirrm libdata/asterisk/sounds/en/digits
-@dirrm libdata/asterisk/sounds/en/dictate
-@dirrm libdata/asterisk/sounds/en
-@dirrm libdata/asterisk/sounds
-@dirrm libdata/asterisk/phoneprov
-@dirrm libdata/asterisk/moh
-@dirrm libdata/asterisk/keys
-@dirrm libdata/asterisk/images
-@dirrm libdata/asterisk/firmware/iax
-@dirrm libdata/asterisk/firmware
-@dirrm libdata/asterisk
-@dirrm lib/asterisk/modules
-@dirrm lib/asterisk
-@dirrm include/asterisk
diff --git a/comms/binkd/PLIST b/comms/binkd/PLIST
index 4328925f38a..c2a1ce5aaa0 100644
--- a/comms/binkd/PLIST
+++ b/comms/binkd/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2004/11/29 00:58:08 tv Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:38:38 joerg Exp $
 man/man8/binkd.8
 sbin/binkd
 sbin/${PKGNAME}
 share/examples/binkd/binkd.conf
-@dirrm share/examples/binkd
diff --git a/comms/conserver/PLIST b/comms/conserver/PLIST
index 2f9b34afa79..b421ae198cf 100644
--- a/comms/conserver/PLIST
+++ b/comms/conserver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/05/02 20:33:58 reed Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:38:38 joerg Exp $
 bin/console
 man/man1/console.1
 man/man5/conserver.cf.5
@@ -8,4 +8,3 @@ sbin/conserver
 share/examples/conserver/conserver.cf.example
 share/examples/conserver/conserver.passwd.example
 share/examples/rc.d/conserver
-@dirrm share/examples/conserver
diff --git a/comms/conserver8/PLIST b/comms/conserver8/PLIST
index 9432c048844..9cace0a878c 100644
--- a/comms/conserver8/PLIST
+++ b/comms/conserver8/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/05/11 21:42:43 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:38:39 joerg Exp $
 bin/console
 lib/conserver/convert
 man/man1/console.1
@@ -13,6 +13,3 @@ share/examples/conserver/conserver.cf
 share/examples/conserver/conserver.passwd
 share/examples/conserver/conserver.rc
 share/examples/rc.d/conserver8
-@dirrm share/examples/conserver
-@dirrm share/doc/conserver
-@dirrm lib/conserver
diff --git a/comms/efax/PLIST b/comms/efax/PLIST
index 1c10a91d018..013be1e5a3f 100644
--- a/comms/efax/PLIST
+++ b/comms/efax/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/12 23:04:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:38:39 joerg Exp $
 bin/efax
 bin/efix
 bin/fax
@@ -6,4 +6,3 @@ man/man1/efax.1
 man/man1/efix.1
 man/man1/fax.1
 share/examples/efax/efax.rc
-@dirrm share/examples/efax
diff --git a/comms/estic/PLIST b/comms/estic/PLIST
index 7ff7a9631d7..b9d5bcbd3ee 100644
--- a/comms/estic/PLIST
+++ b/comms/estic/PLIST
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:44:02 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:39 joerg Exp $
 bin/xestic
 bin/estic.res
 share/doc/estic/estic.doc
 share/examples/estic/alias.dat
 share/examples/estic/cron.dat
 share/examples/estic/estic.ini
-@dirrm share/examples/estic
-@dirrm share/doc/estic
diff --git a/comms/fidogate/PLIST b/comms/fidogate/PLIST
index d2deb369f0d..9d7ea75db73 100644
--- a/comms/fidogate/PLIST
+++ b/comms/fidogate/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/03/20 03:59:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/06/14 17:38:39 joerg Exp $
 info/fidogate.info
 lib/fidogate/areafix.help
 lib/fidogate/bin/areasbbssync
@@ -124,13 +124,3 @@ share/examples/fidogate/point/routing
 share/examples/rc.d/fidogate
 share/fidogate/sendmail/mailer/ffx.m4
 share/fidogate/sendmail/mailer/ftn.m4
-@dirrm share/fidogate/sendmail/mailer
-@dirrm share/fidogate/sendmail
-@dirrm share/fidogate
-@dirrm share/examples/fidogate/point
-@dirrm share/examples/fidogate/orodruin
-@dirrm share/examples/fidogate/morannon
-@dirrm share/examples/fidogate
-@dirrm share/doc/fidogate
-@dirrm lib/fidogate/bin
-@dirrm lib/fidogate
diff --git a/comms/gammu/PLIST b/comms/gammu/PLIST
index b0e2e97f081..a6a6393d292 100644
--- a/comms/gammu/PLIST
+++ b/comms/gammu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/05/26 21:31:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:38:39 joerg Exp $
 bin/gammu
 bin/gammu-config
 bin/gammu-smsd
@@ -170,23 +170,3 @@ share/locale/zh_CN/LC_MESSAGES/gammu.mo
 share/locale/zh_CN/LC_MESSAGES/libgammu.mo
 share/locale/zh_TW/LC_MESSAGES/gammu.mo
 share/locale/zh_TW/LC_MESSAGES/libgammu.mo
-@dirrm share/doc/gammu/symbian
-@dirrm share/doc/gammu/examples/sql
-@dirrm share/doc/gammu/examples/php/smsd-mysql-list
-@dirrm share/doc/gammu/examples/php/smsd-mysql-linked
-@dirrm share/doc/gammu/examples/php/smsd-mysql-intergammu/proc
-@dirrm share/doc/gammu/examples/php/smsd-mysql-intergammu/funcoes
-@dirrm share/doc/gammu/examples/php/smsd-mysql-intergammu
-@dirrm share/doc/gammu/examples/php/smsd-mysql-admin
-@dirrm share/doc/gammu/examples/php/class_gammu
-@dirrm share/doc/gammu/examples/php
-@dirrm share/doc/gammu/examples/media
-@dirrm share/doc/gammu/examples/config
-@dirrm share/doc/gammu/examples
-@dirrm share/doc/gammu/devel/sounds
-@dirrm share/doc/gammu/devel/sms
-@dirrm share/doc/gammu/devel/protocol
-@dirrm share/doc/gammu/devel/examples
-@dirrm share/doc/gammu/devel
-@dirrm share/doc/gammu
-@dirrm include/gammu
diff --git a/comms/gkermit/PLIST b/comms/gkermit/PLIST
index 9ee7560c631..ad86b5d64ea 100644
--- a/comms/gkermit/PLIST
+++ b/comms/gkermit/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:44:05 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:39 joerg Exp $
 bin/gkermit
 man/man1/gkermit.1
 share/doc/gkermit/README
-@dirrm share/doc/gkermit
diff --git a/comms/gnome-pilot/PLIST b/comms/gnome-pilot/PLIST
index 2856b71f1f2..80820d968d3 100644
--- a/comms/gnome-pilot/PLIST
+++ b/comms/gnome-pilot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2009/02/18 20:06:57 ahoka Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/06/14 17:38:39 joerg Exp $
 bin/gnome-pilot-make-password
 bin/gpilot-install-file
 bin/gpilotd-control-applet
@@ -98,24 +98,3 @@ share/pixmaps/sync_broken.png
 share/pixmaps/sync_icon.png
 share/pixmaps/sync_paused.png
 share/pixmaps/syncing_icon.png
-@comment in xdg-dirs: @dirrm share/pixmaps
-@dirrm share/omf/gnome-pilot
-@comment in rarian: @dirrm share/omf
-@comment in xdg-dirs: @dirrm share/mime-info
-@dirrm share/locale/sr@Latn/LC_MESSAGES
-@dirrm share/locale/sr@Latn
-@comment in ORBit2: @dirrm share/idl
-@dirrm share/gnome/help/gnome-pilot/C
-@dirrm share/gnome/help/gnome-pilot
-@comment in gnome2-dirs: @dirrm share/gnome/help
-@dirrm share/gnome-pilot/glade
-@dirrm share/gnome-pilot/conduits
-@dirrm share/gnome-pilot
-@comment in gnome2-dirs: @dirrm share/gnome
-@comment in GConf: @dirrm share/gconf/schemas
-@comment in xdg-dirs: @dirrm share/applications
-@dirrm lib/gnome-pilot/conduits
-@dirrm lib/gnome-pilot
-@comment in libbonobo: @dirrm lib/bonobo/servers
-@dirrm include/libgpilotdCM
-@dirrm include/gpilotd
diff --git a/comms/gscmxx/PLIST b/comms/gscmxx/PLIST
index e19486bf43f..5659557caa7 100644
--- a/comms/gscmxx/PLIST
+++ b/comms/gscmxx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/09/26 14:00:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:38:39 joerg Exp $
 share/pixmaps/gscmxx/addressbook.xpm
 share/pixmaps/gscmxx/addressbook_20.xpm
 share/pixmaps/gscmxx/addressbook_30.xpm
@@ -29,7 +29,3 @@ share/gscmxx/i18n/english
 share/gscmxx/i18n/german
 share/gscmxx/i18n/italian
 share/gscmxx/i18n/magyar
-@dirrm share/pixmaps/gscmxx/groups
-@dirrm share/pixmaps/gscmxx
-@dirrm share/gscmxx/i18n
-@dirrm share/gscmxx
diff --git a/comms/gsmlib/PLIST b/comms/gsmlib/PLIST
index bf971758a8d..e13d22ad4d5 100644
--- a/comms/gsmlib/PLIST
+++ b/comms/gsmlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/17 07:07:14 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:38:39 joerg Exp $
 bin/gsmctl
 bin/gsmpb
 bin/gsmsendsms
@@ -33,4 +33,3 @@ man/man1/gsmsmsstore.1
 man/man7/gsminfo.7
 man/man8/gsmsmsd.8
 share/locale/de/LC_MESSAGES/gsmlib.mo
-@dirrm include/gsmlib
diff --git a/comms/hylafax/PLIST b/comms/hylafax/PLIST
index dedb3caa266..21363b2b672 100644
--- a/comms/hylafax/PLIST
+++ b/comms/hylafax/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2006/05/15 19:02:47 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/06/14 17:38:40 joerg Exp $
 bin/faxalter
 bin/faxcover
 bin/faxmail
@@ -207,9 +207,3 @@ share/hylafax/etc_template/dpsprinter.ps
 share/hylafax/etc_template/hosts.hfaxd
 share/hylafax/etc_template/lutRS18.pcf
 share/hylafax/etc_template/xferfaxlog
-@dirrm share/hylafax/etc_template
-@dirrm share/hylafax/config_template
-@dirrm share/hylafax
-@dirrm share/doc/hylafax
-@dirrm libexec/hylafax
-@dirrm libdata/hylafax
diff --git a/comms/jpilot/PLIST b/comms/jpilot/PLIST
index 5ec984ee6fe..0acea67a6c7 100644
--- a/comms/jpilot/PLIST
+++ b/comms/jpilot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/01/18 12:00:53 shattered Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/06/14 17:38:40 joerg Exp $
 bin/jpilot
 bin/jpilot-dump
 bin/jpilot-sync
@@ -79,11 +79,3 @@ share/locale/uk/LC_MESSAGES/jpilot.mo
 share/locale/vi/LC_MESSAGES/jpilot.mo
 share/locale/zh_CN/LC_MESSAGES/jpilot.mo
 share/locale/zh_TW/LC_MESSAGES/jpilot.mo
-@dirrm share/jpilot
-@dirrm share/doc/jpilot/icons
-@dirrm share/doc/jpilot/manual
-@dirrm share/doc/jpilot
-@dirrm share/doc/jpilot
-@dirrm lib/jpilot/plugins
-@dirrm lib/jpilot
-@dirrm include/jpilot
diff --git a/comms/kermit/PLIST b/comms/kermit/PLIST
index bdfa98ec7f8..2ef87a1409e 100644
--- a/comms/kermit/PLIST
+++ b/comms/kermit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2008/03/01 05:17:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/06/14 17:38:40 joerg Exp $
 bin/kermit
 man/man1/kermit.1
 share/doc/kermit/ckaaaa.txt
@@ -11,4 +11,3 @@ share/doc/kermit/ckermit80.txt
 share/doc/kermit/ckubwr.txt
 share/doc/kermit/ckuins.txt
 share/doc/kermit/ckututor.txt
-@dirrm share/doc/kermit
diff --git a/comms/libmal/PLIST b/comms/libmal/PLIST
index caf31c34aeb..0b98bbf4bae 100644
--- a/comms/libmal/PLIST
+++ b/comms/libmal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:21 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:38:40 joerg Exp $
 bin/malsync
 include/libmal/AGArray.h
 include/libmal/AGBase64.h
@@ -53,4 +53,3 @@ include/libmal/MALCommonWin.h
 include/libmal/ag-md5.h
 include/libmal/libmal.h
 lib/libmal.la
-@dirrm include/libmal
diff --git a/comms/libopensync-plugin-syncml/PLIST b/comms/libopensync-plugin-syncml/PLIST
index ddc810fc84d..7259748f931 100644
--- a/comms/libopensync-plugin-syncml/PLIST
+++ b/comms/libopensync-plugin-syncml/PLIST
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/01/12 14:27:22 dillo Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:40 joerg Exp $
 lib/opensync/plugins/syncml_plugin.la
 share/opensync/defaults/syncml-http-server
 share/opensync/defaults/syncml-obex-client
-@dirrm share/opensync/defaults
-@dirrm lib/opensync/plugins
diff --git a/comms/libopensync/PLIST b/comms/libopensync/PLIST
index aecb9e33d9e..374671e786b 100644
--- a/comms/libopensync/PLIST
+++ b/comms/libopensync/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/05/23 12:44:40 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:40 joerg Exp $
 bin/osyncbinary
 bin/osyncdump
 bin/osyncplugin
@@ -48,8 +48,3 @@ lib/opensync/formats/xmldoc.la
 lib/pkgconfig/opensync-1.0.pc
 lib/pkgconfig/osengine-1.0.pc
 libexec/osplugin
-@dirrm lib/opensync/formats
-@dirrm lib/opensync
-@dirrm include/opensync-1.0/osengine
-@dirrm include/opensync-1.0/opensync
-@dirrm include/opensync-1.0
diff --git a/comms/libsyncml/PLIST b/comms/libsyncml/PLIST
index 4b11ab53605..98298f15c64 100644
--- a/comms/libsyncml/PLIST
+++ b/comms/libsyncml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/01/12 14:09:35 dillo Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:40 joerg Exp $
 bin/syncml-http-client
 bin/syncml-http-server
 bin/syncml-obex-client
@@ -26,5 +26,3 @@ lib/libsyncml.la
 lib/pkgconfig/libsyncml-1.0.pc
 man/man1/syncml-http-server.1
 man/man1/syncml-obex-client.1
-@dirrm include/libsyncml-1.0/libsyncml
-@dirrm include/libsyncml-1.0
diff --git a/comms/malsync/PLIST b/comms/malsync/PLIST
index c2b0719d5ef..352a3f1c429 100644
--- a/comms/malsync/PLIST
+++ b/comms/malsync/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:44:18 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:40 joerg Exp $
 bin/malsync
 share/doc/malsync/README_avantgo
 share/doc/malsync/README_malsync
-@dirrm share/doc/malsync
diff --git a/comms/mgetty+sendfax/PLIST b/comms/mgetty+sendfax/PLIST
index 73f3275e947..856f6b4acc5 100644
--- a/comms/mgetty+sendfax/PLIST
+++ b/comms/mgetty+sendfax/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2006/03/20 04:09:37 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/06/14 17:38:40 joerg Exp $
 bin/autopvf
 bin/basictopvf
 bin/faxq
@@ -69,5 +69,3 @@ share/examples/mgetty+sendfax/login.config
 share/examples/mgetty+sendfax/mgetty.config
 share/examples/mgetty+sendfax/sendfax.config
 share/examples/mgetty+sendfax/voice.conf
-@dirrm share/examples/mgetty+sendfax
-@dirrm lib/mgetty+sendfax
diff --git a/comms/minicom/PLIST b/comms/minicom/PLIST
index a7eb4dab199..6012c98e81a 100644
--- a/comms/minicom/PLIST
+++ b/comms/minicom/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2006/04/17 07:07:14 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/06/14 17:38:40 joerg Exp $
 bin/ascii-xfr
 bin/minicom
 bin/runscript
@@ -17,4 +17,3 @@ share/locale/ja/LC_MESSAGES/minicom.mo
 share/locale/pl/LC_MESSAGES/minicom.mo
 share/locale/pt_BR/LC_MESSAGES/minicom.mo
 share/locale/ru/LC_MESSAGES/minicom.mo
-@dirrm share/examples/minicom
diff --git a/comms/modemd/PLIST b/comms/modemd/PLIST
index cd39314adfe..53be1ca924e 100644
--- a/comms/modemd/PLIST
+++ b/comms/modemd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:44:25 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:41 joerg Exp $
 sbin/modemd
 sbin/mpoold
 man/man8/modemd.8
@@ -8,4 +8,3 @@ man/cat8/mpoold.0
 man/man5/modemcap.5
 man/cat5/modemcap.0
 share/examples/modemd/modemcap
-@dirrm share/examples/modemd
diff --git a/comms/multisync-gui/PLIST b/comms/multisync-gui/PLIST
index c3a84dac433..1a78d8f4e6f 100644
--- a/comms/multisync-gui/PLIST
+++ b/comms/multisync-gui/PLIST
@@ -1,8 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/02/27 17:44:14 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:41 joerg Exp $
 bin/multisync-gui
 share/applications/multisync-gui.desktop
 share/multisync-gui/multisync-gui.glade
 share/pixmaps/multisync-gui/multisync.png
-@dirrm share/pixmaps/multisync-gui
-@dirrm share/multisync-gui
-@comment in xdg-dirs: @dirrm share/applications
diff --git a/comms/obexftp/PLIST b/comms/obexftp/PLIST
index 42e55d6253f..b0542336bcf 100644
--- a/comms/obexftp/PLIST
+++ b/comms/obexftp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/07/17 12:29:57 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:38:41 joerg Exp $
 bin/obexftp
 bin/obexftpd
 include/bfb/bfb.h
@@ -13,6 +13,3 @@ lib/libmulticobex.la
 lib/libobexftp.la
 man/man1/obexftp.1
 man/man1/obexftpd.1
-@dirrm include/obexftp
-@dirrm include/multicobex
-@dirrm include/bfb
diff --git a/comms/op_panel/PLIST b/comms/op_panel/PLIST
index c93355471ab..70c951a1b81 100644
--- a/comms/op_panel/PLIST
+++ b/comms/op_panel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/12/08 04:53:28 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:41 joerg Exp $
 libexec/op_server.pl
 share/examples/op_panel/op_astdb.cfg
 share/examples/op_panel/op_buttons.cfg
@@ -32,5 +32,3 @@ share/op_panel/index-restrict.html
 share/op_panel/index.html
 share/op_panel/mypage.php
 share/op_panel/operator_panel.swf
-@dirrm share/examples/op_panel
-@dirrm share/op_panel
diff --git a/comms/openobex/PLIST b/comms/openobex/PLIST
index ac2687cbeba..ac70f71fe78 100644
--- a/comms/openobex/PLIST
+++ b/comms/openobex/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2006/07/09 09:27:52 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:38:41 joerg Exp $
 include/openobex/obex.h
 include/openobex/obex_const.h
 lib/libopenobex.la
 lib/pkgconfig/openobex.pc
 share/aclocal/openobex.m4
-@dirrm include/openobex
diff --git a/comms/p5-Asterisk/PLIST b/comms/p5-Asterisk/PLIST
index f93998a1f75..7a0a65c5046 100644
--- a/comms/p5-Asterisk/PLIST
+++ b/comms/p5-Asterisk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2006/03/15 00:15:08 gavan Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:41 joerg Exp $
 share/examples/p5-Asterisk/agi-enum.agi
 share/examples/p5-Asterisk/agi-sayani.agi
 share/examples/p5-Asterisk/agi-test.agi
@@ -7,4 +7,3 @@ share/examples/p5-Asterisk/manager-test.pl
 share/examples/p5-Asterisk/tts-bofh.agi
 share/examples/p5-Asterisk/tts-line.agi
 share/examples/p5-Asterisk/tts-ping.agi
-@dirrm share/examples/p5-Asterisk
diff --git a/comms/pilot-link/PLIST b/comms/pilot-link/PLIST
index 08397573a0b..02852287a14 100644
--- a/comms/pilot-link/PLIST
+++ b/comms/pilot-link/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/11/30 18:14:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:38:41 joerg Exp $
 bin/pilot-addresses
 bin/pilot-clip
 bin/pilot-csd
@@ -47,7 +47,3 @@ share/pilot-link/pix/casemask.xbm
 share/pilot-link/prc/getrom.prc
 share/pilot-link/prc/getrom2.prc
 share/pilot-link/udev/60-libpisock.rules
-@dirrm share/pilot-link/udev
-@dirrm share/pilot-link/prc
-@dirrm share/pilot-link/pix
-@dirrm share/pilot-link
diff --git a/comms/pilotmgr/PLIST b/comms/pilotmgr/PLIST
index f3dd0d3d268..183c6641b49 100644
--- a/comms/pilotmgr/PLIST
+++ b/comms/pilotmgr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2007/03/08 19:43:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:38:41 joerg Exp $
 bin/PilotManager
 lib/pilotmgr/Backup.pm
 lib/pilotmgr/Installer.pm
@@ -23,9 +23,3 @@ lib/pilotmgr/lib/test/SyncPlan.t
 share/doc/pilotmgr/Conduit.api
 share/doc/pilotmgr/SyncPlan.help
 share/doc/pilotmgr/WelcomeMessage
-@dirrm lib/pilotmgr/lib/test
-@dirrm lib/pilotmgr/lib/perl5
-@dirrm lib/pilotmgr/lib/images
-@dirrm lib/pilotmgr/lib
-@dirrm lib/pilotmgr
-@dirrm share/doc/pilotmgr
diff --git a/comms/plp/PLIST b/comms/plp/PLIST
index 9271f31f709..e8bf40b2bd1 100644
--- a/comms/plp/PLIST
+++ b/comms/plp/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:21 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:38:41 joerg Exp $
 bin/ncp
 bin/rfsv
 lib/libplputils.la
 share/doc/plp/README
-@dirrm share/doc/plp
diff --git a/comms/plptools/PLIST b/comms/plptools/PLIST
index 1e2094a6c23..3849267d4bb 100644
--- a/comms/plptools/PLIST
+++ b/comms/plptools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/17 07:07:14 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:38:42 joerg Exp $
 bin/plpbackup
 bin/plpftp
 bin/sisinstall
@@ -44,5 +44,3 @@ share/locale/de/LC_MESSAGES/plptools.mo
 share/locale/sv/LC_MESSAGES/plptools.mo
 share/plptools/fontmap
 share/plptools/prolog.ps
-@dirrm share/plptools
-@dirrm include/plptools
diff --git a/comms/py-gammu/PLIST b/comms/py-gammu/PLIST
index 39ac0bd8d7b..f55bb2b35f9 100644
--- a/comms/py-gammu/PLIST
+++ b/comms/py-gammu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/05/26 22:03:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:42 joerg Exp $
 ${PYSITELIB}/gammu/Data.py
 ${PYSITELIB}/gammu/Data.pyc
 ${PYSITELIB}/gammu/Data.pyo
@@ -9,4 +9,3 @@ ${PYSITELIB}/gammu/__init__.py
 ${PYSITELIB}/gammu/__init__.pyc
 ${PYSITELIB}/gammu/__init__.pyo
 ${PYSITELIB}/gammu/_gammu.so
-@dirrm ${PYSITELIB}/gammu
diff --git a/comms/ruby-termios/PLIST b/comms/ruby-termios/PLIST
index 2a7c1e3e3df..224f8d16da7 100644
--- a/comms/ruby-termios/PLIST
+++ b/comms/ruby-termios/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2008/04/04 15:30:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/06/14 17:38:42 joerg Exp $
 ${GEM_HOME}/cache/termios-${PKGVERSION}.gem
 ${GEM_LIBDIR}/ChangeLog
 ${GEM_LIBDIR}/MANIFEST
@@ -15,8 +15,4 @@ ${GEM_LIBDIR}/termios.c
 ${GEM_LIBDIR}/termios.rd
 ${GEM_LIBDIR}/test/test0.rb
 ${GEM_HOME}/specifications/termios-${PKGVERSION}.gemspec
-@dirrm ${GEM_LIBDIR}/test
-@dirrm ${GEM_LIBDIR}/lib
-@dirrm ${GEM_LIBDIR}/examples
-@dirrm ${GEM_LIBDIR}
 @exec ${MKDIR} %D/lib/ruby/gems/1.8/doc/termios-${PKGVERSION}
diff --git a/comms/scmxx/PLIST b/comms/scmxx/PLIST
index 5eb855ea321..029ec3e8b4d 100644
--- a/comms/scmxx/PLIST
+++ b/comms/scmxx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2006/04/17 07:07:14 jlam Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/06/14 17:38:42 joerg Exp $
 bin/adr2vcf
 bin/apoconv
 bin/scmxx
@@ -17,7 +17,5 @@ share/locale/de/LC_MESSAGES/scmxx.mo
 share/locale/fr/LC_MESSAGES/scmxx.mo
 share/locale/it/LC_MESSAGES/scmxx.mo
 share/locale/ru/LC_MESSAGES/scmxx.mo
-@dirrm share/doc/scmxx
-@dirrm share/examples/scmxx
 @unexec ${RMDIR} %D/man/it/man1 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/man/it 2>/dev/null || ${TRUE}
diff --git a/comms/snooper/PLIST b/comms/snooper/PLIST
index 5b28652821e..01872b976fe 100644
--- a/comms/snooper/PLIST
+++ b/comms/snooper/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:44:42 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:42 joerg Exp $
 bin/snooper
 share/doc/snooper/README
-@dirrm share/doc/snooper
diff --git a/comms/synce-rra/PLIST b/comms/synce-rra/PLIST
index 3022d513a8e..aa17ff0030d 100644
--- a/comms/synce-rra/PLIST
+++ b/comms/synce-rra/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/13 16:57:41 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:42 joerg Exp $
 bin/synce-matchmaker
 include/rra/appointment.h
 include/rra/contact.h
@@ -10,4 +10,3 @@ include/rra/uint32vector.h
 lib/librra.la
 man/man1/synce-matchmaker.1
 share/aclocal/rra.m4
-@dirrm include/rra
diff --git a/comms/synce-serial/PLIST b/comms/synce-serial/PLIST
index 74f7ec85133..5a7fbfda589 100644
--- a/comms/synce-serial/PLIST
+++ b/comms/synce-serial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/13 15:08:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:42 joerg Exp $
 bin/synce-serial-abort
 bin/synce-serial-chat
 bin/synce-serial-config
@@ -7,4 +7,3 @@ man/man8/synce-serial-abort.8
 man/man8/synce-serial-config.8
 man/man8/synce-serial-start.8
 share/synce/synce-serial-common
-@dirrm share/synce
diff --git a/comms/tkhylafax/PLIST b/comms/tkhylafax/PLIST
index 9674f58e877..e57a1c3bd54 100644
--- a/comms/tkhylafax/PLIST
+++ b/comms/tkhylafax/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:44:43 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:42 joerg Exp $
 bin/tkhylafax
 share/${PKGNAME}/entryDialog.t
 share/${PKGNAME}/extract.t
@@ -18,4 +18,3 @@ share/${PKGNAME}/trace.t
 share/${PKGNAME}/viewBatch.t
 share/${PKGNAME}/tclIndex
 man/man1/tkhylafax.1
-@dirrm share/${PKGNAME}
diff --git a/comms/xisp/PLIST b/comms/xisp/PLIST
index 7658a39f0be..b5ae17f739d 100644
--- a/comms/xisp/PLIST
+++ b/comms/xisp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/06/07 14:12:13 minskim Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:38:42 joerg Exp $
 bin/xisp
 bin/xispid
 bin/xisprccv
@@ -11,6 +11,3 @@ share/examples/xisp/ip-down
 share/examples/xisp/ip-up
 share/examples/xisp/peers/xisp_dialer
 share/examples/xisp/peers/xisp_modem
-@dirrm share/examples/xisp/peers
-@dirrm share/examples/xisp
-@dirrm share/doc/xisp
diff --git a/comms/xtel/PLIST b/comms/xtel/PLIST
index 2532b02f9be..40e93bd6f05 100644
--- a/comms/xtel/PLIST
+++ b/comms/xtel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/02/07 22:06:06 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:38:43 joerg Exp $
 bin/install_iminitel
 bin/make_xtel_lignes
 bin/mdmdetect
@@ -37,7 +37,3 @@ share/examples/xtel/chat-iminitel
 share/examples/xtel/ip-down.iminitel
 share/examples/xtel/ip-up.iminitel
 share/examples/xtel/peers/iminitel
-@dirrm share/examples/xtel/peers
-@dirrm share/examples/xtel
-@dirrm lib/X11/xtel
-@dirrm lib/X11/fonts/xtel
diff --git a/comms/zaptel-netbsd/PLIST b/comms/zaptel-netbsd/PLIST
index 3569936da2f..c45344d58fe 100644
--- a/comms/zaptel-netbsd/PLIST
+++ b/comms/zaptel-netbsd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/02 20:33:58 reed Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:38:43 joerg Exp $
 bin/fxo_test
 bin/ztcfg
 bin/ztmonitor
@@ -14,5 +14,4 @@ lkm/mod_ztdummy.o
 sbin/zaptel_postinstall
 share/examples/rc.d/ztcfg
 share/examples/zaptel/zaptel.conf
-@dirrm share/examples/zaptel
 @unexec ${RMDIR} %D/lkm 2>/dev/null || ${TRUE}