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

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

19 files changed, 41 insertions, 41 deletions

diff --git a/chinese/CJK/pkg-plist b/chinese/CJK/pkg-plist
index f06c1a409392..5374fc02b2b2 100644
--- a/chinese/CJK/pkg-plist
+++ b/chinese/CJK/pkg-plist
@@ -475,7 +475,7 @@ share/texmf/tex/latex/CJK/thai/thaicjk.ldf
 @dirrm share/texmf/fonts/tfm/arphic/argbkai
 @dirrm share/texmf/fonts/tfm/arphic/argbsung
 @dirrm share/texmf/fonts/tfm/arphic
-@unexec rmdir %D/share/texmf/fonts/truetype/arphic 2>/dev/null || true
+@dirrmtry share/texmf/fonts/truetype/arphic
 @dirrm share/texmf/hbf2gf
 @dirrm share/texmf/tex/latex/CJK/Bg5
 @dirrm share/texmf/tex/latex/CJK/CEF
diff --git a/chinese/auto-tw-l10n/pkg-plist b/chinese/auto-tw-l10n/pkg-plist
index cd5a99af0ae0..4eb95abdacce 100644
--- a/chinese/auto-tw-l10n/pkg-plist
+++ b/chinese/auto-tw-l10n/pkg-plist
@@ -10,4 +10,4 @@ share/skel/zh_TW.Big5/dot.vimrc
 share/skel/zh_TW.Big5/dot.xinitrc
 share/skel/zh_TW.Big5/make.conf
 share/skel/zh_TW.Big5/outta-port.supfile
-@unexec rmdir %D/share/skel/zh_TW.Big5 2>/dev/null || true
+@dirrmtry share/skel/zh_TW.Big5
diff --git a/chinese/firebird/pkg-plist b/chinese/firebird/pkg-plist
index eb141a4874c4..abf1ad9a4a73 100644
--- a/chinese/firebird/pkg-plist
+++ b/chinese/firebird/pkg-plist
@@ -591,5 +591,5 @@ bbs/boards/notepad/M.960994672.A
 @dirrm bbs/0Announce/bms
 @dirrm bbs/0Announce/bbslist
 @dirrm bbs/0Announce
-@unexec rmdir %D/bbs/log 2>/dev/null || true
+@dirrmtry bbs/log
 @dirrm bbs
diff --git a/chinese/iiimf-le-chewing/pkg-plist b/chinese/iiimf-le-chewing/pkg-plist
index 19a46f37995f..2207cebccf64 100644
--- a/chinese/iiimf-le-chewing/pkg-plist
+++ b/chinese/iiimf-le-chewing/pkg-plist
@@ -1,3 +1,3 @@
 lib/im/leif/chewing.so
-@unexec rmdir %D/lib/im/leif 2>/dev/null || true
-@unexec rmdir %D/lib/im 2>/dev/null || true
+@dirrmtry lib/im/leif
+@dirrmtry lib/im
diff --git a/chinese/iiimf-le-xcin/pkg-plist b/chinese/iiimf-le-xcin/pkg-plist
index c612b08a9db5..cb305d174c0b 100644
--- a/chinese/iiimf-le-xcin/pkg-plist
+++ b/chinese/iiimf-le-xcin/pkg-plist
@@ -16,7 +16,7 @@ lib/iiim/locale/zh_TW/xcin/tab/sys.tab
 lib/iiim/locale/zh_TW/xcin/tab/telecode.tab
 @dirrm lib/iiim/locale/zh_TW/xcin/tab
 @dirrm lib/iiim/locale/zh_TW/xcin
-@unexec rmdir %D/lib/iiim/locale/zh_TW 2>/dev/null || true
-@unexec rmdir %D/lib/iiim/locale 2>/dev/null || true
-@unexec rmdir %D/lib/iiim/le/xcin 2>/dev/null || true
-@unexec rmdir %D/lib/iiim/le 2>/dev/null || true
+@dirrmtry lib/iiim/locale/zh_TW
+@dirrmtry lib/iiim/locale
+@dirrmtry lib/iiim/le/xcin
+@dirrmtry lib/iiim/le
diff --git a/chinese/lunar/pkg-plist b/chinese/lunar/pkg-plist
index 84285b79ad5b..171c713a3971 100644
--- a/chinese/lunar/pkg-plist
+++ b/chinese/lunar/pkg-plist
@@ -1,4 +1,4 @@
 @comment $FreeBSD$
 bin/lunar
 share/chinese/lunar.bitmap
-@unexec rmdir %D/share/chinese 2>/dev/null || true
+@dirrmtry share/chinese
diff --git a/chinese/msttf/pkg-plist b/chinese/msttf/pkg-plist
index cadb49339013..4df0d5dd603e 100644
--- a/chinese/msttf/pkg-plist
+++ b/chinese/msttf/pkg-plist
@@ -1,5 +1,5 @@
 share/fonts/TrueType/simhei.ttf
 share/fonts/TrueType/simsun.ttc
 share/fonts/TrueType/tahoma.ttf
-@unexec rmdir %D/share/fonts/TrueType 2>/dev/null || true
-@unexec rmdir %D/share/fonts 2>/dev/null || true
+@dirrmtry share/fonts/TrueType
+@dirrmtry share/fonts
diff --git a/chinese/p5-Encode-HanConvert/pkg-plist b/chinese/p5-Encode-HanConvert/pkg-plist
index 1cd13f83b8b7..f1c7d3f2e99a 100644
--- a/chinese/p5-Encode-HanConvert/pkg-plist
+++ b/chinese/p5-Encode-HanConvert/pkg-plist
@@ -10,7 +10,7 @@ bin/g2b.pl
 %%NEW%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanConvert/HanConvert.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanConvert/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanConvert
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode
 %%OLD%%@dirrm %%SITE_PERL%%/Encode/HanConvert
 %%OLD%%@unexec rmdir %D/%%SITE_PERL%%/Encode 2>/dev/null || true
 %%NEW%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanConvert
diff --git a/chinese/p5-Encode-HanExtra/pkg-plist b/chinese/p5-Encode-HanExtra/pkg-plist
index e9213012f43f..511f93983628 100644
--- a/chinese/p5-Encode-HanExtra/pkg-plist
+++ b/chinese/p5-Encode-HanExtra/pkg-plist
@@ -6,7 +6,7 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode/ConfigLocal.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/TW/Unisys/SOSI1.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/TW/Unisys/SOSI2.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanExtra
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Encode/TW/Unisys
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Encode/TW
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Encode 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode
diff --git a/chinese/p5-Lingua-ZH-TaBE/pkg-plist b/chinese/p5-Lingua-ZH-TaBE/pkg-plist
index 24f46aff424d..c377ca4ba91a 100644
--- a/chinese/p5-Lingua-ZH-TaBE/pkg-plist
+++ b/chinese/p5-Lingua-ZH-TaBE/pkg-plist
@@ -4,6 +4,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/TaBE/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/TaBE
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Lingua/ZH 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Lingua/ZH
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Lingua
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
diff --git a/chinese/p5-Lingua-ZH-Toke/pkg-plist b/chinese/p5-Lingua-ZH-Toke/pkg-plist
index 479fca35a85e..d74b87edb403 100644
--- a/chinese/p5-Lingua-ZH-Toke/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Toke/pkg-plist
@@ -1,7 +1,7 @@
 %%SITE_PERL%%/Lingua/ZH/Toke.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Toke/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Toke
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/ZH 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/ZH
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/chinese/pcmanx/pkg-plist b/chinese/pcmanx/pkg-plist
index ad5e880825d9..c39c5bec73bb 100644
--- a/chinese/pcmanx/pkg-plist
+++ b/chinese/pcmanx/pkg-plist
@@ -14,7 +14,7 @@ lib/libpcmanx_core.so.0
 %%DATADIR%%/nancy_bot/example_usages.data
 share/applications/pcmanx.desktop
 share/pixmaps/pcmanx.png
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/nancy_bot 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/script 2>/dev/null || true
+@dirrmtry share/applications
+@dirrmtry %%DATADIR%%/nancy_bot
+@dirrmtry %%DATADIR%%/script
 @dirrm %%DATADIR%%
diff --git a/chinese/phpbb-tw/pkg-plist b/chinese/phpbb-tw/pkg-plist
index d3ad757e8f43..b627736bde44 100644
--- a/chinese/phpbb-tw/pkg-plist
+++ b/chinese/phpbb-tw/pkg-plist
@@ -344,17 +344,17 @@
 @exec touch %B/config.php
 @exec chown -R %%WWWOWN%%:%%WWWGRP%% %B
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/doc 2>/dev/null || true
+@dirrmtry share/doc
 @dirrm %%DATADIR%%/contrib
 @dirrm %%DATADIR%%
 @dirrm %%PHPBBDIR%%/admin
 @dirrm %%PHPBBDIR%%/cache
 @dirrm %%PHPBBDIR%%/db
 @dirrm %%PHPBBDIR%%/images/smiles
-@unexec rmdir %D/%%PHPBBDIR%%/images/avatars/gallery 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/images/avatars/upload 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/images/avatars 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/images 2>/dev/null || true
+@dirrmtry %%PHPBBDIR%%/images/avatars/gallery
+@dirrmtry %%PHPBBDIR%%/images/avatars/upload
+@dirrmtry %%PHPBBDIR%%/images/avatars
+@dirrmtry %%PHPBBDIR%%/images
 @dirrm %%PHPBBDIR%%/includes
 @dirrm %%PHPBBDIR%%/install/schemas
 @dirrm %%PHPBBDIR%%/install
@@ -362,11 +362,11 @@
 @dirrm %%PHPBBDIR%%/language/lang_chinese_traditional_taiwan
 @dirrm %%PHPBBDIR%%/language/lang_english/email
 @dirrm %%PHPBBDIR%%/language/lang_english
-@unexec rmdir %D/%%PHPBBDIR%%/language 2>/dev/null || true
+@dirrmtry %%PHPBBDIR%%/language
 @dirrm %%PHPBBDIR%%/templates/subSilver/admin
 @dirrm %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/
 @dirrm %%PHPBBDIR%%/templates/subSilver/images/lang_english
-@unexec rmdir %D/%%PHPBBDIR%%/templates/subSilver/images 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/templates/subSilver 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/templates 2>/dev/null || true
+@dirrmtry %%PHPBBDIR%%/templates/subSilver/images
+@dirrmtry %%PHPBBDIR%%/templates/subSilver
+@dirrmtry %%PHPBBDIR%%/templates
 @unexec rmdir %D/%%PHPBBDIR%% 2>/dev/null || echo "Note: %D/%%PHPBBDIR%% not empty -- not deleted!"
diff --git a/chinese/scim-pinyin/pkg-plist b/chinese/scim-pinyin/pkg-plist
index f9fb8730c9ce..fe80075a1ff0 100644
--- a/chinese/scim-pinyin/pkg-plist
+++ b/chinese/scim-pinyin/pkg-plist
@@ -12,6 +12,6 @@ share/scim/pinyin/pinyin_phrase_lib
 share/scim/pinyin/pinyin_table
 share/scim/pinyin/special_table
 share/scim/icons/smart-pinyin.png
-@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 lib/scim-1.0/IMEngine
+@dirrmtry lib/scim-1.0/SetupUI
 @dirrm share/scim/pinyin
diff --git a/chinese/scim-tables/pkg-plist b/chinese/scim-tables/pkg-plist
index b430540e0497..da4b4d5ddbaa 100644
--- a/chinese/scim-tables/pkg-plist
+++ b/chinese/scim-tables/pkg-plist
@@ -32,4 +32,4 @@ share/scim/icons/Wu.png
 share/scim/icons/Wubi.png
 share/scim/icons/ZhuYin.png
 share/scim/icons/Ziranma.png
-@unexec rmdir %D/share/scim/tables 2>/dev/null || true
+@dirrmtry share/scim/tables
diff --git a/chinese/stardict-dict-zh_CN/pkg-plist b/chinese/stardict-dict-zh_CN/pkg-plist
index 3b83dd39f0be..2d531e97e656 100644
--- a/chinese/stardict-dict-zh_CN/pkg-plist
+++ b/chinese/stardict-dict-zh_CN/pkg-plist
@@ -16,4 +16,4 @@ share/gnome/stardict/dic/xdict-ce-gb.ifo
 share/gnome/stardict/dic/xdict-ec-gb.dict.dz
 share/gnome/stardict/dic/xdict-ec-gb.idx
 share/gnome/stardict/dic/xdict-ec-gb.ifo
-@unexec rmdir %D/share/gnome/stardict/dic 2>/dev/null || true
+@dirrmtry share/gnome/stardict/dic
diff --git a/chinese/stardict2-dict-zh_CN/pkg-plist b/chinese/stardict2-dict-zh_CN/pkg-plist
index 3b83dd39f0be..2d531e97e656 100644
--- a/chinese/stardict2-dict-zh_CN/pkg-plist
+++ b/chinese/stardict2-dict-zh_CN/pkg-plist
@@ -16,4 +16,4 @@ share/gnome/stardict/dic/xdict-ce-gb.ifo
 share/gnome/stardict/dic/xdict-ec-gb.dict.dz
 share/gnome/stardict/dic/xdict-ec-gb.idx
 share/gnome/stardict/dic/xdict-ec-gb.ifo
-@unexec rmdir %D/share/gnome/stardict/dic 2>/dev/null || true
+@dirrmtry share/gnome/stardict/dic
diff --git a/chinese/stardict2-dict-zh_TW/pkg-plist b/chinese/stardict2-dict-zh_TW/pkg-plist
index 96e97f1c7b53..9eb4682250bd 100644
--- a/chinese/stardict2-dict-zh_TW/pkg-plist
+++ b/chinese/stardict2-dict-zh_TW/pkg-plist
@@ -19,4 +19,4 @@ share/gnome/stardict/dic/xdict-ce-big5.ifo
 share/gnome/stardict/dic/xdict-ec-big5.dict.dz
 share/gnome/stardict/dic/xdict-ec-big5.idx
 share/gnome/stardict/dic/xdict-ec-big5.ifo
-@unexec rmdir %D/share/gnome/stardict/dic 2>/dev/null || true
+@dirrmtry share/gnome/stardict/dic
diff --git a/chinese/xpdf/pkg-plist b/chinese/xpdf/pkg-plist
index 12439e04ee1f..d4e992f6b9b6 100644
--- a/chinese/xpdf/pkg-plist
+++ b/chinese/xpdf/pkg-plist
@@ -13,4 +13,4 @@
 @unexec rm -f %D/etc/xpdfrc.chinese-traditional
 @dirrm %%DATADIR%%/chinese-simplified
 @dirrm %%DATADIR%%/chinese-traditional
-@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true
+@dirrmtry %%DATADIR%%