11 files changed, 13 insertions, 13 deletions

diff --git a/comms/p5-Device-SerialPort/pkg-plist b/comms/p5-Device-SerialPort/pkg-plist
index 18385da5d66c..5d10e873f573 100644
--- a/comms/p5-Device-SerialPort/pkg-plist
+++ b/comms/p5-Device-SerialPort/pkg-plist
@@ -4,4 +4,5 @@ bin/modemtest
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/SerialPort.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/SerialPort.so
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Device 2>/dev/null || true
diff --git a/databases/p5-Tangram/pkg-descr b/databases/p5-Tangram/pkg-descr
index 1bbae42883e6..477285fcb8b7 100644
--- a/databases/p5-Tangram/pkg-descr
+++ b/databases/p5-Tangram/pkg-descr
@@ -6,6 +6,3 @@ that is, it doesn't require your classes to implement support functions nor
 inherit from a utility class.
 
 WWW: http://search.cpan.org/dist/Tangram/
-
--- Sergey Skvortsov
-skv@FreeBSD.org
diff --git a/databases/p5-Tangram/pkg-plist b/databases/p5-Tangram/pkg-plist
index c83bc9b51051..4d7a617479a4 100644
--- a/databases/p5-Tangram/pkg-plist
+++ b/databases/p5-Tangram/pkg-plist
@@ -62,4 +62,5 @@
 @dirrm %%SITE_PERL%%/Tangram/Relational
 @dirrm %%SITE_PERL%%/Tangram/Type
 @dirrm %%SITE_PERL%%/Tangram
+@dirrm %%SITE_PERL%%/auto/Tangram
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tangram
diff --git a/devel/p5-Getopt-Popt/pkg-plist b/devel/p5-Getopt-Popt/pkg-plist
index f77f37fe451d..306f31361d6c 100644
--- a/devel/p5-Getopt-Popt/pkg-plist
+++ b/devel/p5-Getopt-Popt/pkg-plist
@@ -4,4 +4,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Popt/Popt.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Popt
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Getopt 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Getopt 2>/dev/null || true
diff --git a/devel/p5-POE-Devel-Profiler/pkg-plist b/devel/p5-POE-Devel-Profiler/pkg-plist
index fc1e0a32114d..def69d4a664f 100644
--- a/devel/p5-POE-Devel-Profiler/pkg-plist
+++ b/devel/p5-POE-Devel-Profiler/pkg-plist
@@ -6,6 +6,7 @@ bin/poepp
 %%SITE_PERL%%/POE/Devel/Profiler/Visualizer/BasicSummary.pm
 @dirrm %%SITE_PERL%%/POE/Devel/Profiler/Visualizer
 @dirrm %%SITE_PERL%%/POE/Devel/Profiler
+@unexec rmdir %D/%%SITE_PERL%%/POE/Devel 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Devel/Profiler
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Devel 2>/dev/null || true
diff --git a/mail/p5-Mail-Box-Parser-C/pkg-plist b/mail/p5-Mail-Box-Parser-C/pkg-plist
index 1044fc374299..19b83457e109 100644
--- a/mail/p5-Mail-Box-Parser-C/pkg-plist
+++ b/mail/p5-Mail-Box-Parser-C/pkg-plist
@@ -3,9 +3,9 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser/C/C.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser/C/C.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser/C
-@unexec rmdir %D/%%SITE_PERL%%/Mail/Box/Parser 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail/Box 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box/Parser 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Mail 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
diff --git a/mail/p5-POE-Component-SMTP/pkg-plist b/mail/p5-POE-Component-SMTP/pkg-plist
index 7dd76760b023..ec9d398c6c48 100644
--- a/mail/p5-POE-Component-SMTP/pkg-plist
+++ b/mail/p5-POE-Component-SMTP/pkg-plist
@@ -6,4 +6,5 @@
 @unexec rmdir %D/%%SITE_PERL%%/POE/Filter 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SMTP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
diff --git a/security/p5-Digest-SHA2/pkg-descr b/security/p5-Digest-SHA2/pkg-descr
index 51a8f01a8635..0a618fbccca1 100644
--- a/security/p5-Digest-SHA2/pkg-descr
+++ b/security/p5-Digest-SHA2/pkg-descr
@@ -3,6 +3,3 @@ NIST.  SHA-256, SHA-384, and SHA-512 pertain to hashes whose outputs are
 256 bits, 384 bits and 512 bits, respectively.
 
 WWW: http://search.cpan.org/dist/Digest-SHA2/
-
--- Sergey Skvortsov
-skv@FreeBSD.org
diff --git a/security/p5-Digest-SHA2/pkg-plist b/security/p5-Digest-SHA2/pkg-plist
index ad67dc76b57f..d239641a8c83 100644
--- a/security/p5-Digest-SHA2/pkg-plist
+++ b/security/p5-Digest-SHA2/pkg-plist
@@ -3,5 +3,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA2/SHA2.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA2/SHA2.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA2
-@unexec rmdir %D/%%SITE_PERL%%/Digest 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
diff --git a/security/p5-Digest/pkg-plist b/security/p5-Digest/pkg-plist
index fc690df82d4a..20d61770d45e 100644
--- a/security/p5-Digest/pkg-plist
+++ b/security/p5-Digest/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/.packlist
 %%SITE_PERL%%/Digest.pm
 %%SITE_PERL%%/Digest/base.pm
+%%SITE_PERL%%/Digest/file.pm
 @unexec rmdir %D/%%SITE_PERL%%/Digest 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
diff --git a/security/p5-Nmap-Scanner/Makefile b/security/p5-Nmap-Scanner/Makefile
index 5b7f00422938..50be6cadc2d0 100644
--- a/security/p5-Nmap-Scanner/Makefile
+++ b/security/p5-Nmap-Scanner/Makefile
@@ -26,8 +26,9 @@ PERL_CONFIGURE=	yes
 MAN3=		Nmap::Scanner.3 Nmap::Scanner::Address.3 \
 		Nmap::Scanner::Backend::Processor.3 \
 		Nmap::Scanner::Backend::Results.3 Nmap::Scanner::ExtraPorts.3 \
-		Nmap::Scanner::Host.3 Nmap::Scanner::Hosts.3 \
-		Nmap::Scanner::NmapRun.3 Nmap::Scanner::OS.3 \
+		Nmap::Scanner::Host.3 Nmap::Scanner::Hostname.3 \
+		Nmap::Scanner::Hosts.3 Nmap::Scanner::NmapRun.3 \
+		Nmap::Scanner::OS.3 Nmap::Scanner::OS::Class.3 \
 		Nmap::Scanner::OS::IPIdSequence.3 Nmap::Scanner::OS::Match.3 \
 		Nmap::Scanner::OS::PortUsed.3 Nmap::Scanner::OS::TCPSequence.3 \
 		Nmap::Scanner::OS::TCPTSSequence.3 Nmap::Scanner::OS::Uptime.3 \