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

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

19 files changed, 116 insertions, 116 deletions

diff --git a/x11-wm/afterstep-i18n/pkg-plist b/x11-wm/afterstep-i18n/pkg-plist
index 9bcdadd227c6..1b9970f9de8e 100644
--- a/x11-wm/afterstep-i18n/pkg-plist
+++ b/x11-wm/afterstep-i18n/pkg-plist
@@ -66,4 +66,4 @@ share/doc/afterstep/CHANGES.I18N
 share/doc/afterstep/README.I18N
 share/doc/afterstep/README.I18N.jis
 @dirrm share/doc/afterstep
-@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
+@dirrmtry include/X11/pixmaps
diff --git a/x11-wm/afterstep/pkg-plist b/x11-wm/afterstep/pkg-plist
index 6ccad541f2ba..c009455c097e 100644
--- a/x11-wm/afterstep/pkg-plist
+++ b/x11-wm/afterstep/pkg-plist
@@ -59,4 +59,4 @@ lib/X11/afterstep/system.steprc
 @dirrm lib/X11/afterstep/doc
 @dirrm lib/X11/afterstep/sounds
 @dirrm lib/X11/afterstep
-@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
+@dirrmtry include/X11/pixmaps
diff --git a/x11-wm/amaterus/pkg-plist b/x11-wm/amaterus/pkg-plist
index 0a65dfbd3a4b..0ff48f771b6d 100644
--- a/x11-wm/amaterus/pkg-plist
+++ b/x11-wm/amaterus/pkg-plist
@@ -1,4 +1,4 @@
 bin/amaterus
 share/gnome/wm-properties/Amaterus.desktop
-@unexec rmdir %D/share/gnome/wm-properties 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true
+@dirrmtry share/gnome/wm-properties
+@dirrmtry share/gnome
diff --git a/x11-wm/ctwm/pkg-plist b/x11-wm/ctwm/pkg-plist
index f62dc85b4772..846e107b978a 100644
--- a/x11-wm/ctwm/pkg-plist
+++ b/x11-wm/ctwm/pkg-plist
@@ -91,4 +91,4 @@ lib/X11/twm/images/xrn.xpm
 lib/X11/twm/images/xterm.xpm
 lib/X11/twm/system.ctwmrc
 @dirrm lib/X11/twm/images
-@unexec rmdir %D/lib/X11/twm 2>/dev/null || true
+@dirrmtry lib/X11/twm
diff --git a/x11-wm/e16/pkg-plist b/x11-wm/e16/pkg-plist
index 05c6883ed42e..fcc86fd7510b 100644
--- a/x11-wm/e16/pkg-plist
+++ b/x11-wm/e16/pkg-plist
@@ -491,8 +491,8 @@ share/locale/tr/LC_MESSAGES/enlightenment.mo
 @dirrm %%DATADIR%%/config/pix
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%
-@unexec rmdir %D/etc/X11/dm/Sessions 2> /dev/null || true
-@unexec rmdir %D/etc/X11/dm 2> /dev/null || true
-@unexec rmdir %D/etc/X11 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US 2> /dev/null || true
+@dirrmtry etc/X11/dm/Sessions
+@dirrmtry etc/X11/dm
+@dirrmtry etc/X11
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US
diff --git a/x11-wm/enlightenment/pkg-plist b/x11-wm/enlightenment/pkg-plist
index 05c6883ed42e..fcc86fd7510b 100644
--- a/x11-wm/enlightenment/pkg-plist
+++ b/x11-wm/enlightenment/pkg-plist
@@ -491,8 +491,8 @@ share/locale/tr/LC_MESSAGES/enlightenment.mo
 @dirrm %%DATADIR%%/config/pix
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%
-@unexec rmdir %D/etc/X11/dm/Sessions 2> /dev/null || true
-@unexec rmdir %D/etc/X11/dm 2> /dev/null || true
-@unexec rmdir %D/etc/X11 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US 2> /dev/null || true
+@dirrmtry etc/X11/dm/Sessions
+@dirrmtry etc/X11/dm
+@dirrmtry etc/X11
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US
diff --git a/x11-wm/fvwm/pkg-plist b/x11-wm/fvwm/pkg-plist
index 3c7c2913a09b..68c4bd57574f 100644
--- a/x11-wm/fvwm/pkg-plist
+++ b/x11-wm/fvwm/pkg-plist
@@ -59,4 +59,4 @@ include/X11/pixmaps/xterm-sol.xpm
 include/X11/pixmaps/xterm-sun.xpm
 include/X11/pixmaps/xterm.xpm
 @dirrm lib/X11/fvwm
-@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
+@dirrmtry include/X11/pixmaps
diff --git a/x11-wm/fvwm2-devel/pkg-plist b/x11-wm/fvwm2-devel/pkg-plist
index 497845a25a00..b3db39a6df65 100644
--- a/x11-wm/fvwm2-devel/pkg-plist
+++ b/x11-wm/fvwm2-devel/pkg-plist
@@ -446,8 +446,8 @@ man/man1/xpmroot.1.gz
 %%NLS%%share/locale/sv_SE/LC_MESSAGES/fvwm.mo
 %%NLS%%share/locale/sv_SE/LC_MESSAGES/FvwmTaskBar.mo
 %%NLS%%share/locale/sv_SE/LC_MESSAGES/FvwmScript.mo
-@unexec rmdir %D/share/locale/sv_SE/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv_SE 2>/dev/null || true
+@dirrmtry share/locale/sv_SE/LC_MESSAGES
+@dirrmtry share/locale/sv_SE
 @dirrm %%DATADIR%%/perllib/General
 @dirrm %%DATADIR%%/perllib/FVWM/Tracker
 @dirrm %%DATADIR%%/perllib/FVWM/Module
diff --git a/x11-wm/ion-2/pkg-plist b/x11-wm/ion-2/pkg-plist
index f024e5ddc4ea..79117a851eec 100644
--- a/x11-wm/ion-2/pkg-plist
+++ b/x11-wm/ion-2/pkg-plist
@@ -60,4 +60,4 @@ share/doc/ion/ChangeLog
 @dirrm lib/ion
 @dirrm share/ion
 @dirrm share/doc/ion
-@unexec rmdir %D/etc/ion 2>/dev/null || true
+@dirrmtry etc/ion
diff --git a/x11-wm/ion-3/pkg-plist b/x11-wm/ion-3/pkg-plist
index faede5257b43..f0e5f4b8647c 100644
--- a/x11-wm/ion-3/pkg-plist
+++ b/x11-wm/ion-3/pkg-plist
@@ -82,4 +82,4 @@ share/locale/fi/LC_MESSAGES/ion3.mo
 @dirrm lib/ion3
 @dirrm share/ion3
 @dirrm %%DOCSDIR%%
-@unexec rmdir %D/etc/ion3 2>/dev/null || true
+@dirrmtry etc/ion3
diff --git a/x11-wm/ion-3ds/pkg-plist b/x11-wm/ion-3ds/pkg-plist
index faede5257b43..f0e5f4b8647c 100644
--- a/x11-wm/ion-3ds/pkg-plist
+++ b/x11-wm/ion-3ds/pkg-plist
@@ -82,4 +82,4 @@ share/locale/fi/LC_MESSAGES/ion3.mo
 @dirrm lib/ion3
 @dirrm share/ion3
 @dirrm %%DOCSDIR%%
-@unexec rmdir %D/etc/ion3 2>/dev/null || true
+@dirrmtry etc/ion3
diff --git a/x11-wm/ion/pkg-plist b/x11-wm/ion/pkg-plist
index d9650d5ab706..f7f2ea378150 100644
--- a/x11-wm/ion/pkg-plist
+++ b/x11-wm/ion/pkg-plist
@@ -20,4 +20,4 @@ etc/ion/sample.conf
 %%PORTDOCS%%share/doc/ion/config.txt
 %%PORTDOCS%%share/doc/ion/functions.txt
 %%PORTDOCS%%@dirrm share/doc/ion
-@unexec rmdir %D/etc/ion 2>/dev/null || true
+@dirrmtry etc/ion
diff --git a/x11-wm/ion3/pkg-plist b/x11-wm/ion3/pkg-plist
index f024e5ddc4ea..79117a851eec 100644
--- a/x11-wm/ion3/pkg-plist
+++ b/x11-wm/ion3/pkg-plist
@@ -60,4 +60,4 @@ share/doc/ion/ChangeLog
 @dirrm lib/ion
 @dirrm share/ion
 @dirrm share/doc/ion
-@unexec rmdir %D/etc/ion 2>/dev/null || true
+@dirrmtry etc/ion
diff --git a/x11-wm/vtwm/pkg-plist b/x11-wm/vtwm/pkg-plist
index 86318680eff8..f4e76dc5d55a 100644
--- a/x11-wm/vtwm/pkg-plist
+++ b/x11-wm/vtwm/pkg-plist
@@ -1,3 +1,3 @@
 bin/vtwm
 lib/X11/twm/system.vtwmrc
-@unexec rmdir %D/lib/X11/twm 2>/dev/null || true
+@dirrmtry lib/X11/twm
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index 4acf128fa655..f236d1f40ad2 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -139,24 +139,24 @@ share/xfce4/doc/he/images/xfdesktop-menu-tab.png
 share/xfce4/doc/he/images/xfdesktop-list.png
 share/xfce4/doc/he/xfdesktop.html
 @dirrm etc/xdg/xfce4/desktop
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/etc/xdg/xfce4 2>/dev/null || true
-@unexec rmdir %D/etc/xdg 2>/dev/null || true
-@unexec rmdir %D/etc/xfce4 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
-@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr 2>/dev/null || true
+@dirrmtry share/applications
+@dirrmtry etc/xdg/xfce4
+@dirrmtry etc/xdg
+@dirrmtry etc/xfce4
+@dirrmtry lib/xfce4/mcs-plugins
+@dirrmtry lib/xfce4
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrm share/xfce4/backdrops
-@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
-@unexec rmdir %D/share/xfce4 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
+@dirrmtry share/xfce4/doc/C/images
+@dirrmtry share/xfce4/doc/C
+@dirrmtry share/xfce4/doc/fr/images
+@dirrmtry share/xfce4/doc/fr
+@dirrmtry share/xfce4/doc/he/images
+@dirrmtry share/xfce4/doc/he
+@dirrmtry share/xfce4/doc
+@dirrmtry share/xfce4
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index 182e4776f82a..861f1f309caa 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -153,26 +153,26 @@ share/xfce4/doc/he/images/panel-settings.png
 share/xfce4/doc/he/images/systembuttons-properties.png
 share/xfce4/doc/he/xfce4-panel.html
 @dirrm etc/xdg/xfce4/panel
-@unexec rmdir %D/etc/xdg/xfce4 2>/dev/null || true
-@unexec rmdir %D/etc/xdg 2>/dev/null || true
-@unexec rmdir %D/etc/xfce4 2>/dev/null || true
+@dirrmtry etc/xdg/xfce4
+@dirrmtry etc/xdg
+@dirrmtry etc/xfce4
 @dirrm include/xfce4/panel
-@unexec rmdir %D/include/xfce4 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
-@unexec rmdir %D/share/xfce4 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
+@dirrmtry include/xfce4
+@dirrmtry lib/xfce4/mcs-plugins
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry lib/xfce4
+@dirrmtry share/applications
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/xfce4/doc/C/images
+@dirrmtry share/xfce4/doc/C
+@dirrmtry share/xfce4/doc/fr/images
+@dirrmtry share/xfce4/doc/fr
+@dirrmtry share/xfce4/doc/he/images
+@dirrmtry share/xfce4/doc/he
+@dirrmtry share/xfce4/doc
+@dirrmtry share/xfce4
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index bca50ea42720..bba889fbb209 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -88,28 +88,28 @@ share/xfce4/doc/he/images/xfsm-general.png
 share/xfce4/doc/he/images/xfsm-splash.png
 share/xfce4/doc/he/xfce4-session.html
 @dirrm etc/xdg/xfce4-session
-@unexec rmdir %D/etc/xdg 2>/dev/null || true
+@dirrmtry etc/xdg
 @dirrm include/xfce4/xfce4-session-4.2/libxfsm
 @dirrm include/xfce4/xfce4-session-4.2
-@unexec rmdir %D/include/xfce4 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr 2>/dev/null || true
+@dirrmtry include/xfce4
+@dirrmtry share/applications
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrm share/themes/Default/balou
-@unexec rmdir %D/share/themes/Default 2>/dev/null || true
-@unexec rmdir %D/share/themes 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
-@unexec rmdir %D/share/xfce4 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4/splash/engines 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4/splash 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
-@unexec rmdir %D/lib/pkgconfig 2>/dev/null || true
+@dirrmtry share/themes/Default
+@dirrmtry share/themes
+@dirrmtry share/xfce4/doc/C/images
+@dirrmtry share/xfce4/doc/C
+@dirrmtry share/xfce4/doc/fr/images
+@dirrmtry share/xfce4/doc/fr
+@dirrmtry share/xfce4/doc/he/images
+@dirrmtry share/xfce4/doc/he
+@dirrmtry share/xfce4/doc
+@dirrmtry share/xfce4
+@dirrmtry lib/xfce4/splash/engines
+@dirrmtry lib/xfce4/splash
+@dirrmtry lib/xfce4/mcs-plugins
+@dirrmtry lib/xfce4
+@dirrmtry lib/pkgconfig
diff --git a/x11-wm/xfce4-systray/pkg-plist b/x11-wm/xfce4-systray/pkg-plist
index 81178f037518..476a11784d06 100644
--- a/x11-wm/xfce4-systray/pkg-plist
+++ b/x11-wm/xfce4-systray/pkg-plist
@@ -1,3 +1,3 @@
 lib/xfce4/panel-plugins/libsystray.so
-@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry lib/xfce4
diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist
index 8909d7e8581d..a2ee360efb1d 100644
--- a/x11-wm/xfce4-wm/pkg-plist
+++ b/x11-wm/xfce4-wm/pkg-plist
@@ -721,37 +721,37 @@ share/xfce4/doc/he/images/workspace_margins.png
 share/xfce4/doc/he/images/xfwm_workspaces.png
 share/xfce4/doc/he/xfwm4.html
 share/xfwm4/defaults
-@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
-@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr 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/xfce4/doc/C/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
-@unexec rmdir %D/share/xfce4 2>/dev/null || true
+@dirrmtry lib/xfce4/mcs-plugins
+@dirrmtry lib/xfce4
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/xfce4/doc/C/images
+@dirrmtry share/xfce4/doc/C
+@dirrmtry share/xfce4/doc/fr/images
+@dirrmtry share/xfce4/doc/fr
+@dirrmtry share/xfce4/doc/he/images
+@dirrmtry share/xfce4/doc/he
+@dirrmtry share/xfce4/doc
+@dirrmtry share/xfce4
 @dirrm share/themes/Default/xfwm4
-@unexec rmdir %D/share/themes/Default 2>/dev/null || true
+@dirrmtry share/themes/Default
 @dirrm share/themes/Default-4.0/xfwm4
-@unexec rmdir %D/share/themes/Default-4.0 2>/dev/null || true
+@dirrmtry share/themes/Default-4.0
 @dirrm share/themes/Opta/xfwm4
-@unexec rmdir %D/share/themes/Opta 2>/dev/null || true
+@dirrmtry share/themes/Opta
 @dirrm share/themes/Symphony/xfwm4
-@unexec rmdir %D/share/themes/Symphony 2>/dev/null || true
+@dirrmtry share/themes/Symphony
 @dirrm share/themes/Therapy/xfwm4
-@unexec rmdir %D/share/themes/Therapy 2>/dev/null || true
+@dirrmtry share/themes/Therapy
 @dirrm share/themes/Tyrex/xfwm4
-@unexec rmdir %D/share/themes/Tyrex 2>/dev/null || true
+@dirrmtry share/themes/Tyrex
 @dirrm share/themes/Waza/xfwm4
-@unexec rmdir %D/share/themes/Waza 2>/dev/null || true
+@dirrmtry share/themes/Waza
 @dirrm share/themes/Wildbush/xfwm4
-@unexec rmdir %D/share/themes/Wildbush 2>/dev/null || true
-@unexec rmdir %D/share/xfwm4/themes 2>/dev/null || true
-@unexec rmdir %D/share/xfwm4 2>/dev/null || true
+@dirrmtry share/themes/Wildbush
+@dirrmtry share/xfwm4/themes
+@dirrmtry share/xfwm4