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

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

12 files changed, 64 insertions, 64 deletions

diff --git a/print/gimp-print/pkg-plist b/print/gimp-print/pkg-plist
index b17889131a6e..e95bd54adbd7 100644
--- a/print/gimp-print/pkg-plist
+++ b/print/gimp-print/pkg-plist
@@ -4360,22 +4360,22 @@ share/locale/uk/LC_MESSAGES/gimp-print.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/figures
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%CUPS%%@unexec rmdir %D/share/cups/model/uk 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/sv 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/sk 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/pt 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/pl 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/no 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/nl 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/nb 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/ja 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/hu 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/fr 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/es 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/en_GB 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/el 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/de 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/da 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/cs 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/C 2>/dev/null || true
+%%CUPS%%@dirrmtry share/cups/model/uk
+%%CUPS%%@dirrmtry share/cups/model/sv
+%%CUPS%%@dirrmtry share/cups/model/sk
+%%CUPS%%@dirrmtry share/cups/model/pt
+%%CUPS%%@dirrmtry share/cups/model/pl
+%%CUPS%%@dirrmtry share/cups/model/no
+%%CUPS%%@dirrmtry share/cups/model/nl
+%%CUPS%%@dirrmtry share/cups/model/nb
+%%CUPS%%@dirrmtry share/cups/model/ja
+%%CUPS%%@dirrmtry share/cups/model/hu
+%%CUPS%%@dirrmtry share/cups/model/fr
+%%CUPS%%@dirrmtry share/cups/model/es
+%%CUPS%%@dirrmtry share/cups/model/en_GB
+%%CUPS%%@dirrmtry share/cups/model/el
+%%CUPS%%@dirrmtry share/cups/model/de
+%%CUPS%%@dirrmtry share/cups/model/da
+%%CUPS%%@dirrmtry share/cups/model/cs
+%%CUPS%%@dirrmtry share/cups/model/C
 @dirrm include/gimp-print
diff --git a/print/gutenprint-base/pkg-plist b/print/gutenprint-base/pkg-plist
index b17889131a6e..e95bd54adbd7 100644
--- a/print/gutenprint-base/pkg-plist
+++ b/print/gutenprint-base/pkg-plist
@@ -4360,22 +4360,22 @@ share/locale/uk/LC_MESSAGES/gimp-print.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/figures
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%CUPS%%@unexec rmdir %D/share/cups/model/uk 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/sv 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/sk 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/pt 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/pl 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/no 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/nl 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/nb 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/ja 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/hu 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/fr 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/es 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/en_GB 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/el 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/de 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/da 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/cs 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/C 2>/dev/null || true
+%%CUPS%%@dirrmtry share/cups/model/uk
+%%CUPS%%@dirrmtry share/cups/model/sv
+%%CUPS%%@dirrmtry share/cups/model/sk
+%%CUPS%%@dirrmtry share/cups/model/pt
+%%CUPS%%@dirrmtry share/cups/model/pl
+%%CUPS%%@dirrmtry share/cups/model/no
+%%CUPS%%@dirrmtry share/cups/model/nl
+%%CUPS%%@dirrmtry share/cups/model/nb
+%%CUPS%%@dirrmtry share/cups/model/ja
+%%CUPS%%@dirrmtry share/cups/model/hu
+%%CUPS%%@dirrmtry share/cups/model/fr
+%%CUPS%%@dirrmtry share/cups/model/es
+%%CUPS%%@dirrmtry share/cups/model/en_GB
+%%CUPS%%@dirrmtry share/cups/model/el
+%%CUPS%%@dirrmtry share/cups/model/de
+%%CUPS%%@dirrmtry share/cups/model/da
+%%CUPS%%@dirrmtry share/cups/model/cs
+%%CUPS%%@dirrmtry share/cups/model/C
 @dirrm include/gimp-print
diff --git a/print/gutenprint/pkg-plist b/print/gutenprint/pkg-plist
index b17889131a6e..e95bd54adbd7 100644
--- a/print/gutenprint/pkg-plist
+++ b/print/gutenprint/pkg-plist
@@ -4360,22 +4360,22 @@ share/locale/uk/LC_MESSAGES/gimp-print.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/figures
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%CUPS%%@unexec rmdir %D/share/cups/model/uk 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/sv 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/sk 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/pt 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/pl 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/no 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/nl 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/nb 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/ja 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/hu 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/fr 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/es 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/en_GB 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/el 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/de 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/da 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/cs 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/C 2>/dev/null || true
+%%CUPS%%@dirrmtry share/cups/model/uk
+%%CUPS%%@dirrmtry share/cups/model/sv
+%%CUPS%%@dirrmtry share/cups/model/sk
+%%CUPS%%@dirrmtry share/cups/model/pt
+%%CUPS%%@dirrmtry share/cups/model/pl
+%%CUPS%%@dirrmtry share/cups/model/no
+%%CUPS%%@dirrmtry share/cups/model/nl
+%%CUPS%%@dirrmtry share/cups/model/nb
+%%CUPS%%@dirrmtry share/cups/model/ja
+%%CUPS%%@dirrmtry share/cups/model/hu
+%%CUPS%%@dirrmtry share/cups/model/fr
+%%CUPS%%@dirrmtry share/cups/model/es
+%%CUPS%%@dirrmtry share/cups/model/en_GB
+%%CUPS%%@dirrmtry share/cups/model/el
+%%CUPS%%@dirrmtry share/cups/model/de
+%%CUPS%%@dirrmtry share/cups/model/da
+%%CUPS%%@dirrmtry share/cups/model/cs
+%%CUPS%%@dirrmtry share/cups/model/C
 @dirrm include/gimp-print
diff --git a/print/pkfonts300/pkg-plist.118 b/print/pkfonts300/pkg-plist.118
index 978a83ef2df2..ee25e7233df8 100644
--- a/print/pkfonts300/pkg-plist.118
+++ b/print/pkfonts300/pkg-plist.118
@@ -900,4 +900,4 @@ lib/fonts/pk118/msym9.118pk
 lib/fonts/pk118/msym9.129pk
 lib/fonts/pk118/msym9.142pk
 @dirrm lib/fonts/pk118
-@unexec rmdir %D/lib/fonts 2>/dev/null || true
+@dirrmtry lib/fonts
diff --git a/print/pkfonts300/pkg-plist.240 b/print/pkfonts300/pkg-plist.240
index 0c4882783e4d..54986780f426 100644
--- a/print/pkfonts300/pkg-plist.240
+++ b/print/pkfonts300/pkg-plist.240
@@ -726,4 +726,4 @@ lib/fonts/pk240/linew10.415pk
 lib/fonts/pk240/linew10.498pk
 lib/fonts/pk240/linew10.597pk
 @dirrm lib/fonts/pk240
-@unexec rmdir %D/lib/fonts 2>/dev/null || true
+@dirrmtry lib/fonts
diff --git a/print/pkfonts300/pkg-plist.300 b/print/pkfonts300/pkg-plist.300
index be5ddfedbef0..aac75d05ac6d 100644
--- a/print/pkfonts300/pkg-plist.300
+++ b/print/pkfonts300/pkg-plist.300
@@ -1282,4 +1282,4 @@ lib/fonts/pk300/msym9.240pk
 lib/fonts/pk300/msym9.263pk
 lib/fonts/pk300/msym9.288pk
 @dirrm lib/fonts/pk300
-@unexec rmdir %D/lib/fonts 2>/dev/null || true
+@dirrmtry lib/fonts
diff --git a/print/pkfonts300/pkg-plist.360 b/print/pkfonts300/pkg-plist.360
index ac3f192a1de5..df67a73efcde 100644
--- a/print/pkfonts300/pkg-plist.360
+++ b/print/pkfonts300/pkg-plist.360
@@ -624,4 +624,4 @@ lib/fonts/pk360/linew10.622pk
 lib/fonts/pk360/linew10.746pk
 lib/fonts/pk360/linew10.896pk
 @dirrm lib/fonts/pk360
-@unexec rmdir %D/lib/fonts 2>/dev/null || true
+@dirrmtry lib/fonts
diff --git a/print/pkfonts300/pkg-plist.400 b/print/pkfonts300/pkg-plist.400
index 9e366cd0df58..e89d3698b7a8 100644
--- a/print/pkfonts300/pkg-plist.400
+++ b/print/pkfonts300/pkg-plist.400
@@ -696,4 +696,4 @@ lib/fonts/pk400/linew10.829pk
 lib/fonts/pk400/linew10.995pk
 lib/fonts/pk400/logo50.400pk
 @dirrm lib/fonts/pk400
-@unexec rmdir %D/lib/fonts 2>/dev/null || true
+@dirrmtry lib/fonts
diff --git a/print/pkfonts300/pkg-plist.600 b/print/pkfonts300/pkg-plist.600
index e78751f34b3d..1592e23ab38a 100644
--- a/print/pkfonts300/pkg-plist.600
+++ b/print/pkfonts300/pkg-plist.600
@@ -552,4 +552,4 @@ lib/fonts/pk600/linew10.657pk
 lib/fonts/pk600/linew10.720pk
 lib/fonts/pk600/linew10.864pk
 @dirrm lib/fonts/pk600
-@unexec rmdir %D/lib/fonts 2>/dev/null || true
+@dirrmtry lib/fonts
diff --git a/print/yatex/pkg-plist.mule b/print/yatex/pkg-plist.mule
index af860d68ab92..752eeba7fd19 100644
--- a/print/yatex/pkg-plist.mule
+++ b/print/yatex/pkg-plist.mule
@@ -37,6 +37,6 @@ share/doc/yatex/yatexgen.doc
 share/doc/yatex/yatexj.tex
 share/doc/yatex/yatexref.eng
 @dirrm share/mule/site-lisp/yatex
-@unexec rmdir %D/share/mule/site-lisp 2>/dev/null || true
-@unexec rmdir %D/share/mule 2>/dev/null || true
+@dirrmtry share/mule/site-lisp
+@dirrmtry share/mule
 @dirrm share/doc/yatex
diff --git a/print/yatex/pkg-plist.xemacs b/print/yatex/pkg-plist.xemacs
index abc90e2e90b1..97ae7b3a16fd 100644
--- a/print/yatex/pkg-plist.xemacs
+++ b/print/yatex/pkg-plist.xemacs
@@ -25,5 +25,5 @@ share/doc/yatex/yahtmle.tex
 share/doc/yatex/yatexe.tex
 share/doc/yatex/yatexref.eng
 @dirrm lib/xemacs/site-packages/lisp/yatex
-@unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true
+@dirrmtry lib/xemacs/site-lisp
 @dirrm share/doc/yatex
diff --git a/print/yatex/pkg-plist.xemacs-mule b/print/yatex/pkg-plist.xemacs-mule
index a4b94e6c21cc..e052b6b406df 100644
--- a/print/yatex/pkg-plist.xemacs-mule
+++ b/print/yatex/pkg-plist.xemacs-mule
@@ -38,5 +38,5 @@ share/doc/yatex/yatexgen.doc
 share/doc/yatex/yatexj.tex
 share/doc/yatex/yatexref.eng
 @dirrm lib/xemacs/site-packages/lisp/yatex
-@unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true
+@dirrmtry lib/xemacs/site-lisp
 @dirrm share/doc/yatex