aboutsummaryrefslogtreecommitdiffstats
path: root/japanese
diff options
context:
space:
mode:
authoredwin <edwin@FreeBSD.org>2006-01-22 10:20:05 +0800
committeredwin <edwin@FreeBSD.org>2006-01-22 10:20:05 +0800
commitffa6a89c602bab7fc1470e34b05dcfe64ce87369 (patch)
tree70253ae4904e6777d975133ac5d163530a80b02a /japanese
parente8320e01ab60ecf311418120fb31f132f2adf4e9 (diff)
downloadfreebsd-ports-gnome-ffa6a89c602bab7fc1470e34b05dcfe64ce87369.tar.gz
freebsd-ports-gnome-ffa6a89c602bab7fc1470e34b05dcfe64ce87369.tar.zst
freebsd-ports-gnome-ffa6a89c602bab7fc1470e34b05dcfe64ce87369.zip
Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Approved by: krion@ PR: ports/88711 (related)
Diffstat (limited to 'japanese')
-rw-r--r--japanese/Canna/pkg-plist10
-rw-r--r--japanese/FreeWnn-lib/pkg-plist4
-rw-r--r--japanese/FreeWnn-server/pkg-plist4
-rw-r--r--japanese/canna-lib/pkg-plist10
-rw-r--r--japanese/canna-server/pkg-plist10
-rw-r--r--japanese/dvi2dvi/pkg-plist2
-rw-r--r--japanese/gauche-kakasi/pkg-plist2
-rw-r--r--japanese/jadetex-ptex/pkg-plist2
-rw-r--r--japanese/japaneseAFM/pkg-plist4
-rw-r--r--japanese/kdrill/pkg-plist2
-rw-r--r--japanese/kon2-16dot/pkg-plist2
-rw-r--r--japanese/kterm16c/pkg-plist2
-rw-r--r--japanese/leafrogue/pkg-plist2
-rw-r--r--japanese/lyx-doc/pkg-plist4
-rw-r--r--japanese/mell/pkg-plist2
-rw-r--r--japanese/nethack32/pkg-plist2
-rw-r--r--japanese/nethack34/pkg-plist2
-rw-r--r--japanese/p5-Date-Japanese-Era/pkg-plist8
-rw-r--r--japanese/p5-Text-ChaSen/pkg-plist6
-rw-r--r--japanese/p5-Text-Kakasi/pkg-plist6
-rw-r--r--japanese/perl5/pkg-plist154
-rw-r--r--japanese/prime-dict/pkg-plist6
-rw-r--r--japanese/prime-el/pkg-plist6
-rw-r--r--japanese/prime/pkg-plist14
-rw-r--r--japanese/ptex-tetex/pkg-plist6
-rw-r--r--japanese/ruby-man/pkg-plist2
-rw-r--r--japanese/ruby-usersguide/pkg-plist2
-rw-r--r--japanese/scim-anthy/pkg-plist6
-rw-r--r--japanese/scim-canna/pkg-plist6
-rw-r--r--japanese/scim-prime/pkg-plist6
-rw-r--r--japanese/scim-skk/pkg-plist6
-rw-r--r--japanese/scim-tables/pkg-plist2
-rw-r--r--japanese/scim-uim/pkg-plist4
-rw-r--r--japanese/stardict-dict-ja/pkg-plist2
-rw-r--r--japanese/stardict2-dict-ja/pkg-plist2
-rw-r--r--japanese/suikyo/pkg-plist8
-rw-r--r--japanese/texinfo/pkg-plist38
-rw-r--r--japanese/vftool/pkg-plist2
-rw-r--r--japanese/w3/pkg-plist4
-rw-r--r--japanese/xgate/pkg-plist10
40 files changed, 186 insertions, 186 deletions
diff --git a/japanese/Canna/pkg-plist b/japanese/Canna/pkg-plist
index 3a51e34c0952..d49bf11c90d9 100644
--- a/japanese/Canna/pkg-plist
+++ b/japanese/Canna/pkg-plist
@@ -122,8 +122,8 @@ sbin/cannakill
@dirrm lib/canna/dic/group
@dirrm lib/canna/dic
@dirrm lib/canna
-@unexec rmdir %D/share/canna/dic/user/user 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic/user 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic/group 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic 2>/dev/null || true
-@unexec rmdir %D/share/canna 2>/dev/null || true
+@dirrmtry share/canna/dic/user/user
+@dirrmtry share/canna/dic/user
+@dirrmtry share/canna/dic/group
+@dirrmtry share/canna/dic
+@dirrmtry share/canna
diff --git a/japanese/FreeWnn-lib/pkg-plist b/japanese/FreeWnn-lib/pkg-plist
index 40fbe8cf99d0..1b2ea3222b75 100644
--- a/japanese/FreeWnn-lib/pkg-plist
+++ b/japanese/FreeWnn-lib/pkg-plist
@@ -80,7 +80,7 @@ lib/libwnn.so
lib/libwnn.so.0
@dirrm lib/wnn/ja_JP/rk
@dirrm lib/wnn/ja_JP/rk.vi
-@unexec rmdir %D/lib/wnn/ja_JP 2> /dev/null || true
+@dirrmtry lib/wnn/ja_JP
@dirrm lib/wnn/lt_LN/rk
@dirrm lib/wnn/lt_LN
-@unexec rmdir %D/lib/wnn 2> /dev/null || true
+@dirrmtry lib/wnn
diff --git a/japanese/FreeWnn-server/pkg-plist b/japanese/FreeWnn-server/pkg-plist
index 466e5f902212..e3ce8cba26f6 100644
--- a/japanese/FreeWnn-server/pkg-plist
+++ b/japanese/FreeWnn-server/pkg-plist
@@ -38,5 +38,5 @@ lib/wnn/ja_JP/dic/wnncons/tankan3.dic
@dirrm lib/wnn/ja_JP/dic/pubdic
@dirrm lib/wnn/ja_JP/dic/src
@dirrm lib/wnn/ja_JP/dic/wnncons
-@unexec rmdir %D/lib/wnn/ja_JP/dic/usr 2> /dev/null || true
-@unexec rmdir %D/lib/wnn/ja_JP/dic 2> /dev/null || true
+@dirrmtry lib/wnn/ja_JP/dic/usr
+@dirrmtry lib/wnn/ja_JP/dic
diff --git a/japanese/canna-lib/pkg-plist b/japanese/canna-lib/pkg-plist
index 3a51e34c0952..d49bf11c90d9 100644
--- a/japanese/canna-lib/pkg-plist
+++ b/japanese/canna-lib/pkg-plist
@@ -122,8 +122,8 @@ sbin/cannakill
@dirrm lib/canna/dic/group
@dirrm lib/canna/dic
@dirrm lib/canna
-@unexec rmdir %D/share/canna/dic/user/user 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic/user 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic/group 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic 2>/dev/null || true
-@unexec rmdir %D/share/canna 2>/dev/null || true
+@dirrmtry share/canna/dic/user/user
+@dirrmtry share/canna/dic/user
+@dirrmtry share/canna/dic/group
+@dirrmtry share/canna/dic
+@dirrmtry share/canna
diff --git a/japanese/canna-server/pkg-plist b/japanese/canna-server/pkg-plist
index 3a51e34c0952..d49bf11c90d9 100644
--- a/japanese/canna-server/pkg-plist
+++ b/japanese/canna-server/pkg-plist
@@ -122,8 +122,8 @@ sbin/cannakill
@dirrm lib/canna/dic/group
@dirrm lib/canna/dic
@dirrm lib/canna
-@unexec rmdir %D/share/canna/dic/user/user 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic/user 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic/group 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic 2>/dev/null || true
-@unexec rmdir %D/share/canna 2>/dev/null || true
+@dirrmtry share/canna/dic/user/user
+@dirrmtry share/canna/dic/user
+@dirrmtry share/canna/dic/group
+@dirrmtry share/canna/dic
+@dirrmtry share/canna
diff --git a/japanese/dvi2dvi/pkg-plist b/japanese/dvi2dvi/pkg-plist
index f634cdc937c6..6afebe1bc16d 100644
--- a/japanese/dvi2dvi/pkg-plist
+++ b/japanese/dvi2dvi/pkg-plist
@@ -19,7 +19,7 @@ lib/dvi2dvi/p2n
lib/dvi2dvi/p2pn
lib/dvi2dvi/w2n
@exec mkdir -m 1777 %D/share/fonts/vf-rot
-@unexec rmdir %D/share/fonts/vf-rot 2>/dev/null || true
+@dirrmtry share/fonts/vf-rot
%%PORTDOCS%%%%DOCSDIR%%/bugs.doc
%%PORTDOCS%%%%DOCSDIR%%/changes.doc
%%PORTDOCS%%%%DOCSDIR%%/dvi2dvi.doc
diff --git a/japanese/gauche-kakasi/pkg-plist b/japanese/gauche-kakasi/pkg-plist
index 8a99df645347..d3dc16187778 100644
--- a/japanese/gauche-kakasi/pkg-plist
+++ b/japanese/gauche-kakasi/pkg-plist
@@ -1,4 +1,4 @@
lib/gauche/site/%%VERSION%%/%%TARGET%%/kakasi.so
share/gauche/site/lib/.packages/Gauche-kakasi.gpd
share/gauche/site/lib/text/kakasi.scm
-@unexec rmdir %D/share/gauche/site/lib/text 2>/dev/null || true
+@dirrmtry share/gauche/site/lib/text
diff --git a/japanese/jadetex-ptex/pkg-plist b/japanese/jadetex-ptex/pkg-plist
index 43147873e6ca..38e303ab6d34 100644
--- a/japanese/jadetex-ptex/pkg-plist
+++ b/japanese/jadetex-ptex/pkg-plist
@@ -8,4 +8,4 @@
%%PORTDOCS%%@dirrm %%DOCSDIR%%%%PKGNAMESUFFIX%%
@exec %%MKTEXLSR%%
@unexec %%MKTEXLSR%%
-@unexec rmdir %D/%%TEXMFLOCALDIR%%/ptex/jadetex 2> /dev/null || true
+@dirrmtry %%TEXMFLOCALDIR%%/ptex/jadetex
diff --git a/japanese/japaneseAFM/pkg-plist b/japanese/japaneseAFM/pkg-plist
index 85e05a692466..dda15213e6ee 100644
--- a/japanese/japaneseAFM/pkg-plist
+++ b/japanese/japaneseAFM/pkg-plist
@@ -2,5 +2,5 @@ share/fonts/afm/GothicBBB-Medium-H
share/fonts/afm/GothicBBB-Medium-V
share/fonts/afm/Ryumin-Light-H
share/fonts/afm/Ryumin-Light-V
-@unexec rmdir %D/share/fonts/afm 2>/dev/null || true
-@unexec rmdir %D/share/fonts 2>/dev/null || true
+@dirrmtry share/fonts/afm
+@dirrmtry share/fonts
diff --git a/japanese/kdrill/pkg-plist b/japanese/kdrill/pkg-plist
index 6fc4f604cf14..747106804d47 100644
--- a/japanese/kdrill/pkg-plist
+++ b/japanese/kdrill/pkg-plist
@@ -8,4 +8,4 @@ share/dict/kdrill/kata.edic
share/dict/kdrill/kataplus.edic
lib/X11/app-defaults/KDrill
@dirrm share/dict/kdrill
-@unexec rmdir %D/share/dict 2>/dev/null || true
+@dirrmtry share/dict
diff --git a/japanese/kon2-16dot/pkg-plist b/japanese/kon2-16dot/pkg-plist
index ac17c92f8a25..63cd22de2053 100644
--- a/japanese/kon2-16dot/pkg-plist
+++ b/japanese/kon2-16dot/pkg-plist
@@ -6,4 +6,4 @@ share/fonts/bdf/k14.bdf.gz
share/fonts/bdf/8x16rk.bdf.gz
share/fonts/bdf/jiskan16.bdf.gz
@dirrm share/fonts/bdf
-@unexec rmdir %D/share/fonts 2>/dev/null || true
+@dirrmtry share/fonts
diff --git a/japanese/kterm16c/pkg-plist b/japanese/kterm16c/pkg-plist
index 56b77b0eab10..24c840455bb0 100644
--- a/japanese/kterm16c/pkg-plist
+++ b/japanese/kterm16c/pkg-plist
@@ -6,4 +6,4 @@ lib/X11/fonts/misc/vga.pcf.gz
share/doc/kterm16c/dot.termcap
share/doc/kterm16c/kterm16c.doc
@dirrm share/doc/kterm16c
-@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true
+@dirrmtry lib/X11/fonts/misc
diff --git a/japanese/leafrogue/pkg-plist b/japanese/leafrogue/pkg-plist
index adfaf6f81e5e..a523e4472acc 100644
--- a/japanese/leafrogue/pkg-plist
+++ b/japanese/leafrogue/pkg-plist
@@ -1,6 +1,6 @@
bin/leafrogue
share/rogue/leaf.msg
-@unexec rmdir %D/share/rogue 2>/dev/null || true
+@dirrmtry share/rogue
%%PORTDOCS%%%%DOCSDIR%%/readme.txt
%%PORTDOCS%%%%DOCSDIR%%/lf_rogue.html
%%PORTDOCS%%%%DOCSDIR%%/lf_rogue.txt
diff --git a/japanese/lyx-doc/pkg-plist b/japanese/lyx-doc/pkg-plist
index 4d0dd812c886..1c1bf7f39f2c 100644
--- a/japanese/lyx-doc/pkg-plist
+++ b/japanese/lyx-doc/pkg-plist
@@ -6,5 +6,5 @@ share/lyx/doc/ja_Tutorial.lyx
share/lyx/doc/ja_UserGuide.lyx
share/lyx/doc/mobius.eps
share/lyx/doc/platypus.eps
-@unexec rmdir %D/share/lyx/doc 2>/dev/null || true
-@unexec rmdir %D/share/lyx 2>/dev/null || true
+@dirrmtry share/lyx/doc
+@dirrmtry share/lyx
diff --git a/japanese/mell/pkg-plist b/japanese/mell/pkg-plist
index 728f0b8f1cd2..d03071871457 100644
--- a/japanese/mell/pkg-plist
+++ b/japanese/mell/pkg-plist
@@ -8,6 +8,6 @@ share/emacs/site-lisp/mell/mell-sign.el
share/emacs/site-lisp/mell/mell-split.el
share/emacs/site-lisp/mell/mell-string.el
share/emacs/site-lisp/mell/mell.el
-@unexec rmdir %D/share/emacs/site-lisp/mell 2>/dev/null || true
+@dirrmtry share/emacs/site-lisp/mell
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
diff --git a/japanese/nethack32/pkg-plist b/japanese/nethack32/pkg-plist
index b29642a13853..e35e2b65b0c6 100644
--- a/japanese/nethack32/pkg-plist
+++ b/japanese/nethack32/pkg-plist
@@ -137,5 +137,5 @@ share/examples/ja/nethack/ibm.pcf.gz
share/examples/ja/nethack/nethack.rc
share/examples/ja/nethack/nh10.pcf.gz
@dirrm share/examples/ja/nethack
-@unexec rmdir %D/share/examples/ja 2>/dev/null || true
+@dirrmtry share/examples/ja
@dirrm share/doc/ja/nethack
diff --git a/japanese/nethack34/pkg-plist b/japanese/nethack34/pkg-plist
index 351ca70cb277..fb4e205d01d0 100644
--- a/japanese/nethack34/pkg-plist
+++ b/japanese/nethack34/pkg-plist
@@ -4,7 +4,7 @@ bin/%%HACKNAME%%
@exec chmod -R 775 %D/%%HACKDIR%%
@exec chmod 2755 %D/%%HACKDIR%%/%%HACKNAME%%
@exec chown games:games %D/%%HACKDIR%%/save
-@unexec rmdir %D/%%HACKDIR%%/save 2>/dev/null || true
+@dirrmtry %%HACKDIR%%/save
%%HACKDIR%%/Arc-fila.lev
%%HACKDIR%%/Arc-filb.lev
%%HACKDIR%%/Arc-goal.lev
diff --git a/japanese/p5-Date-Japanese-Era/pkg-plist b/japanese/p5-Date-Japanese-Era/pkg-plist
index 6abea648f8e0..f17ed63a6548 100644
--- a/japanese/p5-Date-Japanese-Era/pkg-plist
+++ b/japanese/p5-Date-Japanese-Era/pkg-plist
@@ -6,8 +6,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Japanese/Era/.packlist
@dirrm %%SITE_PERL%%/Date/Japanese/Era/Table
@dirrm %%SITE_PERL%%/Date/Japanese/Era
-@unexec rmdir %D/%%SITE_PERL%%/Date/Japanese 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Date/Japanese
+@dirrmtry %%SITE_PERL%%/Date
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Japanese/Era
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Japanese 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Japanese
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
diff --git a/japanese/p5-Text-ChaSen/pkg-plist b/japanese/p5-Text-ChaSen/pkg-plist
index d5fe30580ec6..bd62cf284505 100644
--- a/japanese/p5-Text-ChaSen/pkg-plist
+++ b/japanese/p5-Text-ChaSen/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen/ChaSen.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen/ChaSen.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
%%PORTDOCS%%share/chasen/doc/README.perl
diff --git a/japanese/p5-Text-Kakasi/pkg-plist b/japanese/p5-Text-Kakasi/pkg-plist
index ee8ee8e8d6f3..903eb1a9af67 100644
--- a/japanese/p5-Text-Kakasi/pkg-plist
+++ b/japanese/p5-Text-Kakasi/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi/Kakasi.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi/Kakasi.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/japanese/perl5/pkg-plist b/japanese/perl5/pkg-plist
index b6fa53c98779..e416663df002 100644
--- a/japanese/perl5/pkg-plist
+++ b/japanese/perl5/pkg-plist
@@ -530,83 +530,83 @@ lib/perl5/%%JPERL_VERSION%%/validate.pl
lib/perl5/%%JPERL_VERSION%%/vars.pm
@unexec find %D/lib/perl5/%%JPERL_VER%%/ -name '*.ph' -delete 2>/dev/null || true
@unexec find %D/lib/perl5/site_perl/%%JPERL_VER%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%JPERL_VER%%/%%JPERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%JPERL_VER%%/%%JPERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%JPERL_VER%%/%%JPERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%JPERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/pod 2>/dev/null || true
+@dirrmtry lib/perl5/site_perl/%%JPERL_VER%%/%%JPERL_ARCH%%/sys
+@dirrmtry lib/perl5/site_perl/%%JPERL_VER%%/%%JPERL_ARCH%%/machine
+@dirrmtry lib/perl5/site_perl/%%JPERL_VER%%/%%JPERL_ARCH%%
+@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
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/auto/Getopt/Long 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/auto/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/User 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Test 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/File/Spec 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/CPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%% 2>/dev/null || true
+@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
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/IO
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/CORE
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/B
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/auto/Getopt/Long
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/auto/Getopt
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/auto
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/User
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Time
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Tie
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Text
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Test
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Term
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Sys
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Search
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Pod
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Net
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Math
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/IPC
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/I18N
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Getopt
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/File/Spec
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/File
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/ExtUtils
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Devel
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Data
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Class
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/CPAN
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/CGI
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/B
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/sdbm
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/re
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/attrs
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/IO
+@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
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry lib/perl5
diff --git a/japanese/prime-dict/pkg-plist b/japanese/prime-dict/pkg-plist
index 781f81a19c5e..e231e6e8b24d 100644
--- a/japanese/prime-dict/pkg-plist
+++ b/japanese/prime-dict/pkg-plist
@@ -11,6 +11,6 @@
%%DATADIR%%/dict/prime-dict-en-pos_literal.ary
%%DATADIR%%/dict/prime-dict-en.ary
%%DATADIR%%/dict/prime-dict-en_literal.ary
-@unexec rmdir %D/%%DATADIR%%/dict 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/prime 2>/dev/null || true
+@dirrmtry %%DATADIR%%/dict
+@dirrmtry %%DATADIR%%
+@dirrmtry %%RUBY_SITELIBDIR%%/prime
diff --git a/japanese/prime-el/pkg-plist b/japanese/prime-el/pkg-plist
index b38c063d84e8..fc73393a762a 100644
--- a/japanese/prime-el/pkg-plist
+++ b/japanese/prime-el/pkg-plist
@@ -13,10 +13,10 @@ share/emacs/site-lisp/prime-el/prime-socialite.el
share/emacs/site-lisp/prime-el/prime-style.el
share/emacs/site-lisp/prime-el/prime.el
share/emacs/site-lisp/init-prime.el
-@unexec rmdir %D/share/emacs/site-lisp/prime-el/contrib 2>/dev/null || true
-@unexec rmdir %D/share/emacs/site-lisp/prime-el 2>/dev/null || true
+@dirrmtry share/emacs/site-lisp/prime-el/contrib
+@dirrmtry share/emacs/site-lisp/prime-el
etc/prime/Custom_prime-el.el
-@unexec rmdir %D/etc/prime 2>/dev/null || true
+@dirrmtry etc/prime
%%PORTDOCS%%%%DOCSDIR%%/emacs/figures/screenshots/conversion_1.png
%%PORTDOCS%%%%DOCSDIR%%/emacs/figures/screenshots/conversion_2.png
%%PORTDOCS%%%%DOCSDIR%%/emacs/figures/screenshots/conversion_3.png
diff --git a/japanese/prime/pkg-plist b/japanese/prime/pkg-plist
index d3307a3ad3f1..b22e48286efc 100644
--- a/japanese/prime/pkg-plist
+++ b/japanese/prime/pkg-plist
@@ -6,11 +6,11 @@ bin/prime-userdict-convert
bin/prime-userdict-update
libdata/pkgconfig/prime.pc
etc/prime/Custom_prime.rb
-@unexec rmdir %D/etc/prime 2>/dev/null || true
+@dirrmtry etc/prime
%%DATADIR%%/grammar/prime-grammar
%%DATADIR%%/makedict/canna2prime.table
-@unexec rmdir %D/%%DATADIR%%/grammar 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/makedict 2>/dev/null || true
+@dirrmtry %%DATADIR%%/grammar
+@dirrmtry %%DATADIR%%/makedict
%%RUBY_SITELIBDIR%%/prime/engine/engine-adambnc.rb
%%RUBY_SITELIBDIR%%/prime/engine/engine-alphabet.rb
%%RUBY_SITELIBDIR%%/prime/engine/engine-basic.rb
@@ -53,10 +53,10 @@ etc/prime/Custom_prime.rb
%%RUBY_SITELIBDIR%%/prime/session-prime08.rb
%%RUBY_SITELIBDIR%%/prime/session.rb
%%RUBY_SITELIBDIR%%/prime/taiyaki.rb
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/prime/engine 2>/dev/null || true
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/prime/grammar 2>/dev/null || true
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/prime/makedict 2>/dev/null || true
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/prime 2>/dev/null || true
+@dirrmtry %%RUBY_SITELIBDIR%%/prime/engine
+@dirrmtry %%RUBY_SITELIBDIR%%/prime/grammar
+@dirrmtry %%RUBY_SITELIBDIR%%/prime/makedict
+@dirrmtry %%RUBY_SITELIBDIR%%/prime
%%PORTDOCS%%%%DOCSDIR%%/examples/Custom_prime.rb
%%PORTDOCS%%%%DOCSDIR%%/figures/dict-format.png
%%PORTDOCS%%%%DOCSDIR%%/figures/predictive-input.png
diff --git a/japanese/ptex-tetex/pkg-plist b/japanese/ptex-tetex/pkg-plist
index 19f1a4ed8f42..06dbdedfcb3c 100644
--- a/japanese/ptex-tetex/pkg-plist
+++ b/japanese/ptex-tetex/pkg-plist
@@ -319,13 +319,13 @@ bin/updmap-sys-ptex
@dirrm %%TEXMFDIR%%/ptex/platex/config
%%TEXMFDIR%%/dvips/ptex/jis.map
%%TEXMFDIR%%/dvips/ptex/morisawa.map
-@unexec rmdir %D/%%TEXMFDIR%%/dvips/ptex 2> /dev/null || true
+@dirrmtry %%TEXMFDIR%%/dvips/ptex
@exec /bin/mkdir -p %D/%%TEXMFCONFIGDIR%%/dvips/ptex
-@unexec rmdir %D/%%TEXMFCONFIGDIR%%/dvips/ptex 2> /dev/null || true
+@dirrmtry %%TEXMFCONFIGDIR%%/dvips/ptex
%%TEXMFCONFIGDIR%%/texconfig/tcfmgr.map
@dirrm %%TEXMFCONFIGDIR%%/texconfig
%%TEXMFCONFIGDIR%%/web2c/ptex/updmap.cfg
-@unexec rmdir %D/%%TEXMFCONFIGDIR%%/web2c/ptex 2> /dev/null || true
+@dirrmtry %%TEXMFCONFIGDIR%%/web2c/ptex
@exec %%MKTEXLSR%%
@exec /bin/mkdir -p %D/%%TEXMFDIR%%/fonts/map/ptex/dvips/updmap
@exec /bin/mkdir -p %D/%%TEXMFDIR%%/fonts/map/ptex/dvipdfm/updmap
diff --git a/japanese/ruby-man/pkg-plist b/japanese/ruby-man/pkg-plist
index abf246c7b220..b1f58c8b7aaf 100644
--- a/japanese/ruby-man/pkg-plist
+++ b/japanese/ruby-man/pkg-plist
@@ -53,4 +53,4 @@
%%RUBY_MODDOCDIR%%/variable.html
%%RUBY_MODDOCDIR%%/yacc.html
@dirrm %%RUBY_MODDOCDIR%%
-@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+@dirrmtry %%RUBY_DOCDIR%%
diff --git a/japanese/ruby-usersguide/pkg-plist b/japanese/ruby-usersguide/pkg-plist
index fd491a2605bf..77703ccff12d 100644
--- a/japanese/ruby-usersguide/pkg-plist
+++ b/japanese/ruby-usersguide/pkg-plist
@@ -26,4 +26,4 @@
%%RUBY_MODDOCDIR%%/uguide24.html
%%RUBY_MODDOCDIR%%/uguide25.html
@dirrm %%RUBY_MODDOCDIR%%
-@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+@dirrmtry %%RUBY_DOCDIR%%
diff --git a/japanese/scim-anthy/pkg-plist b/japanese/scim-anthy/pkg-plist
index 7034ddc3fcbf..3d774dc4d4d2 100644
--- a/japanese/scim-anthy/pkg-plist
+++ b/japanese/scim-anthy/pkg-plist
@@ -19,6 +19,6 @@ share/scim/Anthy/style/wnn.sty
share/scim/icons/scim-anthy.png
share/scim/icons/scim-anthy-dict.png
share/scim/icons/scim-anthy-swap-colors.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
-@unexec rmdir %D/lib/scim-1.0/icons 2>/dev/null || true
+@dirrmtry lib/scim-1.0/IMEngine
+@dirrmtry lib/scim-1.0/SetupUI
+@dirrmtry lib/scim-1.0/icons
diff --git a/japanese/scim-canna/pkg-plist b/japanese/scim-canna/pkg-plist
index 6f6237b99508..4c7d92b126d4 100644
--- a/japanese/scim-canna/pkg-plist
+++ b/japanese/scim-canna/pkg-plist
@@ -2,6 +2,6 @@ lib/scim-1.0/IMEngine/canna.so
lib/scim-1.0/SetupUI/canna-imengine-setup.so
share/locale/ja/LC_MESSAGES/scim-canna.mo
share/scim/icons/scim-canna.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/japanese/scim-prime/pkg-plist b/japanese/scim-prime/pkg-plist
index b6c96a21966e..fce0fcc36519 100644
--- a/japanese/scim-prime/pkg-plist
+++ b/japanese/scim-prime/pkg-plist
@@ -2,6 +2,6 @@ lib/scim-1.0/IMEngine/prime.so
lib/scim-1.0/SetupUI/prime-imengine-setup.so
share/locale/ja/LC_MESSAGES/scim-prime.mo
share/scim/icons/scim-prime.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/japanese/scim-skk/pkg-plist b/japanese/scim-skk/pkg-plist
index 609a35138c3b..35b77ed7d550 100644
--- a/japanese/scim-skk/pkg-plist
+++ b/japanese/scim-skk/pkg-plist
@@ -2,6 +2,6 @@ lib/scim-1.0/IMEngine/skk.so
lib/scim-1.0/SetupUI/skk-imengine-setup.so
share/locale/ja/LC_MESSAGES/scim-skk.mo
share/scim/icons/scim-skk.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
-@unexec rmdir %D/lib/scim-1.0/icons 2>/dev/null || true
+@dirrmtry lib/scim-1.0/IMEngine
+@dirrmtry lib/scim-1.0/SetupUI
+@dirrmtry lib/scim-1.0/icons
diff --git a/japanese/scim-tables/pkg-plist b/japanese/scim-tables/pkg-plist
index 5e9b45217625..d20718525dbd 100644
--- a/japanese/scim-tables/pkg-plist
+++ b/japanese/scim-tables/pkg-plist
@@ -6,4 +6,4 @@ share/scim/tables/TUT-Code.bin
share/scim/icons/HIRAGANA.png
share/scim/icons/KATAKANA.png
share/scim/icons/Nippon.png
-@unexec rmdir %D/share/scim/tables 2>/dev/null || true
+@dirrmtry share/scim/tables
diff --git a/japanese/scim-uim/pkg-plist b/japanese/scim-uim/pkg-plist
index 67ffbd9591a8..a8f327a8331f 100644
--- a/japanese/scim-uim/pkg-plist
+++ b/japanese/scim-uim/pkg-plist
@@ -1,4 +1,4 @@
lib/scim-1.0/IMEngine/uim.so
share/scim/icons/scim-uim.png
-@unexec rmdir %D/lib/scim-1.0/IMEngine 2>/dev/null || true
-@unexec rmdir %D/lib/scim-1.0/icons 2>/dev/null || true
+@dirrmtry lib/scim-1.0/IMEngine
+@dirrmtry lib/scim-1.0/icons
diff --git a/japanese/stardict-dict-ja/pkg-plist b/japanese/stardict-dict-ja/pkg-plist
index e93f73452bce..3d4a873d4438 100644
--- a/japanese/stardict-dict-ja/pkg-plist
+++ b/japanese/stardict-dict-ja/pkg-plist
@@ -4,4 +4,4 @@ share/gnome/stardict/dic/jmdict-en-ja.ifo
share/gnome/stardict/dic/jmdict-ja-en.dict.dz
share/gnome/stardict/dic/jmdict-ja-en.idx
share/gnome/stardict/dic/jmdict-ja-en.ifo
-@unexec rmdir %D/share/gnome/stardict/dic 2>/dev/null || true
+@dirrmtry share/gnome/stardict/dic
diff --git a/japanese/stardict2-dict-ja/pkg-plist b/japanese/stardict2-dict-ja/pkg-plist
index e93f73452bce..3d4a873d4438 100644
--- a/japanese/stardict2-dict-ja/pkg-plist
+++ b/japanese/stardict2-dict-ja/pkg-plist
@@ -4,4 +4,4 @@ share/gnome/stardict/dic/jmdict-en-ja.ifo
share/gnome/stardict/dic/jmdict-ja-en.dict.dz
share/gnome/stardict/dic/jmdict-ja-en.idx
share/gnome/stardict/dic/jmdict-ja-en.ifo
-@unexec rmdir %D/share/gnome/stardict/dic 2>/dev/null || true
+@dirrmtry share/gnome/stardict/dic
diff --git a/japanese/suikyo/pkg-plist b/japanese/suikyo/pkg-plist
index a8a8772baa9c..2894f4b27d3c 100644
--- a/japanese/suikyo/pkg-plist
+++ b/japanese/suikyo/pkg-plist
@@ -29,17 +29,17 @@
%%DATADIR%%/conv-table/tutcode
%%DATADIR%%/conv-table/tutcode_reverse
%%DATADIR%%/conv-table/wideascii-ascii
-@unexec rmdir %D/%%DATADIR%%/conv-table 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%/conv-table
+@dirrmtry %%DATADIR%%
share/emacs/site-lisp/init-suikyo.el
share/emacs/site-lisp/suikyo/suikyo.el
share/emacs/site-lisp/suikyo/suikyo-config.el
-@unexec rmdir %D/share/emacs/site-lisp/suikyo 2>/dev/null || true
+@dirrmtry share/emacs/site-lisp/suikyo
libdata/pkgconfig/suikyo.pc
%%RUBY_SITELIBDIR%%/suikyo/suikyo-composer.rb
%%RUBY_SITELIBDIR%%/suikyo/suikyo-config.rb
%%RUBY_SITELIBDIR%%/suikyo/suikyo.rb
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/suikyo 2>/dev/null || true
+@dirrmtry %%RUBY_SITELIBDIR%%/suikyo
%%PORTDOCS%%%%DOCSDIR%%/elisp/index.html
%%PORTDOCS%%%%DOCSDIR%%/ruby/index.html
%%PORTDOCS%%%%DOCSDIR%%/index.html
diff --git a/japanese/texinfo/pkg-plist b/japanese/texinfo/pkg-plist
index 41d35c93ee5c..9e07888a4fac 100644
--- a/japanese/texinfo/pkg-plist
+++ b/japanese/texinfo/pkg-plist
@@ -53,22 +53,22 @@ share/locale/sv/LC_MESSAGES/texinfo.mo
share/locale/tr/LC_MESSAGES/texinfo.mo
share/locale/zh_CN/LC_MESSAGES/texinfo.mo
share/locale/zh_TW/LC_MESSAGES/texinfo.mo
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/de_AT/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de_AT 2>/dev/null || true
-@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/no 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/no 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
-@unexec rmdir %D/%%TEXMFLOCAL%%/tex/generic/dvips 2>/dev/null || true
-@unexec rmdir %D/%%TEXMFLOCAL%%/pdftex/plain/misc 2>/dev/null || true
-@unexec rmdir %D/%%TEXMFLOCAL%%/pdftex/plain 2>/dev/null || true
-@unexec rmdir %D/%%TEXMFLOCAL%%/pdftex 2>/dev/null || true
-@unexec rmdir %D/share/texinfo 2>/dev/null || true
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/de_AT/LC_MESSAGES
+@dirrmtry share/locale/de_AT
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry %%TEXMFLOCAL%%/tex/generic/dvips
+@dirrmtry %%TEXMFLOCAL%%/pdftex/plain/misc
+@dirrmtry %%TEXMFLOCAL%%/pdftex/plain
+@dirrmtry %%TEXMFLOCAL%%/pdftex
+@dirrmtry share/texinfo
diff --git a/japanese/vftool/pkg-plist b/japanese/vftool/pkg-plist
index 0a020665a3a7..53de5a164d96 100644
--- a/japanese/vftool/pkg-plist
+++ b/japanese/vftool/pkg-plist
@@ -660,4 +660,4 @@ share/fonts/vf-p2pn/tmin9.vf
@dirrm share/fonts/vf-a2n
@dirrm share/fonts/vf-n2a
@dirrm share/fonts/vf-p2pn
-@unexec rmdir %D/share/fonts 2>/dev/null || true
+@dirrmtry share/fonts
diff --git a/japanese/w3/pkg-plist b/japanese/w3/pkg-plist
index a11926e91e66..f8c27a46d63c 100644
--- a/japanese/w3/pkg-plist
+++ b/japanese/w3/pkg-plist
@@ -64,7 +64,7 @@ share/examples/w3/dot.emacs
share/examples/w3/dot.mosaic-hotlist-default
share/examples/w3/user-install
@dirrm lib/mule/site-lisp/w3
-@unexec rmdir %D/lib/mule/site-lisp 2>/dev/null || true
-@unexec rmdir %D/lib/mule 2>/dev/null || true
+@dirrmtry lib/mule/site-lisp
+@dirrmtry lib/mule
@dirrm share/doc/w3
@dirrm share/examples/w3
diff --git a/japanese/xgate/pkg-plist b/japanese/xgate/pkg-plist
index 005e3fea5f90..f53890afae97 100644
--- a/japanese/xgate/pkg-plist
+++ b/japanese/xgate/pkg-plist
@@ -2774,10 +2774,10 @@
@dirrm %%T%%/webapps/xgate/WEB-INF/classes/com/happysize
@dirrm %%T%%/webapps/xgate/WEB-INF/classes/com
@dirrm %%T%%/webapps/xgate/WEB-INF/classes
-@unexec rmdir %D/%%T%%/webapps/xgate/WEB-INF/conf 2>/dev/null || true
-@unexec rmdir %D/%%T%%/webapps/xgate/WEB-INF/address 2>/dev/null || true
-@unexec rmdir %D/%%T%%/webapps/xgate/WEB-INF/account 2>/dev/null || true
-@unexec rmdir %D/%%T%%/webapps/xgate/WEB-INF 2>/dev/null || true
-@unexec rmdir %D/%%T%%/webapps/xgate 2>/dev/null || true
+@dirrmtry %%T%%/webapps/xgate/WEB-INF/conf
+@dirrmtry %%T%%/webapps/xgate/WEB-INF/address
+@dirrmtry %%T%%/webapps/xgate/WEB-INF/account
+@dirrmtry %%T%%/webapps/xgate/WEB-INF
+@dirrmtry %%T%%/webapps/xgate
@unexec rmdir /var/log/xgate 2>/dev/null || true
@exec install -d -o %%WWWUID%% -g %%WWWGID%% /var/log/xgate