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

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

16 files changed, 29 insertions, 29 deletions

diff --git a/x11-themes/cursor-jimmac-theme/pkg-plist b/x11-themes/cursor-jimmac-theme/pkg-plist
index 948f20842ded..d2378aa37d23 100644
--- a/x11-themes/cursor-jimmac-theme/pkg-plist
+++ b/x11-themes/cursor-jimmac-theme/pkg-plist
@@ -53,4 +53,4 @@ lib/X11/icons/Jimmac/cursors/watch
 lib/X11/icons/Jimmac/cursors/xterm
 @dirrm lib/X11/icons/Jimmac/cursors
 @dirrm lib/X11/icons/Jimmac
-@unexec rmdir %D/lib/X11/icons 2>/dev/null || true
+@dirrmtry lib/X11/icons
diff --git a/x11-themes/cursor-polar-theme/pkg-plist b/x11-themes/cursor-polar-theme/pkg-plist
index 7a0136e7e834..004ec3b92595 100644
--- a/x11-themes/cursor-polar-theme/pkg-plist
+++ b/x11-themes/cursor-polar-theme/pkg-plist
@@ -75,4 +75,4 @@ lib/X11/icons/PolarCursorTheme/cursors/watch
 lib/X11/icons/PolarCursorTheme/cursors/xterm
 @dirrm lib/X11/icons/PolarCursorTheme/cursors
 @dirrm lib/X11/icons/PolarCursorTheme
-@unexec rmdir %D/lib/X11/icons 2>/dev/null || true
+@dirrmtry lib/X11/icons
diff --git a/x11-themes/fvwm-themes/pkg-plist b/x11-themes/fvwm-themes/pkg-plist
index f2369c823660..393fe68d2a32 100644
--- a/x11-themes/fvwm-themes/pkg-plist
+++ b/x11-themes/fvwm-themes/pkg-plist
@@ -1615,4 +1615,4 @@ share/fvwm/themes/unsafe/menustyle.cfg
 @dirrm share/fvwm/images/32x32
 @dirrm share/fvwm/images/16x16-kde
 @dirrm share/fvwm/images
-@unexec rmdir %D/share/fvwm 2>/dev/null || true
+@dirrmtry share/fvwm
diff --git a/x11-themes/gnome-art/pkg-plist b/x11-themes/gnome-art/pkg-plist
index d786436d145b..8d22fa4d1ae3 100644
--- a/x11-themes/gnome-art/pkg-plist
+++ b/x11-themes/gnome-art/pkg-plist
@@ -16,4 +16,4 @@ bin/gnome-art
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist
index 35e7a111788f..c2f18532fd34 100644
--- a/x11-themes/gnome-backgrounds/pkg-plist
+++ b/x11-themes/gnome-backgrounds/pkg-plist
@@ -63,16 +63,16 @@ share/locale/uk/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/vi/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-backgrounds.mo
-@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/te 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
-@unexec rmdir %D/share/locale/ky/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ky 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku 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
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
 @dirrm share/gnome/pixmaps/backgrounds/gnome/translucent
 @dirrm share/gnome/pixmaps/backgrounds/gnome/tiles
 @dirrm share/gnome/pixmaps/backgrounds/gnome/branded
diff --git a/x11-themes/gnome-industrial-theme/pkg-plist b/x11-themes/gnome-industrial-theme/pkg-plist
index a3632beb6172..d74125d850e5 100644
--- a/x11-themes/gnome-industrial-theme/pkg-plist
+++ b/x11-themes/gnome-industrial-theme/pkg-plist
@@ -217,5 +217,5 @@ share/themes/Industrial/index.theme
 @dirrm share/icons/Industrial
 @dirrm share/gnome/themes/Industrial/metacity-1
 @dirrm share/gnome/themes/Industrial
-@unexec rmdir %D/share/themes/Industrial 2>/dev/null || true
+@dirrmtry share/themes/Industrial
 %%XMMS%%@dirrm share/xmms/Skins/Industrial
diff --git a/x11-themes/gnome-splashscreen-manager/pkg-plist b/x11-themes/gnome-splashscreen-manager/pkg-plist
index 812ea627450c..929a2d5703a2 100644
--- a/x11-themes/gnome-splashscreen-manager/pkg-plist
+++ b/x11-themes/gnome-splashscreen-manager/pkg-plist
@@ -11,4 +11,4 @@ share/applications/gnome-splashscreen-manager.desktop
 @dirrm %%RUBY_SITELIBDIR%%/gnome-splashscreen-manager
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index 1a1c5e2ce58c..53ba911792ae 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -1933,8 +1933,8 @@ share/themes/Traditional/index.theme
 @dirrm share/themes/Glider
 @dirrm share/themes/Crux
 @dirrm share/themes/Clearlooks
-@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ug 2> /dev/null || true
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
 @dirrm share/icons/Smokey-Red/96x96/filesystems
 @dirrm share/icons/Smokey-Red/96x96
 @dirrm share/icons/Smokey-Red/72x72/filesystems
diff --git a/x11-themes/gtk-industrial-theme/pkg-plist b/x11-themes/gtk-industrial-theme/pkg-plist
index 909aed8c0bff..7be8930d3113 100644
--- a/x11-themes/gtk-industrial-theme/pkg-plist
+++ b/x11-themes/gtk-industrial-theme/pkg-plist
@@ -1,4 +1,4 @@
 lib/gtk/themes/engines/libindustrial.so
 share/themes/Industrial/gtk/gtkrc
 @dirrm share/themes/Industrial/gtk
-@unexec rmdir %D/share/themes/Industrial 2>/dev/null || true
+@dirrmtry share/themes/Industrial
diff --git a/x11-themes/gtk-qnxtheme/pkg-plist b/x11-themes/gtk-qnxtheme/pkg-plist
index bb02d9b74b75..8a1ddff05bc3 100644
--- a/x11-themes/gtk-qnxtheme/pkg-plist
+++ b/x11-themes/gtk-qnxtheme/pkg-plist
@@ -75,4 +75,4 @@ share/themes/qnxtheme/gtk/vbuttonbar.png
 %%GTK2%%@dirrm share/themes/qnxtheme/gtk-2.0
 @dirrm share/themes/qnxtheme/gtk
 @dirrm share/themes/qnxtheme
-@unexec rmdir %D/share/themes 2>/dev/null || true
+@dirrmtry share/themes
diff --git a/x11-themes/gtk-xfce-engine/pkg-plist b/x11-themes/gtk-xfce-engine/pkg-plist
index b32b6ebbef7a..2153e8bd0f6b 100644
--- a/x11-themes/gtk-xfce-engine/pkg-plist
+++ b/x11-themes/gtk-xfce-engine/pkg-plist
@@ -50,7 +50,7 @@ share/themes/Xfce/gtk-2.0/gtkrc
 @dirrm share/themes/Xfce-4.0/gtk-2.0
 @dirrm share/themes/Xfce-4.0
 @dirrm share/themes/Xfce/gtk-2.0
-@unexec rmdir %D/share/themes/Xfce 2>/dev/null || true
+@dirrmtry share/themes/Xfce
 @dirrm share/themes/Xfce-cadmium/gtk-2.0
 @dirrm share/themes/Xfce-cadmium
 @dirrm share/themes/Xfce-dawn/gtk-2.0
diff --git a/x11-themes/kde-icons-lime-rade8/pkg-plist b/x11-themes/kde-icons-lime-rade8/pkg-plist
index 12a965db78b7..4c0f5796b5a6 100644
--- a/x11-themes/kde-icons-lime-rade8/pkg-plist
+++ b/x11-themes/kde-icons-lime-rade8/pkg-plist
@@ -3936,4 +3936,4 @@ share/icons/%%DIRNAME%%/index.desktop.bak
 @dirrm share/icons/%%DIRNAME%%/128x128/apps
 @dirrm share/icons/%%DIRNAME%%/128x128
 @dirrm share/icons/%%DIRNAME%%
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons
diff --git a/x11-themes/kde-icons-realistic/pkg-plist b/x11-themes/kde-icons-realistic/pkg-plist
index 71f264915859..a5182020f647 100644
--- a/x11-themes/kde-icons-realistic/pkg-plist
+++ b/x11-themes/kde-icons-realistic/pkg-plist
@@ -2003,4 +2003,4 @@ share/icons/%%DIRNAME%%/index.desktop.bak
 @dirrm share/icons/%%DIRNAME%%/128x128/actions
 @dirrm share/icons/%%DIRNAME%%/128x128
 @dirrm share/icons/%%DIRNAME%%
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons
diff --git a/x11-themes/lila-xfwm4/pkg-plist b/x11-themes/lila-xfwm4/pkg-plist
index bd56a17fe87b..b536136647c9 100644
--- a/x11-themes/lila-xfwm4/pkg-plist
+++ b/x11-themes/lila-xfwm4/pkg-plist
@@ -75,4 +75,4 @@ share/themes/Lila-light/xfwm4/title-2-active.xpm
 @dirrm share/themes/Lila/xfwm4
 @dirrm share/themes/Lila-light
 @dirrm share/themes/Lila
-@unexec rmdir %D/share/themes 2>/dev/null || true
+@dirrmtry share/themes
diff --git a/x11-themes/qt-bluecurve-theme/pkg-plist b/x11-themes/qt-bluecurve-theme/pkg-plist
index 32bdf57828be..d8409f19dbc9 100644
--- a/x11-themes/qt-bluecurve-theme/pkg-plist
+++ b/x11-themes/qt-bluecurve-theme/pkg-plist
@@ -2,5 +2,5 @@
 etc/settings/qtrc.bluecurve
 @exec [ -f %B/qtrc ] || cp %B/qtrc.bluecurve %B/qtrc
 lib/plugins/styles/bluecurve.so
-@unexec rmdir %D/etc/settings 2>/dev/null || true
-@unexec rmdir %D/lib/plugins/styles 2>/dev/null || true
+@dirrmtry etc/settings
+@dirrmtry lib/plugins/styles
diff --git a/x11-themes/xfce4-icon-theme/pkg-plist b/x11-themes/xfce4-icon-theme/pkg-plist
index 0a5bf91cd328..14eb17887774 100644
--- a/x11-themes/xfce4-icon-theme/pkg-plist
+++ b/x11-themes/xfce4-icon-theme/pkg-plist
@@ -1231,6 +1231,6 @@ share/xfce4/mime/Rodent.mime.xml
 @dirrm share/icons/Rodent/scalable/stock
 @dirrm share/icons/Rodent/scalable
 @dirrm share/icons/Rodent
-@unexec rmdir %D/share/icons 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/mime 2>/dev/null || true
-@unexec rmdir %D/share/xfce4 2>/dev/null || true
+@dirrmtry share/icons
+@dirrmtry share/xfce4/mime
+@dirrmtry share/xfce4