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

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

6 files changed, 28 insertions, 28 deletions

diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index 88bec4c1e7a..9664e6c246c 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -110,17 +110,17 @@ share/locale/zh_CN/LC_MESSAGES/atk10.mo
 share/locale/zh_TW/LC_MESSAGES/atk10.mo
 @dirrm %%DOCSDIR%%
 @exec mkdir -p %D/%%DOCSDIR%%
-@unexec rmdir %D/share/locale/as/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/as 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/li/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/li 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/tk/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/tk 2> /dev/null || true
-@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/as/LC_MESSAGES
+@dirrmtry share/locale/as
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
 @dirrm include/atk-1.0/atk
 @dirrm include/atk-1.0
diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist
index 1f6aa03b3f0..baf14dc3aa7 100644
--- a/accessibility/dasher/pkg-plist
+++ b/accessibility/dasher/pkg-plist
@@ -250,8 +250,8 @@ share/locale/ug/LC_MESSAGES/dasher.mo
 share/locale/uk/LC_MESSAGES/dasher.mo
 share/locale/zh_CN/LC_MESSAGES/dasher.mo
 share/locale/zh_TW/LC_MESSAGES/dasher.mo
-@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/gnome/omf/dasher
 @dirrm share/gnome/help/dasher/eu/figures
 @dirrm share/gnome/help/dasher/eu
diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist
index 5d46f0d5be4..55bca627a18 100644
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@@ -84,7 +84,7 @@ share/locale/zh_TW/LC_MESSAGES/gail.mo
 @dirrm include/gail-1.0/libgail-util
 @dirrm include/gail-1.0
 @dirrm share/doc/gail-libgail-util
-@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/as/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/as 2> /dev/null || true
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/accessibility/gnome-mag/pkg-plist b/accessibility/gnome-mag/pkg-plist
index f08199c1358..a617b34619a 100644
--- a/accessibility/gnome-mag/pkg-plist
+++ b/accessibility/gnome-mag/pkg-plist
@@ -94,10 +94,10 @@ share/locale/uk/LC_MESSAGES/gnome-mag.mo
 share/locale/vi/LC_MESSAGES/gnome-mag.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-mag.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
-@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ug 2> /dev/null || true
-@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ang 2> /dev/null || true
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/ang/LC_MESSAGES
+@dirrmtry share/locale/ang
 @dirrm share/gnome/idl/gnome-mag-1.0
 @dirrm share/gnome/gnome-mag/1_32
 @dirrm share/gnome/gnome-mag
diff --git a/accessibility/gnomemag/pkg-plist b/accessibility/gnomemag/pkg-plist
index f08199c1358..a617b34619a 100644
--- a/accessibility/gnomemag/pkg-plist
+++ b/accessibility/gnomemag/pkg-plist
@@ -94,10 +94,10 @@ share/locale/uk/LC_MESSAGES/gnome-mag.mo
 share/locale/vi/LC_MESSAGES/gnome-mag.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-mag.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
-@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ug 2> /dev/null || true
-@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ang 2> /dev/null || true
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/ang/LC_MESSAGES
+@dirrmtry share/locale/ang
 @dirrm share/gnome/idl/gnome-mag-1.0
 @dirrm share/gnome/gnome-mag/1_32
 @dirrm share/gnome/gnome-mag
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index 0194363683d..a460e052dfd 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -624,8 +624,8 @@ share/locale/uk/LC_MESSAGES/gok.mo
 share/locale/vi/LC_MESSAGES/gok.mo
 share/locale/zh_CN/LC_MESSAGES/gok.mo
 share/locale/zh_TW/LC_MESSAGES/gok.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/omf/gok
 @dirrm share/gnome/help/gok/C
 @dirrm share/gnome/help/gok