aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--astro/p5-Astro-MoonPhase/pkg-plist2
-rw-r--r--astro/p5-Astro-SunTime/pkg-plist2
-rw-r--r--astro/p5-GPS/pkg-plist4
-rw-r--r--astro/p5-Geo-METAR/pkg-plist2
-rw-r--r--audio/p5-MP3-ID3v1Tag/pkg-plist2
-rw-r--r--audio/p5-MP3-Info/pkg-plist3
-rw-r--r--converters/p5-Convert-ASN1/pkg-plist2
-rw-r--r--converters/p5-Convert-BER/pkg-plist2
-rw-r--r--converters/p5-Convert-Morse/pkg-plist2
-rw-r--r--converters/p5-MIME-Base64/pkg-plist4
-rw-r--r--converters/p5-Text-Iconv/pkg-plist2
-rw-r--r--devel/p5-B-Graph/pkg-plist2
-rw-r--r--devel/p5-Class-Singleton/pkg-plist2
-rw-r--r--devel/p5-Class-Tom/pkg-plist3
-rw-r--r--devel/p5-Config-IniFiles/pkg-plist2
-rw-r--r--devel/p5-Data-Flow/pkg-plist3
-rw-r--r--devel/p5-Date-Calc/pkg-plist4
-rw-r--r--devel/p5-File-Binary/pkg-plist2
-rw-r--r--devel/p5-File-Cache/pkg-plist2
-rw-r--r--devel/p5-File-Remove/pkg-plist2
-rw-r--r--devel/p5-File-Spec/pkg-plist3
-rw-r--r--devel/p5-File-Tail/pkg-plist3
-rw-r--r--devel/p5-File-Tools/pkg-plist3
-rw-r--r--devel/p5-IO-String/pkg-plist1
-rw-r--r--devel/p5-IPC-ShareLite/pkg-plist2
-rw-r--r--devel/p5-Locale-PGetText/pkg-plist2
-rw-r--r--devel/p5-Mac-FileSpec-Unixish/pkg-plist4
-rw-r--r--devel/p5-Parse-RecDescent/pkg-plist3
-rw-r--r--devel/p5-PathTools/pkg-plist3
-rw-r--r--devel/p5-Proc-Daemon/pkg-plist2
-rw-r--r--devel/p5-ReadLine-Gnu/pkg-plist10
-rw-r--r--devel/p5-ReadLine-Perl/pkg-plist3
-rw-r--r--devel/p5-String-Checker/pkg-plist2
-rw-r--r--devel/p5-String-Random/pkg-plist2
-rw-r--r--devel/p5-String-RexxParse/pkg-plist2
-rw-r--r--devel/p5-Tie-Cache/pkg-plist4
-rw-r--r--finance/p5-Math-Financial/pkg-plist2
-rw-r--r--mail/p5-Mail-Bulkmail/pkg-plist2
-rw-r--r--mail/p5-Mail-IMAPClient/pkg-plist2
-rw-r--r--mail/p5-Mail-MailStats/pkg-plist2
-rw-r--r--math/p5-Bit-ShiftReg/pkg-plist2
-rw-r--r--math/p5-Math-Bezier/pkg-plist2
-rw-r--r--math/p5-Math-BigIntFast/pkg-plist2
-rw-r--r--math/p5-Math-Financial/pkg-plist2
-rw-r--r--math/p5-Math-GMP/pkg-plist2
-rw-r--r--math/p5-MatrixReal/pkg-plist2
-rw-r--r--math/p5-Set-IntSpan/pkg-plist3
-rw-r--r--net-mgmt/p5-Net-IPv4Addr/pkg-plist2
-rw-r--r--net-mgmt/p5-Net-Netmask/pkg-plist2
-rw-r--r--net/p5-Net-IPv4Addr/pkg-plist2
-rw-r--r--net/p5-Net-Netmask/pkg-plist2
-rw-r--r--net/p5-Net-Patricia/pkg-plist2
-rw-r--r--net/p5-Socks/pkg-plist3
-rw-r--r--security/p5-Authen-TacacsPlus/pkg-plist2
-rw-r--r--security/p5-Authen-Ticket/pkg-plist2
-rw-r--r--security/p5-Crypt-Blowfish/pkg-plist2
-rw-r--r--security/p5-Crypt-CBC/pkg-plist2
-rw-r--r--security/p5-Crypt-CipherSaber/pkg-plist2
-rw-r--r--security/p5-Crypt-ECB/pkg-plist2
-rw-r--r--security/p5-Crypt-Rijndael/pkg-plist2
-rw-r--r--security/p5-Crypt-SSLeay/pkg-plist5
-rw-r--r--security/p5-Crypt-TripleDES/pkg-plist2
-rw-r--r--security/p5-Crypt-Twofish/pkg-plist2
-rw-r--r--security/p5-Crypt-UnixCrypt/pkg-plist2
-rw-r--r--security/p5-IO-Socket-SSL/pkg-plist4
-rw-r--r--security/p5-PGP-Sign/pkg-plist3
-rw-r--r--sysutils/p5-LJ-TextMessage/pkg-plist7
-rw-r--r--sysutils/p5-Unix-ConfigFile/pkg-plist2
-rw-r--r--textproc/p5-LJ-SpellCheck/pkg-plist6
-rw-r--r--textproc/p5-PDF-Create/pkg-plist5
-rw-r--r--textproc/p5-XML-TreeBuilder/pkg-plist1
-rw-r--r--textproc/p5-XML-Writer/pkg-plist3
-rw-r--r--textproc/p5-dTemplate/pkg-plist1
-rw-r--r--textproc/sdf/pkg-plist2
-rw-r--r--www/p5-CGI_Lite/pkg-plist2
-rw-r--r--www/p5-HTML-Clean/pkg-plist5
-rw-r--r--www/p5-HTTPD-Tools/pkg-plist7
-rw-r--r--www/p5-HTTPD-User-Manage/pkg-plist7
78 files changed, 192 insertions, 22 deletions
diff --git a/astro/p5-Astro-MoonPhase/pkg-plist b/astro/p5-Astro-MoonPhase/pkg-plist
index d2c41f1bd22b..2a8617dd12c2 100644
--- a/astro/p5-Astro-MoonPhase/pkg-plist
+++ b/astro/p5-Astro-MoonPhase/pkg-plist
@@ -1,3 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/Astro/MoonPhase.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Astro/MoonPhase/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Astro/MoonPhase
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Astro 2>/dev/null || true
diff --git a/astro/p5-Astro-SunTime/pkg-plist b/astro/p5-Astro-SunTime/pkg-plist
index a45bf26cbb1c..a39f9c59c315 100644
--- a/astro/p5-Astro-SunTime/pkg-plist
+++ b/astro/p5-Astro-SunTime/pkg-plist
@@ -1,3 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/Astro/SunTime.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Astro/SunTime/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Astro/SunTime
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Astro 2>/dev/null || true
diff --git a/astro/p5-GPS/pkg-plist b/astro/p5-GPS/pkg-plist
index 657a7420f827..be5c71bd0a13 100644
--- a/astro/p5-GPS/pkg-plist
+++ b/astro/p5-GPS/pkg-plist
@@ -6,7 +6,11 @@ lib/perl5/site_perl/%%PERL_VER%%/GPS/Serial.pm
lib/perl5/site_perl/%%PERL_VER%%/auto/GPS/Garmin/Handler/autosplit.ix
lib/perl5/site_perl/%%PERL_VER%%/auto/GPS/Garmin/autosplit.ix
lib/perl5/site_perl/%%PERL_VER%%/auto/GPS/Serial/autosplit.ix
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/GPS/Garmin
@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/GPS/Garmin/Handler
@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/GPS/Garmin
@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/GPS/Serial
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GPS/Garmin
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GPS 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/GPS 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/GPS 2>/dev/null || true
diff --git a/astro/p5-Geo-METAR/pkg-plist b/astro/p5-Geo-METAR/pkg-plist
index 38644e95c142..7a78be3aa439 100644
--- a/astro/p5-Geo-METAR/pkg-plist
+++ b/astro/p5-Geo-METAR/pkg-plist
@@ -1,3 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/Geo/METAR.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Geo/METAR/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Geo/METAR
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Geo 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Geo 2>/dev/null || true
diff --git a/audio/p5-MP3-ID3v1Tag/pkg-plist b/audio/p5-MP3-ID3v1Tag/pkg-plist
index 1499c373af7a..045d6c901ae4 100644
--- a/audio/p5-MP3-ID3v1Tag/pkg-plist
+++ b/audio/p5-MP3-ID3v1Tag/pkg-plist
@@ -1,3 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/MP3/ID3v1Tag.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MP3/ID3v1Tag/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MP3/ID3v1Tag
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MP3 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/MP3 2>/dev/null || true
diff --git a/audio/p5-MP3-Info/pkg-plist b/audio/p5-MP3-Info/pkg-plist
index bbfc2bb677f6..c329e2ab8858 100644
--- a/audio/p5-MP3-Info/pkg-plist
+++ b/audio/p5-MP3-Info/pkg-plist
@@ -2,3 +2,6 @@ lib/perl5/site_perl/%%PERL_VER%%/MP3/Info.pm
lib/perl5/site_perl/%%PERL_VER%%/MPEG/MP3Info.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MP3/Info/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MP3/Info
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MP3 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/MPEG 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/MP3 2>/dev/null || true
diff --git a/converters/p5-Convert-ASN1/pkg-plist b/converters/p5-Convert-ASN1/pkg-plist
index cb702b62943e..52195e7c8571 100644
--- a/converters/p5-Convert-ASN1/pkg-plist
+++ b/converters/p5-Convert-ASN1/pkg-plist
@@ -8,3 +8,5 @@ lib/perl5/site_perl/%%PERL_VER%%/Convert/ASN1/IO.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/ASN1/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/ASN1
@dirrm lib/perl5/site_perl/%%PERL_VER%%/Convert/ASN1
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Convert 2>/dev/null || true
diff --git a/converters/p5-Convert-BER/pkg-plist b/converters/p5-Convert-BER/pkg-plist
index f22a15bc3037..74f626c720aa 100644
--- a/converters/p5-Convert-BER/pkg-plist
+++ b/converters/p5-Convert-BER/pkg-plist
@@ -2,3 +2,5 @@ lib/perl5/site_perl/%%PERL_VER%%/Convert/BER.pod
lib/perl5/site_perl/%%PERL_VER%%/Convert/BER.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/BER/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/BER
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Convert 2>/dev/null || true
diff --git a/converters/p5-Convert-Morse/pkg-plist b/converters/p5-Convert-Morse/pkg-plist
index ecbce390f0da..1f81d57e85a4 100644
--- a/converters/p5-Convert-Morse/pkg-plist
+++ b/converters/p5-Convert-Morse/pkg-plist
@@ -1,3 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/Convert/Morse.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/Morse/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/Morse
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Convert 2>/dev/null || true
diff --git a/converters/p5-MIME-Base64/pkg-plist b/converters/p5-MIME-Base64/pkg-plist
index b69b5e181c2d..df16f76e199b 100644
--- a/converters/p5-MIME-Base64/pkg-plist
+++ b/converters/p5-MIME-Base64/pkg-plist
@@ -3,6 +3,6 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64/Base64.bs
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64/Base64.so
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/MIME/Base64.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/MIME/QuotedPrint.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/MIME
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/MIME 2>/dev/null || true
diff --git a/converters/p5-Text-Iconv/pkg-plist b/converters/p5-Text-Iconv/pkg-plist
index 5302781299e5..0cda067472bd 100644
--- a/converters/p5-Text-Iconv/pkg-plist
+++ b/converters/p5-Text-Iconv/pkg-plist
@@ -4,5 +4,5 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Iconv/Iconv.bs
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Iconv/Iconv.so
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Iconv/autosplit.ix
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Iconv
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Text 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text 2>/dev/null || true
diff --git a/devel/p5-B-Graph/pkg-plist b/devel/p5-B-Graph/pkg-plist
index 1eb204af74bb..d4928258a10b 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 c42ef3e5a0cb..432a33a5784c 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 381610206dd0..f3045234793b 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 e9784a9d1be6..e61076abcda1 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 ba40b4dd2bed..c1526d25dde6 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 d125b4dce329..109643e608d9 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 404a7d60aa06..adaacfef2fb8 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 015867866788..6cb7651cfa62 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 9394348205c7..f20e2ce47d34 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 24b9babfb668..ca1e9c77b4fb 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 050adb86a85f..8bf045b28a07 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 704657f096da..1e88429512c8 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 d6b5704c595e..0606f38a0929 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 83b4de930d83..06e603f38de6 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 9650c32c2ac0..a141eddf7349 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 83db330e0754..d1c5a7a351d0 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 5e565dbfb2de..c8937c7e08ac 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 24b9babfb668..ca1e9c77b4fb 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 6520dc4c14e8..6ae30ec96c00 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 2eb8add366d8..b417ae040ed2 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 3f123cf58bdc..4013cb4e569f 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 16a70e67d564..9bec63a354d6 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 1907d8e5412e..71daa5b9325b 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 93e2eedf5c85..101d90ecb98a 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 cbeec81dff08..52099e7d42b4 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
diff --git a/finance/p5-Math-Financial/pkg-plist b/finance/p5-Math-Financial/pkg-plist
index 6162069fca9f..88ad2cd27ee5 100644
--- a/finance/p5-Math-Financial/pkg-plist
+++ b/finance/p5-Math-Financial/pkg-plist
@@ -1,3 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/Math/Financial.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Financial/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Financial
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math 2>/dev/null || true
diff --git a/mail/p5-Mail-Bulkmail/pkg-plist b/mail/p5-Mail-Bulkmail/pkg-plist
index d513c6fefe07..bcbeae3465d6 100644
--- a/mail/p5-Mail-Bulkmail/pkg-plist
+++ b/mail/p5-Mail-Bulkmail/pkg-plist
@@ -1,3 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/Mail/Bulkmail.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Bulkmail/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Bulkmail
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
diff --git a/mail/p5-Mail-IMAPClient/pkg-plist b/mail/p5-Mail-IMAPClient/pkg-plist
index 162692c6e5a3..84794e49c66d 100644
--- a/mail/p5-Mail-IMAPClient/pkg-plist
+++ b/mail/p5-Mail-IMAPClient/pkg-plist
@@ -1,3 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/Mail/IMAPClient.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/IMAPClient/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/IMAPClient
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
diff --git a/mail/p5-Mail-MailStats/pkg-plist b/mail/p5-Mail-MailStats/pkg-plist
index 57e1e9b6a065..51ed7f845d5e 100644
--- a/mail/p5-Mail-MailStats/pkg-plist
+++ b/mail/p5-Mail-MailStats/pkg-plist
@@ -5,3 +5,5 @@ lib/perl5/site_perl/%%PERL_VER%%/Mail/Stats/Record.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Stats/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Stats
@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/Stats
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
diff --git a/math/p5-Bit-ShiftReg/pkg-plist b/math/p5-Bit-ShiftReg/pkg-plist
index 93de83e653ce..b403ff1bd8ee 100644
--- a/math/p5-Bit-ShiftReg/pkg-plist
+++ b/math/p5-Bit-ShiftReg/pkg-plist
@@ -3,3 +3,5 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/ShiftReg/.packlist
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/ShiftReg/ShiftReg.bs
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/ShiftReg/ShiftReg.so
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit/ShiftReg
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Bit 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bit 2>/dev/null || true
diff --git a/math/p5-Math-Bezier/pkg-plist b/math/p5-Math-Bezier/pkg-plist
index 4b050e791049..ad4dfe4d4401 100644
--- a/math/p5-Math-Bezier/pkg-plist
+++ b/math/p5-Math-Bezier/pkg-plist
@@ -1,3 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/Math/Bezier.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Bezier/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Bezier
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math 2>/dev/null || true
diff --git a/math/p5-Math-BigIntFast/pkg-plist b/math/p5-Math-BigIntFast/pkg-plist
index 1eda1594c163..ad8a9d0c62ef 100644
--- a/math/p5-Math-BigIntFast/pkg-plist
+++ b/math/p5-Math-BigIntFast/pkg-plist
@@ -1,3 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/Math/BigIntFast.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/BigIntFast/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/BigIntFast
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math 2>/dev/null || true
diff --git a/math/p5-Math-Financial/pkg-plist b/math/p5-Math-Financial/pkg-plist
index 6162069fca9f..88ad2cd27ee5 100644
--- a/math/p5-Math-Financial/pkg-plist
+++ b/math/p5-Math-Financial/pkg-plist
@@ -1,3 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/Math/Financial.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Financial/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/Financial
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math 2>/dev/null || true
diff --git a/math/p5-Math-GMP/pkg-plist b/math/p5-Math-GMP/pkg-plist
index a6f7c1cc2f70..ef5a63aa711a 100644
--- a/math/p5-Math-GMP/pkg-plist
+++ b/math/p5-Math-GMP/pkg-plist
@@ -4,3 +4,5 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/GMP/GMP.bs
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/GMP/GMP.so
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/GMP/autosplit.ix
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/GMP
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Math 2>/dev/null || true
diff --git a/math/p5-MatrixReal/pkg-plist b/math/p5-MatrixReal/pkg-plist
index d0cbc17b6a76..d632ca16ad3a 100644
--- a/math/p5-MatrixReal/pkg-plist
+++ b/math/p5-MatrixReal/pkg-plist
@@ -2,3 +2,5 @@ lib/perl5/site_perl/%%PERL_VER%%/Math/MatrixReal.pm
lib/perl5/site_perl/%%PERL_VER%%/Math/Kleene.pod
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/MatrixReal/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math/MatrixReal
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Math 2>/dev/null || true
diff --git a/math/p5-Set-IntSpan/pkg-plist b/math/p5-Set-IntSpan/pkg-plist
index 9087ebc535ab..dfe93c481b2e 100644
--- a/math/p5-Set-IntSpan/pkg-plist
+++ b/math/p5-Set-IntSpan/pkg-plist
@@ -1,4 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/Set/IntSpan.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set/IntSpan/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set/IntSpan
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Set 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Set 2>/dev/null || true
diff --git a/net-mgmt/p5-Net-IPv4Addr/pkg-plist b/net-mgmt/p5-Net-IPv4Addr/pkg-plist
index bd8cac8c4d6e..0a3f254d4f64 100644
--- a/net-mgmt/p5-Net-IPv4Addr/pkg-plist
+++ b/net-mgmt/p5-Net-IPv4Addr/pkg-plist
@@ -3,5 +3,7 @@ lib/perl5/site_perl/%%PERL_VER%%/Net/IPv4Addr.pm
lib/perl5/site_perl/%%PERL_VER%%/auto/Net/IPv4Addr/autosplit.ix
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IPv4Addr/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IPv4Addr
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Net/IPv4Addr
@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
diff --git a/net-mgmt/p5-Net-Netmask/pkg-plist b/net-mgmt/p5-Net-Netmask/pkg-plist
index 6696839b04e0..6a04e9c5fa62 100644
--- a/net-mgmt/p5-Net-Netmask/pkg-plist
+++ b/net-mgmt/p5-Net-Netmask/pkg-plist
@@ -2,3 +2,5 @@ lib/perl5/site_perl/%%PERL_VER%%/Net/Netmask.pod
lib/perl5/site_perl/%%PERL_VER%%/Net/Netmask.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Netmask/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Netmask
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-IPv4Addr/pkg-plist b/net/p5-Net-IPv4Addr/pkg-plist
index bd8cac8c4d6e..0a3f254d4f64 100644
--- a/net/p5-Net-IPv4Addr/pkg-plist
+++ b/net/p5-Net-IPv4Addr/pkg-plist
@@ -3,5 +3,7 @@ lib/perl5/site_perl/%%PERL_VER%%/Net/IPv4Addr.pm
lib/perl5/site_perl/%%PERL_VER%%/auto/Net/IPv4Addr/autosplit.ix
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IPv4Addr/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/IPv4Addr
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Net/IPv4Addr
@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net 2>/dev/null || true
@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Netmask/pkg-plist b/net/p5-Net-Netmask/pkg-plist
index 6696839b04e0..6a04e9c5fa62 100644
--- a/net/p5-Net-Netmask/pkg-plist
+++ b/net/p5-Net-Netmask/pkg-plist
@@ -2,3 +2,5 @@ lib/perl5/site_perl/%%PERL_VER%%/Net/Netmask.pod
lib/perl5/site_perl/%%PERL_VER%%/Net/Netmask.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Netmask/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Netmask
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
diff --git a/net/p5-Net-Patricia/pkg-plist b/net/p5-Net-Patricia/pkg-plist
index fda73cd1faa9..890c195a76a6 100644
--- a/net/p5-Net-Patricia/pkg-plist
+++ b/net/p5-Net-Patricia/pkg-plist
@@ -3,3 +3,5 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Patricia/Patricia.bs
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Patricia/.packlist
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/Patricia.pm
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Patricia
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net 2>/dev/null || true
diff --git a/net/p5-Socks/pkg-plist b/net/p5-Socks/pkg-plist
index 8b965835f49c..9989db8a57c4 100644
--- a/net/p5-Socks/pkg-plist
+++ b/net/p5-Socks/pkg-plist
@@ -20,3 +20,6 @@ lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_user_response5.al
lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS/_validate.al
@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Net/SOCKS
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/SOCKS
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Net 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
diff --git a/security/p5-Authen-TacacsPlus/pkg-plist b/security/p5-Authen-TacacsPlus/pkg-plist
index abc32ec6fe41..5dd99070b141 100644
--- a/security/p5-Authen-TacacsPlus/pkg-plist
+++ b/security/p5-Authen-TacacsPlus/pkg-plist
@@ -3,3 +3,5 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus/.packlist
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus/TacacsPlus.bs
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus/TacacsPlus.so
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Authen 2>/dev/null || true
diff --git a/security/p5-Authen-Ticket/pkg-plist b/security/p5-Authen-Ticket/pkg-plist
index 10b8ef6772d8..c96c9b373fe2 100644
--- a/security/p5-Authen-Ticket/pkg-plist
+++ b/security/p5-Authen-Ticket/pkg-plist
@@ -9,3 +9,5 @@ lib/perl5/site_perl/%%PERL_VER%%/Authen/Ticket/Signature.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Ticket/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Ticket
@dirrm lib/perl5/site_perl/%%PERL_VER%%/Authen/Ticket
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Authen 2>/dev/null || true
diff --git a/security/p5-Crypt-Blowfish/pkg-plist b/security/p5-Crypt-Blowfish/pkg-plist
index 9ce899e8f0e8..2db6023eade1 100644
--- a/security/p5-Crypt-Blowfish/pkg-plist
+++ b/security/p5-Crypt-Blowfish/pkg-plist
@@ -3,3 +3,5 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/.packlist
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/Blowfish.bs
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/Blowfish.so
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Blowfish
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-CBC/pkg-plist b/security/p5-Crypt-CBC/pkg-plist
index 3bf643ca62e3..e45a02b30e70 100644
--- a/security/p5-Crypt-CBC/pkg-plist
+++ b/security/p5-Crypt-CBC/pkg-plist
@@ -1,3 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/Crypt/CBC.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/CBC/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/CBC
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-CipherSaber/pkg-plist b/security/p5-Crypt-CipherSaber/pkg-plist
index 9cccb654f34c..a2c3ba7ed099 100644
--- a/security/p5-Crypt-CipherSaber/pkg-plist
+++ b/security/p5-Crypt-CipherSaber/pkg-plist
@@ -1,3 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/Crypt/CipherSaber.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/CipherSaber/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/CipherSaber
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-ECB/pkg-plist b/security/p5-Crypt-ECB/pkg-plist
index 78a9517dd4a2..e5326fa0d08a 100644
--- a/security/p5-Crypt-ECB/pkg-plist
+++ b/security/p5-Crypt-ECB/pkg-plist
@@ -1,3 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/Crypt/ECB.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/ECB/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/ECB
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-Rijndael/pkg-plist b/security/p5-Crypt-Rijndael/pkg-plist
index e0eb6c94feb2..1d735b701ff0 100644
--- a/security/p5-Crypt-Rijndael/pkg-plist
+++ b/security/p5-Crypt-Rijndael/pkg-plist
@@ -3,3 +3,5 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Rijndael/.packlist
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Rijndael/Rijndael.bs
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Rijndael/Rijndael.so
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Rijndael
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-SSLeay/pkg-plist b/security/p5-Crypt-SSLeay/pkg-plist
index 7bf4fc4a1607..dd46c4c1b9ad 100644
--- a/security/p5-Crypt-SSLeay/pkg-plist
+++ b/security/p5-Crypt-SSLeay/pkg-plist
@@ -1,5 +1,6 @@
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SSLeay/SSLeay.so
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SSLeay/SSLeay.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SSLeay/.packlist
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/SSLeay/Conn.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/SSLeay/X509.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/SSLeay/CTX.pm
@@ -7,5 +8,7 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/SSLeay/Err.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/SSLeay/MainContext.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/SSLeay.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/SSL.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SSLeay/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SSLeay
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-TripleDES/pkg-plist b/security/p5-Crypt-TripleDES/pkg-plist
index a809fabd920a..77b2f78e40b5 100644
--- a/security/p5-Crypt-TripleDES/pkg-plist
+++ b/security/p5-Crypt-TripleDES/pkg-plist
@@ -2,3 +2,5 @@ lib/perl5/site_perl/%%PERL_VER%%/Crypt/PPDES.pm
lib/perl5/site_perl/%%PERL_VER%%/Crypt/TripleDES.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/TripleDES/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/TripleDES
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-Twofish/pkg-plist b/security/p5-Crypt-Twofish/pkg-plist
index e87c131dfd8a..ede795658fc0 100644
--- a/security/p5-Crypt-Twofish/pkg-plist
+++ b/security/p5-Crypt-Twofish/pkg-plist
@@ -5,3 +5,5 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Twofish/Twofish.bs
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Twofish/Twofish.so
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Twofish/autosplit.ix
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Twofish
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
diff --git a/security/p5-Crypt-UnixCrypt/pkg-plist b/security/p5-Crypt-UnixCrypt/pkg-plist
index de43e346f11e..15b19cbb4f48 100644
--- a/security/p5-Crypt-UnixCrypt/pkg-plist
+++ b/security/p5-Crypt-UnixCrypt/pkg-plist
@@ -1,3 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/Crypt/UnixCrypt.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/UnixCrypt/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/UnixCrypt
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Crypt 2>/dev/null || true
diff --git a/security/p5-IO-Socket-SSL/pkg-plist b/security/p5-IO-Socket-SSL/pkg-plist
index 6bafbeaed36c..092f190608aa 100644
--- a/security/p5-IO-Socket-SSL/pkg-plist
+++ b/security/p5-IO-Socket-SSL/pkg-plist
@@ -1,3 +1,7 @@
lib/perl5/site_perl/%%PERL_VER%%/IO/Socket/SSL.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket/SSL/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket/SSL
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/Socket
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/IO/Socket
+@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/security/p5-PGP-Sign/pkg-plist b/security/p5-PGP-Sign/pkg-plist
index 9d144728ca66..e1ad5fd0a295 100644
--- a/security/p5-PGP-Sign/pkg-plist
+++ b/security/p5-PGP-Sign/pkg-plist
@@ -1,4 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/PGP/Sign.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGP/Sign/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGP/Sign
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGP
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PGP 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/PGP 2>/dev/null || true
diff --git a/sysutils/p5-LJ-TextMessage/pkg-plist b/sysutils/p5-LJ-TextMessage/pkg-plist
index 7d8550a8fe30..c252a61e7cad 100644
--- a/sysutils/p5-LJ-TextMessage/pkg-plist
+++ b/sysutils/p5-LJ-TextMessage/pkg-plist
@@ -1,2 +1,5 @@
-lib/perl5/site_perl/5.005/LJ/TextMessage.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/LJ
+lib/perl5/site_perl/%%PERL_VER%%/LJ/TextMessage.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ/TextMessage/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ/TextMessage
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/LJ 2>/dev/null || true
diff --git a/sysutils/p5-Unix-ConfigFile/pkg-plist b/sysutils/p5-Unix-ConfigFile/pkg-plist
index 16151d135594..cf8583837622 100644
--- a/sysutils/p5-Unix-ConfigFile/pkg-plist
+++ b/sysutils/p5-Unix-ConfigFile/pkg-plist
@@ -5,3 +5,5 @@ lib/perl5/site_perl/%%PERL_VER%%/Unix/GroupFile.pm
lib/perl5/site_perl/%%PERL_VER%%/Unix/PasswdFile.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unix/ConfigFile/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unix/ConfigFile
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unix 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Unix 2>/dev/null || true
diff --git a/textproc/p5-LJ-SpellCheck/pkg-plist b/textproc/p5-LJ-SpellCheck/pkg-plist
index f227c3e49587..dd94c10c55fd 100644
--- a/textproc/p5-LJ-SpellCheck/pkg-plist
+++ b/textproc/p5-LJ-SpellCheck/pkg-plist
@@ -1 +1,5 @@
-lib/perl5/site_perl/5.005/LJ/SpellCheck.pm
+lib/perl5/site_perl/%%PERL_VER%%/LJ/SpellCheck.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ/SpellCheck/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ/SpellCheck
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/LJ 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/LJ 2>/dev/null || true
diff --git a/textproc/p5-PDF-Create/pkg-plist b/textproc/p5-PDF-Create/pkg-plist
index 02a3a1374f6d..337a44f67cd8 100644
--- a/textproc/p5-PDF-Create/pkg-plist
+++ b/textproc/p5-PDF-Create/pkg-plist
@@ -1,6 +1,9 @@
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF/Create/.packlist
lib/perl5/site_perl/%%PERL_VER%%/PDF/Create/Page.pm
lib/perl5/site_perl/%%PERL_VER%%/PDF/Create/Outline.pm
lib/perl5/site_perl/%%PERL_VER%%/PDF/sample.pl
lib/perl5/site_perl/%%PERL_VER%%/PDF/Create.pm
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF/Create
@dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF/Create
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/PDF
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/PDF 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/PDF 2>/dev/null || true
diff --git a/textproc/p5-XML-TreeBuilder/pkg-plist b/textproc/p5-XML-TreeBuilder/pkg-plist
index 731e73f8ac63..e928c3c3a9c4 100644
--- a/textproc/p5-XML-TreeBuilder/pkg-plist
+++ b/textproc/p5-XML-TreeBuilder/pkg-plist
@@ -2,3 +2,4 @@ lib/perl5/site_perl/%%PERL_VER%%/XML/TreeBuilder.pm
lib/perl5/site_perl/%%PERL_VER%%/XML/Element.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML-TreeBuilder/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML-TreeBuilder
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
diff --git a/textproc/p5-XML-Writer/pkg-plist b/textproc/p5-XML-Writer/pkg-plist
index 1c1bc26aac2b..982814879030 100644
--- a/textproc/p5-XML-Writer/pkg-plist
+++ b/textproc/p5-XML-Writer/pkg-plist
@@ -1,4 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/XML/Writer.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Writer/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/Writer
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
diff --git a/textproc/p5-dTemplate/pkg-plist b/textproc/p5-dTemplate/pkg-plist
index cccf092f7673..10064d334ebb 100644
--- a/textproc/p5-dTemplate/pkg-plist
+++ b/textproc/p5-dTemplate/pkg-plist
@@ -1,2 +1,3 @@
lib/perl5/site_perl/%%PERL_VER%%/dTemplate.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/dTemplate/.packlist
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/dTemplate 2>/dev/null || true
diff --git a/textproc/sdf/pkg-plist b/textproc/sdf/pkg-plist
index c366b1f30225..55bf7dc3ffc9 100644
--- a/textproc/sdf/pkg-plist
+++ b/textproc/sdf/pkg-plist
@@ -651,3 +651,5 @@ share/doc/sdf/website
@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home/images
@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf/home
@dirrm lib/perl5/site_perl/%%PERL_VER%%/sdf
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDF 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POD 2>/dev/null || true
diff --git a/www/p5-CGI_Lite/pkg-plist b/www/p5-CGI_Lite/pkg-plist
index 51f4a2f6340f..cdd5e40193d4 100644
--- a/www/p5-CGI_Lite/pkg-plist
+++ b/www/p5-CGI_Lite/pkg-plist
@@ -1,3 +1,5 @@
lib/perl5/site_perl/%%PERL_VER%%/CGI/Lite.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Lite/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Lite
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/CGI 2>/dev/null || true
diff --git a/www/p5-HTML-Clean/pkg-plist b/www/p5-HTML-Clean/pkg-plist
index a60104c59c03..fa4f4b48f61d 100644
--- a/www/p5-HTML-Clean/pkg-plist
+++ b/www/p5-HTML-Clean/pkg-plist
@@ -3,7 +3,10 @@ lib/perl5/site_perl/%%PERL_VER%%/HTML/Clean.pm
@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Clean/.packlist
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Clean
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null|| true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
lib/perl5/site_perl/%%PERL_VER%%/auto/HTML/Clean/autosplit.ix
@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/HTML/Clean
@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/HTML 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man/man3 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man/man1 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man 2>/dev/null || true
diff --git a/www/p5-HTTPD-Tools/pkg-plist b/www/p5-HTTPD-Tools/pkg-plist
index 003f2b3a70bd..0dc8c087be18 100644
--- a/www/p5-HTTPD-Tools/pkg-plist
+++ b/www/p5-HTTPD-Tools/pkg-plist
@@ -11,5 +11,10 @@ lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/SQL.pm
lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text.pm
lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text/cern.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD-Tools/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/Text
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/DBM
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD-Tools
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTTPD 2>/dev/null || true
diff --git a/www/p5-HTTPD-User-Manage/pkg-plist b/www/p5-HTTPD-User-Manage/pkg-plist
index 003f2b3a70bd..0dc8c087be18 100644
--- a/www/p5-HTTPD-User-Manage/pkg-plist
+++ b/www/p5-HTTPD-User-Manage/pkg-plist
@@ -11,5 +11,10 @@ lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/SQL.pm
lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text.pm
lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text/cern.pm
lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD-Tools/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin/Text
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/UserAdmin
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/Text
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin/DBM
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTPD/GroupAdmin
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTTPD-Tools
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTTPD 2>/dev/null || true