Cleanup plist

90 files changed, 16 insertions, 979 deletions

diff --git a/irc/atheme-services/pkg-plist b/irc/atheme-services/pkg-plist
index e090e231014c..7723be29765e 100644
--- a/irc/atheme-services/pkg-plist
+++ b/irc/atheme-services/pkg-plist
@@ -1244,91 +1244,4 @@ share/atheme/help/userserv/vhost
 %%NLS%%share/locale/de/LC_MESSAGES/atheme.mo
 %%NLS%%share/locale/es/LC_MESSAGES/atheme.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/atheme.mo
-%%PORTDOCS%%@dirrmtry share/doc/atheme/technical
-%%PORTDOCS%%@dirrmtry share/doc/atheme/reference
-%%PORTDOCS%%@dirrmtry share/doc/atheme/perl
-%%PORTDOCS%%@dirrmtry share/doc/atheme
-@dirrmtry share/atheme/help/userserv
-@dirrmtry share/atheme/help/statserv
-@dirrmtry share/atheme/help/saslserv
-%%NLS%%@dirrmtry share/atheme/help/ru/userserv
-%%NLS%%@dirrmtry share/atheme/help/ru/saslserv
-%%NLS%%@dirrmtry share/atheme/help/ru/oservice
-%%NLS%%@dirrmtry share/atheme/help/ru/nickserv
-%%NLS%%@dirrmtry share/atheme/help/ru/memoserv
-%%NLS%%@dirrmtry share/atheme/help/ru/gservice
-%%NLS%%@dirrmtry share/atheme/help/ru/gameserv
-%%NLS%%@dirrmtry share/atheme/help/ru/cservice
-%%NLS%%@dirrmtry share/atheme/help/ru
-@dirrmtry share/atheme/help/rpgserv
-@dirrmtry share/atheme/help/oservice
-@dirrmtry share/atheme/help/nickserv
-@dirrmtry share/atheme/help/memoserv
-@dirrmtry share/atheme/help/infoserv
-@dirrmtry share/atheme/help/hostserv
-@dirrmtry share/atheme/help/helpserv
-@dirrmtry share/atheme/help/gservice
-@dirrmtry share/atheme/help/groupserv
-@dirrmtry share/atheme/help/gameserv
-%%NLS%%@dirrmtry share/atheme/help/es/userserv
-%%NLS%%@dirrmtry share/atheme/help/es/saslserv
-%%NLS%%@dirrmtry share/atheme/help/es/oservice
-%%NLS%%@dirrmtry share/atheme/help/es/nickserv
-%%NLS%%@dirrmtry share/atheme/help/es/memoserv
-%%NLS%%@dirrmtry share/atheme/help/es/infoserv
-%%NLS%%@dirrmtry share/atheme/help/es/hostserv
-%%NLS%%@dirrmtry share/atheme/help/es/helpserv
-%%NLS%%@dirrmtry share/atheme/help/es/gservice
-%%NLS%%@dirrmtry share/atheme/help/es/groupserv
-%%NLS%%@dirrmtry share/atheme/help/es/gameserv
-%%NLS%%@dirrmtry share/atheme/help/es/cservice
-%%NLS%%@dirrmtry share/atheme/help/es/contrib
-%%NLS%%@dirrmtry share/atheme/help/es/chanfix
-%%NLS%%@dirrmtry share/atheme/help/es/botserv
-%%NLS%%@dirrmtry share/atheme/help/es/alis
-%%NLS%%@dirrmtry share/atheme/help/es
-@dirrmtry share/atheme/help/cservice
-@dirrmtry share/atheme/help/contrib
-@dirrmtry share/atheme/help/chanfix
-@dirrmtry share/atheme/help/botserv
-@dirrmtry share/atheme/help/alis
-@dirrmtry share/atheme/help
-@dirrmtry share/atheme
-@dirrmtry lib/atheme/modules/transport
-@dirrmtry lib/atheme/modules/statserv
-%%PERL%%@dirrmtry lib/atheme/modules/scripting/lib/Atheme/Internal
-%%PERL%%@dirrmtry lib/atheme/modules/scripting/lib/Atheme
-%%PERL%%@dirrmtry lib/atheme/modules/scripting/lib
-%%PERL%%@dirrmtry lib/atheme/modules/scripting/examples
-%%PERL%%@dirrmtry lib/atheme/modules/scripting
-@dirrmtry lib/atheme/modules/saslserv
-@dirrmtry lib/atheme/modules/rpgserv
-@dirrmtry lib/atheme/modules/proxyscan
-@dirrmtry lib/atheme/modules/protocol
-@dirrmtry lib/atheme/modules/operserv
-@dirrmtry lib/atheme/modules/nickserv
-@dirrmtry lib/atheme/modules/misc
-@dirrmtry lib/atheme/modules/memoserv
-@dirrmtry lib/atheme/modules/infoserv
-@dirrmtry lib/atheme/modules/hostserv
-@dirrmtry lib/atheme/modules/helpserv
-@dirrmtry lib/atheme/modules/groupserv
-@dirrmtry lib/atheme/modules/global
-@dirrmtry lib/atheme/modules/gameserv
-@dirrmtry lib/atheme/modules/exttarget
-@dirrmtry lib/atheme/modules/crypto
-%%CONTRIB%%@dirrmtry lib/atheme/modules/contrib
-@dirrmtry lib/atheme/modules/chanserv
-@dirrmtry lib/atheme/modules/chanfix
-@dirrmtry lib/atheme/modules/botserv
-@dirrmtry lib/atheme/modules/backend
-@dirrmtry lib/atheme/modules/auth
-@dirrmtry lib/atheme/modules/alis
-@dirrmtry lib/atheme/modules
-@dirrmtry lib/atheme
-@dirrmtry include/atheme/protocol
-@dirrmtry include/atheme/inline
-@dirrmtry include/atheme
-@group ircservices
-@dirrmtry etc/atheme
-@group
+@dir(,ircservices,) etc/atheme
diff --git a/irc/bip/pkg-plist b/irc/bip/pkg-plist
index 309a65d6cb15..af5153841691 100644
--- a/irc/bip/pkg-plist
+++ b/irc/bip/pkg-plist
@@ -5,4 +5,3 @@ man/man1/bipmkpw.1.gz
 man/man5/bip.conf.5.gz
 %%EXAMPLESDIR%%/bip.conf
 %%EXAMPLESDIR%%/bip.vim
-@dirrmtry %%EXAMPLESDIR%%
diff --git a/irc/bitchx/pkg-plist b/irc/bitchx/pkg-plist
index 0203ffb9f548..349ff66aae70 100644
--- a/irc/bitchx/pkg-plist
+++ b/irc/bitchx/pkg-plist
@@ -76,7 +76,3 @@ man/man1/BitchX.1.gz
 %%DATADIR%%/translation/UNITED_KINGDOM
 %%DATADIR%%/translation/UNITED_KINGDOM_COM
 %%DATADIR%%/wserv
-@dirrm %%DATADIR%%/translation
-@dirrm %%DATADIR%%/script
-@dirrm %%DATADIR%%/plugins
-@comment @dirrm %%DATADIR%% must be appended after PORTDOCS stuff, see Makefile
diff --git a/irc/bitlbee/pkg-plist b/irc/bitlbee/pkg-plist
index 3698cbe64968..37746eb2b870 100644
--- a/irc/bitlbee/pkg-plist
+++ b/irc/bitlbee/pkg-plist
@@ -2,6 +2,4 @@ man/man5/bitlbee.conf.5.gz
 man/man8/bitlbee.8.gz
 sbin/bitlbee
 %%DATADIR%%/help.txt
-@dirrm %%DATADIR%%
-@dirrmtry etc/bitlbee
 @exec mkdir -p %D/etc/bitlbee
diff --git a/irc/bnc/pkg-plist b/irc/bnc/pkg-plist
index 7d84f91073f7..60d6cb64b234 100644
--- a/irc/bnc/pkg-plist
+++ b/irc/bnc/pkg-plist
@@ -7,4 +7,3 @@ etc/bnc.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/Changelog
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/irc/cgiirc/pkg-plist b/irc/cgiirc/pkg-plist
index fcda5aa4edf7..b3f4f5997f7d 100644
--- a/irc/cgiirc/pkg-plist
+++ b/irc/cgiirc/pkg-plist
@@ -121,15 +121,5 @@ www/cgiirc/modules/IRC/Util.pm
 www/cgiirc/modules/Timer.pm
 www/cgiirc/modules/parse.pl
 www/cgiirc/nph-irc.cgi
-@dirrm www/cgiirc/modules/IRC/Channel
-@dirrm www/cgiirc/modules/IRC
-@dirrm www/cgiirc/modules
-@dirrm www/cgiirc/interfaces/interface-make
-@dirrm www/cgiirc/interfaces
-@dirrm www/cgiirc/images/taras
-@dirrm www/cgiirc/images
-@dirrm www/cgiirc/formats
-@dirrm www/cgiirc/docs
-@dirrmtry www/cgiirc
 @owner root
 @group wheel
diff --git a/irc/charybdis/pkg-plist b/irc/charybdis/pkg-plist
index 62db42af6633..d21b07222bd7 100644
--- a/irc/charybdis/pkg-plist
+++ b/irc/charybdis/pkg-plist
@@ -9,9 +9,7 @@ bin/ssld
 bin/viconf
 bin/vimotd
 etc/charybdis/example.conf
-@unexec cmp -s %D/etc/charybdis/ircd.motd.sample %D/etc/charybdis/ircd.motd && rm -f %D/etc/charybdis/ircd.motd || true
-etc/charybdis/ircd.motd.sample
-@exec [ -f %D/ircd.motd ] || cp -p %D/%F %B/ircd.motd
+@sample etc/charybdis/ircd.motd.sample
 %%ETCDIR%%/reference.conf
 lib/libratbox.so
 libdata/pkgconfig/libratbox.pc
@@ -277,13 +275,5 @@ man/man8/ircd.8.gz
 %%DATADIR%%/modules/m_quit.so
 %%DATADIR%%/modules/m_server.so
 %%DATADIR%%/modules/m_squit.so
-@dirrm %%DATADIR%%/modules/extensions
-@dirrm %%DATADIR%%/modules/autoload
-@dirrm %%DATADIR%%/modules
-@dirrm %%DATADIR%%/help/users
-@dirrm %%DATADIR%%/help/opers
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%
-@dirrm %%ETCDIR%%
-@unexec rmdir "/var/log/charybdis" >/dev/null 2>&1 || :
-@unexec rmdir "/var/db/charybdis" >/dev/null 2>&1 || :
+@dir /var/log/charybdis
+@dir /var/db/charybdis
diff --git a/irc/ctrlproxy/pkg-plist b/irc/ctrlproxy/pkg-plist
index 1ce8b31780d5..d66e7c0faebb 100644
--- a/irc/ctrlproxy/pkg-plist
+++ b/irc/ctrlproxy/pkg-plist
@@ -13,7 +13,3 @@ man/man5/ctrlproxy_config.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/user-guide.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%
-@dirrm etc/ctrlproxy
-@dirrm lib/ctrlproxy
diff --git a/irc/cwirc/pkg-plist b/irc/cwirc/pkg-plist
index 9556b7c4ddb7..3b1b0c7a9ec8 100644
--- a/irc/cwirc/pkg-plist
+++ b/irc/cwirc/pkg-plist
@@ -6,8 +6,3 @@ lib/xchat/plugins/cwirc.so
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/schematics/cw_oscillator.jpg
 %%PORTDOCS%%%%DOCSDIR%%/schematics/rs232_key_connection.jpg
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/schematics
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/cwirc/extensions
-@dirrm share/cwirc
-@dirrmtry lib/xchat/plugins
diff --git a/irc/dancer/pkg-plist b/irc/dancer/pkg-plist
index 7afad21bdc9d..108a2728a08b 100644
--- a/irc/dancer/pkg-plist
+++ b/irc/dancer/pkg-plist
@@ -3,4 +3,3 @@ share/dancer/dancer.config
 share/dancer/dancer.explain
 share/dancer/dancer.users
 share/dancer/dancer.funcs
-@dirrm share/dancer
diff --git a/irc/dircproxy/pkg-plist b/irc/dircproxy/pkg-plist
index e083fc1f899e..bcd570e0a996 100644
--- a/irc/dircproxy/pkg-plist
+++ b/irc/dircproxy/pkg-plist
@@ -6,4 +6,3 @@ man/man1/dircproxy-crypt.1.gz
 %%DATADIR%%/dircproxyrc.sample
 %%DATADIR%%/log.pl
 %%DATADIR%%/privmsg-log.pl
-@dirrm %%DATADIR%%
diff --git a/irc/dxirc/pkg-plist b/irc/dxirc/pkg-plist
index f1ccc0a6bca6..a2b06d26e631 100644
--- a/irc/dxirc/pkg-plist
+++ b/irc/dxirc/pkg-plist
@@ -288,9 +288,3 @@ share/pixmaps/dxirc.png
 %%DATADIR%%/icons/smileys/unhappy.png
 %%NLS%%share/locale/cs/LC_MESSAGES/dxirc.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/dxirc.mo
-@dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%/icons/default
-@dirrm %%DATADIR%%/icons/flags
-@dirrm %%DATADIR%%/icons/smileys
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
diff --git a/irc/eggdrop/pkg-plist b/irc/eggdrop/pkg-plist
index 68308d0b6886..af25372fef33 100644
--- a/irc/eggdrop/pkg-plist
+++ b/irc/eggdrop/pkg-plist
@@ -106,13 +106,3 @@ lib/eggdrop/wire.so
 %%DATADIR%%/scripts/weed
 %%DATADIR%%/text/banner
 %%DATADIR%%/text/motd
-@dirrm %%DATADIR%%/text
-@dirrm %%DATADIR%%/scripts/help/msg
-@dirrm %%DATADIR%%/scripts/help
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/language
-@dirrm %%DATADIR%%/help/set
-@dirrm %%DATADIR%%/help/msg
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%
-@dirrm lib/eggdrop
diff --git a/irc/epic4/pkg-plist b/irc/epic4/pkg-plist
index 96470054d46e..6cd57f91ab46 100644
--- a/irc/epic4/pkg-plist
+++ b/irc/epic4/pkg-plist
@@ -1105,21 +1105,3 @@ share/epic/script/window
 %%PORTDOCS%%%%DOCSDIR%%/KNOWNBUGS
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/BUG_FORM
-@dirrm share/epic/script
-@dirrm share/epic/help/8_Scripts
-@dirrm share/epic/help/7_Docs
-@dirrm share/epic/help/6_Functions
-@dirrm share/epic/help/5_Programming/on
-@dirrm share/epic/help/5_Programming
-@dirrm share/epic/help/4_Misc/window
-@dirrm share/epic/help/4_Misc/set
-@dirrm share/epic/help/4_Misc/bind
-@dirrm share/epic/help/4_Misc
-@dirrm share/epic/help/3_Operators
-@dirrm share/epic/help/2_Queries
-@dirrm share/epic/help/1_General/dcc
-@dirrm share/epic/help/1_General/ctcp
-@dirrm share/epic/help/1_General
-@dirrm share/epic/help
-@dirrm share/epic
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/irc/epic5/pkg-plist b/irc/epic5/pkg-plist
index 7e15de2394b8..b60899e54057 100644
--- a/irc/epic5/pkg-plist
+++ b/irc/epic5/pkg-plist
@@ -90,8 +90,4 @@ man/man1/epic5.1.gz
 %%DATADIR%%/script/url.irc
 %%DATADIR%%/script/utime
 %%DATADIR%%/script/xmsglog
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec mkdir -p %D/%%DATADIR%%/help
-@dirrmtry %%DATADIR%%/help
-@dirrm %%DATADIR%%/script
-@dirrm %%DATADIR%%
+@dir %%DATADIR%%/help
diff --git a/irc/ezbounce/pkg-plist b/irc/ezbounce/pkg-plist
index d4cf3fa7948e..2550ff944a76 100644
--- a/irc/ezbounce/pkg-plist
+++ b/irc/ezbounce/pkg-plist
@@ -7,4 +7,3 @@ man/man1/ezbounce.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/worklog
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/irc/fisg/pkg-plist b/irc/fisg/pkg-plist
index beccdf785d1b..f755066086c8 100644
--- a/irc/fisg/pkg-plist
+++ b/irc/fisg/pkg-plist
@@ -20,5 +20,3 @@ man/man1/fisg.1.gz
 %%DATADIR%%/simple.css
 %%DATADIR%%/yellow-h.png
 %%DATADIR%%/yellow-v.png
-@dirrm %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%
diff --git a/irc/gruftistats/pkg-plist b/irc/gruftistats/pkg-plist
index bce05396eaee..9c0a5cbc4a98 100644
--- a/irc/gruftistats/pkg-plist
+++ b/irc/gruftistats/pkg-plist
@@ -24,5 +24,3 @@ share/gruftistats/pipe3v.png
 share/gruftistats/pipe4h.png
 share/gruftistats/pipe4v.png
 share/gruftistats/xchat.lrx
-@dirrm share/gruftistats
-%%PORTDOCS%%@dirrm share/doc/gruftistats
diff --git a/irc/hexchat/pkg-plist b/irc/hexchat/pkg-plist
index 538fb984b991..bd807f200c1b 100644
--- a/irc/hexchat/pkg-plist
+++ b/irc/hexchat/pkg-plist
@@ -67,8 +67,3 @@ share/icons/hicolor/scalable/apps/hexchat.svg
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/hexchat.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/hexchat.mo
 share/pixmaps/hexchat.png
-@dirrm lib/hexchat/plugins
-@dirrm lib/hexchat
-@dirrmtry share/appdata
-%%NLS%%@dirrmtry share/locale/ja_JP/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ja_JP
diff --git a/irc/hybserv/pkg-plist b/irc/hybserv/pkg-plist
index 947512535cc0..9ac4fb65fd32 100644
--- a/irc/hybserv/pkg-plist
+++ b/irc/hybserv/pkg-plist
@@ -217,23 +217,6 @@ hybserv/servchk
 hybserv/settings.conf
 hybserv/showchans
 hybserv/shownicks
-@exec mkdir %D/hybserv/logs
-@dirrmtry hybserv/logs
-@dirrm hybserv/help/statserv
-@dirrm hybserv/help/seenserv
-@dirrm hybserv/help/operserv/dcc
-@dirrm hybserv/help/operserv
-@dirrm hybserv/help/nickserv/set
-@dirrm hybserv/help/nickserv/access
-@dirrm hybserv/help/nickserv
-@dirrm hybserv/help/memoserv
-@dirrm hybserv/help/helpserv
-@dirrm hybserv/help/global
-@dirrm hybserv/help/chanserv/set
-@dirrm hybserv/help/chanserv/level
-@dirrm hybserv/help/chanserv/akick
-@dirrm hybserv/help/chanserv/access
-@dirrm hybserv/help/chanserv
-@dirrm hybserv/help
-@dirrm hybserv/doc
-@dirrmtry hybserv
+@dir hybserv/logs
+@owner
+@group
diff --git a/irc/infobot/pkg-plist b/irc/infobot/pkg-plist
index dc819e5b511c..e1f67b7292f4 100644
--- a/irc/infobot/pkg-plist
+++ b/irc/infobot/pkg-plist
@@ -76,10 +76,3 @@ bin/infobot
 %%PORTDOCS%%%%DOCSDIR%%/REVISIONS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/extras
-@dirrm %%DATADIR%%/files
-@dirrm %%DATADIR%%/scripts
-@dirrmtry %%DATADIR%%/src
-@dirrmtry %%DATADIR%%
-@dirrmtry %%ETCDIR%%
diff --git a/irc/insub/pkg-plist b/irc/insub/pkg-plist
index 02c47b585314..332a5b3c8b7a 100644
--- a/irc/insub/pkg-plist
+++ b/irc/insub/pkg-plist
@@ -78,7 +78,4 @@ bin/insub
 %%COWS%%%%DATADIR%%/wtf.cow
 %%COWS%%%%DATADIR%%/wtf2.cow
 %%COWS%%%%DATADIR%%/zig.cow
-%%COWS%%@dirrmtry %%DATADIR%%
 share/irssi/scripts/insub.pl
-@dirrmtry share/irssi/scripts
-@dirrmtry share/irssi
diff --git a/irc/irc/pkg-plist b/irc/irc/pkg-plist
index 5725557865c7..7e1763a7f7a5 100644
--- a/irc/irc/pkg-plist
+++ b/irc/irc/pkg-plist
@@ -12,4 +12,3 @@ sbin/ircd
 sbin/iauth
 sbin/ircd-mkpasswd
 sbin/ircdwatch
-@dirrmtry etc/ircd
diff --git a/irc/ircII/pkg-plist b/irc/ircII/pkg-plist
index 87ede9768b51..9aab8032a434 100644
--- a/irc/ircII/pkg-plist
+++ b/irc/ircII/pkg-plist
@@ -599,16 +599,3 @@ man/man1/ircII.1.gz
 %%DATADIR%%/script/wallopstat
 %%DATADIR%%/script/whowas
 %%DATADIR%%/script/window
-@dirrm %%DATADIR%%/script
-@dirrm %%DATADIR%%/help/alias
-@dirrm %%DATADIR%%/help/bind
-@dirrm %%DATADIR%%/help/ctcp
-@dirrm %%DATADIR%%/help/dcc
-@dirrm %%DATADIR%%/help/on
-@dirrm %%DATADIR%%/help/load
-@dirrm %%DATADIR%%/help/note
-@dirrm %%DATADIR%%/help/set
-@dirrm %%DATADIR%%/help/window
-@dirrm %%DATADIR%%/help/ircii
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%
diff --git a/irc/ircd-hybrid/pkg-plist b/irc/ircd-hybrid/pkg-plist
index 1364d93d385f..475bc76e2e7e 100644
--- a/irc/ircd-hybrid/pkg-plist
+++ b/irc/ircd-hybrid/pkg-plist
@@ -220,10 +220,3 @@ sbin/ircd
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/whois
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/whowas
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/xline
-@dirrm lib/ircd-hybrid/modules/autoload
-@dirrm lib/ircd-hybrid/modules
-@dirrm lib/ircd-hybrid
-@dirrmtry %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help
-@dirrmtry %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid
-@dirrmtry %%DATADIR%%-%%PORTVERSION%%
-@dirrm %%ETCDIR%%
diff --git a/irc/ircd-ratbox-devel/pkg-plist b/irc/ircd-ratbox-devel/pkg-plist
index 7ded5ba60bf0..c79eb5110c88 100644
--- a/irc/ircd-ratbox-devel/pkg-plist
+++ b/irc/ircd-ratbox-devel/pkg-plist
@@ -226,20 +226,7 @@ lib/ircd-ratbox/modules/m_part.so
 lib/ircd-ratbox/modules/m_quit.so
 lib/ircd-ratbox/modules/m_server.so
 lib/ircd-ratbox/modules/m_squit.so
-@dirrm libexec/ircd-ratbox
-@dirrm lib/ircd-ratbox/modules/autoload
-@dirrm lib/ircd-ratbox/modules/contrib
-@dirrm lib/ircd-ratbox/modules
-@dirrm lib/ircd-ratbox
-@dirrm %%DATADIR%%/help/users
-@dirrm %%DATADIR%%/help/opers
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%
 etc/ircd-ratbox/genssl.sh
 @sample etc/ircd-ratbox/ircd-efnet.conf.sample
 @sample etc/ircd-ratbox/ircd.conf.sample
 @sample etc/ircd-ratbox/ircd.motd.sample
-@dirrmtry etc/ircd-ratbox
-@dirrmtry %%LOGDIR%%
-@dirrmtry %%RUNDIR%%
-@dirrmtry %%DBDIR%%
diff --git a/irc/ircd-ratbox/pkg-plist b/irc/ircd-ratbox/pkg-plist
index 0398d02e8f08..a6bf7ec88be5 100644
--- a/irc/ircd-ratbox/pkg-plist
+++ b/irc/ircd-ratbox/pkg-plist
@@ -226,20 +226,7 @@ lib/ircd-ratbox/modules/m_part.so
 lib/ircd-ratbox/modules/m_quit.so
 lib/ircd-ratbox/modules/m_server.so
 lib/ircd-ratbox/modules/m_squit.so
-@dirrm libexec/ircd-ratbox
-@dirrm lib/ircd-ratbox/modules/autoload
-@dirrm lib/ircd-ratbox/modules/contrib
-@dirrm lib/ircd-ratbox/modules
-@dirrm lib/ircd-ratbox
-@dirrm %%DATADIR%%/help/users
-@dirrm %%DATADIR%%/help/opers
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%
 etc/ircd-ratbox/genssl.sh
 @sample etc/ircd-ratbox/ircd-efnet.conf.sample
 @sample etc/ircd-ratbox/ircd.conf.sample
 @sample etc/ircd-ratbox/ircd.motd.sample
-@dirrmtry etc/ircd-ratbox
-@dirrmtry %%LOGDIR%%
-@dirrmtry %%RUNDIR%%
-@dirrmtry %%DBDIR%%
diff --git a/irc/ircd-ru/pkg-plist b/irc/ircd-ru/pkg-plist
index 8983a7642fd5..c42908b2ffb7 100644
--- a/irc/ircd-ru/pkg-plist
+++ b/irc/ircd-ru/pkg-plist
@@ -8,14 +8,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/opers.txt
 %%PORTDOCS%%%%DOCSDIR%%/ru_RU.KOI8-R/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/ru_RU.KOI8-R/README
-@dirrmtry %%DATADIR%%
-@dirrmtry %%DATADIR%%/codepages
-@dirrmtry %%DATADIR%%/modules
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ru_RU.KOI8-R
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry etc/ircd-ru
-@dirrmtry etc/ircd-ru/ru_RU.CP1251
-@dirrmtry etc/ircd-ru/ru_RU.KOI8-R
 bin/ircdpasswd
 etc/ircd-ru/ircd.conf-dist
 etc/ircd-ru/ircd.motd-dist
diff --git a/irc/ircproxy/pkg-plist b/irc/ircproxy/pkg-plist
index 8978e26a72af..913346df5e43 100644
--- a/irc/ircproxy/pkg-plist
+++ b/irc/ircproxy/pkg-plist
@@ -6,4 +6,3 @@ bin/imkpasswd
 %%DATADIR%%/ircproxyd-user.conf
 %%DATADIR%%/ircproxyd-conn.conf
 %%DATADIR%%/ircproxyd-autoop.conf
-@dirrm %%DATADIR%%
diff --git a/irc/ircservices/pkg-plist b/irc/ircservices/pkg-plist
index db7e706f50a2..0c1734750166 100644
--- a/irc/ircservices/pkg-plist
+++ b/irc/ircservices/pkg-plist
@@ -54,8 +54,3 @@ sbin/ircservices-chk
 %%PORTDOCS%%%%DOCSDIR%%/tech/index.html
 %%PORTDOCS%%%%DOCSDIR%%/tech/style.css
 %%PORTDOCS%%%%DOCSDIR%%/upgrade.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tech
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%ETCDIR%%/languages
-@dirrm %%ETCDIR%%/helpfiles
-@dirrm %%ETCDIR%%
diff --git a/irc/iroffer-dinoex/pkg-plist b/irc/iroffer-dinoex/pkg-plist
index a29e406ee9cc..99dbc31c8f20 100644
--- a/irc/iroffer-dinoex/pkg-plist
+++ b/irc/iroffer-dinoex/pkg-plist
@@ -31,7 +31,6 @@ man/man7/xdcc.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/iroffer.1.html
 %%PORTDOCS%%%%DOCSDIR%%/iroffer.1.ps
 %%PORTDOCS%%%%DOCSDIR%%/iroffer.1.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beispiel.config
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exemple.config
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/footer.html
@@ -45,5 +44,3 @@ man/man7/xdcc.7.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/htdocs/md5.txt.rb
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/htdocs/robots.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/htdocs/sfv.txt.rb
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/htdocs
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/irc/iroffer-lamm/pkg-plist b/irc/iroffer-lamm/pkg-plist
index dcafc535c23e..28a6b68f2a1a 100644
--- a/irc/iroffer-lamm/pkg-plist
+++ b/irc/iroffer-lamm/pkg-plist
@@ -2,8 +2,6 @@ bin/convertxdccfile
 bin/iroffer
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/WHATSNEW
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynip.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iroffer.cron
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.config
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/irc/iroffer/pkg-plist b/irc/iroffer/pkg-plist
index dcafc535c23e..28a6b68f2a1a 100644
--- a/irc/iroffer/pkg-plist
+++ b/irc/iroffer/pkg-plist
@@ -2,8 +2,6 @@ bin/convertxdccfile
 bin/iroffer
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/WHATSNEW
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynip.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iroffer.cron
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.config
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/irc/irssi-devel/pkg-plist b/irc/irssi-devel/pkg-plist
index 01cb511f1ef8..cbfe06dab047 100644
--- a/irc/irssi-devel/pkg-plist
+++ b/irc/irssi-devel/pkg-plist
@@ -275,31 +275,4 @@ man/man1/irssi.1.gz
 %%DATADIR%%/scripts/usercount.pl
 %%DATADIR%%/themes/colorless.theme
 %%DATADIR%%/themes/default.theme
-@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Irssi
-@exec mkdir -p %D/lib/irssi/modules
-@dirrmtry lib/irssi/modules
-@dirrmtry lib/irssi
-@dirrm include/irssi/src/lib-config
-@dirrm include/irssi/src/irc/notifylist
-@dirrm include/irssi/src/irc/flood
-@dirrm include/irssi/src/irc/dcc
-@dirrm include/irssi/src/irc/core
-@dirrm include/irssi/src/irc
-@dirrm include/irssi/src/fe-text
-@dirrm include/irssi/src/fe-common/irc/notifylist
-@dirrm include/irssi/src/fe-common/irc/dcc
-@dirrm include/irssi/src/fe-common/irc
-@dirrm include/irssi/src/fe-common/core
-@dirrm include/irssi/src/fe-common
-@dirrm include/irssi/src/core
-@dirrm include/irssi/src
-@dirrm include/irssi
+@dir lib/irssi/modules
diff --git a/irc/irssi-scripts/pkg-plist b/irc/irssi-scripts/pkg-plist
index 3cfc0b03b463..d8b0db63a33a 100644
--- a/irc/irssi-scripts/pkg-plist
+++ b/irc/irssi-scripts/pkg-plist
@@ -339,5 +339,3 @@ share/irssi/scripts/xmms.pl
 share/irssi/scripts/xmms2.pl
 share/irssi/scripts/xmmsinfo.pl
 share/irssi/scripts/xqf.pl
-@dirrmtry share/irssi/scripts
-@dirrmtry share/irssi
diff --git a/irc/irssi-xmpp/pkg-plist b/irc/irssi-xmpp/pkg-plist
index b985ac91df7a..88b52b05355a 100644
--- a/irc/irssi-xmpp/pkg-plist
+++ b/irc/irssi-xmpp/pkg-plist
@@ -9,7 +9,3 @@
 lib/irssi/modules/libfe_xmpp.so
 lib/irssi/modules/libtext_xmpp.so
 lib/irssi/modules/libxmpp_core.so
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/irssi-xmpp
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrmtry %%DATADIR%%/help
-@dirrmtry %%DATADIR%%
diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist
index e95f3466a18a..20680b64795b 100644
--- a/irc/irssi/pkg-plist
+++ b/irc/irssi/pkg-plist
@@ -265,31 +265,4 @@ man/man1/irssi.1.gz
 %%DATADIR%%/scripts/usercount.pl
 %%DATADIR%%/themes/colorless.theme
 %%DATADIR%%/themes/default.theme
-@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/UI
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/TextUI
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi/Irc
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Irssi
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Irssi
-@exec mkdir -p %D/lib/irssi/modules
-@dirrmtry lib/irssi/modules
-@dirrmtry lib/irssi
-@dirrm include/irssi/src/lib-config
-@dirrm include/irssi/src/irc/notifylist
-@dirrm include/irssi/src/irc/flood
-@dirrm include/irssi/src/irc/dcc
-@dirrm include/irssi/src/irc/core
-@dirrm include/irssi/src/irc
-@dirrm include/irssi/src/fe-text
-@dirrm include/irssi/src/fe-common/irc/notifylist
-@dirrm include/irssi/src/fe-common/irc/dcc
-@dirrm include/irssi/src/fe-common/irc
-@dirrm include/irssi/src/fe-common/core
-@dirrm include/irssi/src/fe-common
-@dirrm include/irssi/src/core
-@dirrm include/irssi/src
-@dirrm include/irssi
+@dir lib/irssi/modules
diff --git a/irc/irssistats/pkg-plist b/irc/irssistats/pkg-plist
index c19177d70a28..e31cfccfe0fa 100644
--- a/irc/irssistats/pkg-plist
+++ b/irc/irssistats/pkg-plist
@@ -43,6 +43,3 @@ man/man1/irssistats.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.configfile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.nickfile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.photofile
-@dirrm %%DATADIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/irc/keitairc2/pkg-plist b/irc/keitairc2/pkg-plist
index 8430d282207e..23e78d8fbdb8 100644
--- a/irc/keitairc2/pkg-plist
+++ b/irc/keitairc2/pkg-plist
@@ -124,19 +124,3 @@ bin/keitairc
 %%DATADIR%%/lib/templates/ipod-sjis/recent.html
 %%DATADIR%%/lib/templates/ipod-sjis/root.html
 %%DATADIR%%/lib/templates/ipod-sjis/topic.html
-@dirrm %%DATADIR%%/lib/templates/ipod-sjis
-@dirrm %%DATADIR%%/lib/templates/default
-@dirrm %%DATADIR%%/lib/templates
-@dirrm %%DATADIR%%/lib/public/iui
-@dirrm %%DATADIR%%/lib/public
-@dirrm %%DATADIR%%/lib/plugins
-@dirrm %%DATADIR%%/lib/Keitairc
-@dirrm %%DATADIR%%/lib
-@dirrm %%DATADIR%%/etc
-@dirrm %%DATADIR%%/doc/screenshot/2.0/keitai
-@dirrm %%DATADIR%%/doc/screenshot/2.0/iphone
-@dirrm %%DATADIR%%/doc/screenshot/2.0
-@dirrm %%DATADIR%%/doc/screenshot
-@dirrm %%DATADIR%%/doc/iui
-@dirrm %%DATADIR%%/doc
-@dirrm %%DATADIR%%
diff --git a/irc/konversation-kde4/pkg-plist b/irc/konversation-kde4/pkg-plist
index 9d06837977f6..36bd4c0c7eb8 100644
--- a/irc/konversation-kde4/pkg-plist
+++ b/irc/konversation-kde4/pkg-plist
@@ -219,29 +219,3 @@ share/locale/tr/LC_MESSAGES/konversation.mo
 share/locale/uk/LC_MESSAGES/konversation.mo
 share/locale/zh_CN/LC_MESSAGES/konversation.mo
 share/locale/zh_TW/LC_MESSAGES/konversation.mo
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrm share/doc/HTML/uk/konversation
-@dirrm share/doc/HTML/sv/konversation
-@dirrm share/doc/HTML/pt_BR/konversation
-@dirrm share/doc/HTML/nl/konversation
-@dirrm share/doc/HTML/it/konversation
-@dirrm share/doc/HTML/fr/konversation
-@dirrm share/doc/HTML/et/konversation
-@dirrm share/doc/HTML/es/konversation
-@dirrm share/doc/HTML/en/konversation
-@dirrm share/doc/HTML/de/konversation
-@dirrm share/doc/HTML/ca/konversation
-@dirrm share/apps/konversation/themes/square
-@dirrm share/apps/konversation/themes/smiling
-@dirrm share/apps/konversation/themes/simplistic
-@dirrm share/apps/konversation/themes/default
-@dirrm share/apps/konversation/themes/classic
-@dirrm share/apps/konversation/themes/christmas
-@dirrm share/apps/konversation/themes/alternative
-@dirrm share/apps/konversation/themes
-@dirrm share/apps/konversation/scripts
-@dirrm share/apps/konversation/scripting_support/python/konversation
-@dirrm share/apps/konversation/scripting_support/python
-@dirrm share/apps/konversation/scripting_support
-@dirrm share/apps/konversation
diff --git a/irc/kvirc/pkg-plist b/irc/kvirc/pkg-plist
index c605fb7f34aa..5cb2e4b22f4d 100644
--- a/irc/kvirc/pkg-plist
+++ b/irc/kvirc/pkg-plist
@@ -2268,58 +2268,3 @@ share/icons/hicolor/scalable/mimetypes/text-x-kvs.svgz
 %%DATADIR%%/%%VER%%/themes/MinimalDark-1.0.0/themeinfo.kvc
 share/pixmaps/kvirc.png
 %%KDE%%share/mime/packages/kvirc.xml
-@dirrm %%DATADIR%%/%%VER%%/themes/MinimalDark-1.0.0
-@dirrm %%DATADIR%%/%%VER%%/themes/Aria-1.0.0
-@dirrm %%DATADIR%%/%%VER%%/themes
-@dirrm %%DATADIR%%/%%VER%%/pics/coresmall
-@dirrm %%DATADIR%%/%%VER%%/pics
-@dirrm %%DATADIR%%/%%VER%%/msgcolors
-@dirrm %%DATADIR%%/%%VER%%/modules/caps/serverimport
-@dirrm %%DATADIR%%/%%VER%%/modules/caps/crypt
-@dirrm %%DATADIR%%/%%VER%%/modules/caps
-@dirrm %%DATADIR%%/%%VER%%/modules
-@dirrm %%DATADIR%%/%%VER%%/locale
-@dirrm %%DATADIR%%/%%VER%%/license
-@dirrm %%DATADIR%%/%%VER%%/help/en
-@dirrm %%DATADIR%%/%%VER%%/help
-@dirrm %%DATADIR%%/%%VER%%/doc
-@dirrm %%DATADIR%%/%%VER%%/defscript
-@dirrm %%DATADIR%%/%%VER%%/config/modules
-@dirrm %%DATADIR%%/%%VER%%/config
-@dirrm %%DATADIR%%/%%VER%%/audio
-@dirrm %%DATADIR%%/%%VER%%
-@dirrm %%DATADIR%%
-%%QT%%@dirrmtry share/icons/hicolor/scalable/mimetypes
-%%QT%%@dirrmtry share/icons/hicolor/scalable/apps
-%%QT%%@dirrmtry share/icons/hicolor/scalable
-%%QT%%@dirrmtry share/icons/hicolor/64x64/mimetypes
-%%QT%%@dirrmtry share/icons/hicolor/64x64/apps
-%%QT%%@dirrmtry share/icons/hicolor/64x64
-%%QT%%@dirrmtry share/icons/hicolor/48x48/mimetypes
-%%QT%%@dirrmtry share/icons/hicolor/48x48/apps
-%%QT%%@dirrmtry share/icons/hicolor/48x48
-%%QT%%@dirrmtry share/icons/hicolor/32x32/mimetypes
-%%QT%%@dirrmtry share/icons/hicolor/32x32/apps
-%%QT%%@dirrmtry share/icons/hicolor/32x32
-%%QT%%@dirrmtry share/icons/hicolor/16x16/mimetypes
-%%QT%%@dirrmtry share/icons/hicolor/16x16/apps
-%%QT%%@dirrmtry share/icons/hicolor/16x16
-%%QT%%@dirrmtry share/icons/hicolor/128x128/mimetypes
-%%QT%%@dirrmtry share/icons/hicolor/128x128/apps
-%%QT%%@dirrmtry share/icons/hicolor/128x128
-%%QT%%@dirrmtry share/icons/hicolor
-%%QT%%@dirrmtry share/icons
-%%KDE%%@dirrm share/apps/kvirc
-@dirrmtry man/uk/man1
-@dirrmtry man/uk
-@dirrmtry man/pt/man1
-@dirrmtry man/pt
-@dirrmtry man/it/man1
-@dirrmtry man/it
-@dirrmtry man/fr/man1
-@dirrmtry man/fr
-@dirrmtry man/de/man1
-@dirrmtry man/de
-@dirrm lib/kvirc/%%VER%%/modules
-@dirrm lib/kvirc/%%VER%%
-@dirrm lib/kvirc
diff --git a/irc/libircclient/pkg-plist b/irc/libircclient/pkg-plist
index 0f62809790e8..1734d9844572 100644
--- a/irc/libircclient/pkg-plist
+++ b/irc/libircclient/pkg-plist
@@ -11,4 +11,3 @@ lib/libircclient.a
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ircftp.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/irctest.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spammer.c
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/irc/lostirc/pkg-plist b/irc/lostirc/pkg-plist
index b1e89d31ede8..79bf6092c22d 100644
--- a/irc/lostirc/pkg-plist
+++ b/irc/lostirc/pkg-plist
@@ -9,4 +9,3 @@ share/applications/lostirc.desktop
 share/pixmaps/lostirc.png
 share/locale/da/LC_MESSAGES/lostirc.mo
 share/locale/fr/LC_MESSAGES/lostirc.mo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/irc/miau/pkg-plist b/irc/miau/pkg-plist
index ef62ddff20f4..a8a62ac15820 100644
--- a/irc/miau/pkg-plist
+++ b/irc/miau/pkg-plist
@@ -2,6 +2,4 @@ bin/miau
 bin/miau-check
 man/man1/miau.1.gz
 %%EXAMPLESDIR%%/miaurc
-@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/irc/nefarious/pkg-plist b/irc/nefarious/pkg-plist
index 4c24742cde3d..89de51054771 100644
--- a/irc/nefarious/pkg-plist
+++ b/irc/nefarious/pkg-plist
@@ -118,9 +118,3 @@ man/man8/ircd.8.gz
 %%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/wallvoices
 %%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/whois
 %%PORTDOCS%%%%INSTALL_PREFIX%%/lib/help/opers/zline
-@dirrm %%INSTALL_PREFIX%%/bin
-%%PORTDOCS%%@dirrm %%INSTALL_PREFIX%%/lib/help/opers
-%%PORTDOCS%%@dirrm %%INSTALL_PREFIX%%/lib/help/users
-%%PORTDOCS%%@dirrm %%INSTALL_PREFIX%%/lib/help
-@dirrm %%INSTALL_PREFIX%%/lib
-@dirrm %%INSTALL_PREFIX%%
diff --git a/irc/nethirc/pkg-plist b/irc/nethirc/pkg-plist
index 4efe412349b4..bcbb0fae4753 100644
--- a/irc/nethirc/pkg-plist
+++ b/irc/nethirc/pkg-plist
@@ -21,5 +21,3 @@ bin/nethirc.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetHirc/.packlist
 %%PERL5_MAN3%%/NetHirc.3.gz
 man/man1/nethirc.pl.1.gz
-@dirrm %%SITE_PERL%%/NetHirc
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetHirc
diff --git a/irc/ninja/pkg-plist b/irc/ninja/pkg-plist
index 08a551422372..50bbdf09c59c 100644
--- a/irc/ninja/pkg-plist
+++ b/irc/ninja/pkg-plist
@@ -33,5 +33,3 @@ bin/ninjawserv
 %%DATADIR%%/translation/SWISS
 %%DATADIR%%/translation/UNITED_KINGDOM
 %%DATADIR%%/translation/UNITED_KINGDOM_COM
-@dirrm %%DATADIR%%/translation
-@dirrm %%DATADIR%%
diff --git a/irc/onis/pkg-plist b/irc/onis/pkg-plist
index ed170ea12e89..1f3a7c3510f1 100644
--- a/irc/onis/pkg-plist
+++ b/irc/onis/pkg-plist
@@ -84,20 +84,3 @@
 %%DATADIR%%/themes/light.theme
 %%DATADIR%%/themes/liner.theme
 %%DATADIR%%/users.conf
-@dirrm %%DATADIR%%/var
-@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%/reports/liner-theme
-@dirrm %%DATADIR%%/reports/light-theme
-@dirrm %%DATADIR%%/reports/dark-theme
-@dirrm %%DATADIR%%/reports
-@dirrm %%DATADIR%%/lib/Onis/Plugins
-@dirrm %%DATADIR%%/lib/Onis/Parser
-@dirrm %%DATADIR%%/lib/Onis/Data/Persistent
-@dirrm %%DATADIR%%/lib/Onis/Data
-@dirrm %%DATADIR%%/lib/Onis
-@dirrm %%DATADIR%%/lib
-@dirrm %%DATADIR%%/lang
-@dirrm %%DATADIR%%/debian
-@dirrm %%DATADIR%%/contrib/systemwide-patch
-@dirrm %%DATADIR%%/contrib
-@dirrm %%DATADIR%%
diff --git a/irc/p5-AnyEvent-IRC/pkg-plist b/irc/p5-AnyEvent-IRC/pkg-plist
index d50ae7698fb8..24db5969323b 100644
--- a/irc/p5-AnyEvent-IRC/pkg-plist
+++ b/irc/p5-AnyEvent-IRC/pkg-plist
@@ -7,7 +7,3 @@
 %%SITE_PERL%%/AnyEvent/IRC/Connection.pm
 %%SITE_PERL%%/AnyEvent/IRC/Util.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/IRC/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent/IRC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AnyEvent
-@dirrmtry %%SITE_PERL%%/AnyEvent/IRC
-@dirrmtry %%SITE_PERL%%/AnyEvent
diff --git a/irc/p5-Bot-BasicBot/pkg-plist b/irc/p5-Bot-BasicBot/pkg-plist
index 531af19c0eeb..d814b5ca7085 100644
--- a/irc/p5-Bot-BasicBot/pkg-plist
+++ b/irc/p5-Bot-BasicBot/pkg-plist
@@ -1,6 +1,3 @@
 %%SITE_PERL%%/Bot/BasicBot.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bot/BasicBot/.packlist
 %%PERL5_MAN3%%/Bot::BasicBot.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bot/BasicBot
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bot
-@dirrmtry %%SITE_PERL%%/Bot
diff --git a/irc/p5-IRC-Bot-Hangman/pkg-plist b/irc/p5-IRC-Bot-Hangman/pkg-plist
index 91dfd2ca107f..1accb697e2eb 100644
--- a/irc/p5-IRC-Bot-Hangman/pkg-plist
+++ b/irc/p5-IRC-Bot-Hangman/pkg-plist
@@ -21,9 +21,3 @@ bin/hangman.pl
 %%SITE_PERL%%/IRC/Bot/Hangman/WordList.pm
 %%SITE_PERL%%/IRC/Bot/Hangman/WordList/Default.pm
 %%SITE_PERL%%/IRC/Bot/Hangman/WordList/TooEasy.pm
-@dirrmtry %%SITE_PERL%%/IRC/Bot/Hangman/WordList
-@dirrmtry %%SITE_PERL%%/IRC/Bot/Hangman/Response
-@dirrmtry %%SITE_PERL%%/IRC/Bot/Hangman/Command
-@dirrmtry %%SITE_PERL%%/IRC/Bot/Hangman
-@dirrmtry %%SITE_PERL%%/IRC/Bot
-@dirrmtry %%SITE_PERL%%/IRC
diff --git a/irc/p5-IRC-Utils/pkg-plist b/irc/p5-IRC-Utils/pkg-plist
index 129df2827431..ade4a31aa1ae 100644
--- a/irc/p5-IRC-Utils/pkg-plist
+++ b/irc/p5-IRC-Utils/pkg-plist
@@ -1,6 +1,3 @@
 %%PERL5_MAN3%%/IRC::Utils.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IRC/Utils/.packlist
 %%SITE_PERL%%/IRC/Utils.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IRC/Utils
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IRC
-@dirrmtry %%SITE_PERL%%/IRC
diff --git a/irc/p5-POE-Component-IRC-Object/pkg-plist b/irc/p5-POE-Component-IRC-Object/pkg-plist
index 412e391c9e21..829f5930e1ca 100644
--- a/irc/p5-POE-Component-IRC-Object/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Object/pkg-plist
@@ -2,11 +2,3 @@
 %%SITE_PERL%%/POE/Component/IRC/Object.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Object/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/elizabot.pl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Object
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/irc/p5-POE-Component-IRC-Plugin-Blowfish/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-Blowfish/pkg-plist
index a7aba16eb393..3ff2445e94b9 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Blowfish/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-Blowfish/pkg-plist
@@ -1,12 +1,3 @@
 %%SITE_PERL%%/POE/Component/IRC/Plugin/Blowfish.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/Blowfish/.packlist
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::Blowfish.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/Blowfish
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/irc/p5-POE-Component-IRC-Plugin-Bollocks/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-Bollocks/pkg-plist
index 2ff675de9b84..7054642f6976 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Bollocks/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-Bollocks/pkg-plist
@@ -1,14 +1,4 @@
 %%SITE_PERL%%/POE/Component/IRC/Plugin/Bollocks.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/Bollocks/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/synopsis.pl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::Bollocks.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/Bollocks
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/irc/p5-POE-Component-IRC-Plugin-CoreList/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-CoreList/pkg-plist
index baa87699c7e7..49f32758a649 100644
--- a/irc/p5-POE-Component-IRC-Plugin-CoreList/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-CoreList/pkg-plist
@@ -1,14 +1,4 @@
 %%SITE_PERL%%/POE/Component/IRC/Plugin/CoreList.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/CoreList/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/synopsis.pl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::CoreList.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/CoreList
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/irc/p5-POE-Component-IRC-Plugin-Hailo/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-Hailo/pkg-plist
index 1a88433db217..51c716dda596 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Hailo/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-Hailo/pkg-plist
@@ -3,12 +3,3 @@ man/man1/irchailo-seed.1.gz
 %%SITE_PERL%%/POE/Component/IRC/Plugin/Hailo.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/Hailo/.packlist
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::Hailo.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/Hailo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/irc/p5-POE-Component-IRC-Plugin-Karma/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-Karma/pkg-plist
index 81689661258e..89433ef707d5 100644
--- a/irc/p5-POE-Component-IRC-Plugin-Karma/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-Karma/pkg-plist
@@ -1,12 +1,3 @@
 %%SITE_PERL%%/POE/Component/IRC/Plugin/Karma.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/Karma/.packlist
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::Karma.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/Karma
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/irc/p5-POE-Component-IRC-Plugin-POE-Knee/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-POE-Knee/pkg-plist
index b4e37c0ed141..013417db2b97 100644
--- a/irc/p5-POE-Component-IRC-Plugin-POE-Knee/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-POE-Knee/pkg-plist
@@ -1,14 +1,3 @@
 %%SITE_PERL%%/POE/Component/IRC/Plugin/POE/Knee.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/POE/Knee/.packlist
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::POE::Knee.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/POE/Knee
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/POE
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC/Plugin/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/irc/p5-POE-Component-IRC-Plugin-QueryDNS/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-QueryDNS/pkg-plist
index d67cbf8db6ff..342d04b1e9de 100644
--- a/irc/p5-POE-Component-IRC-Plugin-QueryDNS/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-QueryDNS/pkg-plist
@@ -1,14 +1,4 @@
 %%SITE_PERL%%/POE/Component/IRC/Plugin/QueryDNS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/QueryDNS/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/synopsis.pl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::QueryDNS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/QueryDNS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/irc/p5-POE-Component-IRC-Plugin-QueryDNSBL/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-QueryDNSBL/pkg-plist
index 7797eb46e898..29a81a6ea1da 100644
--- a/irc/p5-POE-Component-IRC-Plugin-QueryDNSBL/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-QueryDNSBL/pkg-plist
@@ -1,12 +1,3 @@
 %%SITE_PERL%%/POE/Component/IRC/Plugin/QueryDNSBL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/QueryDNSBL/.packlist
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::QueryDNSBL.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/QueryDNSBL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/pkg-plist b/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/pkg-plist
index f489804b057f..8611de4d0183 100644
--- a/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Plugin-RSS-Headlines/pkg-plist
@@ -1,16 +1,4 @@
 %%SITE_PERL%%/POE/Component/IRC/Plugin/RSS/Headlines.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/RSS/Headlines/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/synopsis.pl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PERL5_MAN3%%/POE::Component::IRC::Plugin::RSS::Headlines.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/RSS/Headlines
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin/RSS
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Plugin
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrm %%SITE_PERL%%/POE/Component/IRC/Plugin/RSS
-@dirrm %%SITE_PERL%%/POE/Component/IRC/Plugin
-@dirrm %%SITE_PERL%%/POE/Component/IRC
-@dirrm %%SITE_PERL%%/POE/Component
-@dirrm %%SITE_PERL%%/POE
diff --git a/irc/p5-POE-Component-IRC/pkg-plist b/irc/p5-POE-Component-IRC/pkg-plist
index 3a96c6363e7a..877778d019eb 100644
--- a/irc/p5-POE-Component-IRC/pkg-plist
+++ b/irc/p5-POE-Component-IRC/pkg-plist
@@ -71,14 +71,3 @@
 %%PERL5_MAN3%%/POE::Component::IRC::State.3.gz
 %%PERL5_MAN3%%/POE::Filter::IRC.3.gz
 %%PERL5_MAN3%%/POE::Filter::IRC::Compat.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Filter/IRC
-@dirrmtry %%SITE_PERL%%/POE/Filter
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC/Qnet
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC/Cookbook
-@dirrmtry %%SITE_PERL%%/POE/Component/IRC
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/irc/p5-POE-Component-Server-IRC/pkg-plist b/irc/p5-POE-Component-Server-IRC/pkg-plist
index 8a0018796a39..efe2d740f647 100644
--- a/irc/p5-POE-Component-Server-IRC/pkg-plist
+++ b/irc/p5-POE-Component-Server-IRC/pkg-plist
@@ -13,12 +13,3 @@ man/man1/pmkpasswd.1.gz
 %%PERL5_MAN3%%/POE::Component::Server::IRC::Plugin.3.gz
 %%PERL5_MAN3%%/POE::Component::Server::IRC::Plugin::Auth.3.gz
 %%PERL5_MAN3%%/POE::Component::Server::IRC::Plugin::OperServ.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/IRC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/Server/IRC/Plugin
-@dirrmtry %%SITE_PERL%%/POE/Component/Server/IRC
-@dirrmtry %%SITE_PERL%%/POE/Component/Server
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/irc/p5-POE-Filter-IRCD/pkg-plist b/irc/p5-POE-Filter-IRCD/pkg-plist
index 76009f1fe452..00f5e3601b9e 100644
--- a/irc/p5-POE-Filter-IRCD/pkg-plist
+++ b/irc/p5-POE-Filter-IRCD/pkg-plist
@@ -1,8 +1,3 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/IRCD/.packlist
 %%SITE_PERL%%/POE/Filter/IRCD.pm
 %%PERL5_MAN3%%/POE::Filter::IRCD.3.gz
-@dirrmtry %%SITE_PERL%%/POE/Filter
-@dirrmtry %%SITE_PERL%%/POE
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/IRCD
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/irc/p5-POE-Session-Irssi/pkg-plist b/irc/p5-POE-Session-Irssi/pkg-plist
index 5213e47c259a..53fc25da9aa8 100644
--- a/irc/p5-POE-Session-Irssi/pkg-plist
+++ b/irc/p5-POE-Session-Irssi/pkg-plist
@@ -2,9 +2,3 @@
 %%SITE_PERL%%/POE/Session/Irssi.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Session/Irssi/.packlist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/clean-backlog.pl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Session/Irssi
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Session
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Session
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/irc/p5-Parse-IRC/pkg-plist b/irc/p5-Parse-IRC/pkg-plist
index 59a1e13377b7..9fee7db9526b 100644
--- a/irc/p5-Parse-IRC/pkg-plist
+++ b/irc/p5-Parse-IRC/pkg-plist
@@ -1,6 +1,3 @@
 %%SITE_PERL%%/Parse/IRC.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/IRC/.packlist
 %%PERL5_MAN3%%/Parse::IRC.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/IRC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
-@dirrmtry %%SITE_PERL%%/Parse
diff --git a/irc/pircbot/pkg-plist b/irc/pircbot/pkg-plist
index f4f2bcd174f7..ada58624c16b 100644
--- a/irc/pircbot/pkg-plist
+++ b/irc/pircbot/pkg-plist
@@ -43,9 +43,3 @@
 %%PORTDOCS%%%%DOCSDIR%%/pircbot-style.css
 %%PORTDOCS%%%%DOCSDIR%%/stylesheet.css
 %%PORTDOCS%%%%DOCSDIR%%/resources/inherit.gif
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/org/jibble/pircbot/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/org/jibble/pircbot
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/org/jibble
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/org
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/resources
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/irc/pisg/pkg-plist b/irc/pisg/pkg-plist
index 2bda5c8e552e..06e76ca9f771 100644
--- a/irc/pisg/pkg-plist
+++ b/irc/pisg/pkg-plist
@@ -68,11 +68,3 @@ etc/pisg/pisg.cfg.sample
 %%DATADIR%%/gfx/yellow-v.png
 %%DATADIR%%/lang.txt
 %%PORTDOCS%%%%DOCSDIR%%/pisg-doc.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/layout
-@dirrm %%DATADIR%%/gfx
-@dirrm %%DATADIR%%
-@dirrm %%SITE_PERL%%/Pisg/Parser/Format
-@dirrm %%SITE_PERL%%/Pisg/Parser
-@dirrm %%SITE_PERL%%/Pisg
-@dirrm etc/pisg
diff --git a/irc/psybnc/pkg-plist b/irc/psybnc/pkg-plist
index 37cecbd50f50..f69db7b81fbc 100644
--- a/irc/psybnc/pkg-plist
+++ b/irc/psybnc/pkg-plist
@@ -250,7 +250,3 @@ etc/psybnc.conf.sample
 %%PSYBASE%%/help/DCCSENDME.ITA
 %%PSYBASE%%/help/DCCSENDME.DEU
 %%PSYBASE%%/key/ssl.cnf
-@dirrm %%PSYBASE%%/lang
-@dirrm %%PSYBASE%%/help
-@dirrmtry %%PSYBASE%%/key
-@dirrmtry %%PSYBASE%%
diff --git a/irc/py-gozerbot/pkg-plist b/irc/py-gozerbot/pkg-plist
index 76a4496eb84b..6c1d6d68df2b 100644
--- a/irc/py-gozerbot/pkg-plist
+++ b/irc/py-gozerbot/pkg-plist
@@ -532,12 +532,3 @@ bin/gozerbot-merc
 %%DATADIR%%/postgres_db
 %%DATADIR%%/sqlite_db
 %%DATADIR%%/toudp.py
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/gozerplugs/web
-@dirrm %%PYTHON_SITELIBDIR%%/gozerplugs/plugs
-@dirrm %%PYTHON_SITELIBDIR%%/gozerplugs/dbplugs
-@dirrm %%PYTHON_SITELIBDIR%%/gozerplugs
-@dirrm %%PYTHON_SITELIBDIR%%/gozerbot/contrib
-@dirrm %%PYTHON_SITELIBDIR%%/gozerbot
diff --git a/irc/py-supybot-plugins/pkg-plist b/irc/py-supybot-plugins/pkg-plist
index db92253d5137..fc2d08d42fc1 100644
--- a/irc/py-supybot-plugins/pkg-plist
+++ b/irc/py-supybot-plugins/pkg-plist
@@ -676,53 +676,3 @@
 %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Zipinfo/test.py
 %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Zipinfo/test.pyc
 %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Zipinfo/test.pyo
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Zipinfo
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/WordStats
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Webserver
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Webopedia
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Weather
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Vim
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/UrbanDict
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/TracBot
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Tail
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Supybot
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Stock
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Sshd
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Sourceforge
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/RootWarner
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Rhyme
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/RawLogger
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Python
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Postman
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Poll
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Pastebin
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/OSU
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Minstrel
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Memo
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Markov
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Mailbox
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Lookup
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Linux
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Infobot
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/IgnoreFormatting
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Grasshoppaz
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Geekquote
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Gateway
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Gameknot
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Freshmeat
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Freenode
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/ExternalNotice
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Ebay
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Debian
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Dcc
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Darcs
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/CyborgName
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Currency
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/ChannelRelay
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/CafeBrioso
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Bnc
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Babelfish
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/Amazon
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins/AcronymFinder
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot/plugins
-@dirrm %%PYTHON_LIBDIR%%/site-packages/supybot
diff --git a/irc/py-supybot/pkg-plist b/irc/py-supybot/pkg-plist
index f743202b5d66..d0c38f2b40f5 100644
--- a/irc/py-supybot/pkg-plist
+++ b/irc/py-supybot/pkg-plist
@@ -853,70 +853,3 @@ man/man1/supybot.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/RELNOTES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/utils
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Web
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Utilities
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/User
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Unix
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/URL
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Topic
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Todo
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Time/local/dateutil
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Time/local
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Time
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Success
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/String
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Status
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/ShrinkUrl
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Services
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Seen
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Scheduler
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Reply
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Relay
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/RSS/local
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/RSS
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/QuoteGrabs
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Quote
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Protector
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Praise
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Plugin
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Owner
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Note
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Nickometer
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/NickCapture
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/News
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Network
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/MoobotFactoids
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Misc
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Math/local
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Math
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Limiter
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Later
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Lart
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Karma
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Internet
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Herald
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Google/local/simplejson
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Google/local
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Google
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Games
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Format
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Filter
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Factoids
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Dunno
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Dict/local
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Dict
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Ctcp
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Config
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/ChannelStats
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/ChannelLogger
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Channel
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/BadWords
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/AutoMode
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Anonymous
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Alias
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins/Admin
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/supybot/drivers
-@dirrm %%PYTHON_SITELIBDIR%%/supybot
diff --git a/irc/quirc/pkg-plist b/irc/quirc/pkg-plist
index e3cb2e8a5d5c..897ee92f6cc0 100644
--- a/irc/quirc/pkg-plist
+++ b/irc/quirc/pkg-plist
@@ -21,6 +21,3 @@ bin/quirc
 %%DATADIR%%/themes/default.tcl
 %%DATADIR%%/variables.tcl
 %%DATADIR%%/winpopup.tcl
-@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%/common
-@dirrm %%DATADIR%%
diff --git a/irc/qwebirc/pkg-plist b/irc/qwebirc/pkg-plist
index b0ec88941923..e4ce3a99961f 100644
--- a/irc/qwebirc/pkg-plist
+++ b/irc/qwebirc/pkg-plist
@@ -161,29 +161,3 @@
 %%WWWDIR%%/twisted/plugins/webirc.py
 @group
 @owner
-@dirrm %%WWWDIR%%/twisted/plugins
-@dirrm %%WWWDIR%%/twisted
-@dirrm %%WWWDIR%%/static/sound
-@dirrm %%WWWDIR%%/static/panes
-@dirrm %%WWWDIR%%/static/js/mochaui
-@dirrm %%WWWDIR%%/static/js
-@dirrm %%WWWDIR%%/static/images/mochaui/icons/tree
-@dirrm %%WWWDIR%%/static/images/mochaui/icons/48x48
-@dirrm %%WWWDIR%%/static/images/mochaui/icons
-@dirrm %%WWWDIR%%/static/images/mochaui
-@dirrm %%WWWDIR%%/static/images
-@dirrm %%WWWDIR%%/static
-@dirrm %%WWWDIR%%/simplejson
-@dirrm %%WWWDIR%%/qwebirc/util
-@dirrm %%WWWDIR%%/qwebirc/engines
-@dirrm %%WWWDIR%%/qwebirc
-@dirrm %%WWWDIR%%/js/ui/panes
-@dirrm %%WWWDIR%%/js/ui/frontends
-@dirrm %%WWWDIR%%/js/ui
-@dirrm %%WWWDIR%%/js/irc
-@dirrm %%WWWDIR%%/js
-@dirrm %%WWWDIR%%/dummyauthgate
-@dirrm %%WWWDIR%%/css/mochaui
-@dirrm %%WWWDIR%%/css
-@dirrm %%WWWDIR%%/bin
-@dirrm %%WWWDIR%%
diff --git a/irc/ratbox-services/pkg-plist b/irc/ratbox-services/pkg-plist
index 91d6c485810e..47ba550439ef 100644
--- a/irc/ratbox-services/pkg-plist
+++ b/irc/ratbox-services/pkg-plist
@@ -6,11 +6,9 @@
 %%DATADIR%%/oldschema/1.0-mysql-schema.txt
 %%DATADIR%%/oldschema/1.0-pgsql-schema.txt
 %%DATADIR%%/oldschema/1.0-sqlite-schema.txt
-@dirrm %%DATADIR%%/oldschema
 %%DATADIR%%/base/schema-sqlite.txt
 %%DATADIR%%/base/schema-pgsql.txt
 %%DATADIR%%/base/schema-mysql.txt
-@dirrm %%DATADIR%%/base
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.mysql
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.pgsql
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.sqlite
@@ -24,7 +22,6 @@ include/client.h
 %%DATADIR%%/help/en/alis/general
 %%DATADIR%%/help/en/alis/index
 %%DATADIR%%/help/en/alis/list
-@dirrm %%DATADIR%%/help/en/alis
 %%DATADIR%%/help/en/main/u-boot
 %%DATADIR%%/help/en/main/u-chat
 %%DATADIR%%/help/en/main/u-connect
@@ -34,7 +31,6 @@ include/client.h
 %%DATADIR%%/help/en/main/u-service
 %%DATADIR%%/help/en/main/u-stats
 %%DATADIR%%/help/en/main/u-status
-@dirrm %%DATADIR%%/help/en/main
 %%DATADIR%%/help/en/operbot/general
 %%DATADIR%%/help/en/operbot/index
 %%DATADIR%%/help/en/operbot/index-admin
@@ -44,7 +40,6 @@ include/client.h
 %%DATADIR%%/help/en/operbot/op
 %%DATADIR%%/help/en/operbot/u-objoin
 %%DATADIR%%/help/en/operbot/u-obpart
-@dirrm %%DATADIR%%/help/en/operbot
 %%DATADIR%%/help/en/chanserv/addban
 %%DATADIR%%/help/en/chanserv/adduser
 %%DATADIR%%/help/en/chanserv/chandrop
@@ -83,7 +78,6 @@ include/client.h
 %%DATADIR%%/help/en/chanserv/unban
 %%DATADIR%%/help/en/chanserv/unsuspend
 %%DATADIR%%/help/en/chanserv/voice
-@dirrm %%DATADIR%%/help/en/chanserv
 %%DATADIR%%/help/en/userserv/activate
 %%DATADIR%%/help/en/userserv/general
 %%DATADIR%%/help/en/userserv/index
@@ -111,7 +105,6 @@ include/client.h
 %%DATADIR%%/help/en/userserv/usersetpass
 %%DATADIR%%/help/en/userserv/usersuspend
 %%DATADIR%%/help/en/userserv/userunsuspend
-@dirrm %%DATADIR%%/help/en/userserv
 %%DATADIR%%/help/en/jupeserv/calljupe
 %%DATADIR%%/help/en/jupeserv/callunjupe
 %%DATADIR%%/help/en/jupeserv/general
@@ -122,7 +115,6 @@ include/client.h
 %%DATADIR%%/help/en/jupeserv/u-jupe
 %%DATADIR%%/help/en/jupeserv/u-unjupe
 %%DATADIR%%/help/en/jupeserv/unjupe
-@dirrm %%DATADIR%%/help/en/jupeserv
 %%DATADIR%%/help/en/operserv/addignore
 %%DATADIR%%/help/en/operserv/dbsync
 %%DATADIR%%/help/en/operserv/delignore
@@ -147,7 +139,6 @@ include/client.h
 %%DATADIR%%/help/en/operserv/u-osjoin
 %%DATADIR%%/help/en/operserv/u-ospart
 %%DATADIR%%/help/en/operserv/u-takeover
-@dirrm %%DATADIR%%/help/en/operserv
 %%DATADIR%%/help/en/nickserv/drop
 %%DATADIR%%/help/en/nickserv/general
 %%DATADIR%%/help/en/nickserv/index
@@ -159,7 +150,6 @@ include/client.h
 %%DATADIR%%/help/en/nickserv/release
 %%DATADIR%%/help/en/nickserv/set
 %%DATADIR%%/help/en/nickserv/u-nickdrop
-@dirrm %%DATADIR%%/help/en/nickserv
 %%DATADIR%%/help/en/global/addwelcome
 %%DATADIR%%/help/en/global/delwelcome
 %%DATADIR%%/help/en/global/general
@@ -171,7 +161,6 @@ include/client.h
 %%DATADIR%%/help/en/global/u-delwelcome
 %%DATADIR%%/help/en/global/u-listwelcome
 %%DATADIR%%/help/en/global/u-netmsg
-@dirrm %%DATADIR%%/help/en/global
 %%DATADIR%%/help/en/banserv/addregexp
 %%DATADIR%%/help/en/banserv/addregexpneg
 %%DATADIR%%/help/en/banserv/delregexp
@@ -200,24 +189,20 @@ include/client.h
 %%DATADIR%%/help/en/banserv/unresv
 %%DATADIR%%/help/en/banserv/unxline
 %%DATADIR%%/help/en/banserv/xline
-@dirrm %%DATADIR%%/help/en/banserv
 %%DATADIR%%/help/en/watchserv/general
 %%DATADIR%%/help/en/watchserv/index
 %%DATADIR%%/help/en/watchserv/index-admin
 %%DATADIR%%/help/en/watchserv/u-watch
 %%DATADIR%%/help/en/watchserv/watch
-@dirrm %%DATADIR%%/help/en/watchserv
 %%DATADIR%%/help/en/memoserv/delete
 %%DATADIR%%/help/en/memoserv/general
 %%DATADIR%%/help/en/memoserv/index
 %%DATADIR%%/help/en/memoserv/list
 %%DATADIR%%/help/en/memoserv/read
 %%DATADIR%%/help/en/memoserv/send
-@dirrm %%DATADIR%%/help/en/memoserv
 %%DATADIR%%/help/bg/alis/general
 %%DATADIR%%/help/bg/alis/index
 %%DATADIR%%/help/bg/alis/list
-@dirrm %%DATADIR%%/help/bg/alis
 %%DATADIR%%/help/bg/main/u-boot
 %%DATADIR%%/help/bg/main/u-chat
 %%DATADIR%%/help/bg/main/u-connect
@@ -227,7 +212,6 @@ include/client.h
 %%DATADIR%%/help/bg/main/u-service
 %%DATADIR%%/help/bg/main/u-stats
 %%DATADIR%%/help/bg/main/u-status
-@dirrm %%DATADIR%%/help/bg/main
 %%DATADIR%%/help/bg/operbot/general
 %%DATADIR%%/help/bg/operbot/index
 %%DATADIR%%/help/bg/operbot/index-admin
@@ -237,7 +221,6 @@ include/client.h
 %%DATADIR%%/help/bg/operbot/op
 %%DATADIR%%/help/bg/operbot/u-objoin
 %%DATADIR%%/help/bg/operbot/u-obpart
-@dirrm %%DATADIR%%/help/bg/operbot
 %%DATADIR%%/help/bg/chanserv/addban
 %%DATADIR%%/help/bg/chanserv/adduser
 %%DATADIR%%/help/bg/chanserv/chandrop
@@ -276,7 +259,6 @@ include/client.h
 %%DATADIR%%/help/bg/chanserv/unban
 %%DATADIR%%/help/bg/chanserv/unsuspend
 %%DATADIR%%/help/bg/chanserv/voice
-@dirrm %%DATADIR%%/help/bg/chanserv
 %%DATADIR%%/help/bg/userserv/activate
 %%DATADIR%%/help/bg/userserv/general
 %%DATADIR%%/help/bg/userserv/index
@@ -304,7 +286,6 @@ include/client.h
 %%DATADIR%%/help/bg/userserv/usersetpass
 %%DATADIR%%/help/bg/userserv/usersuspend
 %%DATADIR%%/help/bg/userserv/userunsuspend
-@dirrm %%DATADIR%%/help/bg/userserv
 %%DATADIR%%/help/bg/jupeserv/calljupe
 %%DATADIR%%/help/bg/jupeserv/callunjupe
 %%DATADIR%%/help/bg/jupeserv/general
@@ -315,7 +296,6 @@ include/client.h
 %%DATADIR%%/help/bg/jupeserv/u-jupe
 %%DATADIR%%/help/bg/jupeserv/u-unjupe
 %%DATADIR%%/help/bg/jupeserv/unjupe
-@dirrm %%DATADIR%%/help/bg/jupeserv
 %%DATADIR%%/help/bg/operserv/addignore
 %%DATADIR%%/help/bg/operserv/dbsync
 %%DATADIR%%/help/bg/operserv/delignore
@@ -340,7 +320,6 @@ include/client.h
 %%DATADIR%%/help/bg/operserv/u-osjoin
 %%DATADIR%%/help/bg/operserv/u-ospart
 %%DATADIR%%/help/bg/operserv/u-takeover
-@dirrm %%DATADIR%%/help/bg/operserv
 %%DATADIR%%/help/bg/nickserv/drop
 %%DATADIR%%/help/bg/nickserv/general
 %%DATADIR%%/help/bg/nickserv/index
@@ -352,7 +331,6 @@ include/client.h
 %%DATADIR%%/help/bg/nickserv/release
 %%DATADIR%%/help/bg/nickserv/set
 %%DATADIR%%/help/bg/nickserv/u-nickdrop
-@dirrm %%DATADIR%%/help/bg/nickserv
 %%DATADIR%%/help/bg/global/addwelcome
 %%DATADIR%%/help/bg/global/delwelcome
 %%DATADIR%%/help/bg/global/general
@@ -364,7 +342,6 @@ include/client.h
 %%DATADIR%%/help/bg/global/u-delwelcome
 %%DATADIR%%/help/bg/global/u-listwelcome
 %%DATADIR%%/help/bg/global/u-netmsg
-@dirrm %%DATADIR%%/help/bg/global
 %%DATADIR%%/help/bg/banserv/addregexp
 %%DATADIR%%/help/bg/banserv/addregexpneg
 %%DATADIR%%/help/bg/banserv/delregexp
@@ -393,24 +370,20 @@ include/client.h
 %%DATADIR%%/help/bg/banserv/unresv
 %%DATADIR%%/help/bg/banserv/unxline
 %%DATADIR%%/help/bg/banserv/xline
-@dirrm %%DATADIR%%/help/bg/banserv
 %%DATADIR%%/help/bg/watchserv/general
 %%DATADIR%%/help/bg/watchserv/index
 %%DATADIR%%/help/bg/watchserv/index-admin
 %%DATADIR%%/help/bg/watchserv/u-watch
 %%DATADIR%%/help/bg/watchserv/watch
-@dirrm %%DATADIR%%/help/bg/watchserv
 %%DATADIR%%/help/bg/memoserv/delete
 %%DATADIR%%/help/bg/memoserv/general
 %%DATADIR%%/help/bg/memoserv/index
 %%DATADIR%%/help/bg/memoserv/list
 %%DATADIR%%/help/bg/memoserv/read
 %%DATADIR%%/help/bg/memoserv/send
-@dirrm %%DATADIR%%/help/bg/memoserv
 %%DATADIR%%/help/ru/alis/general
 %%DATADIR%%/help/ru/alis/index
 %%DATADIR%%/help/ru/alis/list
-@dirrm %%DATADIR%%/help/ru/alis
 %%DATADIR%%/help/ru/main/u-boot
 %%DATADIR%%/help/ru/main/u-chat
 %%DATADIR%%/help/ru/main/u-connect
@@ -420,7 +393,6 @@ include/client.h
 %%DATADIR%%/help/ru/main/u-service
 %%DATADIR%%/help/ru/main/u-stats
 %%DATADIR%%/help/ru/main/u-status
-@dirrm %%DATADIR%%/help/ru/main
 %%DATADIR%%/help/ru/operbot/general
 %%DATADIR%%/help/ru/operbot/index
 %%DATADIR%%/help/ru/operbot/index-admin
@@ -430,7 +402,6 @@ include/client.h
 %%DATADIR%%/help/ru/operbot/op
 %%DATADIR%%/help/ru/operbot/u-objoin
 %%DATADIR%%/help/ru/operbot/u-obpart
-@dirrm %%DATADIR%%/help/ru/operbot
 %%DATADIR%%/help/ru/chanserv/addban
 %%DATADIR%%/help/ru/chanserv/adduser
 %%DATADIR%%/help/ru/chanserv/chandrop
@@ -469,7 +440,6 @@ include/client.h
 %%DATADIR%%/help/ru/chanserv/unban
 %%DATADIR%%/help/ru/chanserv/unsuspend
 %%DATADIR%%/help/ru/chanserv/voice
-@dirrm %%DATADIR%%/help/ru/chanserv
 %%DATADIR%%/help/ru/userserv/activate
 %%DATADIR%%/help/ru/userserv/general
 %%DATADIR%%/help/ru/userserv/index
@@ -497,7 +467,6 @@ include/client.h
 %%DATADIR%%/help/ru/userserv/usersetpass
 %%DATADIR%%/help/ru/userserv/usersuspend
 %%DATADIR%%/help/ru/userserv/userunsuspend
-@dirrm %%DATADIR%%/help/ru/userserv
 %%DATADIR%%/help/ru/jupeserv/calljupe
 %%DATADIR%%/help/ru/jupeserv/callunjupe
 %%DATADIR%%/help/ru/jupeserv/general
@@ -508,7 +477,6 @@ include/client.h
 %%DATADIR%%/help/ru/jupeserv/u-jupe
 %%DATADIR%%/help/ru/jupeserv/u-unjupe
 %%DATADIR%%/help/ru/jupeserv/unjupe
-@dirrm %%DATADIR%%/help/ru/jupeserv
 %%DATADIR%%/help/ru/operserv/addignore
 %%DATADIR%%/help/ru/operserv/dbsync
 %%DATADIR%%/help/ru/operserv/delignore
@@ -533,7 +501,6 @@ include/client.h
 %%DATADIR%%/help/ru/operserv/u-osjoin
 %%DATADIR%%/help/ru/operserv/u-ospart
 %%DATADIR%%/help/ru/operserv/u-takeover
-@dirrm %%DATADIR%%/help/ru/operserv
 %%DATADIR%%/help/ru/nickserv/drop
 %%DATADIR%%/help/ru/nickserv/general
 %%DATADIR%%/help/ru/nickserv/index
@@ -545,7 +512,6 @@ include/client.h
 %%DATADIR%%/help/ru/nickserv/release
 %%DATADIR%%/help/ru/nickserv/set
 %%DATADIR%%/help/ru/nickserv/u-nickdrop
-@dirrm %%DATADIR%%/help/ru/nickserv
 %%DATADIR%%/help/ru/global/addwelcome
 %%DATADIR%%/help/ru/global/delwelcome
 %%DATADIR%%/help/ru/global/general
@@ -557,7 +523,6 @@ include/client.h
 %%DATADIR%%/help/ru/global/u-delwelcome
 %%DATADIR%%/help/ru/global/u-listwelcome
 %%DATADIR%%/help/ru/global/u-netmsg
-@dirrm %%DATADIR%%/help/ru/global
 %%DATADIR%%/help/ru/banserv/addregexp
 %%DATADIR%%/help/ru/banserv/addregexpneg
 %%DATADIR%%/help/ru/banserv/delregexp
@@ -586,33 +551,22 @@ include/client.h
 %%DATADIR%%/help/ru/banserv/unresv
 %%DATADIR%%/help/ru/banserv/unxline
 %%DATADIR%%/help/ru/banserv/xline
-@dirrm %%DATADIR%%/help/ru/banserv
 %%DATADIR%%/help/ru/watchserv/general
 %%DATADIR%%/help/ru/watchserv/index
 %%DATADIR%%/help/ru/watchserv/index-admin
 %%DATADIR%%/help/ru/watchserv/u-watch
 %%DATADIR%%/help/ru/watchserv/watch
-@dirrm %%DATADIR%%/help/ru/watchserv
 %%DATADIR%%/help/ru/memoserv/delete
 %%DATADIR%%/help/ru/memoserv/general
 %%DATADIR%%/help/ru/memoserv/index
 %%DATADIR%%/help/ru/memoserv/list
 %%DATADIR%%/help/ru/memoserv/read
 %%DATADIR%%/help/ru/memoserv/send
-@dirrm %%DATADIR%%/help/ru/memoserv
-@dirrm %%DATADIR%%/help/en
-@dirrm %%DATADIR%%/help/ru
-@dirrm %%DATADIR%%/help/bg
 %%DATADIR%%/langs/bg.lang
 %%DATADIR%%/langs/ru.lang
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/langs
-@unexec if [ -f "%D/%%DATADIR%%/schema-mysql.txt" ]; then rm -f "%D/%%DATADIR%%/schema-mysql.txt"; fi
-@unexec if [ -f "%D/%%DATADIR%%/schema-pgsql.txt" ]; then rm -f "%D/%%DATADIR%%/schema-pgsql.txt"; fi
-@unexec if [ -f "%D/%%DATADIR%%/schema-sqlite.txt" ]; then rm -f "%D/%%DATADIR%%/schema-sqlite.txt"; fi
-@dirrm %%DATADIR%%
-@dirrmtry %%DBDIR%%
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+@rmtry %%DATADIR%%/schema-mysql.txt
+@rmtry %%DATADIR%%/schema-pgsql.txt
+@rmtry %%DATADIR%%/schema-sqlite.txt
 @sample etc/ratbox-services.conf.sample
-@unexec f="/var/log/ratbox-services.log"; if [ ! -s "$f" ]; then rm -f "$f"; fi
-@unexec f="/var/run/ratbox-services.pid"; if [ ! -s "$f" ]; then rm -f "$f"; fi
+@rmtry /var/log/ratbox-services.log
+@rmtry /var/run/ratbox-services.pid
diff --git a/irc/rbot/pkg-plist b/irc/rbot/pkg-plist
index 052f1d42841e..e33e9e116d4d 100644
--- a/irc/rbot/pkg-plist
+++ b/irc/rbot/pkg-plist
@@ -146,18 +146,3 @@ bin/rbot-remote
 %%DATADIR%%/templates/salut/salut-french
 %%DATADIR%%/templates/salut/salut-italian
 %%DATADIR%%/templates/salut/salut-japanese
-@dirrm %%DATADIR%%/templates/salut
-@dirrm %%DATADIR%%/templates/quiz
-@dirrm %%DATADIR%%/templates/lart
-@dirrm %%DATADIR%%/templates
-@dirrm %%DATADIR%%/plugins/games
-@dirrm %%DATADIR%%/plugins
-@dirrm %%DATADIR%%/languages
-@dirrm %%DATADIR%%/filters
-@dirrm %%DATADIR%%/contrib/plugins
-@dirrm %%DATADIR%%/contrib
-@dirrm %%DATADIR%%
-@dirrm %%RUBY_SITELIBDIR%%/rbot/registry
-@dirrm %%RUBY_SITELIBDIR%%/rbot/core/utils
-@dirrm %%RUBY_SITELIBDIR%%/rbot/core
-@dirrm %%RUBY_SITELIBDIR%%/rbot
diff --git a/irc/ruby-irc/pkg-plist b/irc/ruby-irc/pkg-plist
index e0b86569336a..ac9feed26935 100644
--- a/irc/ruby-irc/pkg-plist
+++ b/irc/ruby-irc/pkg-plist
@@ -2,7 +2,6 @@
 %%RUBY_SITELIBDIR%%/irc/client.rb
 %%RUBY_SITELIBDIR%%/irc/const.rb
 %%RUBY_SITELIBDIR%%/irc/irc.rb
-@dirrm %%RUBY_SITELIBDIR%%/irc
 %%RUBY_SITELIBDIR%%/localize.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/BUGS
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
@@ -17,8 +16,6 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/irc-client-api.doc
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/irc-lib-api.doc
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/irc-lib.doc
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/cpi/dice.cpi
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/cpi/init.cpi
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/cpi/omikuji.cpi
@@ -26,9 +23,6 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/cpi/syslog.cpi
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/cpi/userlog.cpi
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ja/bot.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/ja/cpi
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/ja/log
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/ja
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cpi/dice.cpi
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cpi/init.cpi
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cpi/omikuji.cpi
@@ -36,6 +30,3 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cpi/syslog.cpi
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cpi/userlog.cpi
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/bot.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/cpi
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/log
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
diff --git a/irc/ruby-rica/pkg-plist b/irc/ruby-rica/pkg-plist
index 7a61581b1cdd..c101fcca0769 100644
--- a/irc/ruby-rica/pkg-plist
+++ b/irc/ruby-rica/pkg-plist
@@ -6,11 +6,9 @@
 %%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/erica.txt
 %%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/ricaco.rb
 %%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/rica-example.rb
-%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/CHANGES
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes_and_methods.txt
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/event.lst
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rica_uml.png
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rica_classes.png
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/irc/ruby-rice/pkg-plist b/irc/ruby-rice/pkg-plist
index ec1158518938..dfca7adff4f3 100644
--- a/irc/ruby-rice/pkg-plist
+++ b/irc/ruby-rice/pkg-plist
@@ -2,7 +2,6 @@
 %%RUBY_SITELIBDIR%%/rice/irc.rb
 %%RUBY_SITELIBDIR%%/rice/proxy.rb
 %%RUBY_SITELIBDIR%%/rice/observer.rb
-@dirrm %%RUBY_SITELIBDIR%%/rice
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/drbc.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/drbs.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ex0.rb
@@ -16,9 +15,6 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ranking.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rwiki-gw.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tinyproxy.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/memo.jp
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/todo.jp
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/irc/scrollz/pkg-plist b/irc/scrollz/pkg-plist
index 3a5bb2ae5b42..e608583d0eb9 100644
--- a/irc/scrollz/pkg-plist
+++ b/irc/scrollz/pkg-plist
@@ -718,17 +718,3 @@ man/man1/scrollz.1.gz
 %%DATADIR%%/help/xecho
 %%DATADIR%%/help/xtype
 @exec mkdir -p %D/%%DATADIR%%/script
-@dirrmtry %%DATADIR%%/script
-@dirrm %%DATADIR%%/help/window
-@dirrm %%DATADIR%%/help/set
-@dirrm %%DATADIR%%/help/scrollz
-@dirrm %%DATADIR%%/help/on
-@dirrm %%DATADIR%%/help/note
-@dirrm %%DATADIR%%/help/dcc
-@dirrm %%DATADIR%%/help/ctcp
-@dirrm %%DATADIR%%/help/cdcc
-@dirrm %%DATADIR%%/help/bind
-@dirrm %%DATADIR%%/help/alias
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/doc
-@dirrmtry %%DATADIR%%
diff --git a/irc/sirc/pkg-plist b/irc/sirc/pkg-plist
index f39179aa2fbd..d7fa231b358d 100644
--- a/irc/sirc/pkg-plist
+++ b/irc/sirc/pkg-plist
@@ -23,4 +23,3 @@ libexec/sirc/sirc.help.gz
 man/man1/sirc.1.gz
 man/man1/ssfe.1.gz
 %%SOCKS%%%%PORTDOCS%%%%DOCSDIR%%/README.socks
-@dirrm libexec/sirc
diff --git a/irc/slirc/pkg-plist b/irc/slirc/pkg-plist
index fc6e88d2d16a..42a2e20d4a74 100644
--- a/irc/slirc/pkg-plist
+++ b/irc/slirc/pkg-plist
@@ -21,8 +21,6 @@ lib/slirc/scripts/registry.sl
 lib/slirc/scripts/slftp.sl
 lib/slirc/scripts/standard.sl
 lib/slirc/scripts/tab-ex.sl
-@dirrm lib/slirc/scripts
-@dirrm lib/slirc
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
@@ -36,4 +34,3 @@ lib/slirc/scripts/tab-ex.sl
 %%PORTDOCS%%%%DOCSDIR%%/VFile.txt
 %%PORTDOCS%%%%DOCSDIR%%/slirc.hlp
 %%PORTDOCS%%%%DOCSDIR%%/utilsfun.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/irc/smartirc4net/pkg-plist b/irc/smartirc4net/pkg-plist
index 4fa38c321c55..63df786bbafe 100644
--- a/irc/smartirc4net/pkg-plist
+++ b/irc/smartirc4net/pkg-plist
@@ -2,6 +2,3 @@ lib/smartirc4net/Meebey.SmartIrc4net.dll
 lib/mono/gac/Meebey.SmartIrc4net/0.4.5.0__7868485fbf407e0f/Meebey.SmartIrc4net.dll
 lib/mono/gac/Meebey.SmartIrc4net/0.4.5.0__7868485fbf407e0f/Meebey.SmartIrc4net.dll.mdb
 libdata/pkgconfig/smartirc4net.pc
-@dirrm lib/mono/gac/Meebey.SmartIrc4net/0.4.5.0__7868485fbf407e0f
-@dirrm lib/mono/gac/Meebey.SmartIrc4net
-@dirrm lib/smartirc4net
diff --git a/irc/thales/pkg-plist b/irc/thales/pkg-plist
index d1d2895f32b9..31ecbe364c46 100644
--- a/irc/thales/pkg-plist
+++ b/irc/thales/pkg-plist
@@ -101,25 +101,3 @@ etc/thales.conf.default
 %%PORTDOCS%%%%DATADIR%%/tools/testbed/killall.sh
 %%PORTDOCS%%%%DATADIR%%/tools/testbed/compileall.sh
 %%PORTDOCS%%%%DATADIR%%/tools/testbed/chgCacheTime.sh
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/recycledcounter
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/clones
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/memphistools/status
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/memphistools/counters
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/memphistools
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/whois
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures/5
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures/4
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures/3
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures/2
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures/1
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/nickinfo/img
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/nickinfo
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/MRTG
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DATADIR%%/tools/testbed
-%%PORTDOCS%%@dirrm %%DATADIR%%/tools/logfilter
-%%PORTDOCS%%@dirrm %%DATADIR%%/tools/crontab
-%%PORTDOCS%%@dirrm %%DATADIR%%/tools
-@dirrm %%DATADIR%%
diff --git a/irc/tircproxy/pkg-plist b/irc/tircproxy/pkg-plist
index 785b506ba435..4b7f00fd1fe7 100644
--- a/irc/tircproxy/pkg-plist
+++ b/irc/tircproxy/pkg-plist
@@ -1,3 +1,2 @@
 sbin/tircproxy
 %%PORTDOCS%%share/doc/tircproxy/README
-%%PORTDOCS%%@dirrm share/doc/tircproxy
diff --git a/irc/weechat-devel/pkg-plist b/irc/weechat-devel/pkg-plist
index 07112e73d4c0..c10b9b08aea6 100644
--- a/irc/weechat-devel/pkg-plist
+++ b/irc/weechat-devel/pkg-plist
@@ -76,19 +76,3 @@ libdata/pkgconfig/weechat.pc
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/weechat.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/weechat.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/weechat.mo
-@dirrmtry lib/weechat/plugins
-@dirrmtry lib/weechat
-%%MANPAGES%%@dirrmtry man/pl/man1
-%%MANPAGES%%@dirrmtry man/pl
-%%MANPAGES%%@dirrmtry man/it/man1
-%%MANPAGES%%@dirrmtry man/it
-%%MANPAGES%%@dirrmtry man/fr/man1
-%%MANPAGES%%@dirrmtry man/fr
-%%MANPAGES%%@dirrmtry man/de/man1
-%%MANPAGES%%@dirrmtry man/de
-%%DOCS%%@dirrmtry %%DOCSDIR%%
-%%ICON%%@dirrmtry share/icons/hicolor/32x32/apps
-%%ICON%%@dirrmtry share/icons/hicolor/32x32
-%%ICON%%@dirrmtry share/icons/hicolor
-%%ICON%%@dirrmtry share/icons
-@dirrm include/weechat
diff --git a/irc/xaric/pkg-plist b/irc/xaric/pkg-plist
index 50716311cbed..7a79259d024a 100644
--- a/irc/xaric/pkg-plist
+++ b/irc/xaric/pkg-plist
@@ -3,5 +3,3 @@ man/man1/xaric.1.gz
 %%DATADIR%%/help/copying
 %%DATADIR%%/help/warranty
 %%DATADIR%%/help/help
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%
diff --git a/irc/xchat/pkg-plist b/irc/xchat/pkg-plist
index 66d3b49cc453..3fd325f730cd 100644
--- a/irc/xchat/pkg-plist
+++ b/irc/xchat/pkg-plist
@@ -34,6 +34,4 @@ share/locale/vi/LC_MESSAGES/xchat.mo
 share/locale/zh_CN/LC_MESSAGES/xchat.mo
 share/locale/zh_TW/LC_MESSAGES/xchat.mo
 share/pixmaps/xchat.png
-@exec mkdir -p %D/lib/xchat/plugins
-@dirrm lib/xchat/plugins
-@dirrm lib/xchat
+@dir lib/xchat/plugins
diff --git a/irc/znc/pkg-plist b/irc/znc/pkg-plist
index a3164f584d62..f564467214e3 100644
--- a/irc/znc/pkg-plist
+++ b/irc/znc/pkg-plist
@@ -161,46 +161,3 @@ man/man1/znc.1.gz
 %%DATADIR%%/webskins/ice/pub/pagebg.gif
 %%DATADIR%%/webskins/ice/tmpl/FooterTag.tmpl
 %%DATADIR%%/webskins/ice/tmpl/Header.tmpl
-%%PYTHON%%@dirrmtry lib/znc/modpython
-%%PERL%%@dirrmtry lib/znc/modperl
-@dirrmtry lib/znc
-@dirrmtry include/znc
-@dirrmtry %%DATADIR%%/webskins/ice/tmpl
-@dirrmtry %%DATADIR%%/webskins/ice/pub
-@dirrmtry %%DATADIR%%/webskins/ice
-@dirrmtry %%DATADIR%%/webskins/forest/tmpl
-@dirrmtry %%DATADIR%%/webskins/forest/pub
-@dirrmtry %%DATADIR%%/webskins/forest
-@dirrmtry %%DATADIR%%/webskins/dark-clouds/tmpl
-@dirrmtry %%DATADIR%%/webskins/dark-clouds/pub
-@dirrmtry %%DATADIR%%/webskins/dark-clouds
-@dirrmtry %%DATADIR%%/webskins/_default_/tmpl
-@dirrmtry %%DATADIR%%/webskins/_default_/pub
-@dirrmtry %%DATADIR%%/webskins/_default_
-@dirrmtry %%DATADIR%%/webskins
-@dirrmtry %%DATADIR%%/modules/webadmin/tmpl
-@dirrmtry %%DATADIR%%/modules/webadmin/files
-@dirrmtry %%DATADIR%%/modules/webadmin
-@dirrmtry %%DATADIR%%/modules/stickychan/tmpl
-@dirrmtry %%DATADIR%%/modules/stickychan
-@dirrmtry %%DATADIR%%/modules/send_raw/tmpl
-@dirrmtry %%DATADIR%%/modules/send_raw/files
-@dirrmtry %%DATADIR%%/modules/send_raw
-@dirrmtry %%DATADIR%%/modules/perform/tmpl
-@dirrmtry %%DATADIR%%/modules/perform
-@dirrmtry %%DATADIR%%/modules/notes/tmpl
-@dirrmtry %%DATADIR%%/modules/notes/files
-@dirrmtry %%DATADIR%%/modules/notes
-@dirrmtry %%DATADIR%%/modules/listsockets/tmpl
-@dirrmtry %%DATADIR%%/modules/listsockets
-@dirrmtry %%DATADIR%%/modules/lastseen/tmpl
-@dirrmtry %%DATADIR%%/modules/lastseen
-@dirrmtry %%DATADIR%%/modules/certauth/tmpl
-@dirrmtry %%DATADIR%%/modules/certauth
-@dirrmtry %%DATADIR%%/modules/cert/tmpl
-@dirrmtry %%DATADIR%%/modules/cert
-@dirrmtry %%DATADIR%%/modules/blockuser/tmpl
-@dirrmtry %%DATADIR%%/modules/blockuser
-%%TCL%%@dirrmtry share/znc/modtcl
-@dirrmtry %%DATADIR%%/modules
-@dirrmtry %%DATADIR%%