Remove empty directories on uninstall.

18 files changed, 31 insertions, 2 deletions

diff --git a/converters/p5-Unicode-Map8/pkg-plist b/converters/p5-Unicode-Map8/pkg-plist
index 8009a1e4e400..037670d5e2f9 100644
--- a/converters/p5-Unicode-Map8/pkg-plist
+++ b/converters/p5-Unicode-Map8/pkg-plist
@@ -184,3 +184,7 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Map8/Map8.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Map8/Map8.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Map8/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Map8
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map8/maps
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map8
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode 2>/dev/null || true
diff --git a/devel/p5-Class-Tom/pkg-plist b/devel/p5-Class-Tom/pkg-plist
index f3045234793b..cb0ebaaa605b 100644
--- a/devel/p5-Class-Tom/pkg-plist
+++ b/devel/p5-Class-Tom/pkg-plist
@@ -3,6 +3,7 @@ lib/perl5/site_perl/%%PERL_VER%%/Class/Tom/Encode/Base64.pm
 lib/perl5/site_perl/%%PERL_VER%%/Class/Tom/Code.pm
 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%%/%%PERL_ARCH%%/auto/Class/Tom
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Class/Tom/Encode
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Class/Tom
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
diff --git a/devel/p5-IPC-Cache/pkg-plist b/devel/p5-IPC-Cache/pkg-plist
index 6f2716b7fbe4..366682b3872f 100644
--- a/devel/p5-IPC-Cache/pkg-plist
+++ b/devel/p5-IPC-Cache/pkg-plist
@@ -1,3 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/IPC/Cache.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/Cache/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/Cache
+@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-Tie-IxHash/pkg-plist b/devel/p5-Tie-IxHash/pkg-plist
index e03074cbcdd8..c1817a7074c1 100644
--- a/devel/p5-Tie-IxHash/pkg-plist
+++ b/devel/p5-Tie-IxHash/pkg-plist
@@ -1,3 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/Tie/IxHash.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/IxHash/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Tie/IxHash
+@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/mail/p5-Mail-MailStats/pkg-plist b/mail/p5-Mail-MailStats/pkg-plist
index 51ed7f845d5e..5ef06671a955 100644
--- a/mail/p5-Mail-MailStats/pkg-plist
+++ b/mail/p5-Mail-MailStats/pkg-plist
@@ -1,3 +1,4 @@
+bin/countmail
 lib/perl5/site_perl/%%PERL_VER%%/Mail/Stats.pm
 lib/perl5/site_perl/%%PERL_VER%%/Mail/Stats/Config.pm
 lib/perl5/site_perl/%%PERL_VER%%/Mail/Stats/Parser.pm
diff --git a/math/p5-AI-NeuralNet-Mesh/pkg-plist b/math/p5-AI-NeuralNet-Mesh/pkg-plist
index a410d801f683..e77e967d4811 100644
--- a/math/p5-AI-NeuralNet-Mesh/pkg-plist
+++ b/math/p5-AI-NeuralNet-Mesh/pkg-plist
@@ -1,5 +1,7 @@
 lib/perl5/site_perl/%%PERL_VER%%/AI/NeuralNet/Mesh.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AI/NeuralNet/Mesh/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AI/NeuralNet/Mesh
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AI/NeuralNet 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/AI 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AI/NeuralNet 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/AI 2>/dev/null || true
diff --git a/net/p5-perl-ldap/pkg-plist b/net/p5-perl-ldap/pkg-plist
index ccfd781eebe8..9a0f3afeae78 100644
--- a/net/p5-perl-ldap/pkg-plist
+++ b/net/p5-perl-ldap/pkg-plist
@@ -47,3 +47,4 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/perl-ldap/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Bundle/Net
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Bundle
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/perl-ldap
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
diff --git a/news/p5-News-Article/pkg-plist b/news/p5-News-Article/pkg-plist
index 968f7eaaa447..dc1393795b21 100644
--- a/news/p5-News-Article/pkg-plist
+++ b/news/p5-News-Article/pkg-plist
@@ -4,3 +4,5 @@ lib/perl5/site_perl/%%PERL_VER%%/News/FormArticle.pm
 lib/perl5/site_perl/%%PERL_VER%%/News/FormReply.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News/Article/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News/Article
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/News 2>/dev/null || true
diff --git a/news/p5-News-Newsrc/pkg-plist b/news/p5-News-Newsrc/pkg-plist
index fc8457f7c1c8..3e498ad729d1 100644
--- a/news/p5-News-Newsrc/pkg-plist
+++ b/news/p5-News-Newsrc/pkg-plist
@@ -1,3 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/News/Newsrc.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News/Newsrc/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News/Newsrc
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/News 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/News 2>/dev/null || true
diff --git a/security/p5-Authen-Krb4/pkg-plist b/security/p5-Authen-Krb4/pkg-plist
index 9aaa7a2d4100..0ffc7172dfd0 100644
--- a/security/p5-Authen-Krb4/pkg-plist
+++ b/security/p5-Authen-Krb4/pkg-plist
@@ -3,3 +3,5 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Krb4/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Krb4/Krb4.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Krb4/Krb4.so
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/Krb4
+@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%%/%%PERL_ARCH%%/Authen 2>/dev/null || true
diff --git a/security/p5-Authen-TacacsPlus/pkg-plist b/security/p5-Authen-TacacsPlus/pkg-plist
index 5dd99070b141..a3e351b9e59b 100644
--- a/security/p5-Authen-TacacsPlus/pkg-plist
+++ b/security/p5-Authen-TacacsPlus/pkg-plist
@@ -4,4 +4,4 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus/TacacsPlus
 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
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Authen 2>/dev/null || true
diff --git a/security/p5-Crypt-Cracklib/pkg-plist b/security/p5-Crypt-Cracklib/pkg-plist
index f7e91b2c54ba..b5b312c6f8c8 100644
--- a/security/p5-Crypt-Cracklib/pkg-plist
+++ b/security/p5-Crypt-Cracklib/pkg-plist
@@ -3,3 +3,5 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Cracklib/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Cracklib/Cracklib.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Cracklib/Cracklib.so
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/Cracklib
+@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 dd46c4c1b9ad..c5102fd79a51 100644
--- a/security/p5-Crypt-SSLeay/pkg-plist
+++ b/security/p5-Crypt-SSLeay/pkg-plist
@@ -9,6 +9,7 @@ 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
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/SSLeay
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/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/textproc/sdf/pkg-plist b/textproc/sdf/pkg-plist
index 55bf7dc3ffc9..f53dab4ba6ab 100644
--- a/textproc/sdf/pkg-plist
+++ b/textproc/sdf/pkg-plist
@@ -652,4 +652,4 @@ share/doc/sdf/website
 @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
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Pod 2>/dev/null || true
diff --git a/www/p5-Apache-AuthenCache/pkg-plist b/www/p5-Apache-AuthenCache/pkg-plist
index 78402d27b3ed..c84aea468239 100644
--- a/www/p5-Apache-AuthenCache/pkg-plist
+++ b/www/p5-Apache-AuthenCache/pkg-plist
@@ -2,3 +2,4 @@ lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthenCache.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthenCache/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthenCache
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true
diff --git a/www/p5-CGI-ArgChecker/pkg-plist b/www/p5-CGI-ArgChecker/pkg-plist
index 1ef8885b8228..b29cc79c1f68 100644
--- a/www/p5-CGI-ArgChecker/pkg-plist
+++ b/www/p5-CGI-ArgChecker/pkg-plist
@@ -1,3 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/CGI/ArgChecker.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/ArgChecker/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/ArgChecker
+@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-CGI-Cache/pkg-plist b/www/p5-CGI-Cache/pkg-plist
index fbe8bfeff50d..ebd3e2a0697d 100644
--- a/www/p5-CGI-Cache/pkg-plist
+++ b/www/p5-CGI-Cache/pkg-plist
@@ -1,3 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/CGI/Cache.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Cache/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CGI/Cache
+@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/x11/p5-X11-Protocol/pkg-plist b/x11/p5-X11-Protocol/pkg-plist
index eb7fcb76b906..5f469d6d46fa 100644
--- a/x11/p5-X11-Protocol/pkg-plist
+++ b/x11/p5-X11-Protocol/pkg-plist
@@ -15,3 +15,5 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/X11/Protocol/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/X11/Protocol/Ext
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/X11/Protocol/Connection
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/X11/Protocol
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/X11 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/X11 2>/dev/null || true