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

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

6 files changed, 11 insertions, 11 deletions

diff --git a/korean/FreeWnn-lib/pkg-plist b/korean/FreeWnn-lib/pkg-plist
index 05dda27ea63c..639e2d6f5af6 100644
--- a/korean/FreeWnn-lib/pkg-plist
+++ b/korean/FreeWnn-lib/pkg-plist
@@ -38,4 +38,4 @@ lib/libkwnn.so
 lib/libkwnn.so.0
 @dirrm lib/wnn/ko_KR/rk
 @dirrm lib/wnn/ko_KR
-@unexec rmdir %D/lib/wnn 2> /dev/null || true
+@dirrmtry lib/wnn
diff --git a/korean/hanemacs/pkg-plist b/korean/hanemacs/pkg-plist
index e58c018dafc2..d2e59ffc159e 100644
--- a/korean/hanemacs/pkg-plist
+++ b/korean/hanemacs/pkg-plist
@@ -12,8 +12,8 @@ bin/emacsclient
 etc/rc.d/emacs.sh
 @comment these two can fail if other ports are installed, no need to
 @comment scare user in that case
-@unexec rmdir %D/share/hanemacs/site-lisp 2>/dev/null || true
-@unexec rmdir %D/share/hanemacs/19.34/site-lisp 2>/dev/null || true
+@dirrmtry share/hanemacs/site-lisp
+@dirrmtry share/hanemacs/19.34/site-lisp
 @unexec install-info --delete %D/info/emacs %D/info/dir
 @unexec install-info --delete %D/info/vip %D/info/dir
 @unexec install-info --delete %D/info/viper %D/info/dir
@@ -126,7 +126,7 @@ libexec/hanemacs/19.34/i386--freebsd/vcdiff
 libexec/hanemacs/19.34/i386--freebsd/yow
 @dirrm libexec/hanemacs/19.34/i386--freebsd
 @dirrm libexec/hanemacs/19.34
-@unexec rmdir %D/libexec/hanemacs 2>/dev/null || true
+@dirrmtry libexec/hanemacs
 share/hanemacs/19.34/etc/3B-MAXMEM
 share/hanemacs/19.34/etc/AIX.DUMP
 share/hanemacs/19.34/etc/BABYL
diff --git a/korean/imhangul/pkg-plist b/korean/imhangul/pkg-plist
index 8eb251aba477..5c818d477d4e 100644
--- a/korean/imhangul/pkg-plist
+++ b/korean/imhangul/pkg-plist
@@ -1,4 +1,4 @@
 lib/gtk-2.0/immodules/im-hangul.la
 lib/gtk-2.0/immodules/im-hangul.so
 @unexec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
-@unexec rmdir %D/lib/gtk-2.0/immodules 2>/dev/null || true
+@dirrmtry lib/gtk-2.0/immodules
diff --git a/korean/munhwafonts-cid/pkg-plist b/korean/munhwafonts-cid/pkg-plist
index c6fe3aed10c2..be0dd9a35c95 100644
--- a/korean/munhwafonts-cid/pkg-plist
+++ b/korean/munhwafonts-cid/pkg-plist
@@ -30,5 +30,5 @@ share/ghostscript/fonts/MunhwaGothic-Bold-KSC-EUC-H.gsf
 share/ghostscript/fonts/MunhwaGothic-Regular
 share/ghostscript/fonts/MunhwaGothic-Regular-KSC-EUC-H.gsf
 @dirrm share/ghostscript/fonts/CMap
-@unexec rmdir %D/share/ghostscript/fonts 2> /dev/null || true
-@unexec rmdir %D/share/ghostscript 2> /dev/null || true
+@dirrmtry share/ghostscript/fonts
+@dirrmtry share/ghostscript
diff --git a/korean/scim-hangul/pkg-plist b/korean/scim-hangul/pkg-plist
index d280e2a67ebb..8fd392d0f8de 100644
--- a/korean/scim-hangul/pkg-plist
+++ b/korean/scim-hangul/pkg-plist
@@ -6,6 +6,6 @@ share/locale/ja/LC_MESSAGES/scim-hangul.mo
 share/locale/ko/LC_MESSAGES/scim-hangul.mo
 share/locale/zh_CN/LC_MESSAGES/scim-hangul.mo
 share/scim/icons/scim-hangul.png
-@unexec rmdir %D/share/scim/icons 2>/dev/null || true
-@unexec rmdir %D/lib/scim-1.0/IMEngine 2>/dev/null || true
-@unexec rmdir %D/lib/scim-1.0/SetupUI 2>/dev/null || true
+@dirrmtry share/scim/icons
+@dirrmtry lib/scim-1.0/IMEngine
+@dirrmtry lib/scim-1.0/SetupUI
diff --git a/korean/scim-tables/pkg-plist b/korean/scim-tables/pkg-plist
index 0777ce7ddf70..9987e4d27a18 100644
--- a/korean/scim-tables/pkg-plist
+++ b/korean/scim-tables/pkg-plist
@@ -3,4 +3,4 @@ share/scim/tables/HangulRomaja.bin
 share/scim/tables/Hanja.bin
 share/scim/icons/Hangul.png
 share/scim/icons/Hanja.png
-@unexec rmdir %D/share/scim/tables 2>/dev/null || true
+@dirrmtry share/scim/tables