19 files changed, 187 insertions, 187 deletions

diff --git a/irc/anope/pkg-plist b/irc/anope/pkg-plist
index d971686a6365..d841f4be1f09 100644
--- a/irc/anope/pkg-plist
+++ b/irc/anope/pkg-plist
@@ -17,9 +17,9 @@ libexec/anope/listnicks
 %%DATADIR%%/languages/ru
 %%DATADIR%%/languages/tr
 %%DATADIR%%/tables.sql
-@unexec rmdir %D/%%DATADIR%%/logs 2>/dev/null || true
+@dirrmtry %%DATADIR%%/logs
 @dirrm %%DATADIR%%/languages
-@unexec rmdir %D/%%DATADIR%%/backups 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%/backups
+@dirrmtry %%DATADIR%%
 @dirrm libexec/anope
 @dirrm lib/anope
diff --git a/irc/bopm/pkg-plist b/irc/bopm/pkg-plist
index e8f6fb58accf..f49f9a7a9996 100644
--- a/irc/bopm/pkg-plist
+++ b/irc/bopm/pkg-plist
@@ -11,4 +11,4 @@ lib/libopm.la
 lib/libopm.a
 @exec mkdir -m 755 /var/log/bopm
 @exec chown bopm:bopm /var/log/bopm
-@unexec rmdir %D/var/log/bopm 2>/dev/null || true
+@dirrmtry var/log/bopm
diff --git a/irc/eggdrop/pkg-plist b/irc/eggdrop/pkg-plist
index ba64f46aec34..fee61512922c 100644
--- a/irc/eggdrop/pkg-plist
+++ b/irc/eggdrop/pkg-plist
@@ -183,4 +183,4 @@ lib/eggdrop/wire.so
 @dirrm %%DATADIR%%/language
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/text
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/irc/epic5/pkg-plist b/irc/epic5/pkg-plist
index 165c8efa3b9b..1704f980d9cf 100644
--- a/irc/epic5/pkg-plist
+++ b/irc/epic5/pkg-plist
@@ -112,6 +112,6 @@ libexec/wserv4
 %%DATADIR%%/script/window
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec mkdir -p %D/%%DATADIR%%/help
-@unexec rmdir %D/%%DATADIR%%/help 2>/dev/null || true
+@dirrmtry %%DATADIR%%/help
 @dirrm %%DATADIR%%/script
 @dirrm %%DATADIR%%
diff --git a/irc/insub/pkg-plist b/irc/insub/pkg-plist
index 589b9d5fb5b3..465d4c169361 100644
--- a/irc/insub/pkg-plist
+++ b/irc/insub/pkg-plist
@@ -58,7 +58,7 @@ share/cows/wtf-pony.cow
 share/cows/wtf.cow
 share/cows/wtf2.cow
 share/cows/zig.cow
-@unexec rmdir %D/share/cows 2>/dev/null || true
+@dirrmtry share/cows
 share/irssi/scripts/insub.pl
-@unexec rmdir %D/share/irssi/scripts 2>/dev/null || true
-@unexec rmdir %D/share/irssi 2>/dev/null || true
+@dirrmtry share/irssi/scripts
+@dirrmtry share/irssi
diff --git a/irc/ircd-hybrid-ru/pkg-plist b/irc/ircd-hybrid-ru/pkg-plist
index 1e44ca918581..8bbb6100cc1f 100644
--- a/irc/ircd-hybrid-ru/pkg-plist
+++ b/irc/ircd-hybrid-ru/pkg-plist
@@ -332,5 +332,5 @@ help/opers/whowas
 @exec mkdir -m 755 /var/log/ircd-hybrid-ru
 @exec chown ircdru:ircdru /var/log/ircd-hybrid-ru
 @unexec rmdir /var/log/ircd-hybrid-ru 2>/dev/null || true
-@unexec rmdir %D/etc/ircd-hybrid-ru/codepage 2>/dev/null || true
-@unexec rmdir %D/etc/ircd-hybrid-ru 2>/dev/null || true
+@dirrmtry etc/ircd-hybrid-ru/codepage
+@dirrmtry etc/ircd-hybrid-ru
diff --git a/irc/kmyirc/pkg-plist b/irc/kmyirc/pkg-plist
index 928e6e828321..1e0972297016 100644
--- a/irc/kmyirc/pkg-plist
+++ b/irc/kmyirc/pkg-plist
@@ -53,10 +53,10 @@ share/locale/pt_BR/LC_MESSAGES/kmyirc.mo
 @dirrm share/apps/kmyirc/icons
 @dirrm share/apps/kmyirc/pics
 @dirrm share/apps/kmyirc
-@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/applnk/Internet
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/config
diff --git a/irc/konversation-kde4/pkg-plist b/irc/konversation-kde4/pkg-plist
index b41320acb687..0eb53fab5073 100644
--- a/irc/konversation-kde4/pkg-plist
+++ b/irc/konversation-kde4/pkg-plist
@@ -250,68 +250,68 @@ share/locale/tr/LC_MESSAGES/konversation.mo
 share/locale/zh_CN/LC_MESSAGES/konversation.mo
 share/services/konvirc.protocol
 share/services/konvirc6.protocol
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/scalable/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/scalable 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/services
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons/crystalsvg/scalable/actions
+@dirrmtry share/icons/crystalsvg/scalable
+@dirrmtry share/icons/crystalsvg/32x32/actions
+@dirrmtry share/icons/crystalsvg/32x32
+@dirrmtry share/icons/crystalsvg/22x22/actions
+@dirrmtry share/icons/crystalsvg/22x22
+@dirrmtry share/icons/crystalsvg/16x16/actions
+@dirrmtry share/icons/crystalsvg/16x16
+@dirrmtry share/icons/crystalsvg
+@dirrmtry share/icons
 @dirrm share/doc/HTML/sv/konversation
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
 @dirrm share/doc/HTML/pt/konversation
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
 @dirrm share/doc/HTML/nl/konversation
-@unexec rmdir %D/share/doc/HTML/nl 2>/dev/null || true
+@dirrmtry share/doc/HTML/nl
 @dirrm share/doc/HTML/it/konversation
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
 @dirrm share/doc/HTML/et/konversation
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
 @dirrm share/doc/HTML/en/konversation
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
 @dirrm share/doc/HTML/da/konversation
-@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config.kcfg 2>/dev/null || true
+@dirrmtry share/doc/HTML/da
+@dirrmtry share/doc/HTML
+@dirrmtry share/config.kcfg
 @dirrm share/apps/konversation/themes/square
 @dirrm share/apps/konversation/themes/smiling
 @dirrm share/apps/konversation/themes/default
@@ -322,7 +322,7 @@ share/services/konvirc6.protocol
 @dirrm share/apps/konversation/scripts
 @dirrm share/apps/konversation/images
 @dirrm share/apps/konversation
-@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/apps/kconf_update
+@dirrmtry share/apps
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
diff --git a/irc/konversation/pkg-plist b/irc/konversation/pkg-plist
index b41320acb687..0eb53fab5073 100644
--- a/irc/konversation/pkg-plist
+++ b/irc/konversation/pkg-plist
@@ -250,68 +250,68 @@ share/locale/tr/LC_MESSAGES/konversation.mo
 share/locale/zh_CN/LC_MESSAGES/konversation.mo
 share/services/konvirc.protocol
 share/services/konvirc6.protocol
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/scalable/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/scalable 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/services
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons/crystalsvg/scalable/actions
+@dirrmtry share/icons/crystalsvg/scalable
+@dirrmtry share/icons/crystalsvg/32x32/actions
+@dirrmtry share/icons/crystalsvg/32x32
+@dirrmtry share/icons/crystalsvg/22x22/actions
+@dirrmtry share/icons/crystalsvg/22x22
+@dirrmtry share/icons/crystalsvg/16x16/actions
+@dirrmtry share/icons/crystalsvg/16x16
+@dirrmtry share/icons/crystalsvg
+@dirrmtry share/icons
 @dirrm share/doc/HTML/sv/konversation
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
 @dirrm share/doc/HTML/pt/konversation
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
 @dirrm share/doc/HTML/nl/konversation
-@unexec rmdir %D/share/doc/HTML/nl 2>/dev/null || true
+@dirrmtry share/doc/HTML/nl
 @dirrm share/doc/HTML/it/konversation
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
 @dirrm share/doc/HTML/et/konversation
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
 @dirrm share/doc/HTML/en/konversation
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
 @dirrm share/doc/HTML/da/konversation
-@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config.kcfg 2>/dev/null || true
+@dirrmtry share/doc/HTML/da
+@dirrmtry share/doc/HTML
+@dirrmtry share/config.kcfg
 @dirrm share/apps/konversation/themes/square
 @dirrm share/apps/konversation/themes/smiling
 @dirrm share/apps/konversation/themes/default
@@ -322,7 +322,7 @@ share/services/konvirc6.protocol
 @dirrm share/apps/konversation/scripts
 @dirrm share/apps/konversation/images
 @dirrm share/apps/konversation
-@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/apps/kconf_update
+@dirrmtry share/apps
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
diff --git a/irc/kwirc/pkg-plist b/irc/kwirc/pkg-plist
index 3182a80840bd..3555343223c3 100644
--- a/irc/kwirc/pkg-plist
+++ b/irc/kwirc/pkg-plist
@@ -39,30 +39,30 @@ share/icons/hicolor/22x22/apps/kwirc.png
 share/icons/hicolor/32x32/apps/kwirc.png
 share/icons/hicolor/48x48/apps/kwirc.png
 share/icons/hicolor/64x64/apps/kwirc.png
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/en/kwirc
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config.kcfg 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/config.kcfg
 @dirrm share/apps/kwirc/themes
 @dirrm share/apps/kwirc/smileys
 @dirrm share/apps/kwirc/scripts
 @dirrm share/apps/kwirc/icons
 @dirrm share/apps/kwirc
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
diff --git a/irc/p5-IRC/pkg-plist b/irc/p5-IRC/pkg-plist
index c825b379247d..5cdbc71e7e1a 100644
--- a/irc/p5-IRC/pkg-plist
+++ b/irc/p5-IRC/pkg-plist
@@ -6,7 +6,7 @@
 %%SITE_PERL%%/Net/IRC/EventQueue/Entry.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IRC/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IRC
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/Net/IRC/EventQueue
 @dirrm %%SITE_PERL%%/Net/IRC
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/irc/p5-POE-Component-IRC-Object/pkg-plist b/irc/p5-POE-Component-IRC-Object/pkg-plist
index 75ac361b80eb..83561b4b4d0d 100644
--- a/irc/p5-POE-Component-IRC-Object/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Object/pkg-plist
@@ -1,9 +1,9 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Object/.packlist
 %%SITE_PERL%%/POE/Component/IRC/Object.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Object
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component/IRC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component  2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Component/IRC
+@dirrmtry %%SITE_PERL%%/POE/Component 
+@dirrmtry %%SITE_PERL%%/POE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
 %%PORTDOCS%%%%EXAMPLESDIR%%/elizabot.pl
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/irc/p5-POE-Component-IRC/pkg-plist b/irc/p5-POE-Component-IRC/pkg-plist
index 37464adf60c9..29122b676dea 100644
--- a/irc/p5-POE-Component-IRC/pkg-plist
+++ b/irc/p5-POE-Component-IRC/pkg-plist
@@ -25,12 +25,12 @@
 %%EXAMPLESDIR%%/tinyurl.pl
 @dirrm %%EXAMPLESDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Filter 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Filter
 @dirrm %%SITE_PERL%%/POE/Component/IRC/Test
 @dirrm %%SITE_PERL%%/POE/Component/IRC/Qnet
 @dirrm %%SITE_PERL%%/POE/Component/IRC/Plugin
 @dirrm %%SITE_PERL%%/POE/Component/IRC/State
 @dirrm %%SITE_PERL%%/POE/Component/IRC
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Component
diff --git a/irc/ptlink-ircd/pkg-plist b/irc/ptlink-ircd/pkg-plist
index ed7752ed974c..147f32ab8210 100644
--- a/irc/ptlink-ircd/pkg-plist
+++ b/irc/ptlink-ircd/pkg-plist
@@ -24,4 +24,4 @@ etc/ptlink-ircd/network.dconf
 etc/ptlink-ircd/opers.motd
 etc/ptlink-ircd/version.info
 @dirrm etc/ptlink-ircd/codepage
-@unexec rmdir %D/etc/ptlink-ircd 2> /dev/null || true
+@dirrmtry etc/ptlink-ircd
diff --git a/irc/ptlink-services/pkg-plist b/irc/ptlink-services/pkg-plist
index 92fbe27fdeb7..9b6d18827d40 100644
--- a/irc/ptlink-services/pkg-plist
+++ b/irc/ptlink-services/pkg-plist
@@ -122,4 +122,4 @@ var/modules/sql/os_sysstats.sql
 @dirrm utils
 @dirrm etc/ptlink-services/mails
 @dirrm bin/modules
-@unexec rmdir %D/etc/ptlink-services 2> /dev/null || true
+@dirrmtry etc/ptlink-services
diff --git a/irc/scrollz/pkg-plist b/irc/scrollz/pkg-plist
index 5d75bc9eccd9..971c65279d09 100644
--- a/irc/scrollz/pkg-plist
+++ b/irc/scrollz/pkg-plist
@@ -716,18 +716,18 @@ share/scrollz/translation/SWISS
 share/scrollz/translation/UNITED_KINGDOM
 share/scrollz/translation/UNITED_KINGDOM_COM
 @exec mkdir %D/share/scrollz/script
-@unexec rmdir %D/share/scrollz/translation 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/script 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/bind 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/alias 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/cdcc 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/dcc 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/note 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/on 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/scrollz 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/set 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/window 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/ctcp 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help 2>/dev/null || true
+@dirrmtry share/scrollz/translation
+@dirrmtry share/scrollz/script
+@dirrmtry share/scrollz/help/bind
+@dirrmtry share/scrollz/help/alias
+@dirrmtry share/scrollz/help/cdcc
+@dirrmtry share/scrollz/help/dcc
+@dirrmtry share/scrollz/help/note
+@dirrmtry share/scrollz/help/on
+@dirrmtry share/scrollz/help/scrollz
+@dirrmtry share/scrollz/help/set
+@dirrmtry share/scrollz/help/window
+@dirrmtry share/scrollz/help/ctcp
+@dirrmtry share/scrollz/help
 @dirrm share/scrollz/doc
-@unexec rmdir %D/share/scrollz 2>/dev/null || true
+@dirrmtry share/scrollz
diff --git a/irc/solid-ircd/pkg-plist b/irc/solid-ircd/pkg-plist
index d06ac76f50cb..44864799ccbe 100644
--- a/irc/solid-ircd/pkg-plist
+++ b/irc/solid-ircd/pkg-plist
@@ -12,5 +12,5 @@ solid-ircd/ssl/ssl.rnd
 solid-ircd/ssl/vgc.pem
 solid-ircd/ssl/vgckey.pem
 @dirrm solid-ircd/ssl/CVS
-@unexec rmdir %D/solid-ircd/ssl 2>/dev/null || true
-@unexec rmdir %D/solid-ircd 2>/dev/null || true
+@dirrmtry solid-ircd/ssl
+@dirrmtry solid-ircd
diff --git a/irc/xchat-gnome/pkg-plist b/irc/xchat-gnome/pkg-plist
index d721eaac6a8c..f68a1b1bd321 100644
--- a/irc/xchat-gnome/pkg-plist
+++ b/irc/xchat-gnome/pkg-plist
@@ -79,6 +79,6 @@ share/xchat/red.png
 share/xchat/voice.png
 @exec mkdir -p %D/lib/xchat/plugins
 @dirrm share/xchat
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
 @dirrm lib/xchat/plugins
 @dirrm lib/xchat
diff --git a/irc/xchat2/pkg-plist b/irc/xchat2/pkg-plist
index 64b57e63bab2..0c797be5d24a 100644
--- a/irc/xchat2/pkg-plist
+++ b/irc/xchat2/pkg-plist
@@ -18,7 +18,7 @@ share/locale/sq/LC_MESSAGES/xchat.mo
 share/locale/vi/LC_MESSAGES/xchat.mo
 share/locale/zh_TW/LC_MESSAGES/xchat.mo
 share/pixmaps/xchat.png
-@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrmtry share/applications
 @exec mkdir -p %D/lib/xchat/plugins
 @dirrm lib/xchat/plugins
 @dirrm lib/xchat