60 files changed, 128 insertions, 128 deletions

diff --git a/devel/c_c++_reference/pkg-plist b/devel/c_c++_reference/pkg-plist
index 31edc7262702..6c7ba43ef81c 100644
--- a/devel/c_c++_reference/pkg-plist
+++ b/devel/c_c++_reference/pkg-plist
@@ -1062,4 +1062,4 @@ share/doc/HTML/en/kdevelop/reference/GRAPHICS/yellowball.gif
 @dirrm share/doc/HTML/en/kdevelop/reference/CPLUSPLUS/X_EXAMPLES
 @dirrm share/doc/HTML/en/kdevelop/reference/CPLUSPLUS
 @dirrm share/doc/HTML/en/kdevelop/reference/GRAPHICS
-@unexec rmdir %D/share/doc/HTML/en/kdevelop/reference/ 2> /dev/null || true
+@dirrmtry share/doc/HTML/en/kdevelop/reference/
diff --git a/devel/cweb/pkg-plist b/devel/cweb/pkg-plist
index f61984e46e28..c90514112f5d 100644
--- a/devel/cweb/pkg-plist
+++ b/devel/cweb/pkg-plist
@@ -6,7 +6,7 @@ share/emacs/site-lisp/cweb.el
 share/texmf/tex/generic/misc/cwebmac.tex
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/texmf/tex/generic/misc 2>/dev/null || true
-@unexec rmdir %D/share/texmf/tex/generic 2>/dev/null || true
-@unexec rmdir %D/share/texmf/tex 2>/dev/null || true
-@unexec rmdir %D/share/texmf 2>/dev/null || true
+@dirrmtry share/texmf/tex/generic/misc
+@dirrmtry share/texmf/tex/generic
+@dirrmtry share/texmf/tex
+@dirrmtry share/texmf
diff --git a/devel/gauche-gaunit/pkg-plist b/devel/gauche-gaunit/pkg-plist
index d791790fe518..dc01c969a777 100644
--- a/devel/gauche-gaunit/pkg-plist
+++ b/devel/gauche-gaunit/pkg-plist
@@ -9,7 +9,7 @@ share/gauche/site/lib/test/unit/ui/gtk.scm
 share/gauche/site/lib/test/unit/ui/text.scm
 @dirrm share/gauche/site/lib/test/unit/ui
 @dirrm share/gauche/site/lib/test/unit
-@unexec rmdir %D/share/gauche/site/lib/test 2>/dev/null || true
+@dirrmtry share/gauche/site/lib/test
 %%EXAMPLESDIR%%/site-lisp/run-test-setting.el
 %%EXAMPLESDIR%%/site-lisp/run-test.el
 %%EXAMPLESDIR%%/symdiff/lib/symdiff.scm
diff --git a/devel/mingw-bin-msvcrt/pkg-plist b/devel/mingw-bin-msvcrt/pkg-plist
index d5c6c48e68ad..0919658facac 100644
--- a/devel/mingw-bin-msvcrt/pkg-plist
+++ b/devel/mingw-bin-msvcrt/pkg-plist
@@ -284,4 +284,4 @@ i386-mingw32msvc/lib/libwst.a
 @dirrm i386-mingw32msvc/include/sys
 @dirrm i386-mingw32msvc/include
 @dirrm i386-mingw32msvc/lib
-@unexec rmdir %D/i386-mingw32msvc 2>/dev/null || true
+@dirrmtry i386-mingw32msvc
diff --git a/devel/mingw-gcc/pkg-plist b/devel/mingw-gcc/pkg-plist
index 85ccf60b6e33..cc254d1ea204 100644
--- a/devel/mingw-gcc/pkg-plist
+++ b/devel/mingw-gcc/pkg-plist
@@ -228,4 +228,4 @@ lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/vector.h
 @dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-6
 @dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%
 @dirrm lib/gcc-lib/i386-mingw32msvc
-@unexec rmdir %D/lib/gcc-lib 2>/dev/null || true
+@dirrmtry lib/gcc-lib
diff --git a/devel/p5-Algorithm-Annotate/pkg-plist b/devel/p5-Algorithm-Annotate/pkg-plist
index 75be75d4bcd9..a6387c9696ac 100644
--- a/devel/p5-Algorithm-Annotate/pkg-plist
+++ b/devel/p5-Algorithm-Annotate/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Algorithm/Annotate.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Annotate/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Annotate 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Algorithm
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Annotate
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
diff --git a/devel/p5-Algorithm-Evolutionary/pkg-plist b/devel/p5-Algorithm-Evolutionary/pkg-plist
index eddfe3182285..44d5fd1b890d 100644
--- a/devel/p5-Algorithm-Evolutionary/pkg-plist
+++ b/devel/p5-Algorithm-Evolutionary/pkg-plist
@@ -1,6 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Evolutionary/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Evolutionary
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
 %%SITE_PERL%%/Algorithm/Evolutionary.pm
 %%SITE_PERL%%/Algorithm/Evolutionary/Experiment.pm
 %%SITE_PERL%%/Algorithm/Evolutionary/Individual/Base.pm
@@ -39,4 +39,4 @@
 @dirrm %%SITE_PERL%%/Algorithm/Evolutionary/Individual
 @dirrm %%SITE_PERL%%/Algorithm/Evolutionary/Op
 @dirrm %%SITE_PERL%%/Algorithm/Evolutionary
-@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Algorithm
diff --git a/devel/p5-Algorithm-MDiff/pkg-plist b/devel/p5-Algorithm-MDiff/pkg-plist
index 78925d600a40..f2322d65aeb8 100644
--- a/devel/p5-Algorithm-MDiff/pkg-plist
+++ b/devel/p5-Algorithm-MDiff/pkg-plist
@@ -4,5 +4,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/MDiff/MDiff.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/MDiff/autosplit.ix
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/MDiff
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Algorithm
diff --git a/devel/p5-Algorithm-MarkovChain/pkg-plist b/devel/p5-Algorithm-MarkovChain/pkg-plist
index d937807dfb08..9590beae9d97 100644
--- a/devel/p5-Algorithm-MarkovChain/pkg-plist
+++ b/devel/p5-Algorithm-MarkovChain/pkg-plist
@@ -1,4 +1,4 @@
 %%SITE_PERL%%/Algorithm/MarkovChain.pm
 %%SITE_PERL%%/Algorithm/MarkovChain/Base.pm
 @dirrm %%SITE_PERL%%/Algorithm/MarkovChain
-@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Algorithm
diff --git a/devel/p5-AppConfig-Std/pkg-plist b/devel/p5-AppConfig-Std/pkg-plist
index 4965e6bf5bef..e44ebdbbaec8 100644
--- a/devel/p5-AppConfig-Std/pkg-plist
+++ b/devel/p5-AppConfig-Std/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/AppConfig/Std.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/AppConfig/Std/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/AppConfig 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/AppConfig
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AppConfig/Std
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AppConfig 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AppConfig
diff --git a/devel/p5-B-Graph/pkg-plist b/devel/p5-B-Graph/pkg-plist
index b76ec491d4f4..52156fba0dfa 100644
--- a/devel/p5-B-Graph/pkg-plist
+++ b/devel/p5-B-Graph/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/B/Graph.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Graph/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Graph
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/B 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/B
+@dirrmtry %%SITE_PERL%%/B
diff --git a/devel/p5-C-Scan/pkg-plist b/devel/p5-C-Scan/pkg-plist
index 34a1bd7c3967..7fb35bf6954a 100644
--- a/devel/p5-C-Scan/pkg-plist
+++ b/devel/p5-C-Scan/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/C/Scan.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/C/Scan/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/C/Scan
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/C 2> /dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/C 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/C
+@dirrmtry %%SITE_PERL%%/C
diff --git a/devel/p5-Class-MakeMethods/pkg-plist b/devel/p5-Class-MakeMethods/pkg-plist
index 654d3bef300c..b607b616beae 100644
--- a/devel/p5-Class-MakeMethods/pkg-plist
+++ b/devel/p5-Class-MakeMethods/pkg-plist
@@ -60,15 +60,15 @@
 %%SITE_PERL%%/Class/MakeMethods/Utility/Ref.pm
 %%SITE_PERL%%/Class/MakeMethods/Utility/TextBuilder.pm
 
-@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Basic 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Composite 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Docs 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Emulator 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Evaled 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Standard 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Template 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Utility 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MakeMethods 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class/MakeMethods/Basic
+@dirrmtry %%SITE_PERL%%/Class/MakeMethods/Composite
+@dirrmtry %%SITE_PERL%%/Class/MakeMethods/Docs
+@dirrmtry %%SITE_PERL%%/Class/MakeMethods/Emulator
+@dirrmtry %%SITE_PERL%%/Class/MakeMethods/Evaled
+@dirrmtry %%SITE_PERL%%/Class/MakeMethods/Standard
+@dirrmtry %%SITE_PERL%%/Class/MakeMethods/Template
+@dirrmtry %%SITE_PERL%%/Class/MakeMethods/Utility
+@dirrmtry %%SITE_PERL%%/Class/MakeMethods
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MakeMethods
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-Roles/pkg-plist b/devel/p5-Class-Roles/pkg-plist
index 08aaf32ebbb4..0365241e2560 100644
--- a/devel/p5-Class-Roles/pkg-plist
+++ b/devel/p5-Class-Roles/pkg-plist
@@ -1,2 +1,2 @@
 %%SITE_PERL%%/Class/Roles.pm
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-Singleton/pkg-plist b/devel/p5-Class-Singleton/pkg-plist
index 429f35e5b447..8fa3042790af 100644
--- a/devel/p5-Class-Singleton/pkg-plist
+++ b/devel/p5-Class-Singleton/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Class/Singleton.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Singleton/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Singleton
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Data-Hexdumper/pkg-plist b/devel/p5-Data-Hexdumper/pkg-plist
index c218d67bfcff..b61fc613f304 100644
--- a/devel/p5-Data-Hexdumper/pkg-plist
+++ b/devel/p5-Data-Hexdumper/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Data/Hexdumper.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Hexdumper/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Hexdumper
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Data
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
diff --git a/devel/p5-Data-Properties/pkg-plist b/devel/p5-Data-Properties/pkg-plist
index ad985a0bd276..0630c2d75fcc 100644
--- a/devel/p5-Data-Properties/pkg-plist
+++ b/devel/p5-Data-Properties/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Properties/.packlist
 %%SITE_PERL%%/Data/Properties.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Properties
-@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/devel/p5-Data-ShowTable/pkg-plist b/devel/p5-Data-ShowTable/pkg-plist
index d401bab5ae4d..9364100f03d5 100644
--- a/devel/p5-Data-ShowTable/pkg-plist
+++ b/devel/p5-Data-ShowTable/pkg-plist
@@ -2,5 +2,5 @@ bin/showtable
 %%SITE_PERL%%/Data/ShowTable.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ShowTable/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ShowTable
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Data
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
diff --git a/devel/p5-Date-ISO/pkg-plist b/devel/p5-Date-ISO/pkg-plist
index f5425e6a3388..c31cdc274efb 100644
--- a/devel/p5-Date-ISO/pkg-plist
+++ b/devel/p5-Date-ISO/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Date/ISO.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/ISO/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Date
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/ISO
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
diff --git a/devel/p5-Date-Pcalc/pkg-plist b/devel/p5-Date-Pcalc/pkg-plist
index ce74c2508d1f..f5f37723be81 100644
--- a/devel/p5-Date-Pcalc/pkg-plist
+++ b/devel/p5-Date-Pcalc/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Date/Pcalc.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Pcalc/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Pcalc
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
+@dirrmtry %%SITE_PERL%%/Date
diff --git a/devel/p5-DateConvert/pkg-plist b/devel/p5-DateConvert/pkg-plist
index ce4d4935f615..4d72fdf4c94c 100644
--- a/devel/p5-DateConvert/pkg-plist
+++ b/devel/p5-DateConvert/pkg-plist
@@ -2,4 +2,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Convert/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Convert
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Date
diff --git a/devel/p5-Devel-StealthDebug/pkg-plist b/devel/p5-Devel-StealthDebug/pkg-plist
index c5c26f50e175..c1f15b0d2600 100644
--- a/devel/p5-Devel-StealthDebug/pkg-plist
+++ b/devel/p5-Devel-StealthDebug/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/StealthDebug/.packlist
 %%SITE_PERL%%/Devel/StealthDebug.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/StealthDebug
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry %%SITE_PERL%%/Devel
diff --git a/devel/p5-Devel-ptkdb/pkg-plist b/devel/p5-Devel-ptkdb/pkg-plist
index 31426f7cedd4..b800bc2004a1 100644
--- a/devel/p5-Devel-ptkdb/pkg-plist
+++ b/devel/p5-Devel-ptkdb/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Devel/ptkdb.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/ptkdb/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/ptkdb
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry %%SITE_PERL%%/Devel
diff --git a/devel/p5-File-BasicFlock/pkg-plist b/devel/p5-File-BasicFlock/pkg-plist
index e02c155292f8..18adf3b17a33 100644
--- a/devel/p5-File-BasicFlock/pkg-plist
+++ b/devel/p5-File-BasicFlock/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/File/BasicFlock.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/BasicFlock/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/BasicFlock
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/devel/p5-File-Binary/pkg-plist b/devel/p5-File-Binary/pkg-plist
index fa939ef3d0ee..bf42fe16ad3a 100644
--- a/devel/p5-File-Binary/pkg-plist
+++ b/devel/p5-File-Binary/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/File/Binary.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Binary/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Binary
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-File-Cache/pkg-plist b/devel/p5-File-Cache/pkg-plist
index 9ccefad85b4f..7a30f04dc31e 100644
--- a/devel/p5-File-Cache/pkg-plist
+++ b/devel/p5-File-Cache/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/File/Cache.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Cache/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Cache
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-File-DirSync/pkg-plist b/devel/p5-File-DirSync/pkg-plist
index 118fcd539572..ac6e8fed2311 100644
--- a/devel/p5-File-DirSync/pkg-plist
+++ b/devel/p5-File-DirSync/pkg-plist
@@ -2,5 +2,5 @@ bin/dirsync
 %%SITE_PERL%%/File/DirSync.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/DirSync/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/DirSync
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-File-FTS/pkg-plist b/devel/p5-File-FTS/pkg-plist
index fecd548aacbf..da0b6b43689f 100644
--- a/devel/p5-File-FTS/pkg-plist
+++ b/devel/p5-File-FTS/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/FTS/.packlist
 %%SITE_PERL%%/File/FTS.pm
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/FTS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/FTS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/devel/p5-Getargs-Long/pkg-plist b/devel/p5-Getargs-Long/pkg-plist
index 5d3305bae512..310bc6b255a6 100644
--- a/devel/p5-Getargs-Long/pkg-plist
+++ b/devel/p5-Getargs-Long/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Getargs/Long.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getargs/Long/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getargs/Long
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getargs 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Getargs 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getargs
+@dirrmtry %%SITE_PERL%%/Getargs
diff --git a/devel/p5-Getopt-Mixed/pkg-plist b/devel/p5-Getopt-Mixed/pkg-plist
index ad95e668fdc2..92824667e6a9 100644
--- a/devel/p5-Getopt-Mixed/pkg-plist
+++ b/devel/p5-Getopt-Mixed/pkg-plist
@@ -1,6 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Mixed/.packlist
 %%SITE_PERL%%/Getopt/Mixed.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Mixed
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mixed 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Getopt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mixed
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt
+@dirrmtry %%SITE_PERL%%/Getopt
diff --git a/devel/p5-IO-Stty/pkg-plist b/devel/p5-IO-Stty/pkg-plist
index eb22f3ad2d55..8aeeabde96ed 100644
--- a/devel/p5-IO-Stty/pkg-plist
+++ b/devel/p5-IO-Stty/pkg-plist
@@ -2,5 +2,5 @@
 %%SITE_PERL%%/IO/Stty.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Stty/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Stty
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/IO
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
diff --git a/devel/p5-IPC-Cache/pkg-plist b/devel/p5-IPC-Cache/pkg-plist
index bfa316da4f13..bd9408b9ecb2 100644
--- a/devel/p5-IPC-Cache/pkg-plist
+++ b/devel/p5-IPC-Cache/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/IPC/Cache.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Cache/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Cache
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IPC 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry %%SITE_PERL%%/IPC
diff --git a/devel/p5-Inline-Java/pkg-plist b/devel/p5-Inline-Java/pkg-plist
index 5e983f199ccf..5c1c0e578414 100644
--- a/devel/p5-Inline-Java/pkg-plist
+++ b/devel/p5-Inline-Java/pkg-plist
@@ -12,5 +12,5 @@
 %%SITE_PERL%%/Inline/Java/Protocol.pm
 @dirrm %%SITE_PERL%%/Inline/Java
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java
-@unexec rmdir %D/%%SITE_PERL%%/Inline 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Inline
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline
diff --git a/devel/p5-Locale-PGetText/pkg-plist b/devel/p5-Locale-PGetText/pkg-plist
index 04724c42f9c2..cdbab07e2284 100644
--- a/devel/p5-Locale-PGetText/pkg-plist
+++ b/devel/p5-Locale-PGetText/pkg-plist
@@ -3,5 +3,5 @@ bin/MsgFormat
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/PGetText/.packlist
 %%SITE_PERL%%/Locale/PGetText.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/PGetText
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Locale 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
+@dirrmtry %%SITE_PERL%%/Locale
diff --git a/devel/p5-Log-Agent-Logger/pkg-plist b/devel/p5-Log-Agent-Logger/pkg-plist
index c24d734b08e0..7a9044f45020 100644
--- a/devel/p5-Log-Agent-Logger/pkg-plist
+++ b/devel/p5-Log-Agent-Logger/pkg-plist
@@ -1,4 +1,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent/Logger/.packlist
 %%SITE_PERL%%/Log/Agent/Logger.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent/Logger
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent
diff --git a/devel/p5-Log-Dispatch-Config/pkg-plist b/devel/p5-Log-Dispatch-Config/pkg-plist
index 09c39a29a5cb..c502375bdea2 100644
--- a/devel/p5-Log-Dispatch-Config/pkg-plist
+++ b/devel/p5-Log-Dispatch-Config/pkg-plist
@@ -3,8 +3,8 @@
 %%SITE_PERL%%/Log/Dispatch/Config.pm
 %%SITE_PERL%%/Log/Dispatch/Configurator/AppConfig.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Config
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Log/Dispatch/Configurator 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Log/Dispatch 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Log 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
+@dirrmtry %%SITE_PERL%%/Log/Dispatch/Configurator
+@dirrmtry %%SITE_PERL%%/Log/Dispatch
+@dirrmtry %%SITE_PERL%%/Log
diff --git a/devel/p5-Memoize-ExpireLRU/pkg-plist b/devel/p5-Memoize-ExpireLRU/pkg-plist
index a5b811a3c7df..2d2fc5de693b 100644
--- a/devel/p5-Memoize-ExpireLRU/pkg-plist
+++ b/devel/p5-Memoize-ExpireLRU/pkg-plist
@@ -4,5 +4,5 @@
 %%SITE_PERL%%/auto/Memoize/ExpireLRU/autosplit.ix
 %%SITE_PERL%%/Memoize/ExpireLRU.pm
 @dirrm %%SITE_PERL%%/auto/Memoize/ExpireLRU
-@unexec rmdir %D/%%SITE_PERL%%/auto/Memoize 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Memoize/ExpireLRU 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Memoize
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Memoize/ExpireLRU
diff --git a/devel/p5-Module-Versions-Report/pkg-plist b/devel/p5-Module-Versions-Report/pkg-plist
index a2ed491598f9..dbfe3cf4a545 100644
--- a/devel/p5-Module-Versions-Report/pkg-plist
+++ b/devel/p5-Module-Versions-Report/pkg-plist
@@ -2,4 +2,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module-Versions-Report/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module-Versions-Report
 @dirrm %%SITE_PERL%%/Module/Versions
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Module
diff --git a/devel/p5-ORBit/pkg-plist b/devel/p5-ORBit/pkg-plist
index 786218567871..30142f108fc4 100644
--- a/devel/p5-ORBit/pkg-plist
+++ b/devel/p5-ORBit/pkg-plist
@@ -9,5 +9,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA/ORBit/ORBit.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA/ORBit
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/CORBA/ORBit
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/CORBA 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/CORBA
diff --git a/devel/p5-PCSC-Card/pkg-plist b/devel/p5-PCSC-Card/pkg-plist
index 49e6458171c8..bc5dabf9807a 100644
--- a/devel/p5-PCSC-Card/pkg-plist
+++ b/devel/p5-PCSC-Card/pkg-plist
@@ -5,7 +5,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC/Card.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard/PCSC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard/PCSC
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Chipcard
diff --git a/devel/p5-POE-Component-TSTP/pkg-plist b/devel/p5-POE-Component-TSTP/pkg-plist
index 2c2da69144b1..b188fe9266ac 100644
--- a/devel/p5-POE-Component-TSTP/pkg-plist
+++ b/devel/p5-POE-Component-TSTP/pkg-plist
@@ -1,6 +1,6 @@
 %%SITE_PERL%%/POE/Component/TSTP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/TSTP/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/TSTP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/devel/p5-Penguin/pkg-plist b/devel/p5-Penguin/pkg-plist
index d12f4b68de92..94b7e50174c8 100644
--- a/devel/p5-Penguin/pkg-plist
+++ b/devel/p5-Penguin/pkg-plist
@@ -36,9 +36,9 @@ lib/perl5/site_perl/Penguin/doc/TODO
 @dirrm %%SITE_PERL%%/Penguin/Frame
 @dirrm %%SITE_PERL%%/Penguin/Trivial
 @dirrm %%SITE_PERL%%/Penguin/Wrapper
-@unexec rmdir %D/%%SITE_PERL%%/Penguin 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Penguin
 @dirrm lib/perl5/site_perl/Penguin/bin
 @dirrm lib/perl5/site_perl/Penguin/misc
 @dirrm lib/perl5/site_perl/Penguin/doc
-@unexec rmdir %D/lib/perl5/site_perl/Penguin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Penguin 2>/dev/null || true
+@dirrmtry lib/perl5/site_perl/Penguin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Penguin
diff --git a/devel/p5-Proc-ProcessTable/pkg-plist b/devel/p5-Proc-ProcessTable/pkg-plist
index 4ce2bbdfdeea..558c508b4c47 100644
--- a/devel/p5-Proc-ProcessTable/pkg-plist
+++ b/devel/p5-Proc-ProcessTable/pkg-plist
@@ -10,5 +10,5 @@
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/ProcessTable/Process
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/ProcessTable
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Proc/ProcessTable
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Proc 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Proc
diff --git a/devel/p5-Set-Array/pkg-plist b/devel/p5-Set-Array/pkg-plist
index c6988fa4409a..ea93519bbff6 100644
--- a/devel/p5-Set-Array/pkg-plist
+++ b/devel/p5-Set-Array/pkg-plist
@@ -1,2 +1,2 @@
 %%SITE_PERL%%/Set/Array.pm
-@unexec rmdir %D/%%SITE_PERL%%/Set 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Set
diff --git a/devel/p5-Sort-ArrayOfArrays/pkg-plist b/devel/p5-Sort-ArrayOfArrays/pkg-plist
index e0f755cedfc2..9848aa689730 100644
--- a/devel/p5-Sort-ArrayOfArrays/pkg-plist
+++ b/devel/p5-Sort-ArrayOfArrays/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Sort/ArrayOfArrays.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArrayOfArrays/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArrayOfArrays
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sort 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
+@dirrmtry %%SITE_PERL%%/Sort
diff --git a/devel/p5-String-Approx/pkg-plist b/devel/p5-String-Approx/pkg-plist
index 526fa974e73a..dcef536e1792 100644
--- a/devel/p5-String-Approx/pkg-plist
+++ b/devel/p5-String-Approx/pkg-plist
@@ -3,5 +3,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Approx/Approx.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Approx/Approx.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Approx
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/String 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/String
diff --git a/devel/p5-String-CRC32/pkg-plist b/devel/p5-String-CRC32/pkg-plist
index dac75c334bec..e1230b967fcd 100644
--- a/devel/p5-String-CRC32/pkg-plist
+++ b/devel/p5-String-CRC32/pkg-plist
@@ -4,5 +4,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CRC32/CRC32.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CRC32/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CRC32
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/String 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/String
diff --git a/devel/p5-String-Checker/pkg-plist b/devel/p5-String-Checker/pkg-plist
index 911be55bbfff..6d8e5d3409cd 100644
--- a/devel/p5-String-Checker/pkg-plist
+++ b/devel/p5-String-Checker/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/String/Checker.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Checker/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Checker
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/String 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrmtry %%SITE_PERL%%/String
diff --git a/devel/p5-String-Ediff/pkg-plist b/devel/p5-String-Ediff/pkg-plist
index 4a717dfaf784..0a517e292cca 100644
--- a/devel/p5-String-Ediff/pkg-plist
+++ b/devel/p5-String-Ediff/pkg-plist
@@ -3,5 +3,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Ediff/Ediff.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Ediff/Ediff.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Ediff
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/String 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/String
diff --git a/devel/p5-String-Random/pkg-plist b/devel/p5-String-Random/pkg-plist
index afcf12cf0563..54542cc223da 100644
--- a/devel/p5-String-Random/pkg-plist
+++ b/devel/p5-String-Random/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/String/Random.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Random/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Random
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/String 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrmtry %%SITE_PERL%%/String
diff --git a/devel/p5-String-RexxParse/pkg-plist b/devel/p5-String-RexxParse/pkg-plist
index 31b9f77618d6..3fdb4879285a 100644
--- a/devel/p5-String-RexxParse/pkg-plist
+++ b/devel/p5-String-RexxParse/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/String/RexxParse.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/RexxParse/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/RexxParse
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/String 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrmtry %%SITE_PERL%%/String
diff --git a/devel/p5-Term-ANSIScreen/pkg-plist b/devel/p5-Term-ANSIScreen/pkg-plist
index 6ab46793b0cd..77facb684b52 100644
--- a/devel/p5-Term-ANSIScreen/pkg-plist
+++ b/devel/p5-Term-ANSIScreen/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Term/ANSIScreen.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ANSIScreen/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ANSIScreen
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term
+@dirrmtry %%SITE_PERL%%/Term
diff --git a/devel/p5-Term-Query/pkg-plist b/devel/p5-Term-Query/pkg-plist
index 3776eb0e2d70..8fd1491180b5 100644
--- a/devel/p5-Term-Query/pkg-plist
+++ b/devel/p5-Term-Query/pkg-plist
@@ -3,5 +3,5 @@
 %%SITE_PERL%%/Term/Query_Test.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Query/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Query
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term
+@dirrmtry %%SITE_PERL%%/Term
diff --git a/devel/p5-Tie-IxHash/pkg-plist b/devel/p5-Tie-IxHash/pkg-plist
index ff6998167a43..5fa6a694775e 100644
--- a/devel/p5-Tie-IxHash/pkg-plist
+++ b/devel/p5-Tie-IxHash/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Tie/IxHash.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/IxHash/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/IxHash
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
+@dirrmtry %%SITE_PERL%%/Tie
diff --git a/devel/p5-TraceFuncs/pkg-plist b/devel/p5-TraceFuncs/pkg-plist
index aa157782d0d1..eaf1ddffa293 100644
--- a/devel/p5-TraceFuncs/pkg-plist
+++ b/devel/p5-TraceFuncs/pkg-plist
@@ -1,4 +1,4 @@
 %%SITE_PERL%%/Devel/TraceFuncs.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
diff --git a/devel/p5-Tree-DAG_Node/pkg-plist b/devel/p5-Tree-DAG_Node/pkg-plist
index 292d9d8a0624..a8262608efc8 100644
--- a/devel/p5-Tree-DAG_Node/pkg-plist
+++ b/devel/p5-Tree-DAG_Node/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Tree/DAG_Node.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/DAG_Node/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/DAG_Node
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tree 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree
+@dirrmtry %%SITE_PERL%%/Tree
diff --git a/devel/p5-VCP-autrijus/pkg-plist b/devel/p5-VCP-autrijus/pkg-plist
index 99c98558f3c9..89786c5d5891 100644
--- a/devel/p5-VCP-autrijus/pkg-plist
+++ b/devel/p5-VCP-autrijus/pkg-plist
@@ -83,4 +83,4 @@ bin/vcp
 @dirrm %%SITE_PERL%%/VCP/Utils
 @dirrm %%SITE_PERL%%/VCP
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP
diff --git a/devel/pear-apd/pkg-plist b/devel/pear-apd/pkg-plist
index 516b5b0b1d8c..5f88185efd50 100644
--- a/devel/pear-apd/pkg-plist
+++ b/devel/pear-apd/pkg-plist
@@ -2,4 +2,4 @@ bin/pprofp
 %%EXTDIR%%/apd.so
 %%PKGREGDIR%%/package.xml
 @dirrm %%PKGREGDIR%%
-@unexec rmdir %D/%%PEARDIR%%/packages 2>/dev/null || true
+@dirrmtry %%PEARDIR%%/packages
diff --git a/devel/pmk/pkg-plist b/devel/pmk/pkg-plist
index 515ae825dc77..6ae1284e5450 100644
--- a/devel/pmk/pkg-plist
+++ b/devel/pmk/pkg-plist
@@ -4,7 +4,7 @@ bin/pmkpc
 bin/pmkscan
 @unexec if cmp -s %D/etc/pmk/pmk.conf %D/etc/pmk/pmk.conf.dist; then rm -f %D/etc/pmk/pmk.conf; fi
 @unexec rm -f %D/etc/pmk/pmk.conf.dist
-@unexec rmdir %D/etc/pmk 2>/dev/null || true
+@dirrmtry etc/pmk
 bin/pmksetup
 %%DATADIR%%/pmkcfgtool.dat
 %%DATADIR%%/pmkcomp.dat
diff --git a/devel/ruby-io-reactor/pkg-plist b/devel/ruby-io-reactor/pkg-plist
index 7c7fbf690d8b..98f488af48a4 100644
--- a/devel/ruby-io-reactor/pkg-plist
+++ b/devel/ruby-io-reactor/pkg-plist
@@ -1,5 +1,5 @@
 %%RUBY_SITELIBDIR%%/io/reactor.rb
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/io 2>/dev/null || true
+@dirrmtry %%RUBY_SITELIBDIR%%/io
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%