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

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

4 files changed, 12 insertions, 12 deletions

diff --git a/editors/joe2/pkg-plist b/editors/joe2/pkg-plist
index f3fdcfa..f8039bf 100644
--- a/editors/joe2/pkg-plist
+++ b/editors/joe2/pkg-plist
@@ -15,5 +15,5 @@ etc/joe/jpicorc
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.cvs
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @dirrmtry etc/joe
diff --git a/editors/mp/pkg-plist b/editors/mp/pkg-plist
index e7adb13..1f1c26b 100644
--- a/editors/mp/pkg-plist
+++ b/editors/mp/pkg-plist
@@ -14,8 +14,8 @@ bin/mp
 %%NLS%%share/locale/es/LC_MESSAGES/minimum-profit.mo
 %%NLS%%share/locale/it/LC_MESSAGES/minimum-profit.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/minimum-profit.mo
-%%NLS%%@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
 @dirrm %%DOCSDIR%%
diff --git a/editors/xemacs-devel-mule/pkg-plist.arch-dep b/editors/xemacs-devel-mule/pkg-plist.arch-dep
index 8817c10..415715b 100644
--- a/editors/xemacs-devel-mule/pkg-plist.arch-dep
+++ b/editors/xemacs-devel-mule/pkg-plist.arch-dep
@@ -405,9 +405,9 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow
 @exec ln -sf ja %D/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.eucJP
 @unexec rm -f %D/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.eucJP
-@unexec rmdir %D/lib/xemacs/mule-packages/etc/app-defaults 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/mule-packages/etc 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/mule-packages 2>/dev/null || true
+@dirrmtry lib/xemacs/mule-packages/etc/app-defaults
+@dirrmtry lib/xemacs/mule-packages/etc
+@dirrmtry lib/xemacs/mule-packages
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include
diff --git a/editors/xemacs21-mule/pkg-plist.arch-dep b/editors/xemacs21-mule/pkg-plist.arch-dep
index c2846c4..a6a40f0 100644
--- a/editors/xemacs21-mule/pkg-plist.arch-dep
+++ b/editors/xemacs21-mule/pkg-plist.arch-dep
@@ -377,14 +377,14 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow
 @exec ln -sf ja %D/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.eucJP
 @unexec rm -f %D/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.eucJP
-@unexec rmdir %D/lib/xemacs/mule-packages/etc/app-defaults 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/mule-packages/etc 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/mule-packages 2>/dev/null || true
+@dirrmtry lib/xemacs/mule-packages/etc/app-defaults
+@dirrmtry lib/xemacs/mule-packages/etc
+@dirrmtry lib/xemacs/mule-packages
 @dirrm lib/xemacs/site-lisp
 @dirrm lib/xemacs/site-modules
 @dirrm lib/xemacs
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include
-@unexec rmdir %D/lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules 2>/dev/null || true
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%