Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry

Approved by:    krion@
PR:             ports/88711 (related)

22 files changed, 239 insertions, 239 deletions

diff --git a/net-p2p/amule-devel/pkg-plist b/net-p2p/amule-devel/pkg-plist
index aec2e898ca9b..b579ccf62f0d 100644
--- a/net-p2p/amule-devel/pkg-plist
+++ b/net-p2p/amule-devel/pkg-plist
@@ -33,14 +33,14 @@ share/locale/it_CH/LC_MESSAGES/amule.mo
 share/locale/pt_PT/LC_MESSAGES/amule.mo
 share/locale/hr/LC_MESSAGES/amule.mo
 share/locale/sl/LC_MESSAGES/amule.mo
-@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/en_US 2>/dev/null || true
-@unexec rmdir %D/share/locale/et_EE/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/et_EE 2>/dev/null || true
-@unexec rmdir %D/share/locale/it_CH/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it_CH 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko_KR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko_KR 2>/dev/null || true
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US
+@dirrmtry share/locale/et_EE/LC_MESSAGES
+@dirrmtry share/locale/et_EE
+@dirrmtry share/locale/it_CH/LC_MESSAGES
+@dirrmtry share/locale/it_CH
+@dirrmtry share/locale/ko_KR/LC_MESSAGES
+@dirrmtry share/locale/ko_KR
 share/gnome/doc/aMule-2.1.0/ABOUT-NLS
 share/gnome/doc/aMule-2.1.0/amulesig.txt
 share/gnome/doc/aMule-2.1.0/amule-win32.HOWTO.txt
@@ -53,15 +53,15 @@ share/gnome/doc/aMule-2.1.0/README
 share/gnome/doc/aMule-2.1.0/TODO
 share/gnome/doc/aMule-2.1.0/EC_Protocol.txt
 share/gnome/doc/aMule-2.1.0/socks4.protocol
-@unexec rmdir %D/share/gnome/doc/aMule-2.1.0 2>/dev/null || true
-@unexec rmdir %D/share/gnome/doc 2>/dev/null || true
+@dirrmtry share/gnome/doc/aMule-2.1.0
+@dirrmtry share/gnome/doc
 %%PL_CAS%%share/gnome/cas/tmp.html
 %%PL_CAS%%share/gnome/cas/stat.png
 %%PL_CAS%%@unexec rmdir %D/share/gnome/cas 2>/dev/null || true
 %%PL_CAS%%share/gnome/pixmaps/wxcas.xpm
 %%PL_ALC%%share/gnome/pixmaps/alc.xpm
 share/gnome/pixmaps/amule.xpm
-@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
+@dirrmtry share/gnome/pixmaps
 %%PL_CAS%%share/gnome/applications/wxcas.desktop
 %%PL_ALC%%share/gnome/applications/alc.desktop
 share/gnome/applications/amule.desktop
@@ -231,8 +231,8 @@ share/gnome/applications/amule.desktop
 %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver 2>/dev/null || true
 %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule 2>/dev/null || true
 lib/xchat/plugins/xas.pl
-@unexec rmdir %D/lib/xchat/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xchat 2>/dev/null || true
+@dirrmtry lib/xchat/plugins
+@dirrmtry lib/xchat
 %%PL_CAS%%bin/cas
 %%PL_CAS%%bin/wxcas
 %%PL_ALC%%bin/alc
diff --git a/net-p2p/amule/pkg-plist b/net-p2p/amule/pkg-plist
index aec2e898ca9b..b579ccf62f0d 100644
--- a/net-p2p/amule/pkg-plist
+++ b/net-p2p/amule/pkg-plist
@@ -33,14 +33,14 @@ share/locale/it_CH/LC_MESSAGES/amule.mo
 share/locale/pt_PT/LC_MESSAGES/amule.mo
 share/locale/hr/LC_MESSAGES/amule.mo
 share/locale/sl/LC_MESSAGES/amule.mo
-@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/en_US 2>/dev/null || true
-@unexec rmdir %D/share/locale/et_EE/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/et_EE 2>/dev/null || true
-@unexec rmdir %D/share/locale/it_CH/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it_CH 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko_KR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko_KR 2>/dev/null || true
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US
+@dirrmtry share/locale/et_EE/LC_MESSAGES
+@dirrmtry share/locale/et_EE
+@dirrmtry share/locale/it_CH/LC_MESSAGES
+@dirrmtry share/locale/it_CH
+@dirrmtry share/locale/ko_KR/LC_MESSAGES
+@dirrmtry share/locale/ko_KR
 share/gnome/doc/aMule-2.1.0/ABOUT-NLS
 share/gnome/doc/aMule-2.1.0/amulesig.txt
 share/gnome/doc/aMule-2.1.0/amule-win32.HOWTO.txt
@@ -53,15 +53,15 @@ share/gnome/doc/aMule-2.1.0/README
 share/gnome/doc/aMule-2.1.0/TODO
 share/gnome/doc/aMule-2.1.0/EC_Protocol.txt
 share/gnome/doc/aMule-2.1.0/socks4.protocol
-@unexec rmdir %D/share/gnome/doc/aMule-2.1.0 2>/dev/null || true
-@unexec rmdir %D/share/gnome/doc 2>/dev/null || true
+@dirrmtry share/gnome/doc/aMule-2.1.0
+@dirrmtry share/gnome/doc
 %%PL_CAS%%share/gnome/cas/tmp.html
 %%PL_CAS%%share/gnome/cas/stat.png
 %%PL_CAS%%@unexec rmdir %D/share/gnome/cas 2>/dev/null || true
 %%PL_CAS%%share/gnome/pixmaps/wxcas.xpm
 %%PL_ALC%%share/gnome/pixmaps/alc.xpm
 share/gnome/pixmaps/amule.xpm
-@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
+@dirrmtry share/gnome/pixmaps
 %%PL_CAS%%share/gnome/applications/wxcas.desktop
 %%PL_ALC%%share/gnome/applications/alc.desktop
 share/gnome/applications/amule.desktop
@@ -231,8 +231,8 @@ share/gnome/applications/amule.desktop
 %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver 2>/dev/null || true
 %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule 2>/dev/null || true
 lib/xchat/plugins/xas.pl
-@unexec rmdir %D/lib/xchat/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xchat 2>/dev/null || true
+@dirrmtry lib/xchat/plugins
+@dirrmtry lib/xchat
 %%PL_CAS%%bin/cas
 %%PL_CAS%%bin/wxcas
 %%PL_ALC%%bin/alc
diff --git a/net-p2p/amule1/pkg-plist b/net-p2p/amule1/pkg-plist
index 72e8096fc80d..69e7a99512d6 100644
--- a/net-p2p/amule1/pkg-plist
+++ b/net-p2p/amule1/pkg-plist
@@ -74,8 +74,8 @@ share/locale/pl/LC_MESSAGES/amule.mo
 share/locale/pt_BR/LC_MESSAGES/amule.mo
 share/locale/ru/LC_MESSAGES/amule.mo
 @dirrm share/gnome/doc/aMule-1.2.8
-@unexec rmdir %D/share/gnome/doc 2>/dev/null || true
-@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ee 2>/dev/null || true
+@dirrmtry share/gnome/doc
+@dirrmtry share/locale/ee/LC_MESSAGES
+@dirrmtry share/locale/ee
 @dirrm share/gnome/amuleweb/webserver
 @dirrm share/gnome/amuleweb
diff --git a/net-p2p/amule2/pkg-plist b/net-p2p/amule2/pkg-plist
index aec2e898ca9b..b579ccf62f0d 100644
--- a/net-p2p/amule2/pkg-plist
+++ b/net-p2p/amule2/pkg-plist
@@ -33,14 +33,14 @@ share/locale/it_CH/LC_MESSAGES/amule.mo
 share/locale/pt_PT/LC_MESSAGES/amule.mo
 share/locale/hr/LC_MESSAGES/amule.mo
 share/locale/sl/LC_MESSAGES/amule.mo
-@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/en_US 2>/dev/null || true
-@unexec rmdir %D/share/locale/et_EE/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/et_EE 2>/dev/null || true
-@unexec rmdir %D/share/locale/it_CH/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it_CH 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko_KR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko_KR 2>/dev/null || true
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US
+@dirrmtry share/locale/et_EE/LC_MESSAGES
+@dirrmtry share/locale/et_EE
+@dirrmtry share/locale/it_CH/LC_MESSAGES
+@dirrmtry share/locale/it_CH
+@dirrmtry share/locale/ko_KR/LC_MESSAGES
+@dirrmtry share/locale/ko_KR
 share/gnome/doc/aMule-2.1.0/ABOUT-NLS
 share/gnome/doc/aMule-2.1.0/amulesig.txt
 share/gnome/doc/aMule-2.1.0/amule-win32.HOWTO.txt
@@ -53,15 +53,15 @@ share/gnome/doc/aMule-2.1.0/README
 share/gnome/doc/aMule-2.1.0/TODO
 share/gnome/doc/aMule-2.1.0/EC_Protocol.txt
 share/gnome/doc/aMule-2.1.0/socks4.protocol
-@unexec rmdir %D/share/gnome/doc/aMule-2.1.0 2>/dev/null || true
-@unexec rmdir %D/share/gnome/doc 2>/dev/null || true
+@dirrmtry share/gnome/doc/aMule-2.1.0
+@dirrmtry share/gnome/doc
 %%PL_CAS%%share/gnome/cas/tmp.html
 %%PL_CAS%%share/gnome/cas/stat.png
 %%PL_CAS%%@unexec rmdir %D/share/gnome/cas 2>/dev/null || true
 %%PL_CAS%%share/gnome/pixmaps/wxcas.xpm
 %%PL_ALC%%share/gnome/pixmaps/alc.xpm
 share/gnome/pixmaps/amule.xpm
-@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
+@dirrmtry share/gnome/pixmaps
 %%PL_CAS%%share/gnome/applications/wxcas.desktop
 %%PL_ALC%%share/gnome/applications/alc.desktop
 share/gnome/applications/amule.desktop
@@ -231,8 +231,8 @@ share/gnome/applications/amule.desktop
 %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver 2>/dev/null || true
 %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule 2>/dev/null || true
 lib/xchat/plugins/xas.pl
-@unexec rmdir %D/lib/xchat/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xchat 2>/dev/null || true
+@dirrmtry lib/xchat/plugins
+@dirrmtry lib/xchat
 %%PL_CAS%%bin/cas
 %%PL_CAS%%bin/wxcas
 %%PL_ALC%%bin/alc
diff --git a/net-p2p/apollon/pkg-plist b/net-p2p/apollon/pkg-plist
index cc482ed5dbe9..f096221ec703 100644
--- a/net-p2p/apollon/pkg-plist
+++ b/net-p2p/apollon/pkg-plist
@@ -53,28 +53,28 @@ share/applnk/Applications/Apollon.desktop
 %%PORTDOCS%%share/doc/HTML/en/apollon/credits.docbook
 %%PORTDOCS%%share/doc/HTML/en/apollon/index.cache.bz2
 %%PORTDOCS%%share/doc/HTML/en/apollon/common
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_br/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_br 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nb_NO/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nb_NO 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/64x64/filesystems 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/48x48/filesystems 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/filesystems 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16/filesystems 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/128x128/filesystems 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/pt_br/LC_MESSAGES
+@dirrmtry share/locale/pt_br
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16/actions
+@dirrmtry share/icons/crystalsvg/64x64/filesystems
+@dirrmtry share/icons/crystalsvg/64x64/apps
+@dirrmtry share/icons/crystalsvg/48x48/filesystems
+@dirrmtry share/icons/crystalsvg/48x48/apps
+@dirrmtry share/icons/crystalsvg/32x32/filesystems
+@dirrmtry share/icons/crystalsvg/32x32/apps
+@dirrmtry share/icons/crystalsvg/22x22/apps
+@dirrmtry share/icons/crystalsvg/16x16/filesystems
+@dirrmtry share/icons/crystalsvg/16x16/apps
+@dirrmtry share/icons/crystalsvg/128x128/filesystems
+@dirrmtry share/icons/crystalsvg/128x128/apps
+@dirrmtry share/applnk/Applications
 %%PORTDOCS%%@unexec rmdir %D/share/doc/HTML/en/apollon
 %%PORTDOCS%%@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
diff --git a/net-p2p/bnbt/pkg-plist b/net-p2p/bnbt/pkg-plist
index 16496f2e9a49..7d52743957b0 100644
--- a/net-p2p/bnbt/pkg-plist
+++ b/net-p2p/bnbt/pkg-plist
@@ -1,4 +1,4 @@
 bin/bnbt
 @exec mkdir -p /var/log/bnbt
 @exec mkdir -p %D/etc/bnbt
-@unexec rmdir %D/etc/bnbt 2>/dev/null || true
+@dirrmtry etc/bnbt
diff --git a/net-p2p/dcd/pkg-plist b/net-p2p/dcd/pkg-plist
index fc4ed235eaf4..5a91762c0485 100644
--- a/net-p2p/dcd/pkg-plist
+++ b/net-p2p/dcd/pkg-plist
@@ -12,6 +12,6 @@ etc/dcd/dcd.welcome.default
 etc/dcd/nicks.allow.default
 @exec install -d -m 751 -o daemon -g daemon /var/log/dcd
 @unexec rmdir /var/log/dcd 2>/dev/null || true
-@unexec rmdir %D/etc/dcd 2>/dev/null || true
-@unexec rmdir %D/man/pl.ISO8859-2/man8 2>/dev/null || true
-@unexec rmdir %D/man/pl.ISO8859-2 2>/dev/null || true
+@dirrmtry etc/dcd
+@dirrmtry man/pl.ISO8859-2/man8
+@dirrmtry man/pl.ISO8859-2
diff --git a/net-p2p/dctc-gui/pkg-plist b/net-p2p/dctc-gui/pkg-plist
index 455c8cb1185d..6bccd6512052 100644
--- a/net-p2p/dctc-gui/pkg-plist
+++ b/net-p2p/dctc-gui/pkg-plist
@@ -28,11 +28,11 @@ share/locale/sv/LC_MESSAGES/dc_gui.mo
 @unexec %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
 @unexec %D/share/locale/de 2>/dev/null || true
 @dirrm share/gnome/pixmaps/dc_gui
-@unexec rmdir %D/share/gnome/help/dc_gui/nl/images 2>/dev/null || true
+@dirrmtry share/gnome/help/dc_gui/nl/images
 @dirrm share/gnome/help/dc_gui/nl
-@unexec rmdir %D/share/gnome/help/dc_gui/es/images 2>/dev/null || true
+@dirrmtry share/gnome/help/dc_gui/es/images
 @dirrm share/gnome/help/dc_gui/es
-@unexec rmdir %D/share/gnome/help/dc_gui/C/images 2>/dev/null || true
+@dirrmtry share/gnome/help/dc_gui/C/images
 @dirrm share/gnome/help/dc_gui/C
 @dirrm share/gnome/help/dc_gui
 %%PORTDOCS%%@dirrm share/doc/dctc-gui
diff --git a/net-p2p/gtk-gnutella/pkg-plist b/net-p2p/gtk-gnutella/pkg-plist
index 6346d1147d2f..cb117c9078c4 100644
--- a/net-p2p/gtk-gnutella/pkg-plist
+++ b/net-p2p/gtk-gnutella/pkg-plist
@@ -50,7 +50,7 @@ share/locale/nl/LC_MESSAGES/gtk-gnutella.mo
 share/locale/hu/LC_MESSAGES/gtk-gnutella.mo
 share/locale/uk/LC_MESSAGES/gtk-gnutella.mo
 share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/el
 @dirrm %%DATADIR%%/en
diff --git a/net-p2p/javadc/pkg-plist b/net-p2p/javadc/pkg-plist
index 7ef9a72e99fd..306e674fde79 100644
--- a/net-p2p/javadc/pkg-plist
+++ b/net-p2p/javadc/pkg-plist
@@ -6,4 +6,4 @@ bin/javadc
 %%JAR_DIR%%/%%JAR_FILE%%
 @dirrm %%JAR_DIR%%
 %%PORTDOCS%%@dirrm share/doc/javadc
-@unexec rmdir %D/share/java/jar 2>/dev/null || true
+@dirrmtry share/java/jar
diff --git a/net-p2p/kmldonkey/pkg-plist b/net-p2p/kmldonkey/pkg-plist
index 192584d496d4..70903c3fd1d5 100644
--- a/net-p2p/kmldonkey/pkg-plist
+++ b/net-p2p/kmldonkey/pkg-plist
@@ -118,65 +118,65 @@ share/services/magnet.protocol
 share/services/mldonkey.protocol
 share/services/sig2dat.protocol
 share/servicetypes/kmldonkey_plugin.desktop
-@unexec rmdir %D/share/servicetypes 2>/dev/null || true
-@unexec rmdir %D/share/services/kded 2>/dev/null || true
-@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/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/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/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 2>/dev/null || true
+@dirrmtry share/servicetypes
+@dirrmtry share/services/kded
+@dirrmtry share/services
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@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
 @dirrm share/doc/HTML/sv/kmldonkey
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
 @dirrm share/doc/HTML/ru/kmldonkey
-@unexec rmdir %D/share/doc/HTML/ru 2>/dev/null || true
+@dirrmtry share/doc/HTML/ru
 @dirrm share/doc/HTML/pt/kmldonkey
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
 @dirrm share/doc/HTML/nl/kmldonkey
-@unexec rmdir %D/share/doc/HTML/nl 2>/dev/null || true
+@dirrmtry share/doc/HTML/nl
 @dirrm share/doc/HTML/it/kmldonkey
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
 @dirrm share/doc/HTML/et/kmldonkey
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
 @dirrm share/doc/HTML/en/kmldonkey-apidocs/src/html
 @dirrm share/doc/HTML/en/kmldonkey-apidocs/src
 @dirrm share/doc/HTML/en/kmldonkey-apidocs
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
 @dirrm share/doc/HTML/de/kmldonkey
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/de
+@dirrmtry share/doc/HTML
 @dirrm share/apps/mldonkeyapplet/pics
 @dirrm share/apps/mldonkeyapplet
-@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
-@unexec rmdir %D/share/apps/konqueror 2>/dev/null || true
+@dirrmtry share/apps/konqueror/servicemenus
+@dirrmtry share/apps/konqueror
 @dirrm share/apps/kmldonkey/images/networks
 @dirrm share/apps/kmldonkey/images
 @dirrm share/apps/kmldonkey
-@unexec rmdir %D/share/apps/kicker/applets 2>/dev/null || true
-@unexec rmdir %D/share/apps/kicker 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Settings/Network 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Settings 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
-@unexec rmdir %D/lib/kde3 2>/dev/null || true
+@dirrmtry share/apps/kicker/applets
+@dirrmtry share/apps/kicker
+@dirrmtry share/apps
+@dirrmtry share/applnk/Settings/Network
+@dirrmtry share/applnk/Settings
+@dirrmtry share/applnk/Internet
+@dirrmtry share/applnk
+@dirrmtry lib/kde3
 @dirrm include/kmldonkey
diff --git a/net-p2p/ktorrent-devel/pkg-plist b/net-p2p/ktorrent-devel/pkg-plist
index f464420ded53..022059df4460 100644
--- a/net-p2p/ktorrent-devel/pkg-plist
+++ b/net-p2p/ktorrent-devel/pkg-plist
@@ -81,20 +81,20 @@ share/services/ktpartfileimportplugin.desktop
 share/services/ktsearchplugin.desktop
 share/services/ktupnpplugin.desktop
 share/servicetypes/ktorrentplugin.desktop
-@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/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk 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/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/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
 @dirrm share/apps/ktorrent/icons/hicolor/scalable/apps
 @dirrm share/apps/ktorrent/icons/hicolor/scalable
 @dirrm share/apps/ktorrent/icons/hicolor/64x64/filesystems
@@ -116,4 +116,4 @@ share/servicetypes/ktorrentplugin.desktop
 @dirrm share/apps/ktorrent/icons/hicolor
 @dirrm share/apps/ktorrent/icons
 @dirrm share/apps/ktorrent
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
+@dirrmtry share/applications/kde
diff --git a/net-p2p/ktorrent/pkg-plist b/net-p2p/ktorrent/pkg-plist
index f464420ded53..022059df4460 100644
--- a/net-p2p/ktorrent/pkg-plist
+++ b/net-p2p/ktorrent/pkg-plist
@@ -81,20 +81,20 @@ share/services/ktpartfileimportplugin.desktop
 share/services/ktsearchplugin.desktop
 share/services/ktupnpplugin.desktop
 share/servicetypes/ktorrentplugin.desktop
-@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/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk 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/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/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
 @dirrm share/apps/ktorrent/icons/hicolor/scalable/apps
 @dirrm share/apps/ktorrent/icons/hicolor/scalable
 @dirrm share/apps/ktorrent/icons/hicolor/64x64/filesystems
@@ -116,4 +116,4 @@ share/servicetypes/ktorrentplugin.desktop
 @dirrm share/apps/ktorrent/icons/hicolor
 @dirrm share/apps/ktorrent/icons
 @dirrm share/apps/ktorrent
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
+@dirrmtry share/applications/kde
diff --git a/net-p2p/ktorrent2/pkg-plist b/net-p2p/ktorrent2/pkg-plist
index f464420ded53..022059df4460 100644
--- a/net-p2p/ktorrent2/pkg-plist
+++ b/net-p2p/ktorrent2/pkg-plist
@@ -81,20 +81,20 @@ share/services/ktpartfileimportplugin.desktop
 share/services/ktsearchplugin.desktop
 share/services/ktupnpplugin.desktop
 share/servicetypes/ktorrentplugin.desktop
-@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/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk 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/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/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
 @dirrm share/apps/ktorrent/icons/hicolor/scalable/apps
 @dirrm share/apps/ktorrent/icons/hicolor/scalable
 @dirrm share/apps/ktorrent/icons/hicolor/64x64/filesystems
@@ -116,4 +116,4 @@ share/servicetypes/ktorrentplugin.desktop
 @dirrm share/apps/ktorrent/icons/hicolor
 @dirrm share/apps/ktorrent/icons
 @dirrm share/apps/ktorrent
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
+@dirrmtry share/applications/kde
diff --git a/net-p2p/liberator/pkg-plist b/net-p2p/liberator/pkg-plist
index f3144e976b3c..75197217e8fb 100644
--- a/net-p2p/liberator/pkg-plist
+++ b/net-p2p/liberator/pkg-plist
@@ -24,4 +24,4 @@ lib/ocaml/hlfreenet.mli
 %%DATADIR%%/liber_mimetypes
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/lib/ocaml 2>/dev/null || true
+@dirrmtry lib/ocaml
diff --git a/net-p2p/p5-pdonkey/pkg-plist b/net-p2p/p5-pdonkey/pkg-plist
index be125504d81b..d14d033d72ef 100644
--- a/net-p2p/p5-pdonkey/pkg-plist
+++ b/net-p2p/p5-pdonkey/pkg-plist
@@ -7,5 +7,5 @@
 @dirrm %%SITE_PERL%%/P2P/pDonkey
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/P2P/pDonkey/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/P2P/pDonkey
-@unexec rmdir %D/%%SITE_PERL%%/P2P 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/P2P 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/P2P
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/P2P
diff --git a/net-p2p/py-bittorrent-devel/pkg-plist b/net-p2p/py-bittorrent-devel/pkg-plist
index 4e772ea657c3..bcfa49a10b54 100644
--- a/net-p2p/py-bittorrent-devel/pkg-plist
+++ b/net-p2p/py-bittorrent-devel/pkg-plist
@@ -260,32 +260,32 @@ share/locale/zh_TW/LC_MESSAGES/bittorrent.mo
 %%GUI%%@dirrm share/pixmaps/BitTorrent/logo
 %%GUI%%@dirrm share/pixmaps/BitTorrent
 %%GUI%%@unexec rmdir %D/share/pixmaps 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 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/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 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/nb_NO/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nb_NO 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/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 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
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@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/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
 @dirrm %%DATADIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/khashmir
 @dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/net-p2p/py-bittorrent/pkg-plist b/net-p2p/py-bittorrent/pkg-plist
index 7127a0489c16..f480ab4cef60 100644
--- a/net-p2p/py-bittorrent/pkg-plist
+++ b/net-p2p/py-bittorrent/pkg-plist
@@ -259,42 +259,42 @@ share/locale/zh_TW/LC_MESSAGES/bittorrent.mo
 %%GUI%%@dirrm share/pixmaps/BitTorrent/logo
 %%GUI%%@dirrm share/pixmaps/BitTorrent       
 %%GUI%%@unexec rmdir %D/share/pixmaps 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 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/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/share/locale/tlh/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tlh 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/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 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/nb_NO/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nb_NO 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/hy/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/hy 2>/dev/null || true
-@unexec rmdir %D/share/locale/he_IL/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/he_IL 2>/dev/null || true
-@unexec rmdir %D/share/locale/gr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/gr 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/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 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
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tlh/LC_MESSAGES
+@dirrmtry share/locale/tlh
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@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/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/he_IL/LC_MESSAGES
+@dirrmtry share/locale/he_IL
+@dirrmtry share/locale/gr/LC_MESSAGES
+@dirrmtry share/locale/gr
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
 @dirrm %%DATADIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/khashmir
 @dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/net-p2p/py-kenosis-bittorrent/pkg-plist b/net-p2p/py-kenosis-bittorrent/pkg-plist
index 1976e19b5c6f..66bdeaf54f65 100644
--- a/net-p2p/py-kenosis-bittorrent/pkg-plist
+++ b/net-p2p/py-kenosis-bittorrent/pkg-plist
@@ -91,5 +91,5 @@ libexec/kenosis-BitTorrent/btunittest.py
 %%PYTHON_SITELIBDIR%%/kenosis_BitTorrent/zurllib.pyo
 @dirrm libexec/kenosis-BitTorrent
 @dirrm %%PYTHON_SITELIBDIR%%/kenosis_BitTorrent
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/net-p2p/py-kenosis/pkg-plist b/net-p2p/py-kenosis/pkg-plist
index 551bbfa713e3..333ce43d1269 100644
--- a/net-p2p/py-kenosis/pkg-plist
+++ b/net-p2p/py-kenosis/pkg-plist
@@ -142,5 +142,5 @@
 @dirrm %%PYTHON_SITELIBDIR%%/kenosis/ds
 @dirrm %%PYTHON_SITELIBDIR%%/kenosis/dns
 @dirrm %%PYTHON_SITELIBDIR%%/kenosis
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/net-p2p/torrentflux/pkg-plist b/net-p2p/torrentflux/pkg-plist
index 88f07382edca..633904dee2fc 100644
--- a/net-p2p/torrentflux/pkg-plist
+++ b/net-p2p/torrentflux/pkg-plist
@@ -5,6 +5,6 @@ etc/tfconfig.php.default
 etc/rc.d/torrentflux.sh
 libexec/btphptornado.py
 %%DATADIR%%/torrentflux.sqlite
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/install.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-p2p/xmule/pkg-plist b/net-p2p/xmule/pkg-plist
index 07e8bdbe6030..d659dc5859ab 100644
--- a/net-p2p/xmule/pkg-plist
+++ b/net-p2p/xmule/pkg-plist
@@ -11,7 +11,7 @@ share/locale/it/LC_MESSAGES/xmule.mo
 share/locale/ko/LC_MESSAGES/xmule.mo
 share/locale/pl/LC_MESSAGES/xmule.mo
 share/locale/tr/LC_MESSAGES/xmule.mo
-@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ee 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
-@unexec rmdir %D/share/gnome/locale 2>/dev/null || true
+@dirrmtry share/locale/ee/LC_MESSAGES
+@dirrmtry share/locale/ee
+@dirrmtry share/locale
+@dirrmtry share/gnome/locale