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

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

45 files changed, 197 insertions, 197 deletions

diff --git a/deskutils/alacarte/pkg-plist b/deskutils/alacarte/pkg-plist
index 39afb27f4d5c..073e075d3c8d 100644
--- a/deskutils/alacarte/pkg-plist
+++ b/deskutils/alacarte/pkg-plist
@@ -6,7 +6,7 @@ share/locale/nb/LC_MESSAGES/alacarte.mo
 share/locale/nl/LC_MESSAGES/alacarte.mo
 share/locale/no/LC_MESSAGES/alacarte.mo
 share/applications/alacarte.desktop
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
 @cwd %%LOCALBASE%%
 %%PYTHON_SITELIBDIR%%/Alacarte/MenuHandler.py
 %%PYTHON_SITELIBDIR%%/Alacarte/PyXDGMenuHandler.py
diff --git a/deskutils/basket/pkg-plist b/deskutils/basket/pkg-plist
index a7b5797f753c..792b81b5fbde 100644
--- a/deskutils/basket/pkg-plist
+++ b/deskutils/basket/pkg-plist
@@ -17,30 +17,30 @@ share/locale/fr/LC_MESSAGES/basket.mo
 share/locale/nl/LC_MESSAGES/basket.mo
 share/locale/pl_PL/LC_MESSAGES/basket.mo
 share/locale/zh_TW/LC_MESSAGES/basket.mo
-@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/pl_PL/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl_PL 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/scalable/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/scalable 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/128x128 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/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/pl_PL/LC_MESSAGES
+@dirrmtry share/locale/pl_PL
+@dirrmtry share/icons/crystalsvg/scalable/apps
+@dirrmtry share/icons/crystalsvg/scalable
+@dirrmtry share/icons/crystalsvg/64x64/apps
+@dirrmtry share/icons/crystalsvg/64x64
+@dirrmtry share/icons/crystalsvg/48x48/apps
+@dirrmtry share/icons/crystalsvg/48x48
+@dirrmtry share/icons/crystalsvg/32x32/apps
+@dirrmtry share/icons/crystalsvg/32x32
+@dirrmtry share/icons/crystalsvg/22x22/apps
+@dirrmtry share/icons/crystalsvg/22x22
+@dirrmtry share/icons/crystalsvg/16x16/apps
+@dirrmtry share/icons/crystalsvg/16x16
+@dirrmtry share/icons/crystalsvg/128x128/apps
+@dirrmtry share/icons/crystalsvg/128x128
+@dirrmtry share/icons/crystalsvg
+@dirrmtry share/icons
 @dirrm share/doc/HTML/en/basket
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
 @dirrm share/apps/basket
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Utilities
+@dirrmtry share/applnk
diff --git a/deskutils/buoh/pkg-plist b/deskutils/buoh/pkg-plist
index 3b14bc9818e8..9ab5c41782bd 100644
--- a/deskutils/buoh/pkg-plist
+++ b/deskutils/buoh/pkg-plist
@@ -16,4 +16,4 @@ share/pixmaps/buoh64x64.png
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/comics
 @dirrm %%DATADIR%%
-@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrmtry share/applications
diff --git a/deskutils/cycle/pkg-plist b/deskutils/cycle/pkg-plist
index 31ccd86d0d71..3f64386d7034 100644
--- a/deskutils/cycle/pkg-plist
+++ b/deskutils/cycle/pkg-plist
@@ -29,14 +29,14 @@ share/locale/es/LC_MESSAGES/cycle.mo
 share/locale/gl/LC_MESSAGES/cycle.mo
 share/locale/ru/LC_MESSAGES/cycle.mo
 share/locale/sk/LC_MESSAGES/cycle.mo
-@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/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl 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
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
 %%DOCSDIR%%/README.html
 %%DOCSDIR%%/README_de.html
 %%DOCSDIR%%/README_ru.html
diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist
index e037e9ea7d79..2864a860d360 100644
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@@ -146,7 +146,7 @@ share/locale/zh_CN/LC_MESSAGES/deskbar-applet.mo
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop
 %%EVO%%@dirrm %%PYTHON_SITELIBDIR%%/deskbar/evolution
 @dirrm %%PYTHON_SITELIBDIR%%/deskbar
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
 @dirrm lib/deskbar-applet/handlers
 @dirrm lib/deskbar-applet
diff --git a/deskutils/dragstack/pkg-plist b/deskutils/dragstack/pkg-plist
index 98f61c650759..b7d97d3801d8 100644
--- a/deskutils/dragstack/pkg-plist
+++ b/deskutils/dragstack/pkg-plist
@@ -3,10 +3,10 @@ lib/libdragstack.so
 lib/libdragstack.so.1
 share/apps/kicker/applets/dragstack.desktop
 share/icons/hicolor/32x32/apps/dragstack.png
-@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 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-@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
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/apps/kicker/applets
+@dirrmtry share/apps/kicker
+@dirrmtry share/apps
diff --git a/deskutils/egroupware/pkg-plist b/deskutils/egroupware/pkg-plist
index 68d4d5442f92..aab7b0046a8f 100644
--- a/deskutils/egroupware/pkg-plist
+++ b/deskutils/egroupware/pkg-plist
@@ -7375,7 +7375,7 @@ www/data-dist/egroupware/wiki/templates/jerryr/images/navbar-over.png
 www/data-dist/egroupware/wiki/templates/jerryr/images/navbar.png
 www/data-dist/egroupware/wiki/templates/literati/images/navbar.png
 www/data-dist/egroupware/xmlrpc.php
-@unexec rmdir %D/www/data-dist/egroupware 2>/dev/null || true
+@dirrmtry www/data-dist/egroupware
 @dirrm www/data-dist/egroupware/wiki/templates/literati/images
 @dirrm www/data-dist/egroupware/wiki/templates/literati
 @dirrm www/data-dist/egroupware/wiki/templates/jerryr/images
@@ -8126,5 +8126,5 @@ www/data-dist/egroupware/xmlrpc.php
 @dirrm www/data-dist/egroupware/addressbook/inc/export
 @dirrm www/data-dist/egroupware/addressbook/inc
 @dirrm www/data-dist/egroupware/addressbook
-@unexec rmdir %D/www/data-dist/egroupware/fudforum 2>/dev/null || true
-@unexec rmdir %D/www/data-dist/egroupware 2>/dev/null || true
+@dirrmtry www/data-dist/egroupware/fudforum
+@dirrmtry www/data-dist/egroupware
diff --git a/deskutils/evolution-jescs/pkg-plist b/deskutils/evolution-jescs/pkg-plist
index 7666ed7410f7..549117ad81c1 100644
--- a/deskutils/evolution-jescs/pkg-plist
+++ b/deskutils/evolution-jescs/pkg-plist
@@ -34,7 +34,7 @@ share/locale/uk/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 2> /dev/null || true
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
 @dirrm share/gnome/evolution-jescs/glade
 @dirrm share/gnome/evolution-jescs
diff --git a/deskutils/gnome-blog/pkg-plist b/deskutils/gnome-blog/pkg-plist
index 66baaec8650f..23b5eec84ba1 100644
--- a/deskutils/gnome-blog/pkg-plist
+++ b/deskutils/gnome-blog/pkg-plist
@@ -54,5 +54,5 @@ share/gnome/applications/gnome-blog.desktop
 share/gnome/gnome-2.0/ui/GNOME_BlogApplet.xml
 share/gnome/pixmaps/gnome-blog.png
 @dirrm %%PYTHON_SITELIBDIR%%/gnomeblog
-@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/deskutils/gnome-pim/pkg-plist b/deskutils/gnome-pim/pkg-plist
index e027e12e4d81..c5193da467ec 100644
--- a/deskutils/gnome-pim/pkg-plist
+++ b/deskutils/gnome-pim/pkg-plist
@@ -69,12 +69,12 @@ share/locale/vi/LC_MESSAGES/gnome-pim.mo
 share/locale/wa/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pim.mo
-@unexec rmdir %D/share/locale/gd/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/gd 2> /dev/null || true
-@unexec rmdir %D/share/locale/gv/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/gv 2> /dev/null || true
-@unexec rmdir %D/share/locale/kw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/kw 2> /dev/null || true
+@dirrmtry share/locale/gd/LC_MESSAGES
+@dirrmtry share/locale/gd
+@dirrmtry share/locale/gv/LC_MESSAGES
+@dirrmtry share/locale/gv
+@dirrmtry share/locale/kw/LC_MESSAGES
+@dirrmtry share/locale/kw
 @dirrm share/gnome/help/gnomecard/eu
 @dirrm share/gnome/help/gnomecard/C
 @dirrm share/gnome/help/gnomecard
diff --git a/deskutils/gnomeblog/pkg-plist b/deskutils/gnomeblog/pkg-plist
index 66baaec8650f..23b5eec84ba1 100644
--- a/deskutils/gnomeblog/pkg-plist
+++ b/deskutils/gnomeblog/pkg-plist
@@ -54,5 +54,5 @@ share/gnome/applications/gnome-blog.desktop
 share/gnome/gnome-2.0/ui/GNOME_BlogApplet.xml
 share/gnome/pixmaps/gnome-blog.png
 @dirrm %%PYTHON_SITELIBDIR%%/gnomeblog
-@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/deskutils/gnomepim/pkg-plist b/deskutils/gnomepim/pkg-plist
index e027e12e4d81..c5193da467ec 100644
--- a/deskutils/gnomepim/pkg-plist
+++ b/deskutils/gnomepim/pkg-plist
@@ -69,12 +69,12 @@ share/locale/vi/LC_MESSAGES/gnome-pim.mo
 share/locale/wa/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pim.mo
-@unexec rmdir %D/share/locale/gd/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/gd 2> /dev/null || true
-@unexec rmdir %D/share/locale/gv/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/gv 2> /dev/null || true
-@unexec rmdir %D/share/locale/kw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/kw 2> /dev/null || true
+@dirrmtry share/locale/gd/LC_MESSAGES
+@dirrmtry share/locale/gd
+@dirrmtry share/locale/gv/LC_MESSAGES
+@dirrmtry share/locale/gv
+@dirrmtry share/locale/kw/LC_MESSAGES
+@dirrmtry share/locale/kw
 @dirrm share/gnome/help/gnomecard/eu
 @dirrm share/gnome/help/gnomecard/C
 @dirrm share/gnome/help/gnomecard
diff --git a/deskutils/horde-kronolith/pkg-plist b/deskutils/horde-kronolith/pkg-plist
index bfee675d8a50..327cb9d73a0e 100644
--- a/deskutils/horde-kronolith/pkg-plist
+++ b/deskutils/horde-kronolith/pkg-plist
@@ -283,5 +283,5 @@
 @dirrm %%KRONOLITHDIR%%/lib/Driver
 @dirrm %%KRONOLITHDIR%%/lib/Block
 @dirrm %%KRONOLITHDIR%%/lib
-@unexec rmdir %D/%%KRONOLITHDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%KRONOLITHDIR%% 2>/dev/null || true
+@dirrmtry %%KRONOLITHDIR%%/config
+@dirrmtry %%KRONOLITHDIR%%
diff --git a/deskutils/horde-mnemo/pkg-plist b/deskutils/horde-mnemo/pkg-plist
index 816549d83396..35a4a06d49d8 100644
--- a/deskutils/horde-mnemo/pkg-plist
+++ b/deskutils/horde-mnemo/pkg-plist
@@ -185,5 +185,5 @@
 @dirrm %%MNEMODIR%%/lib/Driver
 @dirrm %%MNEMODIR%%/lib/Block
 @dirrm %%MNEMODIR%%/lib
-@unexec rmdir %D/%%MNEMODIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%MNEMODIR%% 2>/dev/null || true
+@dirrmtry %%MNEMODIR%%/config
+@dirrmtry %%MNEMODIR%%
diff --git a/deskutils/horde-nag/pkg-plist b/deskutils/horde-nag/pkg-plist
index f8516bc705b9..2cf660b6f809 100644
--- a/deskutils/horde-nag/pkg-plist
+++ b/deskutils/horde-nag/pkg-plist
@@ -204,5 +204,5 @@
 @dirrm %%NAGDIR%%/lib/Driver
 @dirrm %%NAGDIR%%/lib/Block
 @dirrm %%NAGDIR%%/lib
-@unexec rmdir %D/%%NAGDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%NAGDIR%% 2>/dev/null || true
+@dirrmtry %%NAGDIR%%/config
+@dirrmtry %%NAGDIR%%
diff --git a/deskutils/horde4-kronolith/pkg-plist b/deskutils/horde4-kronolith/pkg-plist
index bfee675d8a50..327cb9d73a0e 100644
--- a/deskutils/horde4-kronolith/pkg-plist
+++ b/deskutils/horde4-kronolith/pkg-plist
@@ -283,5 +283,5 @@
 @dirrm %%KRONOLITHDIR%%/lib/Driver
 @dirrm %%KRONOLITHDIR%%/lib/Block
 @dirrm %%KRONOLITHDIR%%/lib
-@unexec rmdir %D/%%KRONOLITHDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%KRONOLITHDIR%% 2>/dev/null || true
+@dirrmtry %%KRONOLITHDIR%%/config
+@dirrmtry %%KRONOLITHDIR%%
diff --git a/deskutils/horde4-mnemo/pkg-plist b/deskutils/horde4-mnemo/pkg-plist
index 816549d83396..35a4a06d49d8 100644
--- a/deskutils/horde4-mnemo/pkg-plist
+++ b/deskutils/horde4-mnemo/pkg-plist
@@ -185,5 +185,5 @@
 @dirrm %%MNEMODIR%%/lib/Driver
 @dirrm %%MNEMODIR%%/lib/Block
 @dirrm %%MNEMODIR%%/lib
-@unexec rmdir %D/%%MNEMODIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%MNEMODIR%% 2>/dev/null || true
+@dirrmtry %%MNEMODIR%%/config
+@dirrmtry %%MNEMODIR%%
diff --git a/deskutils/horde4-nag/pkg-plist b/deskutils/horde4-nag/pkg-plist
index f8516bc705b9..2cf660b6f809 100644
--- a/deskutils/horde4-nag/pkg-plist
+++ b/deskutils/horde4-nag/pkg-plist
@@ -204,5 +204,5 @@
 @dirrm %%NAGDIR%%/lib/Driver
 @dirrm %%NAGDIR%%/lib/Block
 @dirrm %%NAGDIR%%/lib
-@unexec rmdir %D/%%NAGDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%NAGDIR%% 2>/dev/null || true
+@dirrmtry %%NAGDIR%%/config
+@dirrmtry %%NAGDIR%%
diff --git a/deskutils/kblticker/pkg-plist b/deskutils/kblticker/pkg-plist
index 285886a8f470..ad62c79235ff 100644
--- a/deskutils/kblticker/pkg-plist
+++ b/deskutils/kblticker/pkg-plist
@@ -15,8 +15,8 @@ share/icons/hicolor/64x64/apps/kblticker.png
 share/sounds/kblticker_bells.wav
 share/sounds/kblticker_whistles.wav
 @dirrm share/doc/HTML/en/kblticker
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
 @dirrm share/apps/kblticker/icons/hicolor/16x16/actions
 @dirrm share/apps/kblticker/icons/hicolor/22x22/actions
 @dirrm share/apps/kblticker/icons/hicolor/16x16
@@ -24,5 +24,5 @@ share/sounds/kblticker_whistles.wav
 @dirrm share/apps/kblticker/icons/hicolor
 @dirrm share/apps/kblticker/icons
 @dirrm share/apps/kblticker
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk
diff --git a/deskutils/kickpim/pkg-plist b/deskutils/kickpim/pkg-plist
index e31247d2ba77..2b299a877eea 100644
--- a/deskutils/kickpim/pkg-plist
+++ b/deskutils/kickpim/pkg-plist
@@ -25,23 +25,23 @@ share/locale/fr/LC_MESSAGES/kickpim.mo
 share/locale/it/LC_MESSAGES/kickpim.mo
 share/locale/nl/LC_MESSAGES/kickpim.mo
 share/locale/pl/LC_MESSAGES/kickpim.mo
-@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/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
-@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/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nl/LC_MESSAGES
+@dirrmtry share/locale/nl
+@dirrmtry share/locale/it/LC_MESSAGES
+@dirrmtry share/locale/it
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/de
+@dirrmtry share/locale
 @dirrm share/doc/HTML/en/kickpim
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
 @dirrm share/apps/kickpim/info
 @dirrm share/apps/kickpim/icons
 @dirrm share/apps/kickpim
-@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
+@dirrmtry share/apps/kicker/applets
+@dirrmtry share/apps/kicker
+@dirrmtry share/apps
diff --git a/deskutils/klipoquery/pkg-plist b/deskutils/klipoquery/pkg-plist
index 89d75742dfcb..f45641119886 100644
--- a/deskutils/klipoquery/pkg-plist
+++ b/deskutils/klipoquery/pkg-plist
@@ -6,9 +6,9 @@ share/doc/HTML/en/klipoquery/common
 share/doc/HTML/en/klipoquery/index.cache.bz2
 share/doc/HTML/en/klipoquery/index.docbook
 @dirrm share/doc/HTML/en/klipoquery
-@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 2>/dev/null || true
-@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
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/config
+@dirrmtry share/apps/kicker/applets
+@dirrmtry share/apps/kicker
+@dirrmtry share/apps
diff --git a/deskutils/krefty/pkg-plist b/deskutils/krefty/pkg-plist
index fca312ada9f8..c6f5dfa02591 100644
--- a/deskutils/krefty/pkg-plist
+++ b/deskutils/krefty/pkg-plist
@@ -15,19 +15,19 @@ share/doc/HTML/en/krefty/krefty01.png
 share/icons/hicolor/16x16/apps/krefty.png
 share/icons/hicolor/32x32/apps/krefty.png
 share/services/krefty_part.desktop
-@unexec rmdir %D/share/services 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/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/services
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/en/krefty
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
 @dirrm share/apps/krefty/data
 @dirrm share/apps/krefty
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Utilities 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
+@dirrmtry share/applnk/Utilities
+@dirrmtry share/applnk
+@dirrmtry lib/kde3
diff --git a/deskutils/kronolith/pkg-plist b/deskutils/kronolith/pkg-plist
index bfee675d8a50..327cb9d73a0e 100644
--- a/deskutils/kronolith/pkg-plist
+++ b/deskutils/kronolith/pkg-plist
@@ -283,5 +283,5 @@
 @dirrm %%KRONOLITHDIR%%/lib/Driver
 @dirrm %%KRONOLITHDIR%%/lib/Block
 @dirrm %%KRONOLITHDIR%%/lib
-@unexec rmdir %D/%%KRONOLITHDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%KRONOLITHDIR%% 2>/dev/null || true
+@dirrmtry %%KRONOLITHDIR%%/config
+@dirrmtry %%KRONOLITHDIR%%
diff --git a/deskutils/ktagebuch/pkg-plist b/deskutils/ktagebuch/pkg-plist
index ce3e48e6d991..39cc9e33b746 100644
--- a/deskutils/ktagebuch/pkg-plist
+++ b/deskutils/ktagebuch/pkg-plist
@@ -38,17 +38,17 @@ share/icons/hicolor/16x16/apps/ktagebuch.png
 share/icons/hicolor/32x32/apps/ktagebuch.png
 share/locale/de/LC_MESSAGES/ktagebuch.mo
 share/locale/es/LC_MESSAGES/ktagebuch.mo
-@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/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/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/en/ktagebuch
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
 @dirrm share/doc/HTML/de/ktagebuch
-@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/ktagebuch/icons/crystalsvg/32x32/actions
 @dirrm share/apps/ktagebuch/icons/crystalsvg/32x32
 @dirrm share/apps/ktagebuch/icons/crystalsvg/16x16/actions
@@ -56,6 +56,6 @@ share/locale/es/LC_MESSAGES/ktagebuch.mo
 @dirrm share/apps/ktagebuch/icons/crystalsvg
 @dirrm share/apps/ktagebuch/icons
 @dirrm share/apps/ktagebuch
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/deskutils/kuake/pkg-plist b/deskutils/kuake/pkg-plist
index 7ce8a1ba95a9..a3d001d99119 100644
--- a/deskutils/kuake/pkg-plist
+++ b/deskutils/kuake/pkg-plist
@@ -6,16 +6,16 @@ share/doc/HTML/en/kuake/index.cache.bz2
 share/doc/HTML/en/kuake/index.docbook
 share/icons/locolor/16x16/apps/kuake.png
 share/icons/locolor/32x32/apps/kuake.png
-@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/icons 2>/dev/null || true
+@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/icons
 @dirrm share/doc/HTML/en/kuake
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
 @dirrm share/apps/kuake
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Utilities
+@dirrmtry share/applnk
diff --git a/deskutils/logjam/pkg-plist b/deskutils/logjam/pkg-plist
index 29e10e77ac5b..a3e4100cfe73 100644
--- a/deskutils/logjam/pkg-plist
+++ b/deskutils/logjam/pkg-plist
@@ -11,9 +11,9 @@ share/locale/he/LC_MESSAGES/logjam.mo
 share/locale/ru_RU/LC_MESSAGES/logjam.mo
 share/locale/uk_UA/LC_MESSAGES/logjam.mo
 share/locale/ja/LC_MESSAGES/logjam.mo
-@unexec rmdir %D/share/locale/en_US.UTF-8/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US.UTF-8 2> /dev/null || true
-@unexec rmdir %D/share/locale/ru_RU/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ru_RU 2> /dev/null || true
-@unexec rmdir %D/share/locale/uk_UA/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/uk_UA 2> /dev/null || true
+@dirrmtry share/locale/en_US.UTF-8/LC_MESSAGES
+@dirrmtry share/locale/en_US.UTF-8
+@dirrmtry share/locale/ru_RU/LC_MESSAGES
+@dirrmtry share/locale/ru_RU
+@dirrmtry share/locale/uk_UA/LC_MESSAGES
+@dirrmtry share/locale/uk_UA
diff --git a/deskutils/mcatalog/pkg-plist b/deskutils/mcatalog/pkg-plist
index abd5e068fc63..7c15a2b84c46 100644
--- a/deskutils/mcatalog/pkg-plist
+++ b/deskutils/mcatalog/pkg-plist
@@ -56,8 +56,8 @@ share/locale/pt_BR/LC_MESSAGES/mcatalog.mo
 share/locale/rw/LC_MESSAGES/mcatalog.mo
 share/locale/sv/LC_MESSAGES/mcatalog.mo
 share/locale/zh_CN/LC_MESSAGES/mcatalog.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
 @dirrm share/gnome/mcatalog/templates
 @dirrm share/gnome/mcatalog/pixmaps/wood
 @dirrm share/gnome/mcatalog/pixmaps/metal
diff --git a/deskutils/metabar/pkg-plist b/deskutils/metabar/pkg-plist
index ee9a515b635e..39ae14971da9 100644
--- a/deskutils/metabar/pkg-plist
+++ b/deskutils/metabar/pkg-plist
@@ -7,15 +7,15 @@ share/apps/metabar/html/layout.html
 share/apps/metabar/iconsrc
 share/icons/hicolor/16x16/apps/metabar.png
 share/icons/hicolor/32x32/apps/metabar.png
-@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/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/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/apps/metabar/html
 @dirrm share/apps/metabar
-@unexec rmdir %D/share/apps/konqsidebartng/entries 2>/dev/null || true
-@unexec rmdir %D/share/apps/konqsidebartng/add 2>/dev/null || true
-@unexec rmdir %D/share/apps/konqsidebartng 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
+@dirrmtry share/apps/konqsidebartng/entries
+@dirrmtry share/apps/konqsidebartng/add
+@dirrmtry share/apps/konqsidebartng
+@dirrmtry share/apps
diff --git a/deskutils/mnemo/pkg-plist b/deskutils/mnemo/pkg-plist
index 816549d83396..35a4a06d49d8 100644
--- a/deskutils/mnemo/pkg-plist
+++ b/deskutils/mnemo/pkg-plist
@@ -185,5 +185,5 @@
 @dirrm %%MNEMODIR%%/lib/Driver
 @dirrm %%MNEMODIR%%/lib/Block
 @dirrm %%MNEMODIR%%/lib
-@unexec rmdir %D/%%MNEMODIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%MNEMODIR%% 2>/dev/null || true
+@dirrmtry %%MNEMODIR%%/config
+@dirrmtry %%MNEMODIR%%
diff --git a/deskutils/multisync-backup/pkg-plist b/deskutils/multisync-backup/pkg-plist
index 4951094725bb..228b69201c14 100644
--- a/deskutils/multisync-backup/pkg-plist
+++ b/deskutils/multisync-backup/pkg-plist
@@ -1,4 +1,4 @@
 lib/multisync/libbackup_plugin.a
 lib/multisync/libbackup_plugin.so
 lib/multisync/libbackup_plugin.so.0
-@unexec rmdir %D/lib/multisync 2>/dev/null || true
+@dirrmtry lib/multisync
diff --git a/deskutils/multisync-syncml/pkg-plist b/deskutils/multisync-syncml/pkg-plist
index 3f8bb429d3b0..5952ced1d5e0 100644
--- a/deskutils/multisync-syncml/pkg-plist
+++ b/deskutils/multisync-syncml/pkg-plist
@@ -1,4 +1,4 @@
 lib/multisync/libsyncml_plugin.a
 lib/multisync/libsyncml_plugin.so
 lib/multisync/libsyncml_plugin.so.0
-@unexec rmdir %D/lib/multisync 2>/dev/null || true
+@dirrmtry lib/multisync
diff --git a/deskutils/nag/pkg-plist b/deskutils/nag/pkg-plist
index f8516bc705b9..2cf660b6f809 100644
--- a/deskutils/nag/pkg-plist
+++ b/deskutils/nag/pkg-plist
@@ -204,5 +204,5 @@
 @dirrm %%NAGDIR%%/lib/Driver
 @dirrm %%NAGDIR%%/lib/Block
 @dirrm %%NAGDIR%%/lib
-@unexec rmdir %D/%%NAGDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%NAGDIR%% 2>/dev/null || true
+@dirrmtry %%NAGDIR%%/config
+@dirrmtry %%NAGDIR%%
diff --git a/deskutils/nautilus-actions/pkg-plist b/deskutils/nautilus-actions/pkg-plist
index 3cbdea0b06cd..83589ef2ee8b 100644
--- a/deskutils/nautilus-actions/pkg-plist
+++ b/deskutils/nautilus-actions/pkg-plist
@@ -8,6 +8,6 @@ share/locale/fr/LC_MESSAGES/nautilus-actions.mo
 %%DATADIR%%/nact/nautilus-actions-config.glade
 %%DATADIR%%/nact/nautilus-actions-icon.png
 share/pixmaps/nautilus-actions-icon.png
-@unexec rmdir %D/%%DATADIR%%/nact 2> /dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true
-@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrmtry %%DATADIR%%/nact
+@dirrmtry %%DATADIR%%
+@dirrmtry share/applications
diff --git a/deskutils/nautilus-open-terminal/pkg-plist b/deskutils/nautilus-open-terminal/pkg-plist
index f2476f62a777..a094116ff017 100644
--- a/deskutils/nautilus-open-terminal/pkg-plist
+++ b/deskutils/nautilus-open-terminal/pkg-plist
@@ -32,5 +32,5 @@ share/locale/tr/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/uk/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus-open-terminal.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
diff --git a/deskutils/p5-Data-ICal/pkg-plist b/deskutils/p5-Data-ICal/pkg-plist
index 3057b9b77f48..fc3d42fe695e 100644
--- a/deskutils/p5-Data-ICal/pkg-plist
+++ b/deskutils/p5-Data-ICal/pkg-plist
@@ -13,10 +13,10 @@
 %%SITE_PERL%%/Data/ICal/Entry/Todo.pm
 %%SITE_PERL%%/Data/ICal/Property.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ICal/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Data/ICal/Entry/TimeZone 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data/ICal/Entry/Alarm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ICal 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Data/ICal/Entry/TimeZone
+@dirrmtry %%SITE_PERL%%/Data/ICal/Entry/Alarm
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ICal
 @dirrm %%SITE_PERL%%/Data/ICal/Entry
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data/ICal 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry %%SITE_PERL%%/Data/ICal
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/deskutils/plans/pkg-plist b/deskutils/plans/pkg-plist
index 427c1e3f6680..2d0dc379b40c 100644
--- a/deskutils/plans/pkg-plist
+++ b/deskutils/plans/pkg-plist
@@ -330,7 +330,7 @@
 %%DIR%%/zh_tw.pl
 @dirrm %%DIR%%/theme/icons
 @dirrm %%DIR%%/theme/graphics
-@unexec rmdir %D/%%DIR%%/theme 2>/dev/null || true
-@unexec rmdir %D/%%DIR%%/sessions 2>/dev/null || true
-@unexec rmdir %D/%%DIR%%/data 2>/dev/null || true
+@dirrmtry %%DIR%%/theme
+@dirrmtry %%DIR%%/sessions
+@dirrmtry %%DIR%%/data
 @unexec rmdir %D/%%DIR%% 2>/dev/null || echo "Note: %D/%%DIR%% not empty -- not deleted!"
diff --git a/deskutils/pypanel/pkg-plist b/deskutils/pypanel/pkg-plist
index 6f6850ca8d3b..836d885950c3 100644
--- a/deskutils/pypanel/pkg-plist
+++ b/deskutils/pypanel/pkg-plist
@@ -3,5 +3,5 @@ bin/pypanel
 %%DATADIR%%/pypanelrc
 %%PYTHON_SITELIBDIR%%/ppmodule.so
 @dirrm %%DATADIR%%
-@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/deskutils/rox-memo/pkg-plist b/deskutils/rox-memo/pkg-plist
index 36d222d84b5e..6fc1c525de34 100644
--- a/deskutils/rox-memo/pkg-plist
+++ b/deskutils/rox-memo/pkg-plist
@@ -42,4 +42,4 @@ apps/Memo/pretty_time.pyo
 @dirrm apps/Memo/Messages
 @dirrm apps/Memo/Help
 @dirrm apps/Memo
-@unexec rmdir %D/apps 2>/dev/null || true
+@dirrmtry apps
diff --git a/deskutils/sugarcrm/pkg-plist b/deskutils/sugarcrm/pkg-plist
index 15db15a1b5ab..5a5d90ed0f5a 100644
--- a/deskutils/sugarcrm/pkg-plist
+++ b/deskutils/sugarcrm/pkg-plist
@@ -1877,8 +1877,8 @@
 @dirrm %%SUGARCRMDIR%%/cache/layout
 @dirrm %%SUGARCRMDIR%%/cache/pdf
 @dirrm %%SUGARCRMDIR%%/cache/upload
-@unexec rmdir %D/%%SUGARCRMDIR%%/cache/xml 2>/dev/null || true
-@unexec rmdir %D/%%SUGARCRMDIR%%/cache 2>/dev/null || true
+@dirrmtry %%SUGARCRMDIR%%/cache/xml
+@dirrmtry %%SUGARCRMDIR%%/cache
 @unexec rmdir %D/%%SUGARCRMDIR%% 2>/dev/null ||( echo "===>  There are files/directories remaining under %D/%%SUGARCRMDIR%%. If you wish to deinstall sugarcrm completely, inspect this directory for any files you may want to keep and then remove it.  Deinstall process kept these files/directories intact:" | fmt && for i in $(find %D/%%SUGARCRMDIR%%); do echo "    - $i"; done)
 %%PORTDOCS%%%%DOCSDIR%%/INSTALLATION.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
diff --git a/deskutils/tomboy/pkg-plist b/deskutils/tomboy/pkg-plist
index aecfa307f3f8..8007408936b6 100644
--- a/deskutils/tomboy/pkg-plist
+++ b/deskutils/tomboy/pkg-plist
@@ -37,7 +37,7 @@ share/locale/sv/LC_MESSAGES/tomboy.mo
 share/locale/tr/LC_MESSAGES/tomboy.mo
 share/locale/uk/LC_MESSAGES/tomboy.mo
 share/locale/zh_CN/LC_MESSAGES/tomboy.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
 @dirrm lib/tomboy/Plugins
 @dirrm lib/tomboy
diff --git a/deskutils/xcalendar/pkg-plist b/deskutils/xcalendar/pkg-plist
index 90013f6c7dcf..56cfb0bc61e2 100644
--- a/deskutils/xcalendar/pkg-plist
+++ b/deskutils/xcalendar/pkg-plist
@@ -10,5 +10,5 @@ lib/X11/xcalendar/rarrow.xbm
 lib/X11/xcalendar/xcalendar.hlp
 @dirrm lib/X11/xcalendar
 @dirrm lib/X11/ja_JP.eucJP/xcalendar
-@unexec rmdir %D/lib/X11/ja_JP.eucJP/app-defaults 2>/dev/null || true
-@unexec rmdir %D/lib/X11/ja_JP.eucJP 2>/dev/null || true
+@dirrmtry lib/X11/ja_JP.eucJP/app-defaults
+@dirrmtry lib/X11/ja_JP.eucJP
diff --git a/deskutils/xfce4-calendar/pkg-plist b/deskutils/xfce4-calendar/pkg-plist
index 0d76bbbfe5ab..e89e88e7dc59 100644
--- a/deskutils/xfce4-calendar/pkg-plist
+++ b/deskutils/xfce4-calendar/pkg-plist
@@ -52,4 +52,4 @@ share/locale/uk/LC_MESSAGES/xfcalendar.mo
 share/locale/vi/LC_MESSAGES/xfcalendar.mo
 share/locale/zh_CN/LC_MESSAGES/xfcalendar.mo
 share/locale/zh_TW/LC_MESSAGES/xfcalendar.mo
-@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
+@dirrmtry lib/xfce4/mcs-plugins
diff --git a/deskutils/xfce4-notes-plugin/pkg-plist b/deskutils/xfce4-notes-plugin/pkg-plist
index 25236aa4ef08..0490b922c820 100644
--- a/deskutils/xfce4-notes-plugin/pkg-plist
+++ b/deskutils/xfce4-notes-plugin/pkg-plist
@@ -1,6 +1,6 @@
 lib/xfce4/panel-plugins/libnotes.so
 share/xfce4/notes/note.png
-@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/notes 2>/dev/null || true
-@unexec rmdir %D/share/xfce4 2>/dev/null || true
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry lib/xfce4
+@dirrmtry share/xfce4/notes
+@dirrmtry share/xfce4
diff --git a/deskutils/xfce4-xkb-plugin/pkg-plist b/deskutils/xfce4-xkb-plugin/pkg-plist
index 65c6de37159f..f4ba969afc1c 100644
--- a/deskutils/xfce4-xkb-plugin/pkg-plist
+++ b/deskutils/xfce4-xkb-plugin/pkg-plist
@@ -75,6 +75,6 @@ share/xfce4/xkb/flags/ye.png
 share/xfce4/xkb/flags/yu.png
 @dirrm share/xfce4/xkb/flags
 @dirrm share/xfce4/xkb
-@unexec rmdir %D/share/xfce4 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
+@dirrmtry share/xfce4
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry lib/xfce4
diff --git a/deskutils/xpad/pkg-plist b/deskutils/xpad/pkg-plist
index 2f8a442b50fd..5396fdde2d8a 100644
--- a/deskutils/xpad/pkg-plist
+++ b/deskutils/xpad/pkg-plist
@@ -19,4 +19,4 @@ share/locale/sk/LC_MESSAGES/xpad.mo
 share/locale/sl/LC_MESSAGES/xpad.mo
 share/locale/vi/LC_MESSAGES/xpad.mo
 share/locale/zh_TW/LC_MESSAGES/xpad.mo
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications