95 files changed, 3 insertions, 1037 deletions

diff --git a/misc/achievo/pkg-plist b/misc/achievo/pkg-plist
index 9f53fd354b51..8765cd0da678 100644
--- a/misc/achievo/pkg-plist
+++ b/misc/achievo/pkg-plist
@@ -475,98 +475,3 @@
 %%ACHVODIR%%/version.inc
 @owner
 @group
-@dirrm %%ACHVODIR%%/upgrade
-@dirrm %%ACHVODIR%%/themes/achievo_classic/images
-@dirrm %%ACHVODIR%%/themes/achievo_classic
-@dirrm %%ACHVODIR%%/themes/achievo
-@dirrm %%ACHVODIR%%/themes
-@dirrm %%ACHVODIR%%/scheduler
-@dirrm %%ACHVODIR%%/modules/utils/attributes
-@dirrm %%ACHVODIR%%/modules/utils
-@dirrm %%ACHVODIR%%/modules/todo/install
-@dirrm %%ACHVODIR%%/modules/todo/cron
-@dirrm %%ACHVODIR%%/modules/todo
-@dirrm %%ACHVODIR%%/modules/timereg/install
-@dirrm %%ACHVODIR%%/modules/timereg/cron
-@dirrm %%ACHVODIR%%/modules/timereg/attributes
-@dirrm %%ACHVODIR%%/modules/timereg
-@dirrm %%ACHVODIR%%/modules/setup/install
-@dirrm %%ACHVODIR%%/modules/setup
-@dirrm %%ACHVODIR%%/modules/search/install
-@dirrm %%ACHVODIR%%/modules/search
-@dirrm %%ACHVODIR%%/modules/reports/install
-@dirrm %%ACHVODIR%%/modules/reports
-@dirrm %%ACHVODIR%%/modules/project/install
-@dirrm %%ACHVODIR%%/modules/project/attributes
-@dirrm %%ACHVODIR%%/modules/project
-@dirrm %%ACHVODIR%%/modules/pim/install
-@dirrm %%ACHVODIR%%/modules/pim
-@dirrm %%ACHVODIR%%/modules/person/install
-@dirrm %%ACHVODIR%%/modules/person
-@dirrm %%ACHVODIR%%/modules/organization/install
-@dirrm %%ACHVODIR%%/modules/organization
-@dirrm %%ACHVODIR%%/modules/notes/install
-@dirrm %%ACHVODIR%%/modules/notes
-@dirrm %%ACHVODIR%%/modules/graph/jpgraph
-@dirrm %%ACHVODIR%%/modules/graph/attributes
-@dirrm %%ACHVODIR%%/modules/graph
-@dirrm %%ACHVODIR%%/modules/employee/install
-@dirrm %%ACHVODIR%%/modules/employee
-@dirrm %%ACHVODIR%%/modules/calendar/install
-@dirrm %%ACHVODIR%%/modules/calendar
-@dirrm %%ACHVODIR%%/modules
-@dirrm %%ACHVODIR%%/manual
-@dirrm %%ACHVODIR%%/languages/unmaintained
-@dirrm %%ACHVODIR%%/languages
-@dirrm %%ACHVODIR%%/javascript
-@dirrm %%ACHVODIR%%/images
-@dirrm %%ACHVODIR%%/help/english
-@dirrm %%ACHVODIR%%/help
-@dirrm %%ACHVODIR%%/doc
-@dirrm %%ACHVODIR%%/cron
-@dirrm %%ACHVODIR%%/contrib
-@dirrm %%ACHVODIR%%/atk/utils
-@dirrm %%ACHVODIR%%/atk/themes/slash/images
-@dirrm %%ACHVODIR%%/atk/themes/slash
-@dirrm %%ACHVODIR%%/atk/themes/rainyd/images
-@dirrm %%ACHVODIR%%/atk/themes/rainyd
-@dirrm %%ACHVODIR%%/atk/themes/papered/images
-@dirrm %%ACHVODIR%%/atk/themes/papered
-@dirrm %%ACHVODIR%%/atk/themes/outlook/tree_icons
-@dirrm %%ACHVODIR%%/atk/themes/outlook/styles
-@dirrm %%ACHVODIR%%/atk/themes/outlook/images
-@dirrm %%ACHVODIR%%/atk/themes/outlook
-@dirrm %%ACHVODIR%%/atk/themes/newsforge/images
-@dirrm %%ACHVODIR%%/atk/themes/newsforge
-@dirrm %%ACHVODIR%%/atk/themes/moronic/styles
-@dirrm %%ACHVODIR%%/atk/themes/moronic
-@dirrm %%ACHVODIR%%/atk/themes/kuro5hin
-@dirrm %%ACHVODIR%%/atk/themes/default/tree_icons
-@dirrm %%ACHVODIR%%/atk/themes/default/toolbar_icons
-@dirrm %%ACHVODIR%%/atk/themes/default/styles
-@dirrm %%ACHVODIR%%/atk/themes/default/images
-@dirrm %%ACHVODIR%%/atk/themes/default
-@dirrm %%ACHVODIR%%/atk/themes/blurb/images
-@dirrm %%ACHVODIR%%/atk/themes/blurb
-@dirrm %%ACHVODIR%%/atk/themes/blackbox
-@dirrm %%ACHVODIR%%/atk/themes/ananda/images
-@dirrm %%ACHVODIR%%/atk/themes/ananda
-@dirrm %%ACHVODIR%%/atk/themes
-@dirrm %%ACHVODIR%%/atk/session
-@dirrm %%ACHVODIR%%/atk/security
-@dirrm %%ACHVODIR%%/atk/relations
-@dirrm %%ACHVODIR%%/atk/recordlist
-@dirrm %%ACHVODIR%%/atk/popups
-@dirrm %%ACHVODIR%%/atk/modules
-@dirrm %%ACHVODIR%%/atk/lock/db
-@dirrm %%ACHVODIR%%/atk/lock
-@dirrm %%ACHVODIR%%/atk/languages
-@dirrm %%ACHVODIR%%/atk/javascript/calendar/lang
-@dirrm %%ACHVODIR%%/atk/javascript/calendar
-@dirrm %%ACHVODIR%%/atk/javascript
-@dirrm %%ACHVODIR%%/atk/include
-@dirrm %%ACHVODIR%%/atk/images
-@dirrm %%ACHVODIR%%/atk/db
-@dirrm %%ACHVODIR%%/atk/attributes
-@dirrm %%ACHVODIR%%/atk
-@dirrmtry %%ACHVODIR%%
diff --git a/misc/asbutton/pkg-plist b/misc/asbutton/pkg-plist
index 90e619e7242f..4b2b3276ac76 100644
--- a/misc/asbutton/pkg-plist
+++ b/misc/asbutton/pkg-plist
@@ -57,5 +57,3 @@ bin/asbutton
 %%DATADIR%%/asb9-xmms.xpm
 %%DATADIR%%/asb9-xv.xpm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/asbuttonrc
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%DATADIR%%
diff --git a/misc/astrolog/pkg-plist b/misc/astrolog/pkg-plist
index e4810eaefc6c..4ab862e484a4 100644
--- a/misc/astrolog/pkg-plist
+++ b/misc/astrolog/pkg-plist
@@ -57,4 +57,3 @@ lib/astrolog/seplm36.se1
 lib/astrolog/seplm42.se1
 lib/astrolog/seplm48.se1
 lib/astrolog/seplm54.se1
-@dirrmtry lib/astrolog
diff --git a/misc/bbjd/pkg-plist b/misc/bbjd/pkg-plist
index be8622519059..7169afb16a44 100644
--- a/misc/bbjd/pkg-plist
+++ b/misc/bbjd/pkg-plist
@@ -3,4 +3,3 @@ bin/simbj
 share/bbjd/Interactive
 share/bbjd/Simulation
 share/bbjd/Theory
-@dirrm share/bbjd
diff --git a/misc/bibletime/pkg-plist b/misc/bibletime/pkg-plist
index 7fd7c9cc6723..d8c9ef30d1cc 100644
--- a/misc/bibletime/pkg-plist
+++ b/misc/bibletime/pkg-plist
@@ -963,40 +963,3 @@ share/applications/bibletime.desktop
 %%DATADIR%%/pics/startuplogo_christmas.png
 %%DATADIR%%/pics/startuplogo_easter.jpg
 share/icons/bibletime.svg
-@dirrmtry share/icons
-@dirrmtry %%DATADIR%%/pics
-@dirrmtry %%DATADIR%%/locale
-@dirrmtry %%DATADIR%%/license
-@dirrmtry %%DATADIR%%/javascript
-@dirrmtry %%DATADIR%%/icons
-@dirrmtry %%DATADIR%%/docs/howto/ru
-@dirrmtry %%DATADIR%%/docs/howto/pt_BR
-@dirrmtry %%DATADIR%%/docs/howto/nl
-@dirrmtry %%DATADIR%%/docs/howto/ko
-@dirrmtry %%DATADIR%%/docs/howto/it
-@dirrmtry %%DATADIR%%/docs/howto/hu
-@dirrmtry %%DATADIR%%/docs/howto/fr
-@dirrmtry %%DATADIR%%/docs/howto/fi
-@dirrmtry %%DATADIR%%/docs/howto/es
-@dirrmtry %%DATADIR%%/docs/howto/en
-@dirrmtry %%DATADIR%%/docs/howto/de
-@dirrmtry %%DATADIR%%/docs/howto/da
-@dirrmtry %%DATADIR%%/docs/howto/cs
-@dirrmtry %%DATADIR%%/docs/howto/bg
-@dirrmtry %%DATADIR%%/docs/howto/ar
-@dirrmtry %%DATADIR%%/docs/howto
-@dirrmtry %%DATADIR%%/docs/handbook/pt_BR
-@dirrmtry %%DATADIR%%/docs/handbook/nl
-@dirrmtry %%DATADIR%%/docs/handbook/it
-@dirrmtry %%DATADIR%%/docs/handbook/hu
-@dirrmtry %%DATADIR%%/docs/handbook/fr
-@dirrmtry %%DATADIR%%/docs/handbook/fi
-@dirrmtry %%DATADIR%%/docs/handbook/es
-@dirrmtry %%DATADIR%%/docs/handbook/en
-@dirrmtry %%DATADIR%%/docs/handbook/de
-@dirrmtry %%DATADIR%%/docs/handbook/cs
-@dirrmtry %%DATADIR%%/docs/handbook/ar
-@dirrmtry %%DATADIR%%/docs/handbook
-@dirrmtry %%DATADIR%%/docs
-@dirrmtry %%DATADIR%%/display-templates
-@dirrmtry %%DATADIR%%
diff --git a/misc/brs/pkg-plist b/misc/brs/pkg-plist
index f7e94853d2ae..3d481b3eed6f 100644
--- a/misc/brs/pkg-plist
+++ b/misc/brs/pkg-plist
@@ -2,4 +2,3 @@ bin/bible
 man/man1/bible.1.gz
 %%DATADIR%%/bible.data
 %%DATADIR%%/bible.data.conc
-@dirrm %%DATADIR%%
diff --git a/misc/cdcollect/pkg-plist b/misc/cdcollect/pkg-plist
index 223c235d7973..7fdb3772ffa8 100644
--- a/misc/cdcollect/pkg-plist
+++ b/misc/cdcollect/pkg-plist
@@ -4,4 +4,3 @@ share/locale/cs/LC_MESSAGES/cdcollect.mo
 share/locale/es/LC_MESSAGES/cdcollect.mo
 share/pixmaps/cdcollect.png
 share/applications/cdcollect.desktop
-@dirrm lib/cdcollect
diff --git a/misc/compat5x/pkg-plist b/misc/compat5x/pkg-plist
index c6e982859967..16c8902bc795 100644
--- a/misc/compat5x/pkg-plist
+++ b/misc/compat5x/pkg-plist
@@ -209,6 +209,3 @@ lib/compat/snmp_netgraph.so.2
 %%AMD64%%lib32/compat/snmp_mibII.so.2
 %%AMD64%%lib32/compat/snmp_netgraph.so.2
 %%AMD64%%@exec %%LDCONFIG_LIB32%% -m %D/lib32/compat
-%%AMD64%%@dirrmtry lib32/compat
-%%AMD64%%@dirrmtry lib32
-@dirrmtry lib/compat
diff --git a/misc/crosspad/pkg-plist b/misc/crosspad/pkg-plist
index fa6cec7025a2..9aed525d616a 100644
--- a/misc/crosspad/pkg-plist
+++ b/misc/crosspad/pkg-plist
@@ -13,4 +13,3 @@ man/man1/padload.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/PROTOCOL
 %%PORTDOCS%%%%DOCSDIR%%/README.english
 %%PORTDOCS%%%%DOCSDIR%%/README.japanese
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/dahdi/pkg-plist b/misc/dahdi/pkg-plist
index be529623a082..390534f329e4 100644
--- a/misc/dahdi/pkg-plist
+++ b/misc/dahdi/pkg-plist
@@ -23,6 +23,3 @@ man/man8/dahdi_scan.8.gz
 man/man8/dahdi_test.8.gz
 man/man8/dahdi_tool.8.gz
 man/man8/fxotune.8.gz
-@dirrm include/dahdi/compat
-@dirrm include/dahdi
-@dirrmtry etc/dahdi
diff --git a/misc/deco/pkg-plist b/misc/deco/pkg-plist
index e5a0ca3d2152..ed586fac1d31 100644
--- a/misc/deco/pkg-plist
+++ b/misc/deco/pkg-plist
@@ -23,5 +23,3 @@ man/ru.KOI8-R/man1/deco.1.gz
 %%DATADIR%%/help/u.view
 %%DATADIR%%/menu
 %%DATADIR%%/profile
-@dirrm %%DATADIR%%/help
-@dirrm share/deco
diff --git a/misc/dejagnu/pkg-plist b/misc/dejagnu/pkg-plist
index 20d81f09ff53..c424a8cfdae5 100644
--- a/misc/dejagnu/pkg-plist
+++ b/misc/dejagnu/pkg-plist
@@ -160,7 +160,3 @@ man/man1/runtest.1.gz
 %%DATADIR%%/testglue.c
 %%DATADIR%%/tip.exp
 %%DATADIR%%/utils.exp
-@dirrm %%DATADIR%%/libexec
-@dirrm %%DATADIR%%/config
-@dirrm %%DATADIR%%/baseboards
-@dirrm %%DATADIR%%
diff --git a/misc/diary-hercules/pkg-plist b/misc/diary-hercules/pkg-plist
index 3c55a810af4f..66f66916dc0b 100644
--- a/misc/diary-hercules/pkg-plist
+++ b/misc/diary-hercules/pkg-plist
@@ -61,8 +61,3 @@ share/hercules/xrc/exercisewizard.xrc
 share/hercules/xrc/hercules.xrc
 share/locale/cs/LC_MESSAGES/hercules.mo
 share/locale/ru/LC_MESSAGES/hercules.mo
-@dirrm share/hercules/xrc
-@dirrm share/hercules
-@dirrm %%PYTHON_SITELIBDIR%%/Hercules/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/Hercules/gui
-@dirrm %%PYTHON_SITELIBDIR%%/Hercules
diff --git a/misc/dnetc/pkg-plist b/misc/dnetc/pkg-plist
index 1a2767a1c659..d6f537db41c8 100644
--- a/misc/dnetc/pkg-plist
+++ b/misc/dnetc/pkg-plist
@@ -1,14 +1,4 @@
-@owner dnetc
-@group dnetc
-distributed.net/dnetc
-@sample distributed.net/dnetc.ini.sample
-@group
-@owner
+@(dnetc,dnetc,) distributed.net/dnetc
+@sample(dnetc,dnetc,) distributed.net/dnetc.ini.sample
 man/man1/dnetc.1.gz
-@owner dnetc
-@group dnetc
-@mode 0775
-@dirrm distributed.net
-@mode
-@group
-@owner
+@dir(dnetc,dnetc,0775) distributed.net
diff --git a/misc/dphys-config/pkg-plist b/misc/dphys-config/pkg-plist
index e2ba3c4fe023..1ae2e97ead60 100644
--- a/misc/dphys-config/pkg-plist
+++ b/misc/dphys-config/pkg-plist
@@ -18,7 +18,3 @@ man/man1/dphys-config.1.gz
 %%EXAMPLESDIR%%/site.example/local/sbin/dphys-config-quota
 %%EXAMPLESDIR%%/site.example/local/sbin/dphys-config-usb-storage
 %%EXAMPLESDIR%%/site.example/local/sbin/dphys-config-x
-@dirrm %%EXAMPLESDIR%%/site.example/local/sbin
-@dirrm %%EXAMPLESDIR%%/site.example/local
-@dirrm %%EXAMPLESDIR%%/site.example
-@dirrm %%EXAMPLESDIR%%
diff --git a/misc/elscreen/pkg-plist b/misc/elscreen/pkg-plist
index f3dc514f30a1..b1617868ad02 100644
--- a/misc/elscreen/pkg-plist
+++ b/misc/elscreen/pkg-plist
@@ -1,4 +1,3 @@
 share/emacs/site-lisp/elscreen.el
 %%PORTDOCS%%share/doc/elscreen/ChangeLog
 %%PORTDOCS%%share/doc/elscreen/README
-%%PORTDOCS%%@dirrm share/doc/elscreen
diff --git a/misc/explosions/pkg-plist b/misc/explosions/pkg-plist
index d5ee7d056f59..3c3bd7c012b0 100644
--- a/misc/explosions/pkg-plist
+++ b/misc/explosions/pkg-plist
@@ -7,4 +7,3 @@ bin/explosions
 %%DATADIR%%/spark6.png
 %%DATADIR%%/spark7.png
 share/pixmaps/explosions.png
-@dirrm %%DATADIR%%
diff --git a/misc/fbless/pkg-plist b/misc/fbless/pkg-plist
index 47856c09abc4..96ec50d319b5 100644
--- a/misc/fbless/pkg-plist
+++ b/misc/fbless/pkg-plist
@@ -32,5 +32,3 @@ bin/fbless
 %%PYTHON_SITELIBDIR%%/fbless_lib/paragraph.py
 %%PYTHON_SITELIBDIR%%/fbless_lib/paragraph.pyc
 %%PYTHON_SITELIBDIR%%/fbless_lib/paragraph.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/fbless_lib/hyph_dicts
-@dirrm %%PYTHON_SITELIBDIR%%/fbless_lib
diff --git a/misc/figlet-fonts/pkg-plist b/misc/figlet-fonts/pkg-plist
index bc36d5d3eadc..c61c5a28160f 100644
--- a/misc/figlet-fonts/pkg-plist
+++ b/misc/figlet-fonts/pkg-plist
@@ -741,4 +741,3 @@
 %%DATADIR%%/zig_zag_.flf.txt
 %%DATADIR%%/zone7___.flf
 %%DATADIR%%/zone7___.flf.txt
-@dirrmtry %%DATADIR%%
diff --git a/misc/figlet/pkg-plist b/misc/figlet/pkg-plist
index e1ec17466b68..225c34c774c6 100644
--- a/misc/figlet/pkg-plist
+++ b/misc/figlet/pkg-plist
@@ -63,6 +63,4 @@ man/man6/chkfont.6.gz
 man/man6/figlet.6.gz
 man/man6/figlist.6.gz
 man/man6/showfigfonts.6.gz
-@dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/figfont.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/findutils/pkg-plist b/misc/findutils/pkg-plist
index 7a457f8f7bb8..478bf909c885 100644
--- a/misc/findutils/pkg-plist
+++ b/misc/findutils/pkg-plist
@@ -55,7 +55,3 @@ man/man5/glocatedb.5.gz
 %%NLS%%share/locale/vi/LC_MESSAGES/findutils.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/findutils.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/findutils.mo
-%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/rw
-%%NLS%%@dirrmtry share/locale/lg/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lg
diff --git a/misc/fortune-mod-bible/pkg-plist b/misc/fortune-mod-bible/pkg-plist
index bc456c180de9..8a97c2760603 100644
--- a/misc/fortune-mod-bible/pkg-plist
+++ b/misc/fortune-mod-bible/pkg-plist
@@ -1,4 +1,2 @@
 share/games/fortune/bible
 share/games/fortune/bible.dat
-@dirrmtry share/games/fortune
-@dirrmtry share/games
diff --git a/misc/fortune-mod-bofh/pkg-plist b/misc/fortune-mod-bofh/pkg-plist
index 80ee1a9bde21..3a90a83365fc 100644
--- a/misc/fortune-mod-bofh/pkg-plist
+++ b/misc/fortune-mod-bofh/pkg-plist
@@ -1,4 +1,2 @@
 share/games/fortune/bofh
 share/games/fortune/bofh.dat
-@dirrmtry share/games/fortune
-@dirrmtry share/games
diff --git a/misc/fortuneit/pkg-plist b/misc/fortuneit/pkg-plist
index 985597b55f6c..593ea2ea0daa 100644
--- a/misc/fortuneit/pkg-plist
+++ b/misc/fortuneit/pkg-plist
@@ -44,5 +44,3 @@ share/games/fortune/zuse
 share/games/fortune/zuse-o
 share/games/fortune/zuse-o.dat
 share/games/fortune/zuse.dat
-@dirrm share/games/fortune
-@dirrm share/games
diff --git a/misc/fxload/pkg-plist b/misc/fxload/pkg-plist
index f33a8f8145b1..a4676e4184eb 100644
--- a/misc/fxload/pkg-plist
+++ b/misc/fxload/pkg-plist
@@ -2,4 +2,3 @@ etc/devd/xilinx.conf
 sbin/fxload
 man/man8/fxload.8.gz
 %%DATADIR%%/a3load.hex
-@dirrm %%DATADIR%%
diff --git a/misc/gctpc/pkg-plist b/misc/gctpc/pkg-plist
index cb5561cb5db5..638ad2384d87 100644
--- a/misc/gctpc/pkg-plist
+++ b/misc/gctpc/pkg-plist
@@ -23,5 +23,3 @@ lib/libgctpc.so.1
 %%PORTDOCS%%%%DOCSDIR%%/reference.txt
 %%PORTDOCS%%%%DOCSDIR%%/xxxfor.ps
 %%PORTDOCS%%%%DOCSDIR%%/xxxinv.ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/gctpc
diff --git a/misc/gkx86info2/pkg-plist b/misc/gkx86info2/pkg-plist
index 1e2151b32729..0b15afadf8f3 100644
--- a/misc/gkx86info2/pkg-plist
+++ b/misc/gkx86info2/pkg-plist
@@ -1,3 +1,2 @@
 libexec/gkrellm2/plugins/gkx86info2.so
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/gnome-mime-data/pkg-plist b/misc/gnome-mime-data/pkg-plist
index e1b3d4658bc1..c363d6e26d55 100644
--- a/misc/gnome-mime-data/pkg-plist
+++ b/misc/gnome-mime-data/pkg-plist
@@ -76,15 +76,3 @@ share/locale/yi/LC_MESSAGES/gnome-mime-data.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-mime-data.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo
 share/locale/zu/LC_MESSAGES/gnome-mime-data.mo
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/yi/LC_MESSAGES
-@dirrmtry share/locale/yi
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/sr@ije/LC_MESSAGES
-@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
diff --git a/misc/gnome-osd/pkg-plist b/misc/gnome-osd/pkg-plist
index ca79e2a071c4..eb77d678a75d 100644
--- a/misc/gnome-osd/pkg-plist
+++ b/misc/gnome-osd/pkg-plist
@@ -62,6 +62,3 @@ share/locale/sv/LC_MESSAGES/gnome-osd.mo
 share/locale/tr/LC_MESSAGES/gnome-osd.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-osd.mo
 share/pixmaps/gnome-osd.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/gnomeosd
diff --git a/misc/gnuit/pkg-plist b/misc/gnuit/pkg-plist
index ff3d3e26dfcb..b39e1080f30c 100644
--- a/misc/gnuit/pkg-plist
+++ b/misc/gnuit/pkg-plist
@@ -68,6 +68,4 @@ man/man1/gitrgrep.1.gz
 man/man1/gitunpack.1.gz
 man/man1/gitview.1.gz
 man/man1/gitwipe.1.gz
-@dirrm %%DATADIR%%
 %%DOCSDIR%%/gnuit.html
-@dirrm %%DOCSDIR%%
diff --git a/misc/gonvert/pkg-plist b/misc/gonvert/pkg-plist
index 87afffe45c76..ff4c693c79d1 100644
--- a/misc/gonvert/pkg-plist
+++ b/misc/gonvert/pkg-plist
@@ -5,5 +5,3 @@ share/applications/gonvert.desktop
 %%DATADIR%%/pixmaps/gonvert.png
 %%NLS%%share/locale/pl/LC_MESSAGES/gonvert.mo
 share/pixmaps/gonvert.png
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%
diff --git a/misc/grc/pkg-plist b/misc/grc/pkg-plist
index 77c341b2c3a4..1594535ba4bf 100644
--- a/misc/grc/pkg-plist
+++ b/misc/grc/pkg-plist
@@ -23,4 +23,3 @@ man/man1/grcat.1.gz
 %%DATADIR%%/conf.ps
 %%DATADIR%%/conf.traceroute
 %%DATADIR%%/conf.wdiff
-@dirrm %%DATADIR%%
diff --git a/misc/gregexp/pkg-plist b/misc/gregexp/pkg-plist
index c63f56b9189c..589a59ba035c 100644
--- a/misc/gregexp/pkg-plist
+++ b/misc/gregexp/pkg-plist
@@ -2,5 +2,3 @@ bin/gregexp
 share/applications/gregexp.desktop
 share/pixmaps/gregexp.png
 share/gregexp/glade/gregexp.glade
-@dirrm share/gregexp/glade
-@dirrm share/gregexp
diff --git a/misc/hb/pkg-plist b/misc/hb/pkg-plist
index a2b3ae4a83f9..571ea0782c4b 100644
--- a/misc/hb/pkg-plist
+++ b/misc/hb/pkg-plist
@@ -6,4 +6,3 @@ share/doc/hb/1-HB-License.txt
 share/doc/hb/2-HowToUse.txt
 share/doc/hb/3-UnderTheHood.txt
 share/doc/hb/4-Limitations-Enhancements.txt
-@dirrm share/doc/hb
diff --git a/misc/heyu2/pkg-plist b/misc/heyu2/pkg-plist
index 7d456bb83fdc..cc313ef96e96 100644
--- a/misc/heyu2/pkg-plist
+++ b/misc/heyu2/pkg-plist
@@ -11,4 +11,3 @@ man/man5/x10sched.5.gz
 man/man5/x10scripts.5.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/x10.sched.sample
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/x10config.sample
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/misc/hotkeys/pkg-plist b/misc/hotkeys/pkg-plist
index b0c2ea862380..9c3b73583362 100644
--- a/misc/hotkeys/pkg-plist
+++ b/misc/hotkeys/pkg-plist
@@ -31,4 +31,3 @@ man/man1/hotkeys.1.gz
 %%DATADIR%%/sk2800c.def
 %%DATADIR%%/sk7100.def
 %%DATADIR%%/sk9925.def
-@dirrm %%DATADIR%%
diff --git a/misc/iso-codes/pkg-plist b/misc/iso-codes/pkg-plist
index 61862223f9d5..9724aa3715b9 100644
--- a/misc/iso-codes/pkg-plist
+++ b/misc/iso-codes/pkg-plist
@@ -417,80 +417,3 @@ share/xml/iso-codes/iso_4217.xml
 share/xml/iso-codes/iso_639.xml
 share/xml/iso-codes/iso_639_3.xml
 share/xml/iso-codes/iso_639_5.xml
-@dirrmtry share/xml/iso-codes
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/wo/LC_MESSAGES
-@dirrmtry share/locale/wo
-@dirrmtry share/locale/wal/LC_MESSAGES
-@dirrmtry share/locale/wal
-@dirrmtry share/locale/ve/LC_MESSAGES
-@dirrmtry share/locale/ve
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/tt@iqtelif/LC_MESSAGES
-@dirrmtry share/locale/tt@iqtelif
-@dirrmtry share/locale/tt/LC_MESSAGES
-@dirrmtry share/locale/tt
-@dirrmtry share/locale/tl/LC_MESSAGES
-@dirrmtry share/locale/tl
-@dirrmtry share/locale/tig/LC_MESSAGES
-@dirrmtry share/locale/tig
-@dirrmtry share/locale/ti/LC_MESSAGES
-@dirrmtry share/locale/ti
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sw/LC_MESSAGES
-@dirrmtry share/locale/sw
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/so/LC_MESSAGES
-@dirrmtry share/locale/so
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mi/LC_MESSAGES
-@dirrmtry share/locale/mi
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/kok/LC_MESSAGES
-@dirrmtry share/locale/kok
-@dirrmtry share/locale/km/LC_MESSAGES
-@dirrmtry share/locale/km
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/ia/LC_MESSAGES
-@dirrmtry share/locale/ia
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/haw/LC_MESSAGES
-@dirrmtry share/locale/haw
-@dirrmtry share/locale/gez/LC_MESSAGES
-@dirrmtry share/locale/gez
-@dirrmtry share/locale/fo/LC_MESSAGES
-@dirrmtry share/locale/fo
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/crh/LC_MESSAGES
-@dirrmtry share/locale/crh
-@dirrmtry share/locale/byn/LC_MESSAGES
-@dirrmtry share/locale/byn
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
diff --git a/misc/kcd/pkg-plist b/misc/kcd/pkg-plist
index ce5b30cd0bac..9c841513229f 100644
--- a/misc/kcd/pkg-plist
+++ b/misc/kcd/pkg-plist
@@ -8,9 +8,3 @@ man/man1/kcd.1.gz
 share/locale/en_GB/LC_MESSAGES/kcd.mo
 share/locale/en_GB.UTF-8/LC_MESSAGES/kcd.mo
 share/locale/en_US.UTF-8/LC_MESSAGES/kcd.mo
-@dirrmtry share/locale/en_US.UTF-8/LC_MESSAGES
-@dirrmtry share/locale/en_US.UTF-8
-@dirrmtry share/locale/en_GB.UTF-8/LC_MESSAGES
-@dirrmtry share/locale/en_GB.UTF-8
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/kde4-l10n-si/pkg-plist b/misc/kde4-l10n-si/pkg-plist
index 369a5d11a76c..843cf445853a 100644
--- a/misc/kde4-l10n-si/pkg-plist
+++ b/misc/kde4-l10n-si/pkg-plist
@@ -307,5 +307,3 @@ share/locale/si/LC_MESSAGES/systemsettings.mo
 share/locale/si/LC_MESSAGES/useraccount.mo
 share/locale/si/LC_MESSAGES/validatorsplugin.mo
 share/locale/si/entry.desktop
-@dirrm share/locale/si/LC_MESSAGES
-@dirrm share/locale/si
diff --git a/misc/kde4-l10n-tg/pkg-plist b/misc/kde4-l10n-tg/pkg-plist
index 8e7c35eaa091..0947536a27d7 100644
--- a/misc/kde4-l10n-tg/pkg-plist
+++ b/misc/kde4-l10n-tg/pkg-plist
@@ -371,6 +371,3 @@ share/locale/tg/LC_MESSAGES/useraccount.mo
 share/locale/tg/LC_MESSAGES/validatorsplugin.mo
 share/locale/tg/LC_MESSAGES/webarchiver.mo
 share/locale/tg/entry.desktop
-@dirrm share/apps/kvtml/tg
-@dirrm share/apps/kvtml
-@dirrm share/apps/khangman
diff --git a/misc/latex-mk/pkg-plist b/misc/latex-mk/pkg-plist
index 0d9466dba5bc..2b3cb73daa30 100644
--- a/misc/latex-mk/pkg-plist
+++ b/misc/latex-mk/pkg-plist
@@ -27,6 +27,3 @@ bin/latex-mk
 %%DATADIR%%/tgif.mk
 %%DATADIR%%/xfig.gmk
 %%DATADIR%%/xfig.mk
-@dirrm %%DATADIR%%/example/tgif
-@dirrm %%DATADIR%%/example
-@dirrm %%DATADIR%%
diff --git a/misc/libsupertone/pkg-plist b/misc/libsupertone/pkg-plist
index 5168fde4b15b..0b8e6e215e57 100644
--- a/misc/libsupertone/pkg-plist
+++ b/misc/libsupertone/pkg-plist
@@ -5,4 +5,3 @@ lib/libsupertone.so.0
 lib/libsupertone.so.0.0.1
 share/supertone/global-tones.xml
 share/supertone/tones.dtd
-@dirrm share/supertone
diff --git a/misc/linm/pkg-plist b/misc/linm/pkg-plist
index 0f4d46389061..53867f7ee8c3 100644
--- a/misc/linm/pkg-plist
+++ b/misc/linm/pkg-plist
@@ -29,6 +29,3 @@ share/applications/LinM.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README.ko_utf8
 share/locale/ko/LC_MESSAGES/linm.mo
 share/pixmaps/linm.xpm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry etc/profile.d
-@dirrm %%ETCDIR%%
diff --git a/misc/logsurfer/pkg-plist b/misc/logsurfer/pkg-plist
index c65a4317086a..8239e9648a6c 100644
--- a/misc/logsurfer/pkg-plist
+++ b/misc/logsurfer/pkg-plist
@@ -3,4 +3,3 @@ man/man1/logsurfer.1.gz
 man/man4/logsurfer.conf.4.gz
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/lr/pkg-plist b/misc/lr/pkg-plist
index 2f3893bf3e24..bb561e4b89f3 100644
--- a/misc/lr/pkg-plist
+++ b/misc/lr/pkg-plist
@@ -1,4 +1,3 @@
 bin/lr
 %%LESSPIPE%%bin/lesspipe.sh
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/lv/pkg-plist b/misc/lv/pkg-plist
index eeb357e7d72f..f00b5b89b77e 100644
--- a/misc/lv/pkg-plist
+++ b/misc/lv/pkg-plist
@@ -6,5 +6,3 @@ man/man1/lv.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/hello.sample.gif
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/relnote.html
-@dirrmtry lib/lv
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
diff --git a/misc/lxde-common/pkg-plist b/misc/lxde-common/pkg-plist
index 2fcc5c99ad88..06f5b51110f9 100644
--- a/misc/lxde-common/pkg-plist
+++ b/misc/lxde-common/pkg-plist
@@ -18,16 +18,3 @@ share/lxde/wallpapers/lxde_red.jpg
 share/lxpanel/profile/LXDE/config
 share/lxpanel/profile/LXDE/panels/panel
 share/xsessions/LXDE.desktop
-@dirrmtry share/xsessions
-@dirrmtry share/lxpanel/profile/LXDE/panels
-@dirrmtry share/lxpanel/profile/LXDE
-@dirrmtry share/lxpanel/profile
-@dirrmtry share/lxpanel
-@dirrm share/lxde/wallpapers
-@dirrm share/lxde/openbox
-@dirrm share/lxde/images
-@dirrm share/lxde
-@dirrmtry etc/xdg/pcmanfm/LXDE
-@dirrmtry etc/xdg/pcmanfm
-@dirrmtry etc/xdg/lxsession/LXDE
-@dirrmtry etc/xdg/lxsession
diff --git a/misc/magicpoint/pkg-plist b/misc/magicpoint/pkg-plist
index 8bdd5b1224fe..9d184d2dee8b 100644
--- a/misc/magicpoint/pkg-plist
+++ b/misc/magicpoint/pkg-plist
@@ -14,4 +14,3 @@ man/man1/mgpembed.1.gz
 man/man1/mgpnet.1.gz
 man/man1/xwintoppm.1.gz
 man/man1/xmindpath.1.gz
-@dirrm lib/X11/mgp
diff --git a/misc/man.el/pkg-plist b/misc/man.el/pkg-plist
index d730fde576fa..3453fad9cabb 100644
--- a/misc/man.el/pkg-plist
+++ b/misc/man.el/pkg-plist
@@ -12,11 +12,3 @@ lib/xemacs/site-packages/lisp/i18n-man-ja/i18n-man.el
 lib/xemacs/site-packages/lisp/i18n-man-ja/i18n-man-ja.el
 lib/xemacs/site-packages/pkginfo/MANIFEST.i18n-man-ja
 share/doc/i18n-man/byte-compile
-@dirrm lib/xemacs/site-packages/lisp/i18n-man-de
-@dirrm lib/xemacs/site-packages/lisp/i18n-man-en
-@dirrm lib/xemacs/site-packages/lisp/i18n-man-ja
-@dirrmtry lib/xemacs/site-packages/lisp
-@dirrmtry lib/xemacs/site-packages/pkginfo
-@dirrmtry lib/xemacs/site-packages
-@dirrmtry lib/xemacs
-@dirrm share/doc/i18n-man
diff --git a/misc/mc-light/pkg-plist b/misc/mc-light/pkg-plist
index 6b54d3a2d3fb..169d3f536c18 100644
--- a/misc/mc-light/pkg-plist
+++ b/misc/mc-light/pkg-plist
@@ -129,9 +129,3 @@ share/mc/term/xterm.ad
 share/mc/term/xterm.tcap
 share/mc/term/xterm.ti
 %%NLS%%share/locale/ru/LC_MESSAGES/mc.mo
-@dirrm share/mc/term
-@dirrm share/mc/syntax
-@dirrm share/mc/extfs
-@dirrm share/mc/codepages
-@dirrm share/mc/bin
-@dirrm share/mc
diff --git a/misc/metalink-editor/pkg-plist b/misc/metalink-editor/pkg-plist
index 20032f9ab293..f31900a8e8fa 100644
--- a/misc/metalink-editor/pkg-plist
+++ b/misc/metalink-editor/pkg-plist
@@ -7,5 +7,3 @@ bin/metalink_editor.py
 %%PYTHON_SITELIBDIR%%/Metalink_editor/metalink.pyo
 %%DATADIR%%/metalink.png
 %%DATADIR%%/metalink_small.png
-@dirrm %%DATADIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/Metalink_editor
diff --git a/misc/nagios-base-logos/pkg-plist b/misc/nagios-base-logos/pkg-plist
index 99eec2b0f4fa..9da41eb2d180 100644
--- a/misc/nagios-base-logos/pkg-plist
+++ b/misc/nagios-base-logos/pkg-plist
@@ -124,6 +124,3 @@
 %%NAGIOSWWWDIR%%/images/logos/yellowdog.gif
 %%NAGIOSWWWDIR%%/images/logos/yellowdog.jpg
 %%NAGIOSWWWDIR%%/images/logos/yellowdog.png
-@dirrmtry %%NAGIOSWWWDIR%%/images/logos
-@dirrmtry %%NAGIOSWWWDIR%%/images
-@dirrmtry %%NAGIOSWWWDIR%%
diff --git a/misc/numchar/pkg-plist b/misc/numchar/pkg-plist
index 5211ae4fb5cc..1bcacff6bb4b 100644
--- a/misc/numchar/pkg-plist
+++ b/misc/numchar/pkg-plist
@@ -1,4 +1,3 @@
 bin/phdecode
 bin/numchar
 share/doc/numchar/numchar.html
-@dirrm share/doc/numchar
diff --git a/misc/opencyc/pkg-plist b/misc/opencyc/pkg-plist
index 341bafd495cc..ed6699e78cde 100644
--- a/misc/opencyc/pkg-plist
+++ b/misc/opencyc/pkg-plist
@@ -1292,88 +1292,3 @@ opencyc-%%PORTVERSION%%/doc/ooi.pdf
 opencyc-%%PORTVERSION%%/doc/README.win32
 opencyc-%%PORTVERSION%%/doc/toc.html
 opencyc-%%PORTVERSION%%/doc/README.linux
-@dirrm opencyc-%%PORTVERSION%%/src/org/opencyc/xml
-@dirrm opencyc-%%PORTVERSION%%/src/org/opencyc/webserver
-@dirrm opencyc-%%PORTVERSION%%/src/org/opencyc/util
-@dirrm opencyc-%%PORTVERSION%%/src/org/opencyc/jxta
-@dirrm opencyc-%%PORTVERSION%%/src/org/opencyc/inferencesupport
-@dirrm opencyc-%%PORTVERSION%%/src/org/opencyc/cycobject
-@dirrm opencyc-%%PORTVERSION%%/src/org/opencyc/cycagent/fipaos
-@dirrm opencyc-%%PORTVERSION%%/src/org/opencyc/cycagent
-@dirrm opencyc-%%PORTVERSION%%/src/org/opencyc/constraintsolver
-@dirrm opencyc-%%PORTVERSION%%/src/org/opencyc/api
-@dirrm opencyc-%%PORTVERSION%%/src/org/opencyc
-@dirrm opencyc-%%PORTVERSION%%/src/org
-@dirrm opencyc-%%PORTVERSION%%/src/com/cyc/blue/layout
-@dirrm opencyc-%%PORTVERSION%%/src/com/cyc/blue/gui
-@dirrm opencyc-%%PORTVERSION%%/src/com/cyc/blue/graph
-@dirrm opencyc-%%PORTVERSION%%/src/com/cyc/blue/event
-@dirrm opencyc-%%PORTVERSION%%/src/com/cyc/blue/cyc
-@dirrm opencyc-%%PORTVERSION%%/src/com/cyc/blue/command
-@dirrm opencyc-%%PORTVERSION%%/src/com/cyc/blue
-@dirrm opencyc-%%PORTVERSION%%/src/com/cyc
-@dirrm opencyc-%%PORTVERSION%%/src/com
-@dirrm opencyc-%%PORTVERSION%%/src
-@dirrm opencyc-%%PORTVERSION%%/scripts/win
-@dirrm opencyc-%%PORTVERSION%%/scripts/linux
-@dirrm opencyc-%%PORTVERSION%%/scripts
-@dirrm opencyc-%%PORTVERSION%%/run/world
-@dirrm opencyc-%%PORTVERSION%%/run/transcripts/0605
-@dirrm opencyc-%%PORTVERSION%%/run/transcripts
-@dirrm opencyc-%%PORTVERSION%%/run/tests
-@dirrm opencyc-%%PORTVERSION%%/run/preferences/users
-@dirrm opencyc-%%PORTVERSION%%/run/preferences
-@dirrm opencyc-%%PORTVERSION%%/run/init
-@dirrm opencyc-%%PORTVERSION%%/run/httpd/htdocs/javascript
-@dirrm opencyc-%%PORTVERSION%%/run/httpd/htdocs/java/blue
-@dirrm opencyc-%%PORTVERSION%%/run/httpd/htdocs/java
-@dirrm opencyc-%%PORTVERSION%%/run/httpd/htdocs/cycdoc/walkthroughs
-@dirrm opencyc-%%PORTVERSION%%/run/httpd/htdocs/cycdoc/vocab/archive
-@dirrm opencyc-%%PORTVERSION%%/run/httpd/htdocs/cycdoc/vocab
-@dirrm opencyc-%%PORTVERSION%%/run/httpd/htdocs/cycdoc/ref/abbrev_files
-@dirrm opencyc-%%PORTVERSION%%/run/httpd/htdocs/cycdoc/ref
-@dirrm opencyc-%%PORTVERSION%%/run/httpd/htdocs/cycdoc/img/cb
-@dirrm opencyc-%%PORTVERSION%%/run/httpd/htdocs/cycdoc/img
-@dirrm opencyc-%%PORTVERSION%%/run/httpd/htdocs/cycdoc/help
-@dirrm opencyc-%%PORTVERSION%%/run/httpd/htdocs/cycdoc/handbook/images
-@dirrm opencyc-%%PORTVERSION%%/run/httpd/htdocs/cycdoc/handbook
-@dirrm opencyc-%%PORTVERSION%%/run/httpd/htdocs/cycdoc/course
-@dirrm opencyc-%%PORTVERSION%%/run/httpd/htdocs/cycdoc
-@dirrm opencyc-%%PORTVERSION%%/run/httpd/htdocs
-@dirrm opencyc-%%PORTVERSION%%/run/httpd
-@dirrm opencyc-%%PORTVERSION%%/run/data
-@dirrm opencyc-%%PORTVERSION%%/run/bin
-@dirrm opencyc-%%PORTVERSION%%/run
-@dirrm opencyc-%%PORTVERSION%%/lib
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/xml/gui
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/xml
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/webserver
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/util
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/uml/statemachine
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/uml/interpreter
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/uml/commonbehavior
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/uml/action
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/uml
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/templateparser
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/kif
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/jxta
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/javashell
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/inferencesupport
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/elf/wm
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/elf/goal
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/elf/experience
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/elf/bg
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/elf
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/cycobject
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/cycagent/fipaos
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/cycagent/coabs
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/cycagent
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/conversation
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/constraintsolver
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/chat
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc/api
-@dirrm opencyc-%%PORTVERSION%%/doc/org/opencyc
-@dirrm opencyc-%%PORTVERSION%%/doc/org
-@dirrm opencyc-%%PORTVERSION%%/doc/architecture
-@dirrm opencyc-%%PORTVERSION%%/doc
-@dirrm opencyc-%%PORTVERSION%%
diff --git a/misc/openr2/pkg-plist b/misc/openr2/pkg-plist
index a2bdd621e1cb..c9e3026ad360 100644
--- a/misc/openr2/pkg-plist
+++ b/misc/openr2/pkg-plist
@@ -14,4 +14,3 @@ lib/libopenr2.so.3
 lib/libopenr2.so.3.1.1
 man/man5/r2test.conf.5.gz
 man/man8/r2test.8.gz
-@dirrm include/openr2
diff --git a/misc/ossp-uuid/pkg-plist b/misc/ossp-uuid/pkg-plist
index 6aeb3818feaf..bbc8b2a8be7d 100644
--- a/misc/ossp-uuid/pkg-plist
+++ b/misc/ossp-uuid/pkg-plist
@@ -15,4 +15,3 @@ man/man1/uuid-config.1.gz
 man/man1/uuid.1.gz
 man/man3/uuid++.3.gz
 man/man3/uuid.3.gz
-@dirrmtry include/ossp
diff --git a/misc/otter/pkg-plist b/misc/otter/pkg-plist
index a4e360059ad1..4ecc6c6c4ede 100644
--- a/misc/otter/pkg-plist
+++ b/misc/otter/pkg-plist
@@ -320,20 +320,3 @@ bin/otter
 %%PORTEXAMPLES%%share/examples/mace2/Perl-examples/index.html
 %%PORTEXAMPLES%%share/examples/mace2/Perl-examples/README
 %%PORTEXAMPLES%%share/examples/mace2/Perl-examples/candidates
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/auto
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/misc
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/fringe
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/wos
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Loop
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/ivy
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/program
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/kalman
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/split
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTEXAMPLES%%@dirrm share/examples/mace2/basic
-%%PORTEXAMPLES%%@dirrm share/examples/mace2/iterate
-%%PORTEXAMPLES%%@dirrm share/examples/mace2/propositional
-%%PORTEXAMPLES%%@dirrm share/examples/mace2/lattice
-%%PORTEXAMPLES%%@dirrm share/examples/mace2/quasigroup
-%%PORTEXAMPLES%%@dirrm share/examples/mace2/Perl-examples
-%%PORTEXAMPLES%%@dirrm share/examples/mace2
diff --git a/misc/p5-Business-UPS/pkg-plist b/misc/p5-Business-UPS/pkg-plist
index 3d93e36fb176..c391696eae24 100644
--- a/misc/p5-Business-UPS/pkg-plist
+++ b/misc/p5-Business-UPS/pkg-plist
@@ -2,4 +2,3 @@
 %%SITE_PERL%%/Business/UPS.pm
 %%SITE_PERL%%/auto/Business/UPS/autosplit.ix
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.pl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/misc/pantry/pkg-plist b/misc/pantry/pkg-plist
index ce4ef4d51281..cf88ab9ad752 100644
--- a/misc/pantry/pkg-plist
+++ b/misc/pantry/pkg-plist
@@ -22,10 +22,3 @@ bin/pantryd
 %%DATADIR%%/scripts/zsh_functions
 man/man1/pantry.1.gz
 man/man1/pantryd.1.gz
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/examples/recipes
-@dirrm %%DATADIR%%/examples/foods
-@dirrm %%DATADIR%%/examples
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
diff --git a/misc/pdmenu/pkg-plist b/misc/pdmenu/pkg-plist
index 9e5e7e320ba6..05ead91aa25d 100644
--- a/misc/pdmenu/pkg-plist
+++ b/misc/pdmenu/pkg-plist
@@ -8,4 +8,3 @@ share/locale/fr/LC_MESSAGES/pdmenu.mo
 share/locale/ru/LC_MESSAGES/pdmenu.mo
 %%DATADIR%%/editdir.pl
 %%DATADIR%%/showdir.pl
-@dirrm %%DATADIR%%
diff --git a/misc/phraze/pkg-plist b/misc/phraze/pkg-plist
index b52c16912507..938f9ccb818a 100644
--- a/misc/phraze/pkg-plist
+++ b/misc/phraze/pkg-plist
@@ -1,4 +1,3 @@
 bin/phraze
 man/man1/phraze.1.gz
 %%DATADIR%%/wordlist.phr
-@dirrm %%DATADIR%%
diff --git a/misc/pipe/pkg-plist b/misc/pipe/pkg-plist
index e34c67ca2ef1..191b727b2014 100644
--- a/misc/pipe/pkg-plist
+++ b/misc/pipe/pkg-plist
@@ -480,45 +480,3 @@ bin/pipe
 %%DATADIR%%/xslt/GenerateObjectList.xsl
 %%DATADIR%%/xslt/GeneratePNML.xsl
 %%DATADIR%%/xslt/TNtoPipe.xsl
-@dirrmtry %%DATADIR%%/Docs/PIPE images
-@dirrmtry %%DATADIR%%/Docs
-@dirrmtry %%DATADIR%%/Example nets
-@dirrmtry %%DATADIR%%/Images
-@dirrmtry %%DATADIR%%/cfg
-@dirrmtry %%DATADIR%%/expressions/java_cup/runtime
-@dirrmtry %%DATADIR%%/expressions/java_cup
-@dirrmtry %%DATADIR%%/expressions
-@dirrmtry %%DATADIR%%/jama/util
-@dirrmtry %%DATADIR%%/jama
-@dirrmtry %%DATADIR%%/java_cup/runtime
-@dirrmtry %%DATADIR%%/java_cup
-@dirrmtry %%DATADIR%%/jpowergraph
-@dirrmtry %%DATADIR%%/lib
-@dirrmtry %%DATADIR%%/pipe/dataLayer/calculations
-@dirrmtry %%DATADIR%%/pipe/dataLayer
-@dirrmtry %%DATADIR%%/pipe/experiment/editor/gui
-@dirrmtry %%DATADIR%%/pipe/experiment/editor
-@dirrmtry %%DATADIR%%/pipe/experiment/validation
-@dirrmtry %%DATADIR%%/pipe/experiment
-@dirrmtry %%DATADIR%%/pipe/gui/action
-@dirrmtry %%DATADIR%%/pipe/gui/handler
-@dirrmtry %%DATADIR%%/pipe/gui/undo
-@dirrmtry %%DATADIR%%/pipe/gui/widgets
-@dirrmtry %%DATADIR%%/pipe/gui
-@dirrmtry %%DATADIR%%/pipe/io
-@dirrmtry %%DATADIR%%/pipe/modules/classification
-@dirrmtry %%DATADIR%%/pipe/modules/comparison
-@dirrmtry %%DATADIR%%/pipe/modules/dnamaca
-@dirrmtry %%DATADIR%%/pipe/modules/gspn
-@dirrmtry %%DATADIR%%/pipe/modules/invariantAnalysis
-@dirrmtry %%DATADIR%%/pipe/modules/matrices
-@dirrmtry %%DATADIR%%/pipe/modules/minimalSiphons
-@dirrmtry %%DATADIR%%/pipe/modules/reachability
-@dirrmtry %%DATADIR%%/pipe/modules/simulation
-@dirrmtry %%DATADIR%%/pipe/modules/stateSpace
-@dirrmtry %%DATADIR%%/pipe/modules
-@dirrmtry %%DATADIR%%/pipe
-@dirrmtry %%DATADIR%%/schema
-@dirrmtry %%DATADIR%%/src
-@dirrmtry %%DATADIR%%/xslt
-@dirrmtry %%DATADIR%%
diff --git a/misc/podsleuth/pkg-plist b/misc/podsleuth/pkg-plist
index ccb551b1a624..c0efd311cf9d 100644
--- a/misc/podsleuth/pkg-plist
+++ b/misc/podsleuth/pkg-plist
@@ -8,4 +8,3 @@ lib/podsleuth/PodSleuth.Hal.exe.mdb
 libdata/pkgconfig/podsleuth.pc
 libexec/hal-podsleuth
 share/hal/fdi/policy/20thirdparty/20-podsleuth.fdi
-@dirrmtry lib/podsleuth
diff --git a/misc/proxyper/pkg-plist b/misc/proxyper/pkg-plist
index dae88f4da942..b725a0404705 100644
--- a/misc/proxyper/pkg-plist
+++ b/misc/proxyper/pkg-plist
@@ -4,7 +4,5 @@ distributed.net/proxy/proxyper
 @sample distributed.net/proxy/proxyper.ini.sample
 @owner nobody
 @group daemon
-@dirrm distributed.net/proxy
 @group
 @owner
-@dirrmtry distributed.net
diff --git a/misc/py-qt4-demo/pkg-plist b/misc/py-qt4-demo/pkg-plist
index 035fc9f2e91d..7014cd1a19c2 100644
--- a/misc/py-qt4-demo/pkg-plist
+++ b/misc/py-qt4-demo/pkg-plist
@@ -1077,175 +1077,3 @@
 %%EXAMPLESDIR%%/xmlpatterns/schema/schema_rc3.pyc
 %%EXAMPLESDIR%%/xmlpatterns/schema/ui_schema.py
 %%EXAMPLESDIR%%/xmlpatterns/schema/ui_schema.pyc
-@dirrm %%EXAMPLESDIR%%/xmlpatterns/schema/files
-@dirrm %%EXAMPLESDIR%%/xmlpatterns/schema
-@dirrm %%EXAMPLESDIR%%/xmlpatterns
-@dirrm %%EXAMPLESDIR%%/xml/saxbookmarks
-@dirrm %%EXAMPLESDIR%%/xml/dombookmarks
-@dirrm %%EXAMPLESDIR%%/xml
-@dirrm %%EXAMPLESDIR%%/widgets/tooltips/images
-@dirrm %%EXAMPLESDIR%%/widgets/tooltips
-@dirrm %%EXAMPLESDIR%%/widgets/stylesheet/qss
-@dirrm %%EXAMPLESDIR%%/widgets/stylesheet/images
-@dirrm %%EXAMPLESDIR%%/widgets/stylesheet
-@dirrm %%EXAMPLESDIR%%/widgets/movie
-@dirrm %%EXAMPLESDIR%%/widgets/icons/images
-@dirrm %%EXAMPLESDIR%%/widgets/icons
-@dirrm %%EXAMPLESDIR%%/widgets
-@dirrm %%EXAMPLESDIR%%/webkit/simpleselector
-@dirrm %%EXAMPLESDIR%%/webkit/previewer
-@dirrm %%EXAMPLESDIR%%/webkit/googlechat
-@dirrm %%EXAMPLESDIR%%/webkit/formextractor
-@dirrm %%EXAMPLESDIR%%/webkit/fancybrowser
-@dirrm %%EXAMPLESDIR%%/webkit/domtraversal
-@dirrm %%EXAMPLESDIR%%/webkit
-@dirrm %%EXAMPLESDIR%%/tutorials/addressbook
-@dirrm %%EXAMPLESDIR%%/tutorials
-@dirrm %%EXAMPLESDIR%%/tools/settingseditor/inifiles
-@dirrm %%EXAMPLESDIR%%/tools/settingseditor
-@dirrm %%EXAMPLESDIR%%/tools/i18n/translations
-@dirrm %%EXAMPLESDIR%%/tools/i18n
-@dirrm %%EXAMPLESDIR%%/tools/customcompleter/resources
-@dirrm %%EXAMPLESDIR%%/tools/customcompleter
-@dirrm %%EXAMPLESDIR%%/tools/codecs/encodedfiles
-@dirrm %%EXAMPLESDIR%%/tools/codecs
-@dirrm %%EXAMPLESDIR%%/tools
-@dirrm %%EXAMPLESDIR%%/threads
-@dirrm %%EXAMPLESDIR%%/sql
-@dirrm %%EXAMPLESDIR%%/script
-@dirrm %%EXAMPLESDIR%%/richtext/textobject/files
-@dirrm %%EXAMPLESDIR%%/richtext/textobject
-@dirrm %%EXAMPLESDIR%%/richtext
-@dirrm %%EXAMPLESDIR%%/pyuic
-@dirrm %%EXAMPLESDIR%%/phonon
-@dirrm %%EXAMPLESDIR%%/painting/svgviewer/files
-@dirrm %%EXAMPLESDIR%%/painting/svgviewer
-@dirrm %%EXAMPLESDIR%%/painting/basicdrawing/images
-@dirrm %%EXAMPLESDIR%%/painting/basicdrawing
-@dirrm %%EXAMPLESDIR%%/painting
-@dirrm %%EXAMPLESDIR%%/opengl/textures/images
-@dirrm %%EXAMPLESDIR%%/opengl/textures
-@dirrm %%EXAMPLESDIR%%/opengl
-@dirrm %%EXAMPLESDIR%%/network/http
-@dirrm %%EXAMPLESDIR%%/network/ftp/images
-@dirrm %%EXAMPLESDIR%%/network/ftp
-@dirrm %%EXAMPLESDIR%%/network
-@dirrm %%EXAMPLESDIR%%/mainwindows/sdi/images
-@dirrm %%EXAMPLESDIR%%/mainwindows/sdi
-@dirrm %%EXAMPLESDIR%%/mainwindows/mdi/images
-@dirrm %%EXAMPLESDIR%%/mainwindows/mdi
-@dirrm %%EXAMPLESDIR%%/mainwindows/dockwidgets/images
-@dirrm %%EXAMPLESDIR%%/mainwindows/dockwidgets
-@dirrm %%EXAMPLESDIR%%/mainwindows/application/images
-@dirrm %%EXAMPLESDIR%%/mainwindows/application
-@dirrm %%EXAMPLESDIR%%/mainwindows
-@dirrm %%EXAMPLESDIR%%/layouts
-@dirrm %%EXAMPLESDIR%%/itemviews/simpletreemodel
-@dirrm %%EXAMPLESDIR%%/itemviews/puzzle
-@dirrm %%EXAMPLESDIR%%/itemviews/pixelator/images
-@dirrm %%EXAMPLESDIR%%/itemviews/pixelator
-@dirrm %%EXAMPLESDIR%%/itemviews/editabletreemodel
-@dirrm %%EXAMPLESDIR%%/itemviews/chart
-@dirrm %%EXAMPLESDIR%%/itemviews
-@dirrm %%EXAMPLESDIR%%/ipc/sharedmemory
-@dirrm %%EXAMPLESDIR%%/ipc
-@dirrm %%EXAMPLESDIR%%/graphicsview/padnavigator/images
-@dirrm %%EXAMPLESDIR%%/graphicsview/padnavigator
-@dirrm %%EXAMPLESDIR%%/graphicsview/dragdroprobot/images
-@dirrm %%EXAMPLESDIR%%/graphicsview/dragdroprobot
-@dirrm %%EXAMPLESDIR%%/graphicsview/diagramscene/images
-@dirrm %%EXAMPLESDIR%%/graphicsview/diagramscene
-@dirrm %%EXAMPLESDIR%%/graphicsview/collidingmice/images
-@dirrm %%EXAMPLESDIR%%/graphicsview/collidingmice
-@dirrm %%EXAMPLESDIR%%/graphicsview
-@dirrm %%EXAMPLESDIR%%/effects
-@dirrm %%EXAMPLESDIR%%/draganddrop/puzzle
-@dirrm %%EXAMPLESDIR%%/draganddrop/fridgemagnets
-@dirrm %%EXAMPLESDIR%%/draganddrop/draggabletext
-@dirrm %%EXAMPLESDIR%%/draganddrop/draggableicons/images
-@dirrm %%EXAMPLESDIR%%/draganddrop/draggableicons
-@dirrm %%EXAMPLESDIR%%/draganddrop/delayedencoding/images
-@dirrm %%EXAMPLESDIR%%/draganddrop/delayedencoding
-@dirrm %%EXAMPLESDIR%%/draganddrop
-@dirrm %%EXAMPLESDIR%%/dialogs/configdialog/images
-@dirrm %%EXAMPLESDIR%%/dialogs/configdialog
-@dirrm %%EXAMPLESDIR%%/dialogs/classwizard/images
-@dirrm %%EXAMPLESDIR%%/dialogs/classwizard
-@dirrm %%EXAMPLESDIR%%/dialogs
-@dirrm %%EXAMPLESDIR%%/desktop/systray/images
-@dirrm %%EXAMPLESDIR%%/desktop/systray
-@dirrm %%EXAMPLESDIR%%/desktop
-@dirrm %%EXAMPLESDIR%%/designer/plugins/widgets
-@dirrm %%EXAMPLESDIR%%/designer/plugins/python
-@dirrm %%EXAMPLESDIR%%/designer/plugins
-@dirrm %%EXAMPLESDIR%%/designer/calculatorform
-@dirrm %%EXAMPLESDIR%%/designer
-@dirrm %%EXAMPLESDIR%%/demos/textedit/images/win
-@dirrm %%EXAMPLESDIR%%/demos/textedit/images/mac
-@dirrm %%EXAMPLESDIR%%/demos/textedit/images
-@dirrm %%EXAMPLESDIR%%/demos/textedit
-@dirrm %%EXAMPLESDIR%%/demos/spreadsheet/images
-@dirrm %%EXAMPLESDIR%%/demos/spreadsheet
-@dirrm %%EXAMPLESDIR%%/demos/qtdemo/xml
-@dirrm %%EXAMPLESDIR%%/demos/qtdemo/images
-@dirrm %%EXAMPLESDIR%%/demos/qtdemo/__pycache__
-@dirrm %%EXAMPLESDIR%%/demos/qtdemo
-@dirrm %%EXAMPLESDIR%%/demos/embeddeddialogs
-@dirrm %%EXAMPLESDIR%%/demos/embedded
-@dirrm %%EXAMPLESDIR%%/demos/declarative/samegame/highscores
-@dirrm %%EXAMPLESDIR%%/demos/declarative/samegame/SamegameCore/pics
-@dirrm %%EXAMPLESDIR%%/demos/declarative/samegame/SamegameCore
-@dirrm %%EXAMPLESDIR%%/demos/declarative/samegame
-@dirrm %%EXAMPLESDIR%%/demos/declarative/minehunt/MinehuntCore/pics
-@dirrm %%EXAMPLESDIR%%/demos/declarative/minehunt/MinehuntCore
-@dirrm %%EXAMPLESDIR%%/demos/declarative/minehunt
-@dirrm %%EXAMPLESDIR%%/demos/declarative
-@dirrm %%EXAMPLESDIR%%/demos
-@dirrm %%EXAMPLESDIR%%/declarative/ui-components/tabwidget
-@dirrm %%EXAMPLESDIR%%/declarative/ui-components/spinner/content
-@dirrm %%EXAMPLESDIR%%/declarative/ui-components/spinner
-@dirrm %%EXAMPLESDIR%%/declarative/ui-components/slideswitch/content
-@dirrm %%EXAMPLESDIR%%/declarative/ui-components/slideswitch
-@dirrm %%EXAMPLESDIR%%/declarative/ui-components/searchbox/images
-@dirrm %%EXAMPLESDIR%%/declarative/ui-components/searchbox
-@dirrm %%EXAMPLESDIR%%/declarative/ui-components/scrollbar
-@dirrm %%EXAMPLESDIR%%/declarative/ui-components/progressbar/content
-@dirrm %%EXAMPLESDIR%%/declarative/ui-components/progressbar
-@dirrm %%EXAMPLESDIR%%/declarative/ui-components/flipable/content
-@dirrm %%EXAMPLESDIR%%/declarative/ui-components/flipable
-@dirrm %%EXAMPLESDIR%%/declarative/ui-components/dialcontrol/content
-@dirrm %%EXAMPLESDIR%%/declarative/ui-components/dialcontrol
-@dirrm %%EXAMPLESDIR%%/declarative/ui-components
-@dirrm %%EXAMPLESDIR%%/declarative/toys/tvtennis
-@dirrm %%EXAMPLESDIR%%/declarative/toys/tic-tac-toe/content/pics
-@dirrm %%EXAMPLESDIR%%/declarative/toys/tic-tac-toe/content
-@dirrm %%EXAMPLESDIR%%/declarative/toys/tic-tac-toe
-@dirrm %%EXAMPLESDIR%%/declarative/toys/dynamicscene/images
-@dirrm %%EXAMPLESDIR%%/declarative/toys/dynamicscene
-@dirrm %%EXAMPLESDIR%%/declarative/toys/corkboards
-@dirrm %%EXAMPLESDIR%%/declarative/toys/clocks/content
-@dirrm %%EXAMPLESDIR%%/declarative/toys/clocks
-@dirrm %%EXAMPLESDIR%%/declarative/toys
-@dirrm %%EXAMPLESDIR%%/declarative/modelviews/objectlistmodel/__pycache__
-@dirrm %%EXAMPLESDIR%%/declarative/modelviews/objectlistmodel
-@dirrm %%EXAMPLESDIR%%/declarative/modelviews
-@dirrm %%EXAMPLESDIR%%/declarative
-@dirrm %%EXAMPLESDIR%%/dbus/remotecontrolledcar/controller
-@dirrm %%EXAMPLESDIR%%/dbus/remotecontrolledcar/car
-@dirrm %%EXAMPLESDIR%%/dbus/remotecontrolledcar
-@dirrm %%EXAMPLESDIR%%/dbus/pingpong
-@dirrm %%EXAMPLESDIR%%/dbus/chat
-@dirrm %%EXAMPLESDIR%%/dbus
-@dirrm %%EXAMPLESDIR%%/animation/stickman/animations
-@dirrm %%EXAMPLESDIR%%/animation/stickman
-@dirrm %%EXAMPLESDIR%%/animation/states
-@dirrm %%EXAMPLESDIR%%/animation/easing/images
-@dirrm %%EXAMPLESDIR%%/animation/easing
-@dirrm %%EXAMPLESDIR%%/animation/appchooser
-@dirrm %%EXAMPLESDIR%%/animation/animatedtiles/images
-@dirrm %%EXAMPLESDIR%%/animation/animatedtiles
-@dirrm %%EXAMPLESDIR%%/animation
-@dirrm %%EXAMPLESDIR%%/activeqt/webbrowser/icons
-@dirrm %%EXAMPLESDIR%%/activeqt/webbrowser
-@dirrm %%EXAMPLESDIR%%/activeqt
-@dirrm %%EXAMPLESDIR%%
diff --git a/misc/py-qt4-doc/pkg-plist b/misc/py-qt4-doc/pkg-plist
index 185d11fef7d1..7f4dd3d11f46 100644
--- a/misc/py-qt4-doc/pkg-plist
+++ b/misc/py-qt4-doc/pkg-plist
@@ -1335,8 +1335,3 @@
 %%DOCSDIR%%/html/searchindex.js
 %%DOCSDIR%%/html/threads.html
 %%DOCSDIR%%/html/webkit.html
-@dirrm %%DOCSDIR%%/html/images
-@dirrm %%DOCSDIR%%/html/_static
-@dirrm %%DOCSDIR%%/html/_sources
-@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
diff --git a/misc/py-yolk/pkg-plist b/misc/py-yolk/pkg-plist
index e6601a5e012e..d75f035f45cf 100644
--- a/misc/py-yolk/pkg-plist
+++ b/misc/py-yolk/pkg-plist
@@ -6,7 +6,3 @@ man/man1/yolk.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plugins/yolk_portage/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plugins/yolk_portage/setup.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plugins/yolk_portage/yolk_portage.py
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/plugins/yolk_pkg_manager
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/plugins/yolk_portage
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/plugins
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/misc/pypanda/pkg-plist b/misc/pypanda/pkg-plist
index 389ea814eb1f..b0db4d30c5f6 100644
--- a/misc/pypanda/pkg-plist
+++ b/misc/pypanda/pkg-plist
@@ -6,5 +6,3 @@ bin/pypanda
 %%DATADIR%%/pypanda.py
 %%DATADIR%%/pypanda.pyc
 %%DATADIR%%/pypanda.pyo
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/qbrew/pkg-plist b/misc/qbrew/pkg-plist
index 43932d13d6a2..6012b1f7a11e 100644
--- a/misc/qbrew/pkg-plist
+++ b/misc/qbrew/pkg-plist
@@ -1,4 +1,3 @@
 bin/qbrew
 %%DATADIR%%/qbrewdata
 %%DATADIR%%/splash.png
-@dirrm %%DATADIR%%
diff --git a/misc/qmetro/pkg-plist b/misc/qmetro/pkg-plist
index 50840ef9ccff..f7af183e82ff 100644
--- a/misc/qmetro/pkg-plist
+++ b/misc/qmetro/pkg-plist
@@ -8,15 +8,3 @@ share/icons/hicolor/scalable/apps/qmetro.svg
 %%DATADIR%%/locale/fr.lng
 %%DATADIR%%/map/Moscow.pmz
 %%DATADIR%%/skin/Android.zip
-@dirrm %%DATADIR%%/locale
-@dirrm %%DATADIR%%/map
-@dirrm %%DATADIR%%/skin
-@dirrm %%DATADIR%%
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/80x80/apps
-@dirrmtry share/icons/hicolor/80x80
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
diff --git a/misc/quotes/pkg-plist b/misc/quotes/pkg-plist
index 3b8bfb103701..af8844529722 100644
--- a/misc/quotes/pkg-plist
+++ b/misc/quotes/pkg-plist
@@ -3,5 +3,3 @@ bin/quotesmailer
 etc/quotesrc.sample
 %%PORTDOCS%%%%DOCSDIR%%/quotes.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/QuExample.pm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/misc/ringtonetools/pkg-plist b/misc/ringtonetools/pkg-plist
index b2a7bcd67f8f..38287e2753e1 100644
--- a/misc/ringtonetools/pkg-plist
+++ b/misc/ringtonetools/pkg-plist
@@ -4,6 +4,4 @@ bin/ringtonetools
 %%DATADIR%%/ionian.rtttl
 %%DATADIR%%/usa.emelody
 %%DATADIR%%/yngwie_trilogy.rtttl
-@dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/rname/pkg-plist b/misc/rname/pkg-plist
index a336dd75fc07..08544330e88f 100644
--- a/misc/rname/pkg-plist
+++ b/misc/rname/pkg-plist
@@ -1,5 +1,3 @@
 bin/rname
 %%PORTDOCS%%share/doc/rname/html/index.html
 %%PORTDOCS%%share/doc/rname/html/created.with.vim.gif
-%%PORTDOCS%%@dirrm share/doc/rname/html
-%%PORTDOCS%%@dirrm share/doc/rname
diff --git a/misc/ruby-progressbar/pkg-plist b/misc/ruby-progressbar/pkg-plist
index e5589158202a..d3edc5196aa0 100644
--- a/misc/ruby-progressbar/pkg-plist
+++ b/misc/ruby-progressbar/pkg-plist
@@ -2,4 +2,3 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/progressbar.en.rd
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/progressbar.ja.rd
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/misc/rump/pkg-plist b/misc/rump/pkg-plist
index 315e2338d3d8..77d9d0976d33 100644
--- a/misc/rump/pkg-plist
+++ b/misc/rump/pkg-plist
@@ -393,4 +393,3 @@ lib/librumpvfs_layerfs.so.0
 lib/librumpvfs_layerfs.so.0.0
 lib/librumpvfs_layerfs_pic.a
 lib/librumpvfs_pic.a
-@dirrmtry include/rump
diff --git a/misc/saaghar/pkg-plist b/misc/saaghar/pkg-plist
index f4b00ab785af..56984446e5a0 100644
--- a/misc/saaghar/pkg-plist
+++ b/misc/saaghar/pkg-plist
@@ -118,9 +118,3 @@ share/saaghar/themes/iconsets/light-gray/search.png
 share/saaghar/themes/iconsets/light-gray/select-mask.png
 share/saaghar/themes/iconsets/light-gray/settings.png
 share/saaghar/themes/iconsets/light-gray/up.png
-@dirrm share/saaghar/themes/iconsets/light-gray
-@dirrm share/saaghar/themes/iconsets
-@dirrm share/saaghar/themes/backgrounds
-@dirrm share/saaghar/themes
-@dirrm share/saaghar/poets_images
-@dirrm share/saaghar
diff --git a/misc/spamcalc/pkg-plist b/misc/spamcalc/pkg-plist
index 4d92e822c3a9..1491bb52fa65 100644
--- a/misc/spamcalc/pkg-plist
+++ b/misc/spamcalc/pkg-plist
@@ -23,6 +23,3 @@ etc/spamcalc.conf
 %%PORTDOCS%%%%DOCSDIR%%/files
 %%PORTDOCS%%%%DOCSDIR%%/introduction
 %%PORTDOCS%%%%DOCSDIR%%/todo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%
diff --git a/misc/sword/pkg-plist b/misc/sword/pkg-plist
index 3c121c21b53f..905f6e320010 100644
--- a/misc/sword/pkg-plist
+++ b/misc/sword/pkg-plist
@@ -277,7 +277,3 @@ libdata/pkgconfig/sword.pc
 %%DATADIR%%/locales.d/zh_TW-utf8.conf
 %%DATADIR%%/locales.d/zh_english-utf8.conf
 %%DATADIR%%/mods.d/globals.conf
-@dirrm %%DATADIR%%/mods.d
-@dirrm %%DATADIR%%/locales.d
-@dirrm %%DATADIR%%
-@dirrm include/sword
diff --git a/misc/table.el/pkg-plist b/misc/table.el/pkg-plist
index eb612adbb2a3..c947e2c5d04e 100644
--- a/misc/table.el/pkg-plist
+++ b/misc/table.el/pkg-plist
@@ -1,4 +1,2 @@
 share/emacs/site-lisp/table.el
 lib/xemacs/site-lisp/table.el
-@dirrmtry lib/xemacs/site-lisp
-@dirrmtry lib/xemacs
diff --git a/misc/tcb/pkg-plist b/misc/tcb/pkg-plist
index 3aff85147181..10400a6fb7cb 100644
--- a/misc/tcb/pkg-plist
+++ b/misc/tcb/pkg-plist
@@ -5,5 +5,3 @@ man/man1/tcb.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%DATADIR%%/HELP
 %%DATADIR%%/tcbrc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%
diff --git a/misc/tellico-kde4/pkg-plist b/misc/tellico-kde4/pkg-plist
index de7fb18c94d9..3e67f606e831 100644
--- a/misc/tellico-kde4/pkg-plist
+++ b/misc/tellico-kde4/pkg-plist
@@ -371,24 +371,3 @@ share/locale/zh_CN/LC_MESSAGES/tellico.mo
 share/locale/zh_TW/LC_MESSAGES/tellico.mo
 share/mime/packages/tellico.xml
 share/mimelnk/application/x-tellico.desktop
-@dirrmtry share/mimelnk/application
-@dirrmtry share/mimelnk
-@dirrmtry share/locale/ia/LC_MESSAGES
-@dirrmtry share/locale/ia
-@dirrmtry share/appdata
-@dirrm share/doc/HTML/uk/tellico
-@dirrm share/doc/HTML/sv/tellico
-@dirrm share/doc/HTML/pt_BR/tellico
-@dirrm share/doc/HTML/pt/tellico
-@dirrm share/doc/HTML/nl/tellico
-@dirrm share/doc/HTML/fr/tellico
-@dirrm share/doc/HTML/et/tellico
-@dirrm share/doc/HTML/es/tellico
-@dirrm share/doc/HTML/en/tellico
-@dirrm share/doc/HTML/de/tellico
-@dirrm share/doc/HTML/ca/tellico
-@dirrm share/apps/tellico/report-templates
-@dirrm share/apps/tellico/pics
-@dirrm share/apps/tellico/entry-templates
-@dirrm share/apps/tellico/data-sources
-@dirrm share/apps/tellico
diff --git a/misc/terraform/pkg-plist b/misc/terraform/pkg-plist
index f0a4c806afe7..63ebdaf0a954 100644
--- a/misc/terraform/pkg-plist
+++ b/misc/terraform/pkg-plist
@@ -263,18 +263,3 @@ share/pixmaps/terraform/zoom.xpm
 %%DATADIR%%/objects/tree_parametric_7.inc
 %%DATADIR%%/objects/tree_parametric_macro_inc.txt
 %%DATADIR%%/objects/tree_parametric_texture_inc.txt
-@dirrm %%DATADIR%%/objects
-@dirrm %%DATADIR%%/include/water
-@dirrm %%DATADIR%%/include/skies/include
-@dirrm %%DATADIR%%/include/skies
-@dirrm %%DATADIR%%/include/earth_textures
-@dirrm %%DATADIR%%/include/atmospheres
-@dirrm %%DATADIR%%/include
-@dirrm %%DATADIR%%/image_maps
-@dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%
-@dirrm share/pixmaps/terraform
-@dirrm share/gnome/help/terraform/fr
-@dirrm share/gnome/help/terraform/C
-@dirrm share/gnome/help/terraform
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/toilet/pkg-plist b/misc/toilet/pkg-plist
index 88519b5e5fa3..f262eb129030 100644
--- a/misc/toilet/pkg-plist
+++ b/misc/toilet/pkg-plist
@@ -22,4 +22,3 @@ share/figlet/smbraille.tlf
 share/figlet/smmono12.tlf
 share/figlet/smmono9.tlf
 share/figlet/wideterm.tlf
-@dirrmtry share/figlet
diff --git a/misc/tpp/pkg-plist b/misc/tpp/pkg-plist
index 72300cd1c6a9..9c4e4bb1ae10 100644
--- a/misc/tpp/pkg-plist
+++ b/misc/tpp/pkg-plist
@@ -24,6 +24,3 @@ man/man1/tpp.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/examples/test.tpp
 %%PORTDOCS%%%%DOCSDIR%%/examples/tpp-features.tpp
 %%PORTDOCS%%%%DOCSDIR%%/examples/wrap.tpp
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/upclient/pkg-plist b/misc/upclient/pkg-plist
index 6f14ef9f680a..c1455a15957b 100644
--- a/misc/upclient/pkg-plist
+++ b/misc/upclient/pkg-plist
@@ -17,4 +17,3 @@ share/locale/es/LC_MESSAGES/upclient.mo
 share/locale/fr/LC_MESSAGES/upclient.mo
 share/locale/it/LC_MESSAGES/upclient.mo
 share/locale/nl/LC_MESSAGES/upclient.mo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/wmScoreBoard/pkg-plist b/misc/wmScoreBoard/pkg-plist
index 591642e79771..8fd8dcda1bda 100644
--- a/misc/wmScoreBoard/pkg-plist
+++ b/misc/wmScoreBoard/pkg-plist
@@ -4,4 +4,3 @@ bin/wmScoreBoard
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/HINTS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/wmtunlo/pkg-plist b/misc/wmtunlo/pkg-plist
index 5d267466e368..b0de1cbe99f7 100644
--- a/misc/wmtunlo/pkg-plist
+++ b/misc/wmtunlo/pkg-plist
@@ -8,4 +8,3 @@ bin/wmtunlo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wmtunlorc.example7
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wmtunlorc.example8
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wmtunlorc.original
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/misc/xdg-menu/pkg-plist b/misc/xdg-menu/pkg-plist
index cc050f42ba15..49d89d15be44 100644
--- a/misc/xdg-menu/pkg-plist
+++ b/misc/xdg-menu/pkg-plist
@@ -42,6 +42,3 @@ apps/XDG-Menu/python/xdgmenu.pyc
 apps/XDG-Menu/python/xdgmenu.pyo
 bin/xdg-menu
 share/pixmaps/xdg-menu.png
-@dirrm apps/XDG-Menu/python
-@dirrm apps/XDG-Menu/Messages
-@dirrm apps/XDG-Menu
diff --git a/misc/xfce4-wm-themes/pkg-plist b/misc/xfce4-wm-themes/pkg-plist
index c44690668fa6..3320cbf19033 100644
--- a/misc/xfce4-wm-themes/pkg-plist
+++ b/misc/xfce4-wm-themes/pkg-plist
@@ -4984,190 +4984,3 @@ share/themes/Xfce/xfwm4/top-left-active.xpm
 share/themes/Xfce/xfwm4/top-left-inactive.xpm
 share/themes/Xfce/xfwm4/top-right-active.xpm
 share/themes/Xfce/xfwm4/top-right-inactive.xpm
-@dirrm share/themes/Xfce/xfwm4
-@dirrm share/themes/Xfce
-@dirrm share/themes/Wildbush/xfwm4
-@dirrm share/themes/Wildbush
-@dirrm share/themes/Waza/xfwm4
-@dirrm share/themes/Waza
-@dirrm share/themes/Wallis/xfwm4
-@dirrm share/themes/Wallis
-@dirrm share/themes/Variation/xfwm4
-@dirrm share/themes/Variation
-@dirrm share/themes/Tyrex/xfwm4
-@dirrm share/themes/Tyrex
-@dirrm share/themes/Tubular/xfwm4
-@dirrm share/themes/Tubular
-@dirrm share/themes/Triviality/xfwm4
-@dirrm share/themes/Triviality
-@dirrm share/themes/Trench/xfwm4
-@dirrm share/themes/Trench
-@dirrm share/themes/Totem/xfwm4
-@dirrm share/themes/Totem
-@dirrm share/themes/Today/xfwm4
-@dirrm share/themes/Today
-@dirrm share/themes/Therapy/xfwm4
-@dirrm share/themes/Therapy
-@dirrm share/themes/Tgc/xfwm4
-@dirrm share/themes/Tgc-large/xfwm4
-@dirrm share/themes/Tgc-large
-@dirrm share/themes/Tgc
-@dirrm share/themes/Tabs/xfwm4
-@dirrm share/themes/Tabs
-@dirrm share/themes/TUX/xfwm4
-@dirrm share/themes/TUX
-@dirrm share/themes/Synthetic/xfwm4
-@dirrm share/themes/Synthetic
-@dirrm share/themes/Symphony/xfwm4
-@dirrm share/themes/Symphony
-@dirrm share/themes/Stoneage/xfwm4
-@dirrm share/themes/Stoneage
-@dirrm share/themes/Smoothwall/xfwm4
-@dirrm share/themes/Smoothwall
-@dirrm share/themes/Smallscreen/xfwm4
-@dirrm share/themes/Smallscreen
-@dirrm share/themes/Slimline/xfwm4
-@dirrm share/themes/Slimline
-@dirrm share/themes/Slick/xfwm4
-@dirrm share/themes/Slick
-@dirrm share/themes/Silverado/xfwm4
-@dirrm share/themes/Silverado
-@dirrm share/themes/Sassandra/xfwm4
-@dirrm share/themes/Sassandra
-@dirrm share/themes/Retro/xfwm4
-@dirrm share/themes/Retro
-@dirrm share/themes/RedmondXP/xfwm4
-@dirrm share/themes/RedmondXP
-@dirrm share/themes/Redmond/xfwm4
-@dirrm share/themes/Redmond
-@dirrm share/themes/R9X/xfwm4
-@dirrm share/themes/R9X
-@dirrm share/themes/Quinx/xfwm4
-@dirrm share/themes/Quinx
-@dirrm share/themes/Quiet-purple/xfwm4
-@dirrm share/themes/Quiet-purple
-@dirrm share/themes/Prune/xfwm4
-@dirrm share/themes/Prune
-@dirrm share/themes/Platinum/xfwm4
-@dirrm share/themes/Platinum
-@dirrm share/themes/Piranha/xfwm4
-@dirrm share/themes/Piranha
-@dirrm share/themes/Pills/xfwm4
-@dirrm share/themes/Pills
-@dirrm share/themes/Perl/xfwm4
-@dirrm share/themes/Perl
-@dirrm share/themes/Oroborus/xfwm4
-@dirrm share/themes/Oroborus
-@dirrm share/themes/Opta/xfwm4
-@dirrm share/themes/Opta
-@dirrm share/themes/Ops/xfwm4
-@dirrm share/themes/Ops
-@dirrm share/themes/Next/xfwm4
-@dirrm share/themes/Next
-@dirrm share/themes/Mofit/xfwm4
-@dirrm share/themes/Mofit
-@dirrm share/themes/Microgui/xfwm4
-@dirrm share/themes/Microgui
-@dirrm share/themes/Microdeck3/xfwm4
-@dirrm share/themes/Microdeck3
-@dirrm share/themes/Microdeck2/xfwm4
-@dirrm share/themes/Microdeck2
-@dirrm share/themes/Microdeck/xfwm4
-@dirrm share/themes/Microdeck
-@dirrm share/themes/Microcurve/xfwm4
-@dirrm share/themes/Microcurve
-@dirrm share/themes/Metabox/xfwm4
-@dirrm share/themes/Metabox
-@dirrm share/themes/Meenee/xfwm4
-@dirrm share/themes/Meenee
-@dirrm share/themes/Linea/xfwm4
-@dirrm share/themes/Linea
-@dirrm share/themes/LineArt/xfwm4
-@dirrm share/themes/LineArt
-@dirrm share/themes/Koynacity/xfwm4
-@dirrm share/themes/Koynacity
-@dirrm share/themes/Kleanux/xfwm4
-@dirrm share/themes/Kleanux
-@dirrm share/themes/Kindaker/xfwm4
-@dirrm share/themes/Kindaker
-@dirrm share/themes/Keramik/xfwm4
-@dirrm share/themes/Keramik
-@dirrm share/themes/Kde1/xfwm4
-@dirrm share/themes/Kde1
-@dirrm share/themes/Kde/xfwm4
-@dirrm share/themes/Kde
-@dirrm share/themes/Iceg/xfwm4
-@dirrm share/themes/Iceg
-@dirrm share/themes/Gtk/xfwm4
-@dirrm share/themes/Gtk
-@dirrm share/themes/Gorilla/xfwm4
-@dirrm share/themes/Gorilla
-@dirrm share/themes/Gnububble/xfwm4
-@dirrm share/themes/Gnububble
-@dirrm share/themes/Gelly/xfwm4
-@dirrm share/themes/Gelly
-@dirrm share/themes/Gaudy/xfwm4
-@dirrm share/themes/Gaudy
-@dirrm share/themes/Galaxy/xfwm4
-@dirrm share/themes/Galaxy
-@dirrm share/themes/G2/xfwm4
-@dirrm share/themes/G2
-@dirrm share/themes/Fbx/xfwm4
-@dirrm share/themes/Fbx
-@dirrm share/themes/Exocet/xfwm4
-@dirrm share/themes/Exocet
-@dirrm share/themes/Elberg/xfwm4
-@dirrm share/themes/Elberg
-@dirrm share/themes/Eazel-blue/xfwm4
-@dirrm share/themes/Eazel-blue
-@dirrm share/themes/Defcon-IV/xfwm4
-@dirrm share/themes/Defcon-IV
-@dirrm share/themes/Default-4.8/xfwm4
-@dirrm share/themes/Default-4.8
-@dirrm share/themes/Default-4.6/xfwm4
-@dirrm share/themes/Default-4.6
-@dirrm share/themes/Default-4.4/xfwm4
-@dirrm share/themes/Default-4.4
-@dirrm share/themes/Default-4.2/xfwm4
-@dirrm share/themes/Default-4.2
-@dirrm share/themes/Default-4.0/xfwm4
-@dirrm share/themes/Default-4.0
-@dirrm share/themes/Curve/xfwm4
-@dirrm share/themes/Curve
-@dirrm share/themes/Cruxish/xfwm4
-@dirrm share/themes/Cruxish
-@dirrm share/themes/Crux/xfwm4
-@dirrm share/themes/Crux
-@dirrm share/themes/Coolclean/xfwm4
-@dirrm share/themes/Coolclean
-@dirrm share/themes/Coldsteel/xfwm4
-@dirrm share/themes/Coldsteel
-@dirrm share/themes/Buzz/xfwm4
-@dirrm share/themes/Buzz
-@dirrm share/themes/Blackwall/xfwm4
-@dirrm share/themes/Blackwall
-@dirrm share/themes/Biz/xfwm4
-@dirrm share/themes/Biz
-@dirrm share/themes/Beastie/xfwm4
-@dirrm share/themes/Beastie
-@dirrm share/themes/Basix/xfwm4
-@dirrm share/themes/Basix
-@dirrm share/themes/BBS/xfwm4
-@dirrm share/themes/BBS
-@dirrm share/themes/B6/xfwm4
-@dirrm share/themes/B6
-@dirrm share/themes/B5/xfwm4
-@dirrm share/themes/B5
-@dirrm share/themes/Atlanta2/xfwm4
-@dirrm share/themes/Atlanta2
-@dirrm share/themes/Atlanta/xfwm4
-@dirrm share/themes/Atlanta
-@dirrm share/themes/Alternate/xfwm4
-@dirrm share/themes/Alternate
-@dirrm share/themes/Agualemon/xfwm4
-@dirrm share/themes/Agualemon
-@dirrm share/themes/Agua/xfwm4
-@dirrm share/themes/Agua
-@dirrm share/themes/Adept/xfwm4
-@dirrm share/themes/Adept
-@dirrmtry share/themes
diff --git a/misc/xiphos/pkg-plist b/misc/xiphos/pkg-plist
index 3cbc8f848dfd..398f3065b0d5 100644
--- a/misc/xiphos/pkg-plist
+++ b/misc/xiphos/pkg-plist
@@ -222,13 +222,3 @@ share/omf/xiphos/xiphos-fr.omf
 %%DATADIR%%/xiphos-button-125.png
 %%DATADIR%%/xiphos-x-16.png
 %%DATADIR%%/xiphos.xpm
-@dirrmtry %%DATADIR%%
-@dirrmtry share/omf/xiphos
-@dirrmtry share/gnome/help/xiphos/fr/figures
-@dirrmtry share/gnome/help/xiphos/fr
-@dirrmtry share/gnome/help/xiphos/fa/figures
-@dirrmtry share/gnome/help/xiphos/fa
-@dirrmtry share/gnome/help/xiphos/C/figures
-@dirrmtry share/gnome/help/xiphos/C
-@dirrmtry share/gnome/help/xiphos
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
diff --git a/misc/xosd/pkg-plist b/misc/xosd/pkg-plist
index a479ec35160b..3c81eefe6cee 100644
--- a/misc/xosd/pkg-plist
+++ b/misc/xosd/pkg-plist
@@ -32,4 +32,3 @@ share/aclocal/libxosd.m4
 %%DATADIR%%/top-left.png
 %%DATADIR%%/top-right.png
 %%DATADIR%%/top.png
-@dirrm %%DATADIR%%
diff --git a/misc/xsw/pkg-plist b/misc/xsw/pkg-plist
index 6c8e6f5c1ff6..daa309723128 100644
--- a/misc/xsw/pkg-plist
+++ b/misc/xsw/pkg-plist
@@ -28,6 +28,3 @@ man/man1/xswconv.1.gz
 %%DATADIR%%/tutorial/tutorial.xsw
 %%DATADIR%%/tutorial/tutorial.xsw.in
 %%DATADIR%%/tutorial/tux.png
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%DATADIR%%/tutorial
-@dirrm %%DATADIR%%
diff --git a/misc/xyzcmd/pkg-plist b/misc/xyzcmd/pkg-plist
index e9a093232941..547446fcaaab 100644
--- a/misc/xyzcmd/pkg-plist
+++ b/misc/xyzcmd/pkg-plist
@@ -807,43 +807,3 @@ share/man/man1/xyzcmd.1
 %%DATADIR%%/plugins/core/complete/domain_fs.py
 %%DATADIR%%/plugins/core/complete/domain_service.py
 %%DATADIR%%/plugins/core/complete/main.py
-@dirrmtry share/man/man1
-@dirrmtry share/man
-@dirrm %%DATADIR%%/locale/ru/LC_MESSAGES
-@dirrm %%DATADIR%%/locale/ru
-@dirrm %%DATADIR%%/locale
-@dirrm %%DATADIR%%/skins
-@dirrm %%DATADIR%%/plugins/vfs/vfsutils
-@dirrm %%DATADIR%%/plugins/vfs/fileinfo
-@dirrm %%DATADIR%%/plugins/vfs
-@dirrm %%DATADIR%%/plugins/ui/testinput
-@dirrm %%DATADIR%%/plugins/ui/bookmarks
-@dirrm %%DATADIR%%/plugins/ui
-@dirrm %%DATADIR%%/plugins/misc/where
-@dirrm %%DATADIR%%/plugins/misc/hello
-@dirrm %%DATADIR%%/plugins/misc/about
-@dirrm %%DATADIR%%/plugins/misc
-@dirrm %%DATADIR%%/plugins/fsrules/magic
-@dirrm %%DATADIR%%/plugins/fsrules
-@dirrm %%DATADIR%%/plugins/core/shell
-@dirrm %%DATADIR%%/plugins/core/pluginlist
-@dirrm %%DATADIR%%/plugins/core/keycodes
-@dirrm %%DATADIR%%/plugins/core/console
-@dirrm %%DATADIR%%/plugins/core/complete
-@dirrm %%DATADIR%%/plugins/core/bindlist
-@dirrm %%DATADIR%%/plugins/core
-@dirrm %%DATADIR%%/plugins
-@dirrm %%DATADIR%%/conf
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/user-manual/_static
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/user-manual/_sources
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/user-manual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/libxyz/vfs
-@dirrm %%PYTHON_SITELIBDIR%%/libxyz/ui
-@dirrm %%PYTHON_SITELIBDIR%%/libxyz/parser
-@dirrm %%PYTHON_SITELIBDIR%%/libxyz/core/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/libxyz/core/logger
-@dirrm %%PYTHON_SITELIBDIR%%/libxyz/core
-@dirrm %%PYTHON_SITELIBDIR%%/libxyz
diff --git a/misc/ytree/pkg-plist b/misc/ytree/pkg-plist
index 5c1b92026df1..94dd4c91a137 100644
--- a/misc/ytree/pkg-plist
+++ b/misc/ytree/pkg-plist
@@ -6,4 +6,3 @@ man/man1/ytree.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/zoneinfo/pkg-plist b/misc/zoneinfo/pkg-plist
index de10bcba62d0..4b17547562ca 100644
--- a/misc/zoneinfo/pkg-plist
+++ b/misc/zoneinfo/pkg-plist
@@ -467,20 +467,3 @@
 %%DATADIR%%/WET
 %%DATADIR%%/posixrules
 %%DATADIR%%/zone.tab
-@dirrm %%DATADIR%%/Africa
-@dirrm %%DATADIR%%/America
-@dirrm %%DATADIR%%/America/Argentina
-@dirrm %%DATADIR%%/America/Indiana
-@dirrm %%DATADIR%%/America/Kentucky
-@dirrm %%DATADIR%%/America/North_Dakota
-@dirrm %%DATADIR%%/Antarctica
-@dirrm %%DATADIR%%/Arctic
-@dirrm %%DATADIR%%/Asia
-@dirrm %%DATADIR%%/Atlantic
-@dirrm %%DATADIR%%/Australia
-@dirrm %%DATADIR%%/Etc
-@dirrm %%DATADIR%%/Europe
-@dirrm %%DATADIR%%/Indian
-@dirrm %%DATADIR%%/Pacific
-@dirrm %%DATADIR%%/SystemV
-@dirrmtry %%DATADIR%%