Cleanup plist

100 files changed, 17 insertions, 591 deletions

diff --git a/comms/anyremote/pkg-plist b/comms/anyremote/pkg-plist
index f032aa0e5d25..0c219c6b743f 100644
--- a/comms/anyremote/pkg-plist
+++ b/comms/anyremote/pkg-plist
@@ -376,21 +376,6 @@ man/man1/anyremote.1.gz
 %%DATADIR%%/cfg-data/Server-mode/parserTest.cfg
 %%DATADIR%%/cfg-data/Server-mode/pingTest.cfg
 %%DATADIR%%/cfg-data/Server-mode/exampleVibrate.cfg
-@dirrm %%DATADIR%%/cfg-data/AT-mode
-@dirrm %%DATADIR%%/cfg-data/Bemused-emulation
-@dirrm %%DATADIR%%/cfg-data/Icons/16
-@dirrm %%DATADIR%%/cfg-data/Icons/32
-@dirrm %%DATADIR%%/cfg-data/Icons/48
-@dirrm %%DATADIR%%/cfg-data/Icons/64
-@dirrm %%DATADIR%%/cfg-data/Icons/128
-@dirrm %%DATADIR%%/cfg-data/Icons/common
-@dirrm %%DATADIR%%/cfg-data/Icons
-@dirrm %%DATADIR%%/cfg-data/iViewer
-@dirrm %%DATADIR%%/cfg-data/Server-mode
-@dirrm %%DATADIR%%/cfg-data/Utils/iViewer
-@dirrm %%DATADIR%%/cfg-data/Utils
-@dirrm %%DATADIR%%/cfg-data
-@dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/aac-cf2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/echo-player.png
 %%PORTDOCS%%%%DOCSDIR%%/doc-html/data/jc/themes/human-player.png
@@ -588,10 +573,3 @@ man/man1/anyremote.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc-html/data/jc/themes
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc-html/data/jc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc-html/data/img
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc-html/data/icons
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc-html/data
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc-html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/aprsd/pkg-plist b/comms/aprsd/pkg-plist
index 2fe0ddd51a63..fe816ab87007 100644
--- a/comms/aprsd/pkg-plist
+++ b/comms/aprsd/pkg-plist
@@ -12,6 +12,3 @@ etc/rc.d/aprsd
 %%PORTDOCS%%%%DOCSDIR%%/ports.html
 %%PORTDOCS%%%%DOCSDIR%%/q.html
 %%PORTDOCS%%%%DOCSDIR%%/qalgorithm.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry etc/aprsd
diff --git a/comms/atslog/pkg-plist b/comms/atslog/pkg-plist
index b3742a9a2b5a..7228f3fc003b 100644
--- a/comms/atslog/pkg-plist
+++ b/comms/atslog/pkg-plist
@@ -304,42 +304,5 @@ man/ru.KOI8-R/man8/atslogmaster.8.gz
 %%WWW%%%%WWWDIR%%/calls/index.php
 %%WWW%%%%WWWDIR%%/index.html
 %%WWW%%%%WWWDIR%%/index.php
-%%WWW%%@dirrmtry %%WWWDIR%%/users
-%%WWW%%@dirrmtry %%WWWDIR%%/settings
-%%WWW%%@dirrmtry %%WWWDIR%%/phonebook
-%%WWW%%@dirrmtry %%WWWDIR%%/lines
-%%WWW%%@dirrmtry %%WWWDIR%%/intern
-%%WWW%%@dirrmtry %%WWWDIR%%/include/set
-%%WWW%%@dirrmtry %%WWWDIR%%/include/phplot
-%%WWW%%@dirrmtry %%WWWDIR%%/include/lang
-%%WWW%%@dirrmtry %%WWWDIR%%/include/img/colors/whitewood/arrows
-%%WWW%%@dirrmtry %%WWWDIR%%/include/img/colors/whitewood
-%%WWW%%@dirrmtry %%WWWDIR%%/include/img/colors/standart/arrows
-%%WWW%%@dirrmtry %%WWWDIR%%/include/img/colors/standart
-%%WWW%%@dirrmtry %%WWWDIR%%/include/img/colors/classic/arrows
-%%WWW%%@dirrmtry %%WWWDIR%%/include/img/colors/classic
-%%WWW%%@dirrmtry %%WWWDIR%%/include/img/colors
-%%WWW%%@dirrmtry %%WWWDIR%%/include/img
-%%WWW%%@dirrmtry %%WWWDIR%%/include/export
-%%WWW%%@dirrmtry %%WWWDIR%%/include/colors
-%%WWW%%@dirrmtry %%WWWDIR%%/include/adodb/xsl
-%%WWW%%@dirrmtry %%WWWDIR%%/include/adodb/session/old
-%%WWW%%@dirrmtry %%WWWDIR%%/include/adodb/session
-%%WWW%%@dirrmtry %%WWWDIR%%/include/adodb/perf
-%%WWW%%@dirrmtry %%WWWDIR%%/include/adodb/lang
-%%WWW%%@dirrmtry %%WWWDIR%%/include/adodb/drivers
-%%WWW%%@dirrmtry %%WWWDIR%%/include/adodb/datadict
-%%WWW%%@dirrmtry %%WWWDIR%%/include/adodb
-%%WWW%%@dirrmtry %%WWWDIR%%/include
-%%WWW%%@dirrmtry %%WWWDIR%%/diagram
-%%WWW%%@dirrmtry %%WWWDIR%%/calls/query
-%%WWW%%@dirrmtry %%WWWDIR%%/calls
-%%WWW%%@dirrmtry %%WWWDIR%%
 %%WWW%%@owner root
 %%WWW%%@group wheel
-@dirrmtry libexec/atslog
-@dirrmtry %%DATADIR%%/lang
-@dirrmtry %%DATADIR%%/sql
-@dirrmtry %%DATADIR%%
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/textlogs
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/comms/bforce-kst/pkg-plist b/comms/bforce-kst/pkg-plist
index 659d8120fb86..745d9e527071 100644
--- a/comms/bforce-kst/pkg-plist
+++ b/comms/bforce-kst/pkg-plist
@@ -32,11 +32,3 @@ etc/fido/bforce/freq.dirs.sample
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.kst
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/u-srif/lib
-@dirrm %%DATADIR%%/u-srif/conf
-@dirrm %%DATADIR%%/u-srif
-@dirrm %%DATADIR%%/bfha
-@dirrm %%DATADIR%%
-@dirrm etc/fido/bforce
-@dirrm etc/fido
diff --git a/comms/bforce/pkg-plist b/comms/bforce/pkg-plist
index 6b6920dca75e..47164690cc11 100644
--- a/comms/bforce/pkg-plist
+++ b/comms/bforce/pkg-plist
@@ -7,4 +7,3 @@ etc/bforce/bforce.passwd.sample
 etc/bforce/bforce.subst.sample
 etc/bforce/freq.aliases.sample
 etc/bforce/freq.dirs.sample
-@dirrm etc/bforce
diff --git a/comms/bluez-firmware/pkg-plist b/comms/bluez-firmware/pkg-plist
index aba716171163..fccce66ed5ea 100644
--- a/comms/bluez-firmware/pkg-plist
+++ b/comms/bluez-firmware/pkg-plist
@@ -5,4 +5,3 @@ lib/firmware/STLC2500_R4_00_03.ptc
 lib/firmware/STLC2500_R4_00_06.ssf
 lib/firmware/STLC2500_R4_02_02_WLAN.ssf
 lib/firmware/STLC2500_R4_02_04.ptc
-@dirrmtry lib/firmware
diff --git a/comms/cdr_read/pkg-plist b/comms/cdr_read/pkg-plist
index 16cd4e003af0..317d0315a47f 100644
--- a/comms/cdr_read/pkg-plist
+++ b/comms/cdr_read/pkg-plist
@@ -1,3 +1,2 @@
 sbin/cdr_read
 %%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/chirp/pkg-plist b/comms/chirp/pkg-plist
index e63b1fc304b2..12618218670b 100644
--- a/comms/chirp/pkg-plist
+++ b/comms/chirp/pkg-plist
@@ -278,8 +278,3 @@ share/pixmaps/chirp.png
 %%PYTHON_SITELIBDIR%%/chirpui/shiftdialog.py
 %%PYTHON_SITELIBDIR%%/chirpui/shiftdialog.pyc
 %%PYTHON_SITELIBDIR%%/chirpui/shiftdialog.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/chirp
-@dirrm %%PYTHON_SITELIBDIR%%/chirpui
-@dirrm share/chirp/stock_configs
-@dirrm share/chirp
-@dirrm %%DOCSDIR%%
diff --git a/comms/chu/pkg-plist b/comms/chu/pkg-plist
index 338245245bdd..1f4ef72a6d2e 100644
--- a/comms/chu/pkg-plist
+++ b/comms/chu/pkg-plist
@@ -6,5 +6,3 @@ sbin/chu
 %%PORTDOCS%%%%DOCSDIR%%/ntp.html
 %%PORTDOCS%%%%DOCSDIR%%/TESTING
 man/man8/chu.8.gz
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/congruity/pkg-plist b/comms/congruity/pkg-plist
index 0ca6b32c12e5..d76c1b664d95 100644
--- a/comms/congruity/pkg-plist
+++ b/comms/congruity/pkg-plist
@@ -26,4 +26,3 @@ share/applications/mhgui.desktop
 %%DATADIR%%/serialization.xsd
 %%DATADIR%%/throbber.gif
 %%DATADIR%%/user_feature.xsd
-@dirrmtry %%DATADIR%%
diff --git a/comms/conserver-com/pkg-plist b/comms/conserver-com/pkg-plist
index 6bf4eff23dee..c37b5cab9591 100644
--- a/comms/conserver-com/pkg-plist
+++ b/comms/conserver-com/pkg-plist
@@ -8,4 +8,3 @@ man/man1/console.1.gz
 man/man5/conserver.cf.5.gz
 man/man5/conserver.passwd.5.gz
 man/man8/conserver.8.gz
-@dirrm %%EXAMPLESDIR%%
diff --git a/comms/cqrlog/pkg-plist b/comms/cqrlog/pkg-plist
index f7cf0aeca561..4d6cbee0b4ed 100644
--- a/comms/cqrlog/pkg-plist
+++ b/comms/cqrlog/pkg-plist
@@ -298,13 +298,3 @@ share/applications/cqrlog.desktop
 share/icons/cqrlog.png
 man/man1/cqrlog.1.gz
 share/pixmaps/cqrlog/cqrlog.png
-@dirrmtry share/pixmaps/cqrlog
-@dirrmtry %%DATADIR%%/ctyfiles
-@dirrmtry %%DATADIR%%/help/img
-@dirrmtry %%DATADIR%%/help
-@dirrmtry %%DATADIR%%/images
-@dirrmtry %%DATADIR%%/members
-@dirrmtry %%DATADIR%%/voice_keyer
-@dirrmtry %%DATADIR%%/xplanet
-@dirrmtry %%DATADIR%%/zipcodes
-@dirrmtry %%DATADIR%%
diff --git a/comms/cwdaemon/pkg-plist b/comms/cwdaemon/pkg-plist
index e61567b160e7..74a5ac58ba19 100644
--- a/comms/cwdaemon/pkg-plist
+++ b/comms/cwdaemon/pkg-plist
@@ -9,4 +9,3 @@ man/man8/cwdaemon.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/parallelport_circuit.ps
 %%PORTDOCS%%%%DOCSDIR%%/serialport_circuit.jpg
 %%PORTDOCS%%%%DOCSDIR%%/serialport_circuit.ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/deforaos-phone/pkg-plist b/comms/deforaos-phone/pkg-plist
index cbce0b80a050..f93dc3dfaded 100644
--- a/comms/deforaos-phone/pkg-plist
+++ b/comms/deforaos-phone/pkg-plist
@@ -64,21 +64,3 @@ share/icons/hicolor/48x48/apps/phone-openmoko.png
 share/icons/hicolor/48x48/apps/phone-roaming.png
 share/icons/hicolor/48x48/apps/phone-sent.png
 share/locale/fr/LC_MESSAGES/Phone.mo
-@dirrm include/Desktop/Phone/modems
-@dirrm include/Desktop/Phone
-@dirrm lib/Phone/modem
-@dirrm lib/Phone/plugins
-@dirrm lib/Phone
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrmtry include/Desktop
diff --git a/comms/ebook2cw/pkg-plist b/comms/ebook2cw/pkg-plist
index d0322161e5fd..ff0b742257f1 100644
--- a/comms/ebook2cw/pkg-plist
+++ b/comms/ebook2cw/pkg-plist
@@ -4,5 +4,3 @@ man/man1/ebook2cw.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/isomap.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/utf8map.txt
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/comms/echolinux/pkg-plist b/comms/echolinux/pkg-plist
index ba8874a87861..20ec5f39c359 100644
--- a/comms/echolinux/pkg-plist
+++ b/comms/echolinux/pkg-plist
@@ -5,6 +5,3 @@ share/echolinux/echolinux.desktop
 share/echolinux/pixmaps/echolinux_48x48.png
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/Using_EchoLinux.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/echolinux/pixmaps
-@dirrm share/echolinux
diff --git a/comms/efax/pkg-plist b/comms/efax/pkg-plist
index fa0100bb754e..5a89a84db054 100644
--- a/comms/efax/pkg-plist
+++ b/comms/efax/pkg-plist
@@ -10,8 +10,8 @@ man/man1/efix.1.gz
 @group dialer
 /var/spool/fax/incoming/.keepme
 /var/spool/fax/outgoing/lock
-@dirrmtry /var/spool/fax/outgoing
-@dirrmtry /var/spool/fax/incoming
-@dirrmtry /var/spool/fax
+@dir /var/spool/fax/outgoing
+@dir /var/spool/fax/incoming
+@dir /var/spool/fax
 @group
 @owner
diff --git a/comms/esmska/pkg-plist b/comms/esmska/pkg-plist
index 03d4a6726e67..48f16ff232cc 100644
--- a/comms/esmska/pkg-plist
+++ b/comms/esmska/pkg-plist
@@ -66,8 +66,3 @@ bin/esmska
 %%DATADIR%%/lib/trident-1.3.jar
 %%DATADIR%%/license/gnu-agpl.txt
 %%DATADIR%%/license/license.txt
-@dirrm %%DATADIR%%/license
-@dirrm %%DATADIR%%/lib
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/gateways
-@dirrm %%DATADIR%%
diff --git a/comms/fl_moxgen/pkg-plist b/comms/fl_moxgen/pkg-plist
index d99cdc29c961..12d43ed780bf 100644
--- a/comms/fl_moxgen/pkg-plist
+++ b/comms/fl_moxgen/pkg-plist
@@ -1,3 +1,2 @@
 bin/fl_moxgen
 %%DATADIR%%/moxgen.png
-@dirrm %%DATADIR%%
diff --git a/comms/fldigi/pkg-plist b/comms/fldigi/pkg-plist
index 7d29c174dfd7..bdd334268063 100644
--- a/comms/fldigi/pkg-plist
+++ b/comms/fldigi/pkg-plist
@@ -19,5 +19,3 @@ share/pixmaps/fldigi.xpm
 %%FLARQ%%share/pixmaps/flarq.xpm
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/guide.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%
diff --git a/comms/flwrap/pkg-plist b/comms/flwrap/pkg-plist
index b456aa58bcc7..fb00e797e88f 100644
--- a/comms/flwrap/pkg-plist
+++ b/comms/flwrap/pkg-plist
@@ -2,4 +2,3 @@ bin/flwrap
 share/applications/flwrap.desktop
 share/pixmaps/flwrap.xpm
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/gammu/pkg-plist b/comms/gammu/pkg-plist
index 5945025b3ca8..97f48f83a461 100644
--- a/comms/gammu/pkg-plist
+++ b/comms/gammu/pkg-plist
@@ -148,10 +148,3 @@ share/locale/zh_TW/LC_MESSAGES/libgammu.mo
 %%PYTHON_SITELIBDIR%%/gammu/worker.py
 %%PYTHON_SITELIBDIR%%/gammu/worker.pyc
 %%PYTHON_SITELIBDIR%%/gammu/worker.pyo
-@dirrmtry share/locale/sw/LC_MESSAGES
-@dirrmtry share/locale/sw
-@dirrm share/gammu
-@dirrm include/gammu
-@dirrm %%PYTHON_SITELIBDIR%%/gammu
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/comms/geoid/pkg-plist b/comms/geoid/pkg-plist
index 6363eba22dd5..f753f75f9c80 100644
--- a/comms/geoid/pkg-plist
+++ b/comms/geoid/pkg-plist
@@ -1,4 +1,3 @@
 bin/geoid
 share/pixmaps/geoid.png
 %%DATADIR%%/country.pos
-@dirrm %%DATADIR%%
diff --git a/comms/gkermit/pkg-plist b/comms/gkermit/pkg-plist
index e373e96c5eab..fcf4b70d7456 100644
--- a/comms/gkermit/pkg-plist
+++ b/comms/gkermit/pkg-plist
@@ -1,4 +1,3 @@
 bin/gkermit
 man/man1/gkermit.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/gkermit.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/gmfsk/pkg-plist b/comms/gmfsk/pkg-plist
index aae645061cee..0b05ecebfd6c 100644
--- a/comms/gmfsk/pkg-plist
+++ b/comms/gmfsk/pkg-plist
@@ -13,8 +13,3 @@ share/pixmaps/gmfsk/pause.xpm
 share/pixmaps/gmfsk/rx.xpm
 share/pixmaps/gmfsk/tune.xpm
 share/pixmaps/gmfsk/tx.xpm
-@dirrm share/pixmaps/gmfsk
-@dirrm share/omf/gmfsk
-@dirrm share/gnome/help/gmfsk/C/figures
-@dirrm share/gnome/help/gmfsk/C
-@dirrm share/gnome/help/gmfsk
diff --git a/comms/gnocky/pkg-plist b/comms/gnocky/pkg-plist
index 0916acc27c54..2cf5e40f5e5c 100644
--- a/comms/gnocky/pkg-plist
+++ b/comms/gnocky/pkg-plist
@@ -29,7 +29,6 @@ share/gnocky/glade/sms.png
 share/gnocky/glade/startup-logo.png
 share/gnocky/glade/tasks.png
 share/gnocky/glade/write-to-phone.png
-@dirrm share/gnocky/glade
 share/gnocky/pixmaps/phones/3210.png
 share/gnocky/pixmaps/phones/3310.png
 share/gnocky/pixmaps/phones/3510i.png
@@ -41,11 +40,8 @@ share/gnocky/pixmaps/phones/c55.png
 share/gnocky/pixmaps/phones/m55.png
 share/gnocky/pixmaps/phones/s55.png
 share/gnocky/pixmaps/phones/unknown.png
-@dirrm share/gnocky/pixmaps/phones
 share/gnocky/pixmaps/me.png
 share/gnocky/pixmaps/sm.png
-@dirrm share/gnocky/pixmaps
-@dirrm share/gnocky
 %%NLS%%share/locale/de/LC_MESSAGES/gnocky.mo
 %%NLS%%share/locale/it/LC_MESSAGES/gnocky.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/gnocky.mo
diff --git a/comms/gnokii/pkg-plist b/comms/gnokii/pkg-plist
index 0e5c31e9e570..6e265fbc7577 100644
--- a/comms/gnokii/pkg-plist
+++ b/comms/gnokii/pkg-plist
@@ -17,7 +17,6 @@ include/gnokii/sms.h
 include/gnokii/statemachine.h
 include/gnokii/virtmodem.h
 include/gnokii/wappush.h
-@dirrm include/gnokii
 lib/libgnokii.a
 lib/libgnokii.so
 lib/libgnokii.so.7
@@ -52,6 +51,4 @@ share/locale/sv/LC_MESSAGES/gnokii.mo
 %%PGM%%share/smsd/sms.tables.pq.sql
 %%SQLT%%lib/smsd/libsmsd_sqlite.a
 %%SQLT%%lib/smsd/libsmsd_sqlite.so
-%%SMSD%%@dirrm lib/smsd
-%%SMSD%%@dirrm share/smsd
 %%X11%%share/applications/xgnokii.desktop
diff --git a/comms/gpredict/pkg-plist b/comms/gpredict/pkg-plist
index 0be82851ecc4..c2ce39a958df 100644
--- a/comms/gpredict/pkg-plist
+++ b/comms/gpredict/pkg-plist
@@ -146,12 +146,3 @@ share/pixmaps/gpredict/maps/nasa-topo_1024.jpg
 share/pixmaps/gpredict/maps/nasa-topo_1600.jpg
 share/pixmaps/gpredict/maps/nasa-topo_2048.jpg
 share/pixmaps/gpredict/maps/nasa-topo_800.png
-@dirrm share/pixmaps/gpredict/maps
-@dirrm share/pixmaps/gpredict/icons
-@dirrm share/pixmaps/gpredict
-@dirrmtry share/locale/en_US/LC_MESSAGES
-@dirrmtry share/locale/en_US
-@dirrm %%DATADIR%%/data/trsp
-@dirrm %%DATADIR%%/data/satdata
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%
diff --git a/comms/gpsk31/pkg-plist b/comms/gpsk31/pkg-plist
index eaedc93c6cb3..d44f9c6acaca 100644
--- a/comms/gpsk31/pkg-plist
+++ b/comms/gpsk31/pkg-plist
@@ -5,4 +5,3 @@ man/man1/gpsk31.1.gz
 %%DATADIR%%/README
 share/applications/gpsk31.desktop
 share/pixmaps/gpsk31.png
-@dirrm share/gpsk31
diff --git a/comms/grig/pkg-plist b/comms/grig/pkg-plist
index b60f13288cbd..5bd4148354ab 100644
--- a/comms/grig/pkg-plist
+++ b/comms/grig/pkg-plist
@@ -11,8 +11,3 @@ share/pixmaps/grig/digits_small.png
 share/pixmaps/grig/grig-logo.png
 share/pixmaps/grig/ic910.png
 share/pixmaps/grig/smeter.png
-@dirrm share/pixmaps/grig
-@dirrm %%DATADIR%%
-@dirrmtry lib/locale/fr/LC_MESSAGES
-@dirrmtry lib/locale/fr
-@dirrmtry lib/locale
diff --git a/comms/gscmxx/pkg-plist b/comms/gscmxx/pkg-plist
index 94131305486e..cc1ddcaf9b90 100644
--- a/comms/gscmxx/pkg-plist
+++ b/comms/gscmxx/pkg-plist
@@ -1,8 +1,6 @@
 %%SITE_PERL%%/SCMxx.pm
 %%SITE_PERL%%/SCMxx/Config.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/gscmxx/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/gscmxx
-@dirrm %%SITE_PERL%%/SCMxx
 bin/gscmxx
 share/pixmaps/gscmxx/phonebook_30.xpm
 share/pixmaps/gscmxx/preferences_30.xpm
@@ -34,9 +32,5 @@ share/gscmxx/i18n/magyar
 share/gscmxx/i18n/german
 share/gscmxx/i18n/english
 share/gscmxx/i18n/italian
-@dirrm share/gscmxx/i18n
-@dirrm share/gscmxx
-@dirrm share/pixmaps/gscmxx/groups
-@dirrm share/pixmaps/gscmxx
 %%PERL5_MAN3%%/SCMxx.3.gz
 man/man1/gscmxx.1.gz
diff --git a/comms/gsmlib/pkg-plist b/comms/gsmlib/pkg-plist
index d87748885af1..dd328c5594ba 100644
--- a/comms/gsmlib/pkg-plist
+++ b/comms/gsmlib/pkg-plist
@@ -38,4 +38,3 @@ man/man1/gsmsmsstore.1.gz
 man/man7/gsminfo.7.gz
 man/man8/gsmsmsd.8.gz
 %%NLS%%share/locale/de/LC_MESSAGES/gsmlib.mo
-@dirrm include/gsmlib
diff --git a/comms/hamfax/pkg-plist b/comms/hamfax/pkg-plist
index 2bd53afaa9be..374a51ce6a51 100644
--- a/comms/hamfax/pkg-plist
+++ b/comms/hamfax/pkg-plist
@@ -4,4 +4,3 @@ share/applications/hamfax.desktop
 %%DATADIR%%/hamfax_de.qm
 %%DATADIR%%/hamfax_fr.qm
 man/man1/hamfax.1.gz
-@dirrm %%DATADIR%%
diff --git a/comms/hamlib/pkg-plist b/comms/hamlib/pkg-plist
index 9a7db27c78bc..1aa00f13e14d 100644
--- a/comms/hamlib/pkg-plist
+++ b/comms/hamlib/pkg-plist
@@ -179,8 +179,3 @@ man/man8/rpc.rigd.8.gz
 man/man8/rpc.rotd.8.gz
 man/man8/rigctld.8.gz
 man/man8/rotctld.8.gz
-@dirrm lib/hamlib
-@dirrm lib/tcl%%TCL_VER%%/hamlib
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hamlib
-@dirrm include/hamlib
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/hf/pkg-plist b/comms/hf/pkg-plist
index 6fa89f888836..0071136fbbd7 100644
--- a/comms/hf/pkg-plist
+++ b/comms/hf/pkg-plist
@@ -56,5 +56,3 @@ man/man1/hfterm.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/pactor.ps
 %%PORTDOCS%%%%DOCSDIR%%/pactor.txt
 %%PORTDOCS%%%%DOCSDIR%%/pactor_statediag.fig
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/hidapi/pkg-plist b/comms/hidapi/pkg-plist
index 60ef37dd32f4..04a5e71bdd2f 100644
--- a/comms/hidapi/pkg-plist
+++ b/comms/hidapi/pkg-plist
@@ -4,4 +4,3 @@ lib/libhidapi.so
 lib/libhidapi.so.0
 lib/libhidapi.so.0.0.0
 libdata/pkgconfig/hidapi.pc
-@dirrm include/hidapi
diff --git a/comms/kb/pkg-plist b/comms/kb/pkg-plist
index 4a6b6c527d0c..ef1d885577fa 100644
--- a/comms/kb/pkg-plist
+++ b/comms/kb/pkg-plist
@@ -20,6 +20,3 @@ share/pixmaps/kb/icons/kb-icon.png
 %%PORTDOCS%%%%DOCSDIR%%/README_SRC
 %%PORTDOCS%%%%DOCSDIR%%/README_TIPS
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/pixmaps/kb/icons
-@dirrm share/pixmaps/kb
-@dirrm %%DATADIR%%
diff --git a/comms/libticables2/pkg-plist b/comms/libticables2/pkg-plist
index bbd563b5dced..f2adf91c46eb 100644
--- a/comms/libticables2/pkg-plist
+++ b/comms/libticables2/pkg-plist
@@ -7,4 +7,3 @@ lib/libticables2.so.6
 lib/libticables2.so.6.0.0
 libdata/pkgconfig/ticables2.pc
 %%NLS%%share/locale/fr/LC_MESSAGES/libticables2.mo
-@dirrmtry include/tilp2
diff --git a/comms/libticalcs2/pkg-plist b/comms/libticalcs2/pkg-plist
index 1c23df05b93b..55caa975aa62 100644
--- a/comms/libticalcs2/pkg-plist
+++ b/comms/libticalcs2/pkg-plist
@@ -19,4 +19,3 @@ lib/libticalcs2.so.11
 lib/libticalcs2.so.11.0.3
 libdata/pkgconfig/ticalcs2.pc
 %%NLS%%share/locale/fr/LC_MESSAGES/libticalcs2.mo
-@dirrmtry include/tilp2
diff --git a/comms/linrad/pkg-plist b/comms/linrad/pkg-plist
index f337cc16e145..4343ee6c7659 100644
--- a/comms/linrad/pkg-plist
+++ b/comms/linrad/pkg-plist
@@ -14,5 +14,3 @@ bin/xlinrad
 %%PORTDOCS%%%%DOCSDIR%%/z_SETTINGS.txt
 %%PORTDOCS%%%%DOCSDIR%%/z_USERS_EXTRA.txt
 %%PORTDOCS%%%%DOCSDIR%%/z_USERS_HWARE.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%
diff --git a/comms/lirc/pkg-plist b/comms/lirc/pkg-plist
index 28bff10bad3f..f8855fca000f 100644
--- a/comms/lirc/pkg-plist
+++ b/comms/lirc/pkg-plist
@@ -30,6 +30,5 @@ man/man8/lircd.8.gz
 man/man8/lircmd.8.gz
 sbin/lircd
 sbin/lircmd
-@dirrm include/lirc
 @sample etc/lircd.conf.sample
-@dirrmtry /var/run/lirc
+@dir /var/run/lirc
diff --git a/comms/locator/pkg-plist b/comms/locator/pkg-plist
index bdeb87e39cce..a5f74241ca12 100644
--- a/comms/locator/pkg-plist
+++ b/comms/locator/pkg-plist
@@ -1,3 +1,2 @@
 bin/locator
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/mgetty+sendfax/pkg-plist b/comms/mgetty+sendfax/pkg-plist
index 807dfda14905..eff2b8069232 100644
--- a/comms/mgetty+sendfax/pkg-plist
+++ b/comms/mgetty+sendfax/pkg-plist
@@ -129,7 +129,3 @@ sbin/faxrunqd
 sbin/mgetty
 sbin/sendfax
 sbin/vgetty
-@dirrmtry etc/mgetty+sendfax
-@dirrm lib/mgetty+sendfax/samples/new_fax.all
-@dirrm lib/mgetty+sendfax/samples
-@dirrm lib/mgetty+sendfax
diff --git a/comms/minicom/pkg-plist b/comms/minicom/pkg-plist
index a3c1c5db6634..a4901dfe35c2 100644
--- a/comms/minicom/pkg-plist
+++ b/comms/minicom/pkg-plist
@@ -30,9 +30,7 @@ man/man1/xminicom.1.gz
 %%NLS%%share/locale/sv/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/minicom.mo
-@owner uucp
-@dirrmtry etc/minicom
-@owner
+@dir(uucp,,) etc/minicom
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -78,12 +76,3 @@ man/man1/xminicom.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/extras/terminfo/README
 %%PORTDOCS%%%%DOCSDIR%%/extras/terminfo/minicom
 %%PORTDOCS%%%%DOCSDIR%%/extras/unixlogin
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/extras/linux
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/extras/tables
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/extras/termcap
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/extras/terminfo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/extras
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/rw
diff --git a/comms/nasawash/pkg-plist b/comms/nasawash/pkg-plist
index cb33d1b613be..00246ec5cb96 100644
--- a/comms/nasawash/pkg-plist
+++ b/comms/nasawash/pkg-plist
@@ -1,4 +1,3 @@
 bin/nasawash
 %%PORTDOCS%%%%DOCSDIR%%/nasawash.txt
 %%PORTDOCS%%%%DOCSDIR%%/nasawash.upd
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/ncid/pkg-plist b/comms/ncid/pkg-plist
index 2eb2751c3c85..ef84911472fd 100644
--- a/comms/ncid/pkg-plist
+++ b/comms/ncid/pkg-plist
@@ -62,4 +62,3 @@ sbin/ncidd
 sbin/sip2ncid
 %%DATADIR%%
 share/pixmaps/ncid
-@dirrmtry %%ETCDIR%%
diff --git a/comms/nec2c/pkg-plist b/comms/nec2c/pkg-plist
index 1229b5043311..f9982cacf4a5 100644
--- a/comms/nec2c/pkg-plist
+++ b/comms/nec2c/pkg-plist
@@ -104,5 +104,3 @@ bin/nec2c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yg_5el_50p_opt.nec
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yg_5el_50t.nec
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yg_9el_144.nec
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/o2sms/pkg-plist b/comms/o2sms/pkg-plist
index d9bb440465ce..f9830366aaf0 100644
--- a/comms/o2sms/pkg-plist
+++ b/comms/o2sms/pkg-plist
@@ -26,7 +26,3 @@ man/man1/meteorsms.1.gz
 man/man1/o2sms.1.gz
 man/man1/threesms.1.gz
 man/man1/vodasms.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/o2sms
-@dirrm %%SITE_PERL%%/WWW/SMS/IE
-@dirrmtry %%SITE_PERL%%/WWW/SMS
-@dirrmtry %%SITE_PERL%%/WWW
diff --git a/comms/openobex/pkg-plist b/comms/openobex/pkg-plist
index 0ad0fd2292b0..67b176ef8be6 100644
--- a/comms/openobex/pkg-plist
+++ b/comms/openobex/pkg-plist
@@ -69,8 +69,3 @@ libdata/pkgconfig/openobex.pc
 %%DOXYGEN%%%%DOCSDIR%%/html/tabs.css
 %%DOXYGEN%%%%DOCSDIR%%/html/unionobex__headerdata__t.html
 %%DOXYGEN%%%%DOCSDIR%%/html/unionobex__interface__t.html
-%%DOXYGEN%%@dirrm %%DOCSDIR%%/html
-%%DOXYGEN%%@dirrm %%DOCSDIR%%
-@dirrm include/openobex
-@dirrm lib/cmake/OpenObex-1.7.1
-@dirrmtry lib/cmake
diff --git a/comms/owfs/pkg-plist b/comms/owfs/pkg-plist
index ee49983c1e71..8c53ac2a969f 100644
--- a/comms/owfs/pkg-plist
+++ b/comms/owfs/pkg-plist
@@ -13,22 +13,18 @@
 %%OWNETPERL%%%%PERL5_MAN3%%/OWNet.3.gz
 %%OWNETPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OWNet/.packlist
 %%OWNETPERL%%%%SITE_PERL%%/OWNet.pm
-%%OWNETPERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OWNet
 %%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet-0.3-py2.7.egg-info
 %%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/__init__.py
 %%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/__init__.pyc
 %%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/connection.py
 %%OWNETPYTHON%%%%PYTHON_SITELIBDIR%%/ownet/connection.pyc
-%%OWNETPYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/ownet
 %%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/OW.pm
 %%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OW/.packlist
 %%OWPERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OW/OW.so
-%%OWPERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OW
 %%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow-2.9p5-py2.7.egg-info
 %%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/_OW.so
 %%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.py
 %%OWPYTHON%%%%PYTHON_SITELIBDIR%%/ow/__init__.pyc
-%%OWPYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/ow
 %%OWSERVER%%bin/owserver
 %%OWSHELL%%bin/owdir
 %%OWSHELL%%bin/owexist
@@ -37,7 +33,6 @@
 %%OWSHELL%%bin/owread
 %%OWSHELL%%bin/owwrite
 %%OWTAP%%bin/owtap
-%%OWTCL%%@dirrm lib/owtcl-1.0
 %%OWTCL%%lib/owtcl-1.0/ow-1.0.so
 %%OWTCL%%lib/owtcl-1.0/ow.so
 %%OWTCL%%lib/owtcl-1.0/ow.tcl
diff --git a/comms/p5-Cisco-UCS/pkg-plist b/comms/p5-Cisco-UCS/pkg-plist
index ef13e7133508..9a95605364a5 100644
--- a/comms/p5-Cisco-UCS/pkg-plist
+++ b/comms/p5-Cisco-UCS/pkg-plist
@@ -25,8 +25,3 @@
 %%PERL5_MAN3%%/Cisco::UCS::Interconnect.3.gz
 %%PERL5_MAN3%%/Cisco::UCS::MgmtEntity.3.gz
 %%PERL5_MAN3%%/Cisco::UCS::ServiceProfile.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cisco/UCS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cisco
-@dirrmtry %%SITE_PERL%%/Cisco/UCS/Common
-@dirrmtry %%SITE_PERL%%/Cisco/UCS
-@dirrmtry %%SITE_PERL%%/Cisco
diff --git a/comms/p5-Device-Gsm/pkg-plist b/comms/p5-Device-Gsm/pkg-plist
index f80fcb1c0b86..23b073c91976 100644
--- a/comms/p5-Device-Gsm/pkg-plist
+++ b/comms/p5-Device-Gsm/pkg-plist
@@ -22,8 +22,3 @@
 %%PERL5_MAN3%%/Device::Gsm::Sms.3.gz
 %%PERL5_MAN3%%/Device::Gsm::Pdu.3.gz
 %%PERL5_MAN3%%/Device::Gsm.3.gz
-@dirrm %%SITE_PERL%%/Device/Gsm/Sms/Token
-@dirrm %%SITE_PERL%%/Device/Gsm/Sms
-@dirrm %%SITE_PERL%%/Device/Gsm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/Gsm
-@dirrmtry %%SITE_PERL%%/Device
diff --git a/comms/p5-Device-Modem/pkg-plist b/comms/p5-Device-Modem/pkg-plist
index eb5e4b086ee9..ed54140e88d4 100644
--- a/comms/p5-Device-Modem/pkg-plist
+++ b/comms/p5-Device-Modem/pkg-plist
@@ -16,10 +16,3 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dial.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/shell.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmodem.pl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/Modem
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device
-@dirrmtry %%SITE_PERL%%/Device/Modem/Protocol
-@dirrmtry %%SITE_PERL%%/Device/Modem/Log
-@dirrmtry %%SITE_PERL%%/Device/Modem
-@dirrmtry %%SITE_PERL%%/Device
diff --git a/comms/p5-Device-SerialPort/pkg-plist b/comms/p5-Device-SerialPort/pkg-plist
index 3ff183b83d2e..5cdb60d6c915 100644
--- a/comms/p5-Device-SerialPort/pkg-plist
+++ b/comms/p5-Device-SerialPort/pkg-plist
@@ -4,6 +4,3 @@ bin/modemtest
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/SerialPort.so
 man/man1/modemtest.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Device
diff --git a/comms/p5-Fax-Hylafax-Client/pkg-plist b/comms/p5-Fax-Hylafax-Client/pkg-plist
index 98ebff9b439a..b034fba7789f 100644
--- a/comms/p5-Fax-Hylafax-Client/pkg-plist
+++ b/comms/p5-Fax-Hylafax-Client/pkg-plist
@@ -1,8 +1,3 @@
 %%PERL5_MAN3%%/Fax::Hylafax::Client.3.gz
 %%SITE_PERL%%/Fax/Hylafax/Client.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax/Hylafax/Client/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax/Hylafax/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax/Hylafax
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax
-@dirrmtry %%SITE_PERL%%/Fax/Hylafax
-@dirrmtry %%SITE_PERL%%/Fax
diff --git a/comms/p5-Nexmo-SMS/pkg-plist b/comms/p5-Nexmo-SMS/pkg-plist
index 24a84dae7981..cd48701ea5eb 100644
--- a/comms/p5-Nexmo-SMS/pkg-plist
+++ b/comms/p5-Nexmo-SMS/pkg-plist
@@ -15,8 +15,3 @@
 %%PERL5_MAN3%%/Nexmo::SMS::Response::Message.3.gz
 %%PERL5_MAN3%%/Nexmo::SMS::TextMessage.3.gz
 %%PERL5_MAN3%%/Nexmo::SMS::WAPPushMessage.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nexmo/SMS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nexmo
-@dirrm %%SITE_PERL%%/Nexmo/SMS/Response
-@dirrm %%SITE_PERL%%/Nexmo/SMS
-@dirrmtry %%SITE_PERL%%/Nexmo
diff --git a/comms/p5-SMS-SMS77/pkg-plist b/comms/p5-SMS-SMS77/pkg-plist
index aafea30dc106..392217631cc3 100644
--- a/comms/p5-SMS-SMS77/pkg-plist
+++ b/comms/p5-SMS-SMS77/pkg-plist
@@ -5,7 +5,3 @@ man/man1/sms77send.1.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/SMS77/.packlist
 %%PERL5_MAN3%%/SMS::SMS77.3.gz
 %%PERL5_MAN3%%/SMS::SMS77::Message.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/SMS77
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS
-@dirrmtry %%SITE_PERL%%/SMS/SMS77
-@dirrmtry %%SITE_PERL%%/SMS
diff --git a/comms/p5-SMS-Send-DeviceGsm/pkg-plist b/comms/p5-SMS-Send-DeviceGsm/pkg-plist
index f14ffce60050..8c7550ff2a76 100644
--- a/comms/p5-SMS-Send-DeviceGsm/pkg-plist
+++ b/comms/p5-SMS-Send-DeviceGsm/pkg-plist
@@ -1,8 +1,3 @@
 %%SITE_PERL%%/SMS/Send/DeviceGsm.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/DeviceGsm/.packlist
 %%PERL5_MAN3%%/SMS::Send::DeviceGsm.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/DeviceGsm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS
-@dirrmtry %%SITE_PERL%%/SMS/Send
-@dirrmtry %%SITE_PERL%%/SMS
diff --git a/comms/p5-SMS-Send-NexmoUnicode/pkg-plist b/comms/p5-SMS-Send-NexmoUnicode/pkg-plist
index 0a61b22f1ae8..bc2651a33cf0 100644
--- a/comms/p5-SMS-Send-NexmoUnicode/pkg-plist
+++ b/comms/p5-SMS-Send-NexmoUnicode/pkg-plist
@@ -1,8 +1,3 @@
 %%SITE_PERL%%/SMS/Send/NexmoUnicode.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/NexmoUnicode/.packlist
 %%PERL5_MAN3%%/SMS::Send::NexmoUnicode.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/NexmoUnicode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS
-@dirrmtry %%SITE_PERL%%/SMS/Send
-@dirrmtry %%SITE_PERL%%/SMS
diff --git a/comms/p5-SMS-Send-TW-HiAir/pkg-plist b/comms/p5-SMS-Send-TW-HiAir/pkg-plist
index 40804e0b97da..06df73377cce 100644
--- a/comms/p5-SMS-Send-TW-HiAir/pkg-plist
+++ b/comms/p5-SMS-Send-TW-HiAir/pkg-plist
@@ -1,10 +1,3 @@
 %%SITE_PERL%%/SMS/Send/TW/HiAir.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/HiAir/.packlist
 %%PERL5_MAN3%%/SMS::Send::TW::HiAir.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/HiAir
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS
-@dirrmtry %%SITE_PERL%%/SMS/Send/TW
-@dirrmtry %%SITE_PERL%%/SMS/Send
-@dirrmtry %%SITE_PERL%%/SMS
diff --git a/comms/p5-SMS-Send-TW-PChome/pkg-plist b/comms/p5-SMS-Send-TW-PChome/pkg-plist
index e2bf86e733dc..0232f2670190 100644
--- a/comms/p5-SMS-Send-TW-PChome/pkg-plist
+++ b/comms/p5-SMS-Send-TW-PChome/pkg-plist
@@ -1,10 +1,3 @@
 %%SITE_PERL%%/SMS/Send/TW/PChome.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/PChome/.packlist
 %%PERL5_MAN3%%/SMS::Send::TW::PChome.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/PChome
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS
-@dirrmtry %%SITE_PERL%%/SMS/Send/TW
-@dirrmtry %%SITE_PERL%%/SMS/Send
-@dirrmtry %%SITE_PERL%%/SMS
diff --git a/comms/p5-SMS-Send-TW-Qma/pkg-plist b/comms/p5-SMS-Send-TW-Qma/pkg-plist
index d5bf843a3a57..991ffd2c001d 100644
--- a/comms/p5-SMS-Send-TW-Qma/pkg-plist
+++ b/comms/p5-SMS-Send-TW-Qma/pkg-plist
@@ -1,10 +1,3 @@
 %%SITE_PERL%%/SMS/Send/TW/Qma.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/Qma/.packlist
 %%PERL5_MAN3%%/SMS::Send::TW::Qma.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/Qma
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS
-@dirrmtry %%SITE_PERL%%/SMS/Send/TW
-@dirrmtry %%SITE_PERL%%/SMS/Send
-@dirrmtry %%SITE_PERL%%/SMS
diff --git a/comms/p5-SMS-Send-TW-ShareSMS/pkg-plist b/comms/p5-SMS-Send-TW-ShareSMS/pkg-plist
index d8ffbb8b3fe7..e8ed5e2c0829 100644
--- a/comms/p5-SMS-Send-TW-ShareSMS/pkg-plist
+++ b/comms/p5-SMS-Send-TW-ShareSMS/pkg-plist
@@ -1,10 +1,3 @@
 %%SITE_PERL%%/SMS/Send/TW/ShareSMS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/ShareSMS/.packlist
 %%PERL5_MAN3%%/SMS::Send::TW::ShareSMS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/ShareSMS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS
-@dirrmtry %%SITE_PERL%%/SMS/Send/TW
-@dirrmtry %%SITE_PERL%%/SMS/Send
-@dirrmtry %%SITE_PERL%%/SMS
diff --git a/comms/p5-SMS-Send-TW-Socket2Air/pkg-plist b/comms/p5-SMS-Send-TW-Socket2Air/pkg-plist
index 13c3548c6d6f..ff3773a2f241 100644
--- a/comms/p5-SMS-Send-TW-Socket2Air/pkg-plist
+++ b/comms/p5-SMS-Send-TW-Socket2Air/pkg-plist
@@ -1,10 +1,3 @@
 %%SITE_PERL%%/SMS/Send/TW/Socket2Air.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/Socket2Air/.packlist
 %%PERL5_MAN3%%/SMS::Send::TW::Socket2Air.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/Socket2Air
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS
-@dirrmtry %%SITE_PERL%%/SMS/Send/TW
-@dirrmtry %%SITE_PERL%%/SMS/Send
-@dirrmtry %%SITE_PERL%%/SMS
diff --git a/comms/p5-SMS-Send-TW-chtsns/pkg-plist b/comms/p5-SMS-Send-TW-chtsns/pkg-plist
index ad92f7abdb71..84bc4a94db6e 100644
--- a/comms/p5-SMS-Send-TW-chtsns/pkg-plist
+++ b/comms/p5-SMS-Send-TW-chtsns/pkg-plist
@@ -1,10 +1,3 @@
 %%SITE_PERL%%/SMS/Send/TW/chtsns.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/chtsns/.packlist
 %%PERL5_MAN3%%/SMS::Send::TW::chtsns.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/chtsns
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS
-@dirrmtry %%SITE_PERL%%/SMS/Send/TW
-@dirrmtry %%SITE_PERL%%/SMS/Send
-@dirrmtry %%SITE_PERL%%/SMS
diff --git a/comms/p5-SMS-Send-TW-emome/pkg-plist b/comms/p5-SMS-Send-TW-emome/pkg-plist
index 56f9f0774e1e..f1d068810cdd 100644
--- a/comms/p5-SMS-Send-TW-emome/pkg-plist
+++ b/comms/p5-SMS-Send-TW-emome/pkg-plist
@@ -1,10 +1,3 @@
 %%SITE_PERL%%/SMS/Send/TW/emome.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/emome/.packlist
 %%PERL5_MAN3%%/SMS::Send::TW::emome.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW/emome
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send/TW
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS
-@dirrmtry %%SITE_PERL%%/SMS/Send/TW
-@dirrmtry %%SITE_PERL%%/SMS/Send
-@dirrmtry %%SITE_PERL%%/SMS
diff --git a/comms/p5-SMS-Send/pkg-plist b/comms/p5-SMS-Send/pkg-plist
index f4e8ebd0a85f..7b152357a20c 100644
--- a/comms/p5-SMS-Send/pkg-plist
+++ b/comms/p5-SMS-Send/pkg-plist
@@ -7,8 +7,3 @@
 %%PERL5_MAN3%%/SMS::Send::AU::Test.3.gz
 %%PERL5_MAN3%%/SMS::Send::Driver.3.gz
 %%PERL5_MAN3%%/SMS::Send::Test.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS/Send
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SMS
-@dirrmtry %%SITE_PERL%%/SMS/Send/AU
-@dirrmtry %%SITE_PERL%%/SMS/Send
-@dirrmtry %%SITE_PERL%%/SMS
diff --git a/comms/pr/pkg-plist b/comms/pr/pkg-plist
index 898da9260cd1..2959732b6c43 100644
--- a/comms/pr/pkg-plist
+++ b/comms/pr/pkg-plist
@@ -3,4 +3,3 @@ etc/rc.d/pr.sh.sample
 sbin/PortRedirector
 sbin/PortTest
 %%DOCSDIR%%/PR.html
-@dirrm %%DOCSDIR%%
diff --git a/comms/predict/pkg-plist b/comms/predict/pkg-plist
index abbcce3792dc..057410c39361 100644
--- a/comms/predict/pkg-plist
+++ b/comms/predict/pkg-plist
@@ -43,6 +43,3 @@ man/man1/predict.1.gz
 %%DATADIR%%/vocalizer/two.wav
 %%DATADIR%%/vocalizer/visible.wav
 %%DATADIR%%/vocalizer/zero.wav
-@dirrm %%DATADIR%%/default
-@dirrm %%DATADIR%%/vocalizer
-@dirrm %%DATADIR%%
diff --git a/comms/py-bulksms/pkg-plist b/comms/py-bulksms/pkg-plist
index 797825d40ac7..08393d0b457c 100644
--- a/comms/py-bulksms/pkg-plist
+++ b/comms/py-bulksms/pkg-plist
@@ -15,5 +15,3 @@ bin/sms
 %%PYTHON_SITELIBDIR%%/BulkSMS/__init__.pyc
 %%PYTHON_SITELIBDIR%%/BulkSMS/__init__.pyo
 %%PORTDOCS%%%%DOCSDIR%%/README.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/BulkSMS
diff --git a/comms/py-serial/pkg-plist b/comms/py-serial/pkg-plist
index 8809539d6185..c5de1bc8db21 100644
--- a/comms/py-serial/pkg-plist
+++ b/comms/py-serial/pkg-plist
@@ -80,8 +80,3 @@ bin/miniterm.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wxSerialConfigDialog.wxg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wxTerminal.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wxTerminal.wxg
-@dirrmtry %%PYTHON_SITELIBDIR%%/serial/tools
-@dirrmtry %%PYTHON_SITELIBDIR%%/serial/urlhandler
-@dirrmtry %%PYTHON_SITELIBDIR%%/serial
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/comms/qico/pkg-plist b/comms/qico/pkg-plist
index d0cd6806a51e..d639d313932c 100644
--- a/comms/qico/pkg-plist
+++ b/comms/qico/pkg-plist
@@ -3,4 +3,3 @@ etc/qico.conf.sample
 libexec/qico
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.ru
 %%PORTDOCS%%%%DOCSDIR%%/README.ru
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/qpage/pkg-plist b/comms/qpage/pkg-plist
index ff08ab0dcb41..25fc131ebf35 100644
--- a/comms/qpage/pkg-plist
+++ b/comms/qpage/pkg-plist
@@ -1,4 +1,4 @@
 bin/qpage
 @sample etc/qpage.conf.sample
 man/man1/qpage.1.gz
-@dirrmtry(uucp,dialer,0775) /var/spool/qpage
+@dir(uucp,dialer,0775) /var/spool/qpage
diff --git a/comms/qrq/pkg-plist b/comms/qrq/pkg-plist
index b35b63f9c7e5..a3dc5e39eeed 100644
--- a/comms/qrq/pkg-plist
+++ b/comms/qrq/pkg-plist
@@ -6,4 +6,3 @@ man/man1/qrq.1.gz
 %%DATADIR%%/qrqrc
 %%DATADIR%%/qrq.png
 %%DATADIR%%/toplist
-@dirrm %%DATADIR%%
diff --git a/comms/scmxx/pkg-plist b/comms/scmxx/pkg-plist
index a2a9a688eee4..4df0fd7d9924 100644
--- a/comms/scmxx/pkg-plist
+++ b/comms/scmxx/pkg-plist
@@ -18,14 +18,6 @@ share/locale/ru/LC_MESSAGES/scmxx.mo
 %%PORTDOCS%%%%DOCSDIR%%/gsm0338.txt
 %%PORTDOCS%%%%DOCSDIR%%/gsmcharset.txt
 %%PORTDOCS%%%%DOCSDIR%%/smi.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%EXAMPLESDIR%%/sms.txt
 %%EXAMPLESDIR%%/vCalendar.vcs
 %%EXAMPLESDIR%%/vCard.vcf
-@dirrm %%EXAMPLESDIR%%
-@dirrmtry man/de/man1
-@dirrmtry man/de/
-@dirrmtry man/ru/man1
-@dirrmtry man/ru/
-@dirrmtry man/it/man1
-@dirrmtry man/it
diff --git a/comms/sms_client/pkg-plist b/comms/sms_client/pkg-plist
index 1d4d0a559f97..a58f92d9d5bf 100644
--- a/comms/sms_client/pkg-plist
+++ b/comms/sms_client/pkg-plist
@@ -159,114 +159,3 @@ var/spool/sms/services/vodafone_australia/.keep
 var/spool/sms/services/vodafone_tap/.keep
 var/spool/sms/services/vodapage_block/.keep
 var/spool/sms/services/vstream/.keep
-@dirrmtry var/spool/sms/services/vstream
-@dirrmtry var/spool/sms/services/vodapage_block
-@dirrmtry var/spool/sms/services/vodafone_tap
-@dirrmtry var/spool/sms/services/vodafone_australia
-@dirrmtry var/spool/sms/services/vodafone
-@dirrmtry var/spool/sms/services/vodacom
-@dirrmtry var/spool/sms/services/ucp_tcp
-@dirrmtry var/spool/sms/services/tim
-@dirrmtry var/spool/sms/services/telstra
-@dirrmtry var/spool/sms/services/telia
-@dirrmtry var/spool/sms/services/telenor
-@dirrmtry var/spool/sms/services/swisscom
-@dirrmtry var/spool/sms/services/snpp
-@dirrmtry var/spool/sms/services/skytel2
-@dirrmtry var/spool/sms/services/skytel1
-@dirrmtry var/spool/sms/services/proximus_web
-@dirrmtry var/spool/sms/services/proximus
-@dirrmtry var/spool/sms/services/pageone
-@dirrmtry var/spool/sms/services/pagenet_web
-@dirrmtry var/spool/sms/services/orange_web
-@dirrmtry var/spool/sms/services/orange
-@dirrmtry var/spool/sms/services/one2one
-@dirrmtry var/spool/sms/services/nz
-@dirrmtry var/spool/sms/services/nextel_web
-@dirrmtry var/spool/sms/services/netcom
-@dirrmtry var/spool/sms/services/mtn
-@dirrmtry var/spool/sms/services/mobistar
-@dirrmtry var/spool/sms/services/minicall_new
-@dirrmtry var/spool/sms/services/minicall
-@dirrmtry var/spool/sms/services/lycos_web
-@dirrmtry var/spool/sms/services/libertel
-@dirrmtry var/spool/sms/services/kpn
-@dirrmtry var/spool/sms/services/hello
-@dirrmtry var/spool/sms/services/generic
-@dirrmtry var/spool/sms/services/europolitan
-@dirrmtry var/spool/sms/services/eplus
-@dirrmtry var/spool/sms/services/eirpage
-@dirrmtry var/spool/sms/services/digifone
-@dirrmtry var/spool/sms/services/detemobil
-@dirrmtry var/spool/sms/services/d2
-@dirrmtry var/spool/sms/services/cellnet_web
-@dirrmtry var/spool/sms/services/cellnet
-@dirrmtry var/spool/sms/services/callmax
-@dirrmtry var/spool/sms/services/btmessagemaster
-@dirrmtry var/spool/sms/services/bteasyreach
-@dirrmtry var/spool/sms/services/azcom
-@dirrmtry var/spool/sms/services/att_web
-@dirrmtry var/spool/sms/services/answer
-@dirrmtry var/spool/sms/services/ampi
-@dirrmtry var/spool/sms/services/a1
-@dirrmtry var/spool/sms/services
-@dirrmtry var/spool/sms/named_pipes
-@dirrmtry var/spool/sms/locks
-@dirrmtry var/spool/sms/incoming
-@dirrmtry var/spool/sms/errors/vstream
-@dirrmtry var/spool/sms/errors/vodapage_block
-@dirrmtry var/spool/sms/errors/vodafone_tap
-@dirrmtry var/spool/sms/errors/vodafone_australia
-@dirrmtry var/spool/sms/errors/vodafone
-@dirrmtry var/spool/sms/errors/vodacom
-@dirrmtry var/spool/sms/errors/ucp_tcp
-@dirrmtry var/spool/sms/errors/tim
-@dirrmtry var/spool/sms/errors/telstra
-@dirrmtry var/spool/sms/errors/telia
-@dirrmtry var/spool/sms/errors/telenor
-@dirrmtry var/spool/sms/errors/swisscom
-@dirrmtry var/spool/sms/errors/snpp
-@dirrmtry var/spool/sms/errors/skytel2
-@dirrmtry var/spool/sms/errors/skytel1
-@dirrmtry var/spool/sms/errors/proximus_web
-@dirrmtry var/spool/sms/errors/proximus
-@dirrmtry var/spool/sms/errors/pageone
-@dirrmtry var/spool/sms/errors/pagenet_web
-@dirrmtry var/spool/sms/errors/orange_web
-@dirrmtry var/spool/sms/errors/orange
-@dirrmtry var/spool/sms/errors/one2one
-@dirrmtry var/spool/sms/errors/nz
-@dirrmtry var/spool/sms/errors/nextel_web
-@dirrmtry var/spool/sms/errors/netcom
-@dirrmtry var/spool/sms/errors/mtn
-@dirrmtry var/spool/sms/errors/mobistar
-@dirrmtry var/spool/sms/errors/minicall_new
-@dirrmtry var/spool/sms/errors/minicall
-@dirrmtry var/spool/sms/errors/lycos_web
-@dirrmtry var/spool/sms/errors/libertel
-@dirrmtry var/spool/sms/errors/kpn
-@dirrmtry var/spool/sms/errors/hello
-@dirrmtry var/spool/sms/errors/generic
-@dirrmtry var/spool/sms/errors/europolitan
-@dirrmtry var/spool/sms/errors/eplus
-@dirrmtry var/spool/sms/errors/eirpage
-@dirrmtry var/spool/sms/errors/digifone
-@dirrmtry var/spool/sms/errors/detemobil
-@dirrmtry var/spool/sms/errors/d2
-@dirrmtry var/spool/sms/errors/cellnet_web
-@dirrmtry var/spool/sms/errors/cellnet
-@dirrmtry var/spool/sms/errors/callmax
-@dirrmtry var/spool/sms/errors/btmessagemaster
-@dirrmtry var/spool/sms/errors/bteasyreach
-@dirrmtry var/spool/sms/errors/azcom
-@dirrmtry var/spool/sms/errors/att_web
-@dirrmtry var/spool/sms/errors/answer
-@dirrmtry var/spool/sms/errors/ampi
-@dirrmtry var/spool/sms/errors/a1
-@dirrmtry var/spool/sms/errors
-@dirrmtry var/spool/sms
-@dirrmtry var/spool
-@dirrmtry var
-@dirrm etc/sms/services
-@dirrm etc/sms/scripts
-@dirrm etc/sms
diff --git a/comms/smstools3/pkg-plist b/comms/smstools3/pkg-plist
index cece952aa2c8..cc612b8dbf8b 100644
--- a/comms/smstools3/pkg-plist
+++ b/comms/smstools3/pkg-plist
@@ -26,10 +26,9 @@ bin/unicode2sms
 %%DATADIR%%/sql_demo
 %%DATADIR%%/unicode2sms
 @sample etc/smsd.conf.sample
-@dirrm %%DATADIR%%
-@dirrmtry(%%SMSD_USER%%,%%SMSD_GROUP%%,) %%SPOOLDIR%%/incoming
-@dirrmtry(%%SMSD_USER%%,%%SMSD_GROUP%%,) %%SPOOLDIR%%/outgoing
-@dirrmtry(%%SMSD_USER%%,%%SMSD_GROUP%%,) %%SPOOLDIR%%/checked
-@dirrmtry(%%SMSD_USER%%,%%SMSD_GROUP%%,) %%LOGDIR%%
-@dirrmtry(%%SMSD_USER%%,%%SMSD_GROUP%%,) %%PIDDIR%%
-@dirrmtry(%%SMSD_USER%%,%%SMSD_GROUP%%,) %%SPOOLDIR%%
+@dir(%%SMSD_USER%%,%%SMSD_GROUP%%,) %%SPOOLDIR%%/incoming
+@dir(%%SMSD_USER%%,%%SMSD_GROUP%%,) %%SPOOLDIR%%/outgoing
+@dir(%%SMSD_USER%%,%%SMSD_GROUP%%,) %%SPOOLDIR%%/checked
+@dir(%%SMSD_USER%%,%%SMSD_GROUP%%,) %%LOGDIR%%
+@dir(%%SMSD_USER%%,%%SMSD_GROUP%%,) %%PIDDIR%%
+@dir(%%SMSD_USER%%,%%SMSD_GROUP%%,) %%SPOOLDIR%%
diff --git a/comms/spandsp/pkg-plist b/comms/spandsp/pkg-plist
index fc43d8704eb4..c0bb10cf514b 100644
--- a/comms/spandsp/pkg-plist
+++ b/comms/spandsp/pkg-plist
@@ -74,4 +74,3 @@ lib/libspandsp.a
 lib/libspandsp.so
 lib/libspandsp.so.1
 lib/libspandsp.so.1.0.0
-@dirrm include/spandsp
diff --git a/comms/sredird/pkg-plist b/comms/sredird/pkg-plist
index 0331017aa79c..f84c4cfa34d7 100644
--- a/comms/sredird/pkg-plist
+++ b/comms/sredird/pkg-plist
@@ -1,3 +1,2 @@
 libexec/sredird
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/svxlink/pkg-plist b/comms/svxlink/pkg-plist
index cfbeaa3f5276..f3e8ec83d9e2 100644
--- a/comms/svxlink/pkg-plist
+++ b/comms/svxlink/pkg-plist
@@ -141,18 +141,7 @@ man/man5/ModuleDtmfRepeater.conf.5.gz
 man/man5/ModulePropagationMonitor.conf.5.gz
 man/man5/ModuleSelCallEnc.conf.5.gz
 man/man5/remotetrx.conf.5.gz
-@dirrmtry etc/svxlink/svxlink.d
-@dirrmtry etc/svxlink
-@dirrm include/svxlink
-@dirrm lib/svxlink
-@dirrm %%DATADIR%%/events.d
-@dirrm %%DATADIR%%/modules.d
-@dirrm %%DATADIR%%
-%%QTEL%%@dirrm share/qtel/translations
-%%QTEL%%@dirrm share/qtel/sounds
-%%QTEL%%@dirrm share/qtel
-%%QTEL%%@dirrmtry share/icons
-@unexec rmdir >/dev/null 2>&1 /var/spool/svxlink/voice_mail || :
-@unexec rmdir >/dev/null 2>&1 /var/spool/svxlink/qso_recorder || :
-@unexec rmdir >/dev/null 2>&1 /var/spool/svxlink/propagation_monitor || :
-@unexec rmdir >/dev/null 2>&1 /var/spool/svxlink || :
+@dir /var/spool/svxlink/voice_mail
+@dir /var/spool/svxlink/qso_recorder
+@dir /var/spool/svxlink/propagation_monitor
+@dir /var/spool/svxlink
diff --git a/comms/thebridge/pkg-plist b/comms/thebridge/pkg-plist
index 58f6f6af4ee2..4b5b59c0ba40 100644
--- a/comms/thebridge/pkg-plist
+++ b/comms/thebridge/pkg-plist
@@ -4,4 +4,3 @@ etc/tbd.conf.sample
 libexec/tbd
 %%DATADIR%%/README
 %%DATADIR%%/usermgmt.cgi
-@dirrm %%DATADIR%%
diff --git a/comms/tilp2/pkg-plist b/comms/tilp2/pkg-plist
index 255a60853582..7c3f7f696da1 100644
--- a/comms/tilp2/pkg-plist
+++ b/comms/tilp2/pkg-plist
@@ -123,10 +123,3 @@ share/mime/packages/tilp.xml
 %%DATADIR%%/pixmaps/tb_send.png
 %%DATADIR%%/pixmaps/tb_trash.png
 %%DATADIR%%/pixmaps/tilp.xpm
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/builder
-@dirrm %%DATADIR%%
-@dirrmtry share/mime/packages
-@dirrmtry share/mime
diff --git a/comms/tkhylafax/pkg-plist b/comms/tkhylafax/pkg-plist
index 93900c00572e..3b9b0b2aba35 100644
--- a/comms/tkhylafax/pkg-plist
+++ b/comms/tkhylafax/pkg-plist
@@ -19,4 +19,3 @@ lib/tkhylafax-3.2/tkhylafax.xbm
 lib/tkhylafax-3.2/dn.xbm
 lib/tkhylafax-3.2/up.xbm
 man/man1/tkhylafax.1.gz
-@dirrm lib/tkhylafax-3.2
diff --git a/comms/tkscanfax/pkg-plist b/comms/tkscanfax/pkg-plist
index 1d746235ad01..fc0d0c800d41 100644
--- a/comms/tkscanfax/pkg-plist
+++ b/comms/tkscanfax/pkg-plist
@@ -92,14 +92,3 @@ bin/tkscan
 %%TKSCANFAXDIR%%/tkscan
 %%TKSCANFAXDIR%%/tkscan.desktop
 %%TKSCANFAXDIR%%/tkscanfax.spec
-@dirrm %%TKSCANFAXDIR%%/tex
-@dirrm %%TKSCANFAXDIR%%/scan-drivers
-@dirrm %%TKSCANFAXDIR%%/images
-@dirrm %%TKSCANFAXDIR%%/doc/zh_TW
-@dirrm %%TKSCANFAXDIR%%/doc/ja_JP.UTF-8
-@dirrm %%TKSCANFAXDIR%%/doc/ja
-@dirrm %%TKSCANFAXDIR%%/doc/images
-@dirrm %%TKSCANFAXDIR%%/doc/en_US
-@dirrm %%TKSCANFAXDIR%%/doc/C
-@dirrm %%TKSCANFAXDIR%%/doc
-@dirrm %%TKSCANFAXDIR%%
diff --git a/comms/tlf/pkg-plist b/comms/tlf/pkg-plist
index aa9a8c1eb189..5504bce33df9 100644
--- a/comms/tlf/pkg-plist
+++ b/comms/tlf/pkg-plist
@@ -26,6 +26,3 @@ man/man1/tlf.1.gz
 %%DATADIR%%/ssamults
 %%DATADIR%%/rules/template
 %%DATADIR%%/rules/wpx
-@dirrm %%DATADIR%%/doc
-@dirrm %%DATADIR%%/rules
-@dirrm %%DATADIR%%
diff --git a/comms/trustedqsl/pkg-plist b/comms/trustedqsl/pkg-plist
index 82175ff91ed7..d37e25da3c5d 100644
--- a/comms/trustedqsl/pkg-plist
+++ b/comms/trustedqsl/pkg-plist
@@ -108,6 +108,3 @@ share/TrustedQSL/help/tqslapp/update.htm
 share/TrustedQSL/help/tqslapp/update1.bmp
 share/TrustedQSL/help/tqslapp/update2.bmp
 share/pixmaps/TrustedQSL.png
-@dirrm share/TrustedQSL/help/tqslapp
-@dirrm share/TrustedQSL/help
-@dirrm share/TrustedQSL
diff --git a/comms/twpsk/pkg-plist b/comms/twpsk/pkg-plist
index e97e4f6a034d..bd7c3824d079 100644
--- a/comms/twpsk/pkg-plist
+++ b/comms/twpsk/pkg-plist
@@ -7,7 +7,3 @@ share/pixmaps/twpsk.png
 %%DATADIR%%/twpskDir/Brag
 %%DATADIR%%/twpskDir/LongCQ
 %%DATADIR%%/twpskDir/ShortCQ
-@dirrmtry share/X11/app-defaults
-@dirrmtry share/X11
-@dirrmtry %%DATADIR%%/twpskDir
-@dirrmtry %%DATADIR%%
diff --git a/comms/usrp/pkg-plist b/comms/usrp/pkg-plist
index d11edabfbf31..4888418bc935 100644
--- a/comms/usrp/pkg-plist
+++ b/comms/usrp/pkg-plist
@@ -886,24 +886,3 @@ share/uhd/utils/usrp_n2xx_net_burner_gui.py
 %%PUSRP2%%share/uhd/images/usrp_n210_fw.bin
 %%PUSRP1%%share/uhd/images/usrp1_fpga_4rx.rbf
 %%PUSRP1%%share/uhd/images/usrp_b100_fw.ihx
-@dirrm share/uhd/images
-%%PUSRP1%%@dirrm share/uhd/fpga/usrp1/rev2
-%%PUSRP1%%@dirrm share/uhd/fpga/usrp1/rev4
-%%PUSRP1%%@dirrm share/uhd/fpga/usrp1
-%%PUSRP1%%@dirrm share/uhd/fpga
-@dirrm share/uhd/examples
-@dirrm share/uhd/tests
-@dirrm share/uhd/utils
-@dirrm share/uhd
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doxygen/html/search
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doxygen/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doxygen
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/rst
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/uhd/transport
-@dirrm include/uhd/types
-@dirrm include/uhd/usrp
-@dirrm include/uhd/utils
-@dirrm include/uhd
diff --git a/comms/vrflash/pkg-plist b/comms/vrflash/pkg-plist
index 292624b42938..f0ce9149422e 100644
--- a/comms/vrflash/pkg-plist
+++ b/comms/vrflash/pkg-plist
@@ -3,4 +3,3 @@ bin/vrflash
 %%PORTDOCS%%%%DOCSDIR%%/troubleshooting.txt
 %%PORTDOCS%%%%DOCSDIR%%/pmon-protect-unprotect.txt
 %%PORTDOCS%%%%DOCSDIR%%/usage.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/wsjt/pkg-plist b/comms/wsjt/pkg-plist
index 778e6e03fe35..769e0099c82e 100644
--- a/comms/wsjt/pkg-plist
+++ b/comms/wsjt/pkg-plist
@@ -35,6 +35,3 @@ bin/wsjt.py
 %%PYTHON_SITELIBDIR%%/WsjtMod/specjt.py
 %%PYTHON_SITELIBDIR%%/WsjtMod/specjt.pyc
 %%PYTHON_SITELIBDIR%%/Wsjt-WSJT.Version.%%VERSION%%_.by.K1JT-py%%PYVER%%.egg-info
-@dirrm %%PYTHON_SITELIBDIR%%/WsjtMod
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%
diff --git a/comms/wwl/pkg-plist b/comms/wwl/pkg-plist
index af2ff7d127f4..247e94f100a6 100644
--- a/comms/wwl/pkg-plist
+++ b/comms/wwl/pkg-plist
@@ -1,4 +1,3 @@
 bin/wwl 
 man/man1/wwl.1.gz
 share/doc/wwl/INSTALL
-@dirrm share/doc/wwl
diff --git a/comms/wy60/pkg-plist b/comms/wy60/pkg-plist
index edc2a52dc08a..a4e40179a3be 100644
--- a/comms/wy60/pkg-plist
+++ b/comms/wy60/pkg-plist
@@ -1,5 +1,3 @@
 bin/wy60
-@unexec if cmp %D/etc/wy60.rc.sample %D/etc/wy60.rc 2>/dev/null; then rm -f %D/etc/wy60.rc; fi
-etc/wy60.rc.sample
-@exec if test ! -f %D/etc/wy60.rc; then cp -p %D/etc/wy60.rc.sample %D/etc/wy60.rc; fi
+@sample etc/wy60.rc.sample
 man/man1/wy60.1.gz
diff --git a/comms/xastir/pkg-plist b/comms/xastir/pkg-plist
index b55ae858028e..d6b4b7b8b680 100644
--- a/comms/xastir/pkg-plist
+++ b/comms/xastir/pkg-plist
@@ -213,16 +213,3 @@ man/man1/xastir_udp_client.1.gz
 %%DATADIR%%/symbols/wind.xbm
 %%DATADIR%%/symbols/winter_storm.xbm
 %%DATADIR%%/symbols/winter_weather.xbm
-@dirrm %%DATADIR%%/symbols
-@dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/maps/Online
-@dirrm %%DATADIR%%/maps/GPS
-@dirrm %%DATADIR%%/maps
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/fcc
-@dirrm %%DATADIR%%/config
-@dirrm %%DATADIR%%/GNIS
-@dirrm %%DATADIR%%/Counties
-@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
diff --git a/comms/xdx/pkg-plist b/comms/xdx/pkg-plist
index ca6b8a087fd7..ee3d28b65945 100644
--- a/comms/xdx/pkg-plist
+++ b/comms/xdx/pkg-plist
@@ -25,6 +25,3 @@ share/locale/pt/LC_MESSAGES/xdx.mo
 %%DATADIR%%/sounds/attention.wav
 %%DATADIR%%/wwv.gnuplot
 %%DATADIR%%/wwv.gnuplot~
-@dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%
diff --git a/comms/xlog/pkg-plist b/comms/xlog/pkg-plist
index f4b45e6d78ff..c567cbb33fe1 100644
--- a/comms/xlog/pkg-plist
+++ b/comms/xlog/pkg-plist
@@ -503,29 +503,3 @@ share/pixmaps/xlog/xlog.xpm
 %%DATADIR%%/maps/ZS.png
 %%DATADIR%%/maps/ZS8.png
 %%DATADIR%%/maps/worldmap.jpg
-@dirrmtry %%DATADIR%%/maps/VP8
-@dirrmtry %%DATADIR%%/maps/VP6
-@dirrmtry %%DATADIR%%/maps/SV
-@dirrmtry %%DATADIR%%/maps/KH8
-@dirrmtry %%DATADIR%%/maps/JD
-@dirrmtry %%DATADIR%%/maps/HK0
-@dirrmtry %%DATADIR%%/maps/FR
-@dirrmtry %%DATADIR%%/maps/FO
-@dirrmtry %%DATADIR%%/maps/FK
-@dirrmtry %%DATADIR%%/maps/E5
-@dirrmtry %%DATADIR%%/maps/3Y
-@dirrmtry %%DATADIR%%/maps/3D2
-@dirrmtry %%DATADIR%%/maps
-@dirrmtry %%DATADIR%%/dxcc
-@dirrmtry %%DATADIR%%
-@dirrmtry share/pixmaps/xlog
-@dirrmtry share/mime/text
-@dirrmtry share/mime/packages
-@dirrmtry share/mime
-@dirrmtry share/icons
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/manual/output/html/search
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/manual/output/html
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/manual/output
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/manual
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/glabels
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
diff --git a/comms/xnec2c/pkg-plist b/comms/xnec2c/pkg-plist
index 893676b55315..288ac4eb3e27 100644
--- a/comms/xnec2c/pkg-plist
+++ b/comms/xnec2c/pkg-plist
@@ -7,5 +7,3 @@ bin/xnec2c
 %%DOCS%%%%DOCSDIR%%/images/nec2_edit.png
 %%DOCS%%%%DOCSDIR%%/images/radiation.png
 %%DOCS%%%%DOCSDIR%%/images/wire.png
-%%DOCS%%@dirrm %%DOCSDIR%%/images
-%%DOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/xwota/pkg-plist b/comms/xwota/pkg-plist
index 1e1e4432ff37..bf37e0d2c42e 100644
--- a/comms/xwota/pkg-plist
+++ b/comms/xwota/pkg-plist
@@ -7,5 +7,3 @@ bin/xwota
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/yagiuda/pkg-plist b/comms/yagiuda/pkg-plist
index 17df5087168d..70c47d59a5fc 100644
--- a/comms/yagiuda/pkg-plist
+++ b/comms/yagiuda/pkg-plist
@@ -24,4 +24,3 @@ man/man5/output.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/pattern.jpg
 %%PORTDOCS%%%%DOCSDIR%%/yagi.1.html
 %%PORTDOCS%%%%DOCSDIR%%/yagi.jpg
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/yaps/pkg-plist b/comms/yaps/pkg-plist
index 535d0b5fee38..d352b9701161 100644
--- a/comms/yaps/pkg-plist
+++ b/comms/yaps/pkg-plist
@@ -3,4 +3,3 @@ etc/yaps.rc.sample
 man/man1/yaps.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/yaps.doc
 %%PORTDOCS%%%%DOCSDIR%%/yaps.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/comms/yfklog/pkg-plist b/comms/yfklog/pkg-plist
index 595f2329636f..54d5c5118898 100644
--- a/comms/yfklog/pkg-plist
+++ b/comms/yfklog/pkg-plist
@@ -25,8 +25,3 @@ share/pixmaps/yfklog.png
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/RELEASENOTES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/clubs
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/onlinelog
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%DATADIR%%