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

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

10 files changed, 21 insertions, 21 deletions

diff --git a/japanese/iiimf-le-canna/pkg-plist b/japanese/iiimf-le-canna/pkg-plist
index 739e6727c515..d40fcee0a463 100644
--- a/japanese/iiimf-le-canna/pkg-plist
+++ b/japanese/iiimf-le-canna/pkg-plist
@@ -4,4 +4,4 @@ lib/iiim/le/CannaLE/aux.la
 lib/iiim/le/CannaLE/aux.a
 lib/iiim/le/CannaLE/auxmenu
 @dirrm lib/iiim/le/CannaLE
-@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true
+@dirrmtry lib/iiim/le
diff --git a/japanese/iiimf-le-freewnn/pkg-plist b/japanese/iiimf-le-freewnn/pkg-plist
index fdc944d0defc..af9a714942fd 100644
--- a/japanese/iiimf-le-freewnn/pkg-plist
+++ b/japanese/iiimf-le-freewnn/pkg-plist
@@ -1,3 +1,3 @@
 lib/iiim/le/FreeWnnLE/FreeWnnLE.so
 @dirrm lib/iiim/le/FreeWnnLE
-@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true
+@dirrmtry lib/iiim/le
diff --git a/japanese/mell/pkg-plist b/japanese/mell/pkg-plist
index d03071871457..e80d8c325189 100644
--- a/japanese/mell/pkg-plist
+++ b/japanese/mell/pkg-plist
@@ -10,4 +10,4 @@ share/emacs/site-lisp/mell/mell-string.el
 share/emacs/site-lisp/mell/mell.el
 @dirrmtry share/emacs/site-lisp/mell
 %%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
diff --git a/japanese/migemo/pkg-plist b/japanese/migemo/pkg-plist
index 2ed4e42d3933..76e47205dd49 100644
--- a/japanese/migemo/pkg-plist
+++ b/japanese/migemo/pkg-plist
@@ -18,4 +18,4 @@
 %%MIGEMO%%share/migemo/user-dict.sample
 %%MIGEMO%%share/migemo/regex-dict.sample
 %%MIGEMO%%@dirrm share/migemo
-%%ELISP%%@unexec rmdir %D/%%EMACS_SITE_LISPDIR%% 2>/dev/null || true
+%%ELISP%%@dirrmtry %%EMACS_SITE_LISPDIR%%
diff --git a/japanese/navi2ch-emacs20/pkg-plist b/japanese/navi2ch-emacs20/pkg-plist
index 19ce0d6cfc1c..e80bd3544b92 100644
--- a/japanese/navi2ch-emacs20/pkg-plist
+++ b/japanese/navi2ch-emacs20/pkg-plist
@@ -76,4 +76,4 @@ share/doc/ja/navi2ch/contrib/navi2ch-migemo.el
 %%LISPDIR%%/navi2ch/navi2ch.el
 %%LISPDIR%%/navi2ch/navi2ch.elc
 @dirrm %%LISPDIR%%/navi2ch
-%%FSF%%@unexec rmdir %D/%%LISPDIR%% 2>/dev/null || true
+%%FSF%%@dirrmtry %%LISPDIR%%
diff --git a/japanese/perl5/pkg-plist b/japanese/perl5/pkg-plist
index e416663df002..4332027c9eef 100644
--- a/japanese/perl5/pkg-plist
+++ b/japanese/perl5/pkg-plist
@@ -536,8 +536,8 @@ lib/perl5/%%JPERL_VERSION%%/vars.pm
 @dirrmtry lib/perl5/site_perl/%%JPERL_VER%%
 @dirrmtry lib/perl5/site_perl
 @dirrmtry lib/perl5/%%JPERL_VERSION%%/pod
-%%NOTON4%%@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/man/man3 2>/dev/null || true
-%%NOTON4%%@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/man 2>/dev/null || true
+%%NOTON4%%@dirrmtry lib/perl5/%%JPERL_VERSION%%/man/man3
+%%NOTON4%%@dirrmtry lib/perl5/%%JPERL_VERSION%%/man
 @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/sdbm
 @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/re
 @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/attrs
@@ -608,5 +608,5 @@ lib/perl5/%%JPERL_VERSION%%/vars.pm
 @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/CORE
 @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/B
 @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%
-%%NOTON4%%@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%% 2>/dev/null || true
+%%NOTON4%%@dirrmtry lib/perl5/%%JPERL_VERSION%%
 @dirrmtry lib/perl5
diff --git a/japanese/prime-el/pkg-plist b/japanese/prime-el/pkg-plist
index fc73393a762a..f2f7e4b3c53a 100644
--- a/japanese/prime-el/pkg-plist
+++ b/japanese/prime-el/pkg-plist
@@ -39,8 +39,8 @@ etc/prime/Custom_prime-el.el
 %%PORTDOCS%%%%DOCSDIR%%/emacs/customize.html
 %%PORTDOCS%%%%DOCSDIR%%/emacs/usage.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/Custom_prime-el.el
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/emacs/figures/screenshots 2>/dev/null || true
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/emacs/figures 2>/dev/null || true
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/emacs 2>/dev/null || true
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/examples 2>/dev/null || true
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/emacs/figures/screenshots
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/emacs/figures
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/emacs
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
diff --git a/japanese/prime/pkg-plist b/japanese/prime/pkg-plist
index b22e48286efc..37913e5a6b21 100644
--- a/japanese/prime/pkg-plist
+++ b/japanese/prime/pkg-plist
@@ -72,7 +72,7 @@ etc/prime/Custom_prime.rb
 %%PORTDOCS%%%%DOCSDIR%%/usage.html
 %%PORTDOCS%%%%DOCSDIR%%/taiyaki.css
 %%PORTDOCS%%%%DOCSDIR%%/taiyaki.png
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/examples 2>/dev/null || true
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/figures 2>/dev/null || true
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/uim 2>/dev/null || true
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/figures
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/uim
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
diff --git a/japanese/skk-jisyo/pkg-plist b/japanese/skk-jisyo/pkg-plist
index 28f66865c6d8..22c0d9fff841 100644
--- a/japanese/skk-jisyo/pkg-plist
+++ b/japanese/skk-jisyo/pkg-plist
@@ -1 +1 @@
-@unexec rmdir %D/%%SKKDIR%% > /dev/null 2>&1 || true
+@dirrmtry %%SKKDIR%%
diff --git a/japanese/suikyo/pkg-plist b/japanese/suikyo/pkg-plist
index 2894f4b27d3c..fe2b999f0cf9 100644
--- a/japanese/suikyo/pkg-plist
+++ b/japanese/suikyo/pkg-plist
@@ -43,6 +43,6 @@ libdata/pkgconfig/suikyo.pc
 %%PORTDOCS%%%%DOCSDIR%%/elisp/index.html
 %%PORTDOCS%%%%DOCSDIR%%/ruby/index.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/elisp 2>/dev/null || true
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/ruby 2>/dev/null || true
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/elisp
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/ruby
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%