Remove empty directories on uninstall.

25 files changed, 63 insertions, 8 deletions

diff --git a/devel/p5-B-Graph/pkg-plist b/devel/p5-B-Graph/pkg-plist
index 1eb204a..d492825 100644
--- a/devel/p5-B-Graph/pkg-plist
+++ b/devel/p5-B-Graph/pkg-plist
@@ -1,3 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/B/Graph.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/Graph/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/Graph
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/B 2>/dev/null || true
diff --git a/devel/p5-Class-Singleton/pkg-plist b/devel/p5-Class-Singleton/pkg-plist
index c42ef3e..432a33a 100644
--- a/devel/p5-Class-Singleton/pkg-plist
+++ b/devel/p5-Class-Singleton/pkg-plist
@@ -1,3 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/Class/Singleton.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Singleton/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Singleton
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
diff --git a/devel/p5-Class-Tom/pkg-plist b/devel/p5-Class-Tom/pkg-plist
index 3816102..f304523 100644
--- a/devel/p5-Class-Tom/pkg-plist
+++ b/devel/p5-Class-Tom/pkg-plist
@@ -5,4 +5,5 @@ lib/perl5/site_perl/%%PERL_VER%%/Class/Tom.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/Tom/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Class/Tom/Encode
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Class/Tom
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Class
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Class 2>/dev/null || true
diff --git a/devel/p5-Config-IniFiles/pkg-plist b/devel/p5-Config-IniFiles/pkg-plist
index e9784a9..e61076a 100644
--- a/devel/p5-Config-IniFiles/pkg-plist
+++ b/devel/p5-Config-IniFiles/pkg-plist
@@ -1,3 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/Config/IniFiles.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Config/IniFiles/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Config/IniFiles
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Config 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Config 2>/dev/null || true
diff --git a/devel/p5-Data-Flow/pkg-plist b/devel/p5-Data-Flow/pkg-plist
index ba40b4d..c1526d2 100644
--- a/devel/p5-Data-Flow/pkg-plist
+++ b/devel/p5-Data-Flow/pkg-plist
@@ -3,3 +3,6 @@ lib/perl5/site_perl/%%PERL_VER%%/auto/Data/Flow/autosplit.ix
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Flow/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Data/Flow
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Flow
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Data 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Data 2>/dev/null || true
diff --git a/devel/p5-Date-Calc/pkg-plist b/devel/p5-Date-Calc/pkg-plist
index d125b4d..109643e 100644
--- a/devel/p5-Date-Calc/pkg-plist
+++ b/devel/p5-Date-Calc/pkg-plist
@@ -1,5 +1,7 @@
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date/Calc.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Calc/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Calc/Calc.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Calc/Calc.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Date/Calc.pm
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Calc
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Date 2>/dev/null || true
diff --git a/devel/p5-File-Binary/pkg-plist b/devel/p5-File-Binary/pkg-plist
index 404a7d6..adaacfe 100644
--- a/devel/p5-File-Binary/pkg-plist
+++ b/devel/p5-File-Binary/pkg-plist
@@ -1,3 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/File/Binary.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Binary/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Binary
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
diff --git a/devel/p5-File-Cache/pkg-plist b/devel/p5-File-Cache/pkg-plist
index 0158678..6cb7651 100644
--- a/devel/p5-File-Cache/pkg-plist
+++ b/devel/p5-File-Cache/pkg-plist
@@ -1,3 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/File/Cache.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Cache/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Cache
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
diff --git a/devel/p5-File-Remove/pkg-plist b/devel/p5-File-Remove/pkg-plist
index 9394348..f20e2ce 100644
--- a/devel/p5-File-Remove/pkg-plist
+++ b/devel/p5-File-Remove/pkg-plist
@@ -1 +1,3 @@
 lib/perl5/site_perl/%%PERL_VER%%/File/Remove.pm
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
diff --git a/devel/p5-File-Spec/pkg-plist b/devel/p5-File-Spec/pkg-plist
index 24b9bab..ca1e9c7 100644
--- a/devel/p5-File-Spec/pkg-plist
+++ b/devel/p5-File-Spec/pkg-plist
@@ -8,4 +8,5 @@ lib/perl5/site_perl/%%PERL_VER%%/File/Spec/Win32.pm
 lib/perl5/site_perl/%%PERL_VER%%/File/Spec.pm
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Spec
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/File/Spec
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/File
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
diff --git a/devel/p5-File-Tail/pkg-plist b/devel/p5-File-Tail/pkg-plist
index 050adb8..8bf045b 100644
--- a/devel/p5-File-Tail/pkg-plist
+++ b/devel/p5-File-Tail/pkg-plist
@@ -3,3 +3,6 @@ lib/perl5/site_perl/%%PERL_VER%%/File/Tail.pm
 lib/perl5/site_perl/%%PERL_VER%%/auto/File/Tail/autosplit.ix
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Tail
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/File/Tail
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/File 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
diff --git a/devel/p5-File-Tools/pkg-plist b/devel/p5-File-Tools/pkg-plist
index 704657f..1e88429 100644
--- a/devel/p5-File-Tools/pkg-plist
+++ b/devel/p5-File-Tools/pkg-plist
@@ -1,4 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/File/Copy.pm
 lib/perl5/site_perl/%%PERL_VER%%/File/Recurse.pm
 lib/perl5/site_perl/%%PERL_VER%%/File/Tools.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/File
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
diff --git a/devel/p5-IO-String/pkg-plist b/devel/p5-IO-String/pkg-plist
index d6b5704..0606f38 100644
--- a/devel/p5-IO-String/pkg-plist
+++ b/devel/p5-IO-String/pkg-plist
@@ -1,4 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/IO/String.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/String/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/String
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/IO 2>/dev/null || true
diff --git a/devel/p5-IPC-ShareLite/pkg-plist b/devel/p5-IPC-ShareLite/pkg-plist
index 83b4de9..06e603f 100644
--- a/devel/p5-IPC-ShareLite/pkg-plist
+++ b/devel/p5-IPC-ShareLite/pkg-plist
@@ -4,3 +4,5 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/ShareLite/ShareLite.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/ShareLite/ShareLite.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/ShareLite/autosplit.ix
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/ShareLite
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/IPC 2>/dev/null || true
diff --git a/devel/p5-Locale-PGetText/pkg-plist b/devel/p5-Locale-PGetText/pkg-plist
index 9650c32..a141edd 100644
--- a/devel/p5-Locale-PGetText/pkg-plist
+++ b/devel/p5-Locale-PGetText/pkg-plist
@@ -3,3 +3,5 @@ bin/MsgFormat
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale/PGetText/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/Locale/PGetText.pm
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale/PGetText
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Locale 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Locale 2>/dev/null || true
diff --git a/devel/p5-Mac-FileSpec-Unixish/pkg-plist b/devel/p5-Mac-FileSpec-Unixish/pkg-plist
index 83db330..d1c5a7a 100644
--- a/devel/p5-Mac-FileSpec-Unixish/pkg-plist
+++ b/devel/p5-Mac-FileSpec-Unixish/pkg-plist
@@ -2,3 +2,7 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mac/FileSpec/Unixish/.packli
 lib/perl5/site_perl/%%PERL_VER%%/Mac/FileSpec/Unixish.pm
 lib/perl5/site_perl/%%PERL_VER%%/Mac/FileSpec/unixish_guts_test.pl
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mac/FileSpec/Unixish
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mac/FileSpec 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mac 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mac/FileSpec 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mac 2>/dev/null || true
diff --git a/devel/p5-Parse-RecDescent/pkg-plist b/devel/p5-Parse-RecDescent/pkg-plist
index 5e565db..c8937c7 100644
--- a/devel/p5-Parse-RecDescent/pkg-plist
+++ b/devel/p5-Parse-RecDescent/pkg-plist
@@ -4,3 +4,6 @@ lib/perl5/site_perl/%%PERL_VER%%/Text/Balanced.pm
 lib/perl5/site_perl/%%PERL_VER%%/Text/Balanced.pod
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/RecDescent/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse/RecDescent
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Parse 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Parse 2>/dev/null || true
diff --git a/devel/p5-PathTools/pkg-plist b/devel/p5-PathTools/pkg-plist
index 24b9bab..ca1e9c7 100644
--- a/devel/p5-PathTools/pkg-plist
+++ b/devel/p5-PathTools/pkg-plist
@@ -8,4 +8,5 @@ lib/perl5/site_perl/%%PERL_VER%%/File/Spec/Win32.pm
 lib/perl5/site_perl/%%PERL_VER%%/File/Spec.pm
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Spec
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/File/Spec
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/File
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
diff --git a/devel/p5-Proc-Daemon/pkg-plist b/devel/p5-Proc-Daemon/pkg-plist
index 6520dc4..6ae30ec 100644
--- a/devel/p5-Proc-Daemon/pkg-plist
+++ b/devel/p5-Proc-Daemon/pkg-plist
@@ -1,3 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/Proc/Daemon.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Proc/Daemon/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Proc/Daemon
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Proc 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Proc 2>/dev/null || true
diff --git a/devel/p5-ReadLine-Gnu/pkg-plist b/devel/p5-ReadLine-Gnu/pkg-plist
index 2eb8add..b417ae0 100644
--- a/devel/p5-ReadLine-Gnu/pkg-plist
+++ b/devel/p5-ReadLine-Gnu/pkg-plist
@@ -1,5 +1,13 @@
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Term/ReadLine/Gnu.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Term/ReadLine/Gnu/XS.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadLine/Gnu/Gnu.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadLine/Gnu/Gnu.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Term/ReadLine/Gnu.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadLine/Gnu/XS/autosplit.ix
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadLine/Gnu/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadLine/Gnu/XS
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadLine/Gnu
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Term/ReadLine/Gnu
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadLine 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Term/ReadLine 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Term 2>/dev/null || true
diff --git a/devel/p5-ReadLine-Perl/pkg-plist b/devel/p5-ReadLine-Perl/pkg-plist
index 3f123cf..4013cb4 100644
--- a/devel/p5-ReadLine-Perl/pkg-plist
+++ b/devel/p5-ReadLine-Perl/pkg-plist
@@ -1,3 +1,6 @@
 lib/perl5/site_perl/%%PERL_VER%%/Term/ReadLine/Perl.pm
 lib/perl5/site_perl/%%PERL_VER%%/Term/ReadLine/readline.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadLine/.packlist
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Term/ReadLine 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Term 2>/dev/null || true
diff --git a/devel/p5-String-Checker/pkg-plist b/devel/p5-String-Checker/pkg-plist
index 16a70e6..9bec63a 100644
--- a/devel/p5-String-Checker/pkg-plist
+++ b/devel/p5-String-Checker/pkg-plist
@@ -1,3 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/String/Checker.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Checker/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Checker
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/String 2>/dev/null || true
diff --git a/devel/p5-String-Random/pkg-plist b/devel/p5-String-Random/pkg-plist
index 1907d8e..71daa5b 100644
--- a/devel/p5-String-Random/pkg-plist
+++ b/devel/p5-String-Random/pkg-plist
@@ -1,3 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/String/Random.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Random/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/Random
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/String 2>/dev/null || true
diff --git a/devel/p5-String-RexxParse/pkg-plist b/devel/p5-String-RexxParse/pkg-plist
index 93e2eed..101d90e 100644
--- a/devel/p5-String-RexxParse/pkg-plist
+++ b/devel/p5-String-RexxParse/pkg-plist
@@ -1,3 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/String/RexxParse.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/RexxParse/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String/RexxParse
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/String 2>/dev/null || true
diff --git a/devel/p5-Tie-Cache/pkg-plist b/devel/p5-Tie-Cache/pkg-plist
index cbeec81..52099e7 100644
--- a/devel/p5-Tie-Cache/pkg-plist
+++ b/devel/p5-Tie-Cache/pkg-plist
@@ -1,5 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/Tie/Cache.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/Cache/.packlist
-@unexec rmdir lib/perl5/site_perl/%%PERL_VER%%/Tie 2>/dev/null || true
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/Cache
-@unexec rmdir lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Tie 2>/dev/null || true