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

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

44 files changed, 1171 insertions, 1171 deletions

diff --git a/lang/STk/pkg-plist b/lang/STk/pkg-plist
index 7590bff9ed33..2e4ac18d7330 100644
--- a/lang/STk/pkg-plist
+++ b/lang/STk/pkg-plist
@@ -550,7 +550,7 @@ lib/stk/%%STK_VERSION%%/STk/www-url.stk
 lib/stk/%%STK_VERSION%%/STk/www.stk
 @exec ln -sf %D/lib/stk/%%STK_VERSION%%/man %D/lib/stk/man
 @exec mkdir -p %D/lib/stk/site-scheme
-@unexec rmdir %D/lib/stk/site-scheme 2>/dev/null || true
+@dirrmtry lib/stk/site-scheme
 @unexec rm -f %D/lib/stk/man
 @dirrm lib/stk/%%STK_VERSION%%/STk/Match
 @dirrm lib/stk/%%STK_VERSION%%/STk
diff --git a/lang/erlang/pkg-plist b/lang/erlang/pkg-plist
index 9d57499b83e4..d3472efbd34a 100644
--- a/lang/erlang/pkg-plist
+++ b/lang/erlang/pkg-plist
@@ -11,5 +11,5 @@ bin/erlc
 @dirrm lib/erlang/man/man3
 @dirrm lib/erlang/man/man1
 @dirrm lib/erlang/man
-@unexec rmdir %D/lib/erlang/lib 2>/dev/null || true
-@unexec rmdir %D/lib/erlang 2>/dev/null || true
+@dirrmtry lib/erlang/lib
+@dirrmtry lib/erlang
diff --git a/lang/erlang14/pkg-plist b/lang/erlang14/pkg-plist
index 9d57499b83e4..d3472efbd34a 100644
--- a/lang/erlang14/pkg-plist
+++ b/lang/erlang14/pkg-plist
@@ -11,5 +11,5 @@ bin/erlc
 @dirrm lib/erlang/man/man3
 @dirrm lib/erlang/man/man1
 @dirrm lib/erlang/man
-@unexec rmdir %D/lib/erlang/lib 2>/dev/null || true
-@unexec rmdir %D/lib/erlang 2>/dev/null || true
+@dirrmtry lib/erlang/lib
+@dirrmtry lib/erlang
diff --git a/lang/gcc28/pkg-plist b/lang/gcc28/pkg-plist
index aa407d502a08..52fea6d25500 100644
--- a/lang/gcc28/pkg-plist
+++ b/lang/gcc28/pkg-plist
@@ -37,6 +37,6 @@ lib/gcc-lib/%%GNUHOST%%/2.8.1/libobjc.a
 @dirrm lib/gcc-lib/%%GNUHOST%%/2.8.1/include
 @dirrm lib/gcc-lib/%%GNUHOST%%/2.8.1
 @dirrm lib/gcc-lib/%%GNUHOST%%
-@unexec rmdir %D/lib/gcc-lib 2>/dev/null || true
+@dirrmtry lib/gcc-lib
 @dirrm %%GNUHOST%%/include
 @dirrm %%GNUHOST%%
diff --git a/lang/gcc34/pkg-plist b/lang/gcc34/pkg-plist
index c78e749ccda1..6e2f599b4350 100644
--- a/lang/gcc34/pkg-plist
+++ b/lang/gcc34/pkg-plist
@@ -20,7 +20,7 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders
 @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools
 @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%
-@unexec rmdir %D/libexec/gcc/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/gcc 2>/dev/null || true
+@dirrmtry libexec/gcc/%%GNU_HOST%%
+@dirrmtry libexec/gcc
 info/gcc%%SUFFIX%%/dir
 @comment Insert PLIST.lib here
diff --git a/lang/ici/pkg-plist b/lang/ici/pkg-plist
index cf59c255edfd..5b84a0e4b033 100644
--- a/lang/ici/pkg-plist
+++ b/lang/ici/pkg-plist
@@ -7,5 +7,5 @@ lib/ici4/ici4core1.ici
 lib/ici4/ici4core2.ici
 lib/ici4/ici4core3.ici
 share/doc/ici4/ici.pdf
-@unexec rmdir %D/lib/ici4 2>/dev/null || true
+@dirrmtry lib/ici4
 @dirrm share/doc/ici4
diff --git a/lang/klogoturtle/pkg-plist b/lang/klogoturtle/pkg-plist
index f4ce839a88c7..a35a27b4275c 100644
--- a/lang/klogoturtle/pkg-plist
+++ b/lang/klogoturtle/pkg-plist
@@ -26,40 +26,40 @@ share/locale/de/LC_MESSAGES/klogoturtle.mo
 share/locale/fr/LC_MESSAGES/klogoturtle.mo
 share/locale/it/LC_MESSAGES/klogoturtle.mo
 share/locale/pt_BR/LC_MESSAGES/klogoturtle.mo
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/locale/pt_BR/LC_MESSAGES
+@dirrmtry share/locale/pt_BR
+@dirrmtry share/locale/it/LC_MESSAGES
+@dirrmtry share/locale/it
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/de
+@dirrmtry share/locale
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/pt_BR/klogoturtle
-@unexec rmdir %D/share/doc/HTML/pt_BR 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt_BR
 @dirrm share/doc/HTML/it/klogoturtle
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
 @dirrm share/doc/HTML/fr/klogoturtle
-@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
+@dirrmtry share/doc/HTML/fr
 @dirrm share/doc/HTML/en/klogoturtle
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
 @dirrm share/doc/HTML/de/klogoturtle
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/de
+@dirrmtry share/doc/HTML
 @dirrm share/apps/klogoturtle
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Edutainment/Miscellaneous 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Edutainment 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Edutainment/Miscellaneous
+@dirrmtry share/applnk/Edutainment
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/lang/kroc/pkg-plist b/lang/kroc/pkg-plist
index 054b4dd2a866..80b1a6daf4cf 100644
--- a/lang/kroc/pkg-plist
+++ b/lang/kroc/pkg-plist
@@ -109,8 +109,8 @@ lib/kroc/libudc.so
 %%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc/lib 2>/dev/null || true
 %%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc/html 2>/dev/null || true
 %%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/vtlib 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/vtinclude 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
-@unexec rmdir %D/lib/kroc 2>/dev/null || true
-@unexec rmdir %D/include/kroc 2>/dev/null || true
+@dirrmtry %%DATADIR%%/vtlib
+@dirrmtry %%DATADIR%%/vtinclude
+@dirrmtry %%DATADIR%%
+@dirrmtry lib/kroc
+@dirrmtry include/kroc
diff --git a/lang/ml-pnet/pkg-plist b/lang/ml-pnet/pkg-plist
index 1e30eacee99a..7081c8777f7f 100644
--- a/lang/ml-pnet/pkg-plist
+++ b/lang/ml-pnet/pkg-plist
@@ -61,6 +61,6 @@ lib/cscc/lib/nunit.framework.dll
 lib/cscc/lib/nunit.util.dll
 lib/cscc/lib/sqlsharp-pnet.exe
 lib/cscc/lib/wsdl-pnet.exe
-@unexec rmdir %D/lib/cscc/lib/2.2.0.0 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/1.0.5000.0 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/0.7.6.1 2>/dev/null || true
+@dirrmtry lib/cscc/lib/2.2.0.0
+@dirrmtry lib/cscc/lib/1.0.5000.0
+@dirrmtry lib/cscc/lib/0.7.6.1
diff --git a/lang/mono/pkg-plist b/lang/mono/pkg-plist
index 186c1f7efea7..35a650377257 100644
--- a/lang/mono/pkg-plist
+++ b/lang/mono/pkg-plist
@@ -748,12 +748,12 @@ share/jay/skeleton.cs
 @dirrm lib/mono/gac/Accessibility/2.0.0.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Accessibility
-@unexec rmdir %D/lib/mono/gac 2>/dev/null || true
-@unexec rmdir %D/lib/mono/compat-2.0 2>/dev/null || true
-@unexec rmdir %D/lib/mono/compat-1.0 2>/dev/null || true
-@unexec rmdir %D/lib/mono/2.0 2>/dev/null || true
-@unexec rmdir %D/lib/mono/1.0 2>/dev/null || true
-@unexec rmdir %D/lib/mono 2>/dev/null || true
+@dirrmtry lib/mono/gac
+@dirrmtry lib/mono/compat-2.0
+@dirrmtry lib/mono/compat-1.0
+@dirrmtry lib/mono/2.0
+@dirrmtry lib/mono/1.0
+@dirrmtry lib/mono
 @dirrm include/mono/utils
 @dirrm include/mono/private
 @dirrm include/mono/metadata
diff --git a/lang/p5-Data-JavaScript/pkg-plist b/lang/p5-Data-JavaScript/pkg-plist
index e12136637de9..673d91d6c2a1 100644
--- a/lang/p5-Data-JavaScript/pkg-plist
+++ b/lang/p5-Data-JavaScript/pkg-plist
@@ -2,5 +2,5 @@
 %%SITE_PERL%%/Data/example.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/JavaScript/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/JavaScript
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/lang/p5-Error/pkg-plist b/lang/p5-Error/pkg-plist
index e8875e37ddc9..3ab31e87f67d 100644
--- a/lang/p5-Error/pkg-plist
+++ b/lang/p5-Error/pkg-plist
@@ -1,3 +1,3 @@
 %%SITE_PERL%%/Error.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Error/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Error 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Error
diff --git a/lang/p5-Expect/pkg-plist b/lang/p5-Expect/pkg-plist
index edc73e0e5fce..67bd73f81431 100644
--- a/lang/p5-Expect/pkg-plist
+++ b/lang/p5-Expect/pkg-plist
@@ -1,4 +1,4 @@
 %%SITE_PERL%%/Expect.pod
 %%SITE_PERL%%/Expect.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Expect/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Expect 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Expect
diff --git a/lang/p5-ExtUtils-F77/pkg-plist b/lang/p5-ExtUtils-F77/pkg-plist
index 5db2c856338c..763bdeb2fd27 100644
--- a/lang/p5-ExtUtils-F77/pkg-plist
+++ b/lang/p5-ExtUtils-F77/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/ExtUtils/F77.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/ExtUtils 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils
+@dirrmtry %%SITE_PERL%%/ExtUtils
diff --git a/lang/p5-F77/pkg-plist b/lang/p5-F77/pkg-plist
index 5db2c856338c..763bdeb2fd27 100644
--- a/lang/p5-F77/pkg-plist
+++ b/lang/p5-F77/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/ExtUtils/F77.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/ExtUtils 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils
+@dirrmtry %%SITE_PERL%%/ExtUtils
diff --git a/lang/p5-Interpolation/pkg-plist b/lang/p5-Interpolation/pkg-plist
index 0ed704d7d2a5..9e327a1566b2 100644
--- a/lang/p5-Interpolation/pkg-plist
+++ b/lang/p5-Interpolation/pkg-plist
@@ -1,3 +1,3 @@
 %%SITE_PERL%%/Interpolation.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Interpolation/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Interpolation 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Interpolation
diff --git a/lang/p5-JavaScript-SpiderMonkey/pkg-plist b/lang/p5-JavaScript-SpiderMonkey/pkg-plist
index 13096faa43cf..e7ebc1119bfc 100644
--- a/lang/p5-JavaScript-SpiderMonkey/pkg-plist
+++ b/lang/p5-JavaScript-SpiderMonkey/pkg-plist
@@ -2,6 +2,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/SpiderMonkey/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/SpiderMonkey/SpiderMonkey.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/SpiderMonkey/SpiderMonkey.so
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/JavaScript 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/JavaScript
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/SpiderMonkey
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript
diff --git a/lang/p5-JavaScript-Squish/pkg-plist b/lang/p5-JavaScript-Squish/pkg-plist
index 2d8cbf278c77..d185075be0cc 100644
--- a/lang/p5-JavaScript-Squish/pkg-plist
+++ b/lang/p5-JavaScript-Squish/pkg-plist
@@ -1,6 +1,6 @@
 bin/js_compactor
 %%SITE_PERL%%/JavaScript/Squish.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Squish/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Squish 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/JavaScript 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Squish
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript
+@dirrmtry %%SITE_PERL%%/JavaScript
diff --git a/lang/p5-List-MoreUtils/pkg-plist b/lang/p5-List-MoreUtils/pkg-plist
index b51add371cd1..84558dbd36ea 100644
--- a/lang/p5-List-MoreUtils/pkg-plist
+++ b/lang/p5-List-MoreUtils/pkg-plist
@@ -3,5 +3,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/MoreUtils/MoreUtils.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/MoreUtils/MoreUtils.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/MoreUtils
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/List 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/List
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/List
diff --git a/lang/p5-Perl6-Subs/pkg-plist b/lang/p5-Perl6-Subs/pkg-plist
index 13e9e65b7b5d..ef2d9c455ce2 100644
--- a/lang/p5-Perl6-Subs/pkg-plist
+++ b/lang/p5-Perl6-Subs/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Perl6/Subs.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Subs/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Subs 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Perl6 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Subs
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6
+@dirrmtry %%SITE_PERL%%/Perl6
diff --git a/lang/p5-Scalar-List-Utils/pkg-plist b/lang/p5-Scalar-List-Utils/pkg-plist
index c202f3eda11f..418b5ac67c5a 100644
--- a/lang/p5-Scalar-List-Utils/pkg-plist
+++ b/lang/p5-Scalar-List-Utils/pkg-plist
@@ -4,6 +4,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Scalar/Util.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/List/Util.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Util
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Scalar 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/List 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/List
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Scalar
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/List
diff --git a/lang/p5-Switch/pkg-plist b/lang/p5-Switch/pkg-plist
index 6dadc139d1ff..605311a4e920 100644
--- a/lang/p5-Switch/pkg-plist
+++ b/lang/p5-Switch/pkg-plist
@@ -1,3 +1,3 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Switch/.packlist
 %%SITE_PERL%%/Switch.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Switch 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Switch
diff --git a/lang/perl5.10/pkg-plist b/lang/perl5.10/pkg-plist
index a02b3fa3191a..c75ede0c1aaf 100644
--- a/lang/perl5.10/pkg-plist
+++ b/lang/perl5.10/pkg-plist
@@ -1515,112 +1515,112 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @dirrm lib/perl5/%%PERL_VER%%/BSDPAN
 @unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
 %%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/warnings 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/User 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/DBM_Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Carp 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%
+@dirrmtry lib/perl5/%%PERL_VER%%/IO/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/warnings
+@dirrmtry lib/perl5/%%PERL_VER%%/User
+@dirrmtry lib/perl5/%%PERL_VER%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/Search
+@dirrmtry lib/perl5/%%PERL_VER%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/Exporter
+@dirrmtry lib/perl5/%%PERL_VER%%/Scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/List
+@dirrmtry lib/perl5/%%PERL_VER%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/DBM_Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/CPAN
+@dirrmtry lib/perl5/%%PERL_VER%%/Carp
 @dirrm lib/perl5/%%PERL_VER%%/unicore/To
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/gc_sc
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/dt
@@ -1632,73 +1632,73 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/nt
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/ccc
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicore 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode/Collate 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Thread 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/TabsWrap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/Balanced 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Harness 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term/ANSIColor 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Switch 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Perldoc 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/NEXT 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/Ping 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/FTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/demos 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Memoize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigInt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigFloat 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Maketext 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Codes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N/LangTags 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Hash 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt/Long 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File/Spec 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Command 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Constant 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Liblist 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class/ISA 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI/eg 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/unicore
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode/Collate
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Tie
+@dirrmtry lib/perl5/%%PERL_VER%%/Thread
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/TabsWrap
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/Balanced
+@dirrmtry lib/perl5/%%PERL_VER%%/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Harness
+@dirrmtry lib/perl5/%%PERL_VER%%/Test
+@dirrmtry lib/perl5/%%PERL_VER%%/Term/ANSIColor
+@dirrmtry lib/perl5/%%PERL_VER%%/Term
+@dirrmtry lib/perl5/%%PERL_VER%%/Switch
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Perldoc
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/NEXT
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/Ping
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/FTP
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/demos
+@dirrmtry lib/perl5/%%PERL_VER%%/Net
+@dirrmtry lib/perl5/%%PERL_VER%%/Memoize
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigInt
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigFloat
+@dirrmtry lib/perl5/%%PERL_VER%%/Math
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Maketext
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Codes
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N/LangTags
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/Hash
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt/Long
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/File/Spec
+@dirrmtry lib/perl5/%%PERL_VER%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Command
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Constant
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Liblist
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils
+@dirrmtry lib/perl5/%%PERL_VER%%/Class/ISA
+@dirrmtry lib/perl5/%%PERL_VER%%/Class
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI/eg
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute
+@dirrmtry lib/perl5/%%PERL_VER%%/pod
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man
+@dirrmtry lib/perl5/%%PERL_VER%%/perl
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
+@dirrmtry lib/perl5/%%PERL_VER%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
+@dirrmtry %%SITE_PERL%%/auto
+@dirrmtry %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5
diff --git a/lang/perl5.12/pkg-plist b/lang/perl5.12/pkg-plist
index a02b3fa3191a..c75ede0c1aaf 100644
--- a/lang/perl5.12/pkg-plist
+++ b/lang/perl5.12/pkg-plist
@@ -1515,112 +1515,112 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @dirrm lib/perl5/%%PERL_VER%%/BSDPAN
 @unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
 %%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/warnings 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/User 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/DBM_Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Carp 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%
+@dirrmtry lib/perl5/%%PERL_VER%%/IO/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/warnings
+@dirrmtry lib/perl5/%%PERL_VER%%/User
+@dirrmtry lib/perl5/%%PERL_VER%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/Search
+@dirrmtry lib/perl5/%%PERL_VER%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/Exporter
+@dirrmtry lib/perl5/%%PERL_VER%%/Scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/List
+@dirrmtry lib/perl5/%%PERL_VER%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/DBM_Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/CPAN
+@dirrmtry lib/perl5/%%PERL_VER%%/Carp
 @dirrm lib/perl5/%%PERL_VER%%/unicore/To
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/gc_sc
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/dt
@@ -1632,73 +1632,73 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/nt
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/ccc
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicore 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode/Collate 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Thread 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/TabsWrap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/Balanced 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Harness 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term/ANSIColor 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Switch 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Perldoc 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/NEXT 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/Ping 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/FTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/demos 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Memoize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigInt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigFloat 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Maketext 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Codes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N/LangTags 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Hash 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt/Long 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File/Spec 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Command 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Constant 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Liblist 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class/ISA 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI/eg 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/unicore
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode/Collate
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Tie
+@dirrmtry lib/perl5/%%PERL_VER%%/Thread
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/TabsWrap
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/Balanced
+@dirrmtry lib/perl5/%%PERL_VER%%/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Harness
+@dirrmtry lib/perl5/%%PERL_VER%%/Test
+@dirrmtry lib/perl5/%%PERL_VER%%/Term/ANSIColor
+@dirrmtry lib/perl5/%%PERL_VER%%/Term
+@dirrmtry lib/perl5/%%PERL_VER%%/Switch
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Perldoc
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/NEXT
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/Ping
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/FTP
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/demos
+@dirrmtry lib/perl5/%%PERL_VER%%/Net
+@dirrmtry lib/perl5/%%PERL_VER%%/Memoize
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigInt
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigFloat
+@dirrmtry lib/perl5/%%PERL_VER%%/Math
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Maketext
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Codes
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N/LangTags
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/Hash
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt/Long
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/File/Spec
+@dirrmtry lib/perl5/%%PERL_VER%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Command
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Constant
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Liblist
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils
+@dirrmtry lib/perl5/%%PERL_VER%%/Class/ISA
+@dirrmtry lib/perl5/%%PERL_VER%%/Class
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI/eg
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute
+@dirrmtry lib/perl5/%%PERL_VER%%/pod
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man
+@dirrmtry lib/perl5/%%PERL_VER%%/perl
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
+@dirrmtry lib/perl5/%%PERL_VER%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
+@dirrmtry %%SITE_PERL%%/auto
+@dirrmtry %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5
diff --git a/lang/perl5.14/pkg-plist b/lang/perl5.14/pkg-plist
index a02b3fa3191a..c75ede0c1aaf 100644
--- a/lang/perl5.14/pkg-plist
+++ b/lang/perl5.14/pkg-plist
@@ -1515,112 +1515,112 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @dirrm lib/perl5/%%PERL_VER%%/BSDPAN
 @unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
 %%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/warnings 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/User 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/DBM_Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Carp 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%
+@dirrmtry lib/perl5/%%PERL_VER%%/IO/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/warnings
+@dirrmtry lib/perl5/%%PERL_VER%%/User
+@dirrmtry lib/perl5/%%PERL_VER%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/Search
+@dirrmtry lib/perl5/%%PERL_VER%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/Exporter
+@dirrmtry lib/perl5/%%PERL_VER%%/Scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/List
+@dirrmtry lib/perl5/%%PERL_VER%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/DBM_Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/CPAN
+@dirrmtry lib/perl5/%%PERL_VER%%/Carp
 @dirrm lib/perl5/%%PERL_VER%%/unicore/To
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/gc_sc
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/dt
@@ -1632,73 +1632,73 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/nt
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/ccc
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicore 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode/Collate 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Thread 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/TabsWrap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/Balanced 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Harness 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term/ANSIColor 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Switch 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Perldoc 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/NEXT 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/Ping 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/FTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/demos 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Memoize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigInt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigFloat 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Maketext 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Codes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N/LangTags 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Hash 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt/Long 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File/Spec 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Command 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Constant 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Liblist 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class/ISA 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI/eg 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/unicore
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode/Collate
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Tie
+@dirrmtry lib/perl5/%%PERL_VER%%/Thread
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/TabsWrap
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/Balanced
+@dirrmtry lib/perl5/%%PERL_VER%%/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Harness
+@dirrmtry lib/perl5/%%PERL_VER%%/Test
+@dirrmtry lib/perl5/%%PERL_VER%%/Term/ANSIColor
+@dirrmtry lib/perl5/%%PERL_VER%%/Term
+@dirrmtry lib/perl5/%%PERL_VER%%/Switch
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Perldoc
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/NEXT
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/Ping
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/FTP
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/demos
+@dirrmtry lib/perl5/%%PERL_VER%%/Net
+@dirrmtry lib/perl5/%%PERL_VER%%/Memoize
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigInt
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigFloat
+@dirrmtry lib/perl5/%%PERL_VER%%/Math
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Maketext
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Codes
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N/LangTags
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/Hash
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt/Long
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/File/Spec
+@dirrmtry lib/perl5/%%PERL_VER%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Command
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Constant
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Liblist
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils
+@dirrmtry lib/perl5/%%PERL_VER%%/Class/ISA
+@dirrmtry lib/perl5/%%PERL_VER%%/Class
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI/eg
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute
+@dirrmtry lib/perl5/%%PERL_VER%%/pod
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man
+@dirrmtry lib/perl5/%%PERL_VER%%/perl
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
+@dirrmtry lib/perl5/%%PERL_VER%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
+@dirrmtry %%SITE_PERL%%/auto
+@dirrmtry %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5
diff --git a/lang/perl5.16/pkg-plist b/lang/perl5.16/pkg-plist
index a02b3fa3191a..c75ede0c1aaf 100644
--- a/lang/perl5.16/pkg-plist
+++ b/lang/perl5.16/pkg-plist
@@ -1515,112 +1515,112 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @dirrm lib/perl5/%%PERL_VER%%/BSDPAN
 @unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
 %%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/warnings 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/User 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/DBM_Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Carp 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%
+@dirrmtry lib/perl5/%%PERL_VER%%/IO/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/warnings
+@dirrmtry lib/perl5/%%PERL_VER%%/User
+@dirrmtry lib/perl5/%%PERL_VER%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/Search
+@dirrmtry lib/perl5/%%PERL_VER%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/Exporter
+@dirrmtry lib/perl5/%%PERL_VER%%/Scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/List
+@dirrmtry lib/perl5/%%PERL_VER%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/DBM_Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/CPAN
+@dirrmtry lib/perl5/%%PERL_VER%%/Carp
 @dirrm lib/perl5/%%PERL_VER%%/unicore/To
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/gc_sc
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/dt
@@ -1632,73 +1632,73 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/nt
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/ccc
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicore 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode/Collate 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Thread 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/TabsWrap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/Balanced 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Harness 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term/ANSIColor 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Switch 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Perldoc 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/NEXT 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/Ping 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/FTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/demos 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Memoize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigInt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigFloat 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Maketext 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Codes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N/LangTags 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Hash 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt/Long 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File/Spec 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Command 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Constant 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Liblist 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class/ISA 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI/eg 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/unicore
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode/Collate
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Tie
+@dirrmtry lib/perl5/%%PERL_VER%%/Thread
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/TabsWrap
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/Balanced
+@dirrmtry lib/perl5/%%PERL_VER%%/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Harness
+@dirrmtry lib/perl5/%%PERL_VER%%/Test
+@dirrmtry lib/perl5/%%PERL_VER%%/Term/ANSIColor
+@dirrmtry lib/perl5/%%PERL_VER%%/Term
+@dirrmtry lib/perl5/%%PERL_VER%%/Switch
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Perldoc
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/NEXT
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/Ping
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/FTP
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/demos
+@dirrmtry lib/perl5/%%PERL_VER%%/Net
+@dirrmtry lib/perl5/%%PERL_VER%%/Memoize
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigInt
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigFloat
+@dirrmtry lib/perl5/%%PERL_VER%%/Math
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Maketext
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Codes
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N/LangTags
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/Hash
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt/Long
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/File/Spec
+@dirrmtry lib/perl5/%%PERL_VER%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Command
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Constant
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Liblist
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils
+@dirrmtry lib/perl5/%%PERL_VER%%/Class/ISA
+@dirrmtry lib/perl5/%%PERL_VER%%/Class
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI/eg
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute
+@dirrmtry lib/perl5/%%PERL_VER%%/pod
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man
+@dirrmtry lib/perl5/%%PERL_VER%%/perl
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
+@dirrmtry lib/perl5/%%PERL_VER%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
+@dirrmtry %%SITE_PERL%%/auto
+@dirrmtry %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5
diff --git a/lang/perl5.6/pkg-plist b/lang/perl5.6/pkg-plist
index 99bb4c697e72..b9ca3a355c95 100644
--- a/lang/perl5.6/pkg-plist
+++ b/lang/perl5.6/pkg-plist
@@ -1035,79 +1035,79 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @dirrm lib/perl5/%%PERL_VER%%/BSDPAN
 @unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
 %%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/Getopt/Long 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/warnings 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicode/To 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicode/Is 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicode/In 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/User 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
+@dirrmtry %%SITE_PERL%%/auto
+@dirrmtry %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%
+@dirrmtry lib/perl5/%%PERL_VER%%/IO/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/Getopt/Long
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/Getopt
+@dirrmtry lib/perl5/%%PERL_VER%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/warnings
+@dirrmtry lib/perl5/%%PERL_VER%%/unicode/To
+@dirrmtry lib/perl5/%%PERL_VER%%/unicode/Is
+@dirrmtry lib/perl5/%%PERL_VER%%/unicode/In
+@dirrmtry lib/perl5/%%PERL_VER%%/unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/User
+@dirrmtry lib/perl5/%%PERL_VER%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/Tie
+@dirrmtry lib/perl5/%%PERL_VER%%/Text
 @dirrm lib/perl5/%%PERL_VER%%/Test/Simple/t
 @dirrm lib/perl5/%%PERL_VER%%/Test/Simple
 @dirrm lib/perl5/%%PERL_VER%%/Test/t
 @dirrm lib/perl5/%%PERL_VER%%/Test/Harness/t
 @dirrm lib/perl5/%%PERL_VER%%/Test/Harness
 @dirrm lib/perl5/%%PERL_VER%%/Test
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/Term
+@dirrmtry lib/perl5/%%PERL_VER%%/Search
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod
+@dirrmtry lib/perl5/%%PERL_VER%%/Net
+@dirrmtry lib/perl5/%%PERL_VER%%/Math
+@dirrmtry lib/perl5/%%PERL_VER%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt
 @dirrm lib/perl5/%%PERL_VER%%/File/Temp/t
 @dirrm lib/perl5/%%PERL_VER%%/File/Temp
 @dirrm lib/perl5/%%PERL_VER%%/File/Spec/t
@@ -1118,17 +1118,17 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @dirrm lib/perl5/%%PERL_VER%%/ExtUtils/Liblist
 @dirrm lib/perl5/%%PERL_VER%%/ExtUtils/Command
 @dirrm lib/perl5/%%PERL_VER%%/ExtUtils
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Carp 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI
+@dirrmtry lib/perl5/%%PERL_VER%%/Exporter
+@dirrmtry lib/perl5/%%PERL_VER%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/Class
+@dirrmtry lib/perl5/%%PERL_VER%%/Carp
+@dirrmtry lib/perl5/%%PERL_VER%%/CPAN
+@dirrmtry lib/perl5/%%PERL_VER%%/pod
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man
+@dirrmtry lib/perl5/%%PERL_VER%%/perl
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
+@dirrmtry lib/perl5/%%PERL_VER%%
+@dirrmtry lib/perl5
diff --git a/lang/perl5.8/pkg-plist b/lang/perl5.8/pkg-plist
index a02b3fa3191a..c75ede0c1aaf 100644
--- a/lang/perl5.8/pkg-plist
+++ b/lang/perl5.8/pkg-plist
@@ -1515,112 +1515,112 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @dirrm lib/perl5/%%PERL_VER%%/BSDPAN
 @unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
 %%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/warnings 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/User 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/DBM_Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Carp 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%
+@dirrmtry lib/perl5/%%PERL_VER%%/IO/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/warnings
+@dirrmtry lib/perl5/%%PERL_VER%%/User
+@dirrmtry lib/perl5/%%PERL_VER%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/Search
+@dirrmtry lib/perl5/%%PERL_VER%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/Exporter
+@dirrmtry lib/perl5/%%PERL_VER%%/Scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/List
+@dirrmtry lib/perl5/%%PERL_VER%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/DBM_Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/CPAN
+@dirrmtry lib/perl5/%%PERL_VER%%/Carp
 @dirrm lib/perl5/%%PERL_VER%%/unicore/To
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/gc_sc
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/dt
@@ -1632,73 +1632,73 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/nt
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib/ccc
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicore 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode/Collate 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Thread 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/TabsWrap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/Balanced 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Harness 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term/ANSIColor 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Switch 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Perldoc 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/NEXT 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/Ping 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/FTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/demos 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Memoize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigInt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigFloat 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Maketext 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Codes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N/LangTags 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Hash 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt/Long 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File/Spec 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Command 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Constant 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Liblist 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class/ISA 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI/eg 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/unicore
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode/Collate
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Tie
+@dirrmtry lib/perl5/%%PERL_VER%%/Thread
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/TabsWrap
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/Balanced
+@dirrmtry lib/perl5/%%PERL_VER%%/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Harness
+@dirrmtry lib/perl5/%%PERL_VER%%/Test
+@dirrmtry lib/perl5/%%PERL_VER%%/Term/ANSIColor
+@dirrmtry lib/perl5/%%PERL_VER%%/Term
+@dirrmtry lib/perl5/%%PERL_VER%%/Switch
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Perldoc
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/NEXT
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/Ping
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/FTP
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/demos
+@dirrmtry lib/perl5/%%PERL_VER%%/Net
+@dirrmtry lib/perl5/%%PERL_VER%%/Memoize
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigInt
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigFloat
+@dirrmtry lib/perl5/%%PERL_VER%%/Math
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Maketext
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Codes
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N/LangTags
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/Hash
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt/Long
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/File/Spec
+@dirrmtry lib/perl5/%%PERL_VER%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Command
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Constant
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Liblist
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils
+@dirrmtry lib/perl5/%%PERL_VER%%/Class/ISA
+@dirrmtry lib/perl5/%%PERL_VER%%/Class
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI/eg
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute
+@dirrmtry lib/perl5/%%PERL_VER%%/pod
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man
+@dirrmtry lib/perl5/%%PERL_VER%%/perl
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
+@dirrmtry lib/perl5/%%PERL_VER%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
+@dirrmtry %%SITE_PERL%%/auto
+@dirrmtry %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5
diff --git a/lang/perl5/pkg-plist b/lang/perl5/pkg-plist
index 99bb4c697e72..b9ca3a355c95 100644
--- a/lang/perl5/pkg-plist
+++ b/lang/perl5/pkg-plist
@@ -1035,79 +1035,79 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @dirrm lib/perl5/%%PERL_VER%%/BSDPAN
 @unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
 %%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/Getopt/Long 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/warnings 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicode/To 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicode/Is 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicode/In 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/User 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
+@dirrmtry %%SITE_PERL%%/auto
+@dirrmtry %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%
+@dirrmtry lib/perl5/%%PERL_VER%%/IO/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/Getopt/Long
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/Getopt
+@dirrmtry lib/perl5/%%PERL_VER%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/warnings
+@dirrmtry lib/perl5/%%PERL_VER%%/unicode/To
+@dirrmtry lib/perl5/%%PERL_VER%%/unicode/Is
+@dirrmtry lib/perl5/%%PERL_VER%%/unicode/In
+@dirrmtry lib/perl5/%%PERL_VER%%/unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/User
+@dirrmtry lib/perl5/%%PERL_VER%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/Tie
+@dirrmtry lib/perl5/%%PERL_VER%%/Text
 @dirrm lib/perl5/%%PERL_VER%%/Test/Simple/t
 @dirrm lib/perl5/%%PERL_VER%%/Test/Simple
 @dirrm lib/perl5/%%PERL_VER%%/Test/t
 @dirrm lib/perl5/%%PERL_VER%%/Test/Harness/t
 @dirrm lib/perl5/%%PERL_VER%%/Test/Harness
 @dirrm lib/perl5/%%PERL_VER%%/Test
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/Term
+@dirrmtry lib/perl5/%%PERL_VER%%/Search
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod
+@dirrmtry lib/perl5/%%PERL_VER%%/Net
+@dirrmtry lib/perl5/%%PERL_VER%%/Math
+@dirrmtry lib/perl5/%%PERL_VER%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt
 @dirrm lib/perl5/%%PERL_VER%%/File/Temp/t
 @dirrm lib/perl5/%%PERL_VER%%/File/Temp
 @dirrm lib/perl5/%%PERL_VER%%/File/Spec/t
@@ -1118,17 +1118,17 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
 @dirrm lib/perl5/%%PERL_VER%%/ExtUtils/Liblist
 @dirrm lib/perl5/%%PERL_VER%%/ExtUtils/Command
 @dirrm lib/perl5/%%PERL_VER%%/ExtUtils
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Carp 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI
+@dirrmtry lib/perl5/%%PERL_VER%%/Exporter
+@dirrmtry lib/perl5/%%PERL_VER%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/Class
+@dirrmtry lib/perl5/%%PERL_VER%%/Carp
+@dirrmtry lib/perl5/%%PERL_VER%%/CPAN
+@dirrmtry lib/perl5/%%PERL_VER%%/pod
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man
+@dirrmtry lib/perl5/%%PERL_VER%%/perl
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
+@dirrmtry lib/perl5/%%PERL_VER%%
+@dirrmtry lib/perl5
diff --git a/lang/php4/pkg-plist b/lang/php4/pkg-plist
index 754571e14918..209024ef1f08 100644
--- a/lang/php4/pkg-plist
+++ b/lang/php4/pkg-plist
@@ -172,9 +172,9 @@ lib/php/build/shtool
 @dirrm include/php/TSRM
 @dirrm include/php/Zend
 @dirrm include/php/ext/standard
-@unexec rmdir %D/include/php/ext 2> /dev/null || true
+@dirrmtry include/php/ext
 @dirrm include/php/main
 @dirrm include/php/regex
-@unexec rmdir %D/include/php 2> /dev/null || true
+@dirrmtry include/php
 @dirrm lib/php/build
-@unexec rmdir %D/lib/php 2> /dev/null || true
+@dirrmtry lib/php
diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist
index a2fb357af332..4e08b934c5c3 100644
--- a/lang/php5/pkg-plist
+++ b/lang/php5/pkg-plist
@@ -207,10 +207,10 @@ lib/php/build/shtool
 @dirrm include/php/ext/libxml
 @dirrm include/php/ext/spl
 @dirrm include/php/ext/standard
-@unexec rmdir %D/include/php/ext 2> /dev/null || true
+@dirrmtry include/php/ext
 @dirrm include/php/main/streams
 @dirrm include/php/main
 @dirrm include/php/regex
-@unexec rmdir %D/include/php 2> /dev/null || true
+@dirrmtry include/php
 @dirrm lib/php/build
-@unexec rmdir %D/lib/php 2> /dev/null || true
+@dirrmtry lib/php
diff --git a/lang/php53/pkg-plist b/lang/php53/pkg-plist
index a2fb357af332..4e08b934c5c3 100644
--- a/lang/php53/pkg-plist
+++ b/lang/php53/pkg-plist
@@ -207,10 +207,10 @@ lib/php/build/shtool
 @dirrm include/php/ext/libxml
 @dirrm include/php/ext/spl
 @dirrm include/php/ext/standard
-@unexec rmdir %D/include/php/ext 2> /dev/null || true
+@dirrmtry include/php/ext
 @dirrm include/php/main/streams
 @dirrm include/php/main
 @dirrm include/php/regex
-@unexec rmdir %D/include/php 2> /dev/null || true
+@dirrmtry include/php
 @dirrm lib/php/build
-@unexec rmdir %D/lib/php 2> /dev/null || true
+@dirrmtry lib/php
diff --git a/lang/pike70/pkg-plist b/lang/pike70/pkg-plist
index 819f937298a9..b6649533f719 100644
--- a/lang/pike70/pkg-plist
+++ b/lang/pike70/pkg-plist
@@ -441,7 +441,7 @@ pike/%%PORTVERSION%%/man/man1/pike.1
 @dirrm pike/%%PORTVERSION%%/lib/modules/Calendar.pmod
 @dirrm pike/%%PORTVERSION%%/lib/modules/Debug.pmod
 @dirrm pike/%%PORTVERSION%%/lib/modules/Filesystem.pmod
-@unexec rmdir %D/pike/%%PORTVERSION%%/lib/modules/GDKSupport.pmod 2> /dev/null || true
+@dirrmtry pike/%%PORTVERSION%%/lib/modules/GDKSupport.pmod
 @dirrm pike/%%PORTVERSION%%/lib/modules/GTKSupport.pmod
 @dirrm pike/%%PORTVERSION%%/lib/modules/Graphics.pmod/Graph.pmod
 @dirrm pike/%%PORTVERSION%%/lib/modules/Graphics.pmod
diff --git a/lang/pnet-base/pkg-plist b/lang/pnet-base/pkg-plist
index f01e7676c14c..b41ce94131ad 100644
--- a/lang/pnet-base/pkg-plist
+++ b/lang/pnet-base/pkg-plist
@@ -141,5 +141,5 @@ lib/libILSupport.a
 %%I386%%@dirrm lib/pnet/elf
 %%I386%%@dirrm lib/pnet
 @dirrm lib/cscc/plugins
-@unexec rmdir %D/lib/cscc 2>/dev/null || true
+@dirrmtry lib/cscc
 %%I386%%@dirrm share/gc
diff --git a/lang/pnetc/pkg-plist b/lang/pnetc/pkg-plist
index 39159409dbee..53c0291c5dfc 100644
--- a/lang/pnetc/pkg-plist
+++ b/lang/pnetc/pkg-plist
@@ -118,14 +118,14 @@ share/cscc/include/varargs.h
 share/cscc/include/wchar.h
 share/cscc/include/wctype.h
 share/cscc/include/xlocale.h
-@unexec rmdir %D/share/cscc/include/sys 2>/dev/null || true
-@unexec rmdir %D/share/cscc/include/netinet 2>/dev/null || true
-@unexec rmdir %D/share/cscc/include/gnu 2>/dev/null || true
-@unexec rmdir %D/share/cscc/include/bits 2>/dev/null || true
-@unexec rmdir %D/share/cscc/include/assembly 2>/dev/null || true
-@unexec rmdir %D/share/cscc/include/arpa 2>/dev/null || true
-@unexec rmdir %D/share/cscc/include 2>/dev/null || true
-@unexec rmdir %D/share/cscc 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/2.0.3600.0 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib 2>/dev/null || true
-@unexec rmdir %D/lib/cscc 2>/dev/null || true
+@dirrmtry share/cscc/include/sys
+@dirrmtry share/cscc/include/netinet
+@dirrmtry share/cscc/include/gnu
+@dirrmtry share/cscc/include/bits
+@dirrmtry share/cscc/include/assembly
+@dirrmtry share/cscc/include/arpa
+@dirrmtry share/cscc/include
+@dirrmtry share/cscc
+@dirrmtry lib/cscc/lib/2.0.3600.0
+@dirrmtry lib/cscc/lib
+@dirrmtry lib/cscc
diff --git a/lang/pnetlib/pkg-plist b/lang/pnetlib/pkg-plist
index 634f112f2ee1..39feee925eb6 100644
--- a/lang/pnetlib/pkg-plist
+++ b/lang/pnetlib/pkg-plist
@@ -130,15 +130,15 @@ lib/cscc/lib/pinvoke.map
 lib/cscc/lib/sysglobl.dll
 share/cscc/config/machine.default
 @dirrm share/cscc/config
-@unexec rmdir %D/share/cscc 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/8.0.1200.0/de 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/8.0.1200.0/ca 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/8.0.1200.0 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/2.0.3600.0/de 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/2.0.3600.0/ca 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/2.0.3600.0 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/0.81.0.1407 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/ca 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/de 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib 2>/dev/null || true
-@unexec rmdir %D/lib/cscc 2>/dev/null || true
+@dirrmtry share/cscc
+@dirrmtry lib/cscc/lib/8.0.1200.0/de
+@dirrmtry lib/cscc/lib/8.0.1200.0/ca
+@dirrmtry lib/cscc/lib/8.0.1200.0
+@dirrmtry lib/cscc/lib/2.0.3600.0/de
+@dirrmtry lib/cscc/lib/2.0.3600.0/ca
+@dirrmtry lib/cscc/lib/2.0.3600.0
+@dirrmtry lib/cscc/lib/0.81.0.1407
+@dirrmtry lib/cscc/lib/ca
+@dirrmtry lib/cscc/lib/de
+@dirrmtry lib/cscc/lib
+@dirrmtry lib/cscc
diff --git a/lang/pugs/pkg-plist b/lang/pugs/pkg-plist
index 497241525c48..f88d9041ec57 100644
--- a/lang/pugs/pkg-plist
+++ b/lang/pugs/pkg-plist
@@ -457,9 +457,9 @@ lib/perl6/site_perl/mach/CORE/pugs/syck/yamlbyte.h
 @dirrm lib/perl6
 @dirrm %%SITE_PERL%%/Perl6/Pugs
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Pugs
-@unexec rmdir %D/lib/perl6/mach 2>/dev/null || true
-@unexec rmdir %D/lib/perl6 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Inline 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/pugs 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Perl6 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6 2>/dev/null || true
+@dirrmtry lib/perl6/mach
+@dirrmtry lib/perl6
+@dirrmtry %%SITE_PERL%%/Inline
+@dirrmtry %%SITE_PERL%%/pugs
+@dirrmtry %%SITE_PERL%%/Perl6
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6
diff --git a/lang/python-mode.el/pkg-plist b/lang/python-mode.el/pkg-plist
index ef1b6a89ea27..a6e51d4536bc 100644
--- a/lang/python-mode.el/pkg-plist
+++ b/lang/python-mode.el/pkg-plist
@@ -5,5 +5,5 @@ share/emacs/site-lisp/pycomplete.el
 @exec ln -sf %D/%F %D/lib/xemacs/site-lisp/pycomplete.el
 @unexec rm %D/lib/xemacs/site-lisp/python-mode.el 2>/dev/null || true
 @unexec rm %D/lib/xemacs/site-lisp/pycomplete.el 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs 2>/dev/null || true
+@dirrmtry lib/xemacs/site-lisp
+@dirrmtry lib/xemacs
diff --git a/lang/ruby-man/pkg-plist b/lang/ruby-man/pkg-plist
index 9ffc2eeecd78..d2ffea6f93d9 100644
--- a/lang/ruby-man/pkg-plist
+++ b/lang/ruby-man/pkg-plist
@@ -48,4 +48,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/lang/ruby-programmingruby/pkg-plist b/lang/ruby-programmingruby/pkg-plist
index 3576369333fd..d96a2defc079 100644
--- a/lang/ruby-programmingruby/pkg-plist
+++ b/lang/ruby-programmingruby/pkg-plist
@@ -158,4 +158,4 @@
 @dirrm %%RUBY_MODDOCDIR%%/html
 @dirrm %%RUBY_MODDOCDIR%%/xml
 @dirrm %%RUBY_MODDOCDIR%%
-@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+@dirrmtry %%RUBY_DOCDIR%%
diff --git a/lang/ruby-reference/pkg-plist b/lang/ruby-reference/pkg-plist
index 7b76ea2e42ff..a4274fdf42b6 100644
--- a/lang/ruby-reference/pkg-plist
+++ b/lang/ruby-reference/pkg-plist
@@ -45,4 +45,4 @@
 %%RUBY_MODDOCDIR%%/ref_m_objectspace.html
 %%RUBY_MODDOCDIR%%/ref_m_process.html
 @dirrm %%RUBY_MODDOCDIR%%
-@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+@dirrmtry %%RUBY_DOCDIR%%
diff --git a/lang/ruby-usersguide/pkg-plist b/lang/ruby-usersguide/pkg-plist
index 4e4292666914..384a81591f84 100644
--- a/lang/ruby-usersguide/pkg-plist
+++ b/lang/ruby-usersguide/pkg-plist
@@ -34,4 +34,4 @@
 %%RUBY_MODDOCDIR%%/variables.html
 %%RUBY_MODDOCDIR%%/whatisruby.html
 @dirrm %%RUBY_MODDOCDIR%%
-@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+@dirrmtry %%RUBY_DOCDIR%%
diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist
index 8035fbe8e051..e1bc445114ba 100644
--- a/lang/ruby16/pkg-plist
+++ b/lang/ruby16/pkg-plist
@@ -141,7 +141,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 @exec /bin/mkdir -p %D/%%RUBY_SITEARCHLIBDIR%%
 @dirrm %%RUBY_SITEARCHLIBDIR%%
 %%RUBYLIB%%@dirrm %%RUBY_SITELIBDIR%%
-@unexec rmdir %D/lib/ruby/site_ruby 2>/dev/null || true
+@dirrmtry lib/ruby/site_ruby
 @dirrm %%RUBY_ARCHLIBDIR%%
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/uri
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/shell
@@ -153,8 +153,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%
 @unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
 %%RUBY_ELISPDIR%%/.keep_me.%%RUBY_NAME%%
-@unexec rmdir %D/%%RUBY_ELISPDIR%% 2>/dev/null || true
-@unexec rmdir %D/lib/ruby 2>/dev/null || true
+@dirrmtry %%RUBY_ELISPDIR%%
+@dirrmtry lib/ruby
 %%PORTDOCS%%%%RUBY_DOCDIR%%/COPYING
 %%PORTDOCS%%%%RUBY_DOCDIR%%/COPYING.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/ChangeLog
@@ -190,7 +190,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/net
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
 %%RUBY_DOCDIR%%/.keep_me
-@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+@dirrmtry %%RUBY_DOCDIR%%
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/biorhythm.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cal.rb
@@ -248,4 +248,4 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
 %%RUBY_EXAMPLESDIR%%/.keep_me
-@unexec rmdir %D/%%RUBY_EXAMPLESDIR%% 2>/dev/null || true
+@dirrmtry %%RUBY_EXAMPLESDIR%%
diff --git a/lang/smalltalk/pkg-plist b/lang/smalltalk/pkg-plist
index 2fe05f25dd53..7f6f6016d8d4 100644
--- a/lang/smalltalk/pkg-plist
+++ b/lang/smalltalk/pkg-plist
@@ -454,4 +454,4 @@ share/smalltalk/xml/XSL.st
 @dirrm share/smalltalk
 @dirrm lib/smalltalk
 @exec mkdir -p %D/include/snprintfv
-@unexec rmdir %D/include/snprintfv 2>/dev/null || true
+@dirrmtry include/snprintfv