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

18 files changed, 56 insertions, 56 deletions

diff --git a/chinese/FreeWnn-lib/pkg-plist b/chinese/FreeWnn-lib/pkg-plist
index b808bcd9a337..e08c4bfd8ecc 100644
--- a/chinese/FreeWnn-lib/pkg-plist
+++ b/chinese/FreeWnn-lib/pkg-plist
@@ -115,4 +115,4 @@ lib/libcwnn.so.0
 @dirrm lib/wnn/zh_CN/rk_p
 @dirrm lib/wnn/zh_CN/rk
 @dirrm lib/wnn/zh_CN
-@unexec rmdir %D/lib/wnn 2> /dev/null || true
+@dirrmtry lib/wnn
diff --git a/chinese/big5fs/pkg-plist b/chinese/big5fs/pkg-plist
index 4839d6303cc5..b2916b8c5825 100644
--- a/chinese/big5fs/pkg-plist
+++ b/chinese/big5fs/pkg-plist
@@ -2,4 +2,4 @@ etc/rc.d/big5fs.sh
 modules/cd9660.ko
 modules/%%MSDOSFSKO%%
 modules/ntfs.ko
-@unexec rmdir %D/modules 2>/dev/null || true
+@dirrmtry modules
diff --git a/chinese/c2t/pkg-plist b/chinese/c2t/pkg-plist
index 47791017aa9c..2599a95b9d6c 100644
--- a/chinese/c2t/pkg-plist
+++ b/chinese/c2t/pkg-plist
@@ -1,5 +1,5 @@
 @comment $FreeBSD$
 bin/c2t
 share/chinese/gb/TONEPY.tit
-@unexec rmdir %D/share/chinese/gb 2>/dev/null || true
-@unexec rmdir %D/share/chinese 2>/dev/null || true
+@dirrmtry share/chinese/gb
+@dirrmtry share/chinese
diff --git a/chinese/gb2ps/pkg-plist b/chinese/gb2ps/pkg-plist
index f03cd6845b87..8eb5295bec1d 100644
--- a/chinese/gb2ps/pkg-plist
+++ b/chinese/gb2ps/pkg-plist
@@ -8,5 +8,5 @@ share/chinese/gb/chei24.ccf
 share/chinese/gb/cfan24.ccf
 %%PORTDOCS%%share/doc/gb2ps/gb2ps.help
 %%PORTDOCS%%@dirrm share/doc/gb2ps
-@unexec rmdir %D/share/chinese/gb 2>/dev/null || true
-@unexec rmdir %D/share/chinese 2>/dev/null || true
+@dirrmtry share/chinese/gb
+@dirrmtry share/chinese
diff --git a/chinese/gbfs/pkg-plist b/chinese/gbfs/pkg-plist
index ec0161f0ffd3..583756e02836 100644
--- a/chinese/gbfs/pkg-plist
+++ b/chinese/gbfs/pkg-plist
@@ -2,4 +2,4 @@ etc/rc.d/gbfs.sh
 modules/cd9660.ko
 modules/%%MSDOSFSKO%%
 modules/ntfs.ko
-@unexec rmdir %D/modules 2>/dev/null || true
+@dirrmtry modules
diff --git a/chinese/gbscript/pkg-plist b/chinese/gbscript/pkg-plist
index c0f219d2651e..304a1f475a12 100644
--- a/chinese/gbscript/pkg-plist
+++ b/chinese/gbscript/pkg-plist
@@ -2,5 +2,5 @@
 bin/gbscript
 share/chinese/gb/gbscript.pro
 share/chinese/gb/cclib.24
-@unexec rmdir %D/share/chinese/gb 2>/dev/null || true
-@unexec rmdir %D/share/chinese 2>/dev/null || true
+@dirrmtry share/chinese/gb
+@dirrmtry share/chinese
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index 07bfd4f13968..11fa8ca87ee2 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -50,15 +50,15 @@ share/icons/gcin.png
 share/icons/gcin/pin-fixed24.png
 share/icons/gcin/pin-float16.png
 %%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%  2>/dev/null || true
-@unexec rmdir %D/share/icons/gcin  2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-@unexec rmdir %D/share/gnome/control-center-2.0/capplets 2>/dev/null || true
-@unexec rmdir %D/share/gnome/control-center-2.0 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/table 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/script 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
-@unexec rmdir %D/lib/gtk-2.0/immodules 2>/dev/null || true
+@dirrmtry share/icons/gcin 
+@dirrmtry share/icons
+@dirrmtry share/gnome/control-center-2.0/capplets
+@dirrmtry share/gnome/control-center-2.0
+@dirrmtry share/gnome
+@dirrmtry share/applications
+@dirrmtry %%DATADIR%%/table
+@dirrmtry %%DATADIR%%/script
+@dirrmtry %%DATADIR%%
+@dirrmtry lib/gtk-2.0/immodules
 @exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
 @unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index 07bfd4f13968..11fa8ca87ee2 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -50,15 +50,15 @@ share/icons/gcin.png
 share/icons/gcin/pin-fixed24.png
 share/icons/gcin/pin-float16.png
 %%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%  2>/dev/null || true
-@unexec rmdir %D/share/icons/gcin  2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-@unexec rmdir %D/share/gnome/control-center-2.0/capplets 2>/dev/null || true
-@unexec rmdir %D/share/gnome/control-center-2.0 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/table 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/script 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
-@unexec rmdir %D/lib/gtk-2.0/immodules 2>/dev/null || true
+@dirrmtry share/icons/gcin 
+@dirrmtry share/icons
+@dirrmtry share/gnome/control-center-2.0/capplets
+@dirrmtry share/gnome/control-center-2.0
+@dirrmtry share/gnome
+@dirrmtry share/applications
+@dirrmtry %%DATADIR%%/table
+@dirrmtry %%DATADIR%%/script
+@dirrmtry %%DATADIR%%
+@dirrmtry lib/gtk-2.0/immodules
 @exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
 @unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
diff --git a/chinese/hc/pkg-plist b/chinese/hc/pkg-plist
index 61ae1c77d66e..5cf9a8157043 100644
--- a/chinese/hc/pkg-plist
+++ b/chinese/hc/pkg-plist
@@ -4,4 +4,4 @@ bin/b2g
 bin/g2b
 share/chinese/hc.tab
 share/chinese/hc-supp.tab
-@unexec rmdir %D/share/chinese 2>/dev/null || true
+@dirrmtry share/chinese
diff --git a/chinese/mplayer-fonts/pkg-plist b/chinese/mplayer-fonts/pkg-plist
index 5e99f85751b0..ccfc67527d85 100644
--- a/chinese/mplayer-fonts/pkg-plist
+++ b/chinese/mplayer-fonts/pkg-plist
@@ -223,5 +223,5 @@
 @dirrm %%MF%%/gbsn00lp24
 @dirrm %%MF%%/gbsn00lp16
 @dirrm %%MF%%
-@unexec rmdir %D/share/mplayer/fonts 2>/dev/null || true
-@unexec rmdir %D/share/mplayer 2>/dev/null || true
+@dirrmtry share/mplayer/fonts
+@dirrmtry share/mplayer
diff --git a/chinese/oicq/pkg-plist b/chinese/oicq/pkg-plist
index 0ec1fd3b7de6..b48e9bdb92c5 100644
--- a/chinese/oicq/pkg-plist
+++ b/chinese/oicq/pkg-plist
@@ -6,6 +6,6 @@ bin/q
 %%SITE_PERL%%/Net/OICQ/ServerEvent.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OICQ/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OICQ
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/Net/OICQ
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/chinese/p5-Date-Chinese/pkg-plist b/chinese/p5-Date-Chinese/pkg-plist
index 6a7d41c46fce..75c2ce042e70 100644
--- a/chinese/p5-Date-Chinese/pkg-plist
+++ b/chinese/p5-Date-Chinese/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Date/Chinese.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Chinese/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Chinese
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Date
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
diff --git a/chinese/p5-Lingua-ZH-Keywords/pkg-plist b/chinese/p5-Lingua-ZH-Keywords/pkg-plist
index e156f7b0c4d5..549332031379 100644
--- a/chinese/p5-Lingua-ZH-Keywords/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Keywords/pkg-plist
@@ -1,7 +1,7 @@
 %%SITE_PERL%%/Lingua/ZH/Keywords.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Keywords/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Keywords
-@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/p5-Lingua-ZH-Numbers/pkg-plist b/chinese/p5-Lingua-ZH-Numbers/pkg-plist
index a44d996d7fff..8aa456afa6f6 100644
--- a/chinese/p5-Lingua-ZH-Numbers/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Numbers/pkg-plist
@@ -3,7 +3,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Numbers/.packlist
 @dirrm %%SITE_PERL%%/Lingua/ZH/Numbers
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Numbers
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/ZH 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
-@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
+@dirrmtry %%SITE_PERL%%/Lingua/ZH
+@dirrmtry %%SITE_PERL%%/Lingua
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
diff --git a/chinese/p5-Lingua-ZH-Summarize/pkg-plist b/chinese/p5-Lingua-ZH-Summarize/pkg-plist
index 4647abe32764..c8879accda94 100644
--- a/chinese/p5-Lingua-ZH-Summarize/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Summarize/pkg-plist
@@ -1,7 +1,7 @@
 %%SITE_PERL%%/Lingua/ZH/Summarize.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Summarize/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Summarize
-@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/p5-Lingua-ZH-Wrap/pkg-plist b/chinese/p5-Lingua-ZH-Wrap/pkg-plist
index 94c6ab8841b1..25c702d8ca9a 100644
--- a/chinese/p5-Lingua-ZH-Wrap/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Wrap/pkg-plist
@@ -1,7 +1,7 @@
 %%SITE_PERL%%/Lingua/ZH/Wrap.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Wrap/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Wrap
-@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/scim-chewing/pkg-plist b/chinese/scim-chewing/pkg-plist
index 8fb4222286d0..6307ec0a3173 100644
--- a/chinese/scim-chewing/pkg-plist
+++ b/chinese/scim-chewing/pkg-plist
@@ -1,5 +1,5 @@
 lib/scim-1.0/IMEngine/chewing.so
 lib/scim-1.0/SetupUI/chewing-imengine-setup.so
 share/scim/icons/scim-chewing.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
diff --git a/chinese/tocps/pkg-plist b/chinese/tocps/pkg-plist
index 76285a0dc6b0..9eb4ff5294cf 100644
--- a/chinese/tocps/pkg-plist
+++ b/chinese/tocps/pkg-plist
@@ -4,5 +4,5 @@ share/chinese/gb/cfang24.ccf
 share/chinese/gb/chei24.ccf
 share/chinese/gb/ckai24.ccf
 share/chinese/gb/csong24.ccf
-@unexec rmdir %D/share/chinese/gb 2>/dev/null || true
-@unexec rmdir %D/share/chinese 2>/dev/null || true
+@dirrmtry share/chinese/gb
+@dirrmtry share/chinese