8 files changed, 4 insertions, 15 deletions

diff --git a/devel/p5-Class-Factory-Util/pkg-descr b/devel/p5-Class-Factory-Util/pkg-descr
index 2777fc143968..80058e73adfd 100644
--- a/devel/p5-Class-Factory-Util/pkg-descr
+++ b/devel/p5-Class-Factory-Util/pkg-descr
@@ -2,6 +2,3 @@ This module is part of an effort to take functionality within Alzabo which has
 general utility and make it available outside of the Alzabo framework.
 
 WWW: http://search.cpan.org/dist/Class-Factory-Util/
-
--- Sergey Skvortsov
-skv@FreeBSD.org
diff --git a/devel/p5-Class-Factory-Util/pkg-plist b/devel/p5-Class-Factory-Util/pkg-plist
index 9d51f5b779ec..468f45710308 100644
--- a/devel/p5-Class-Factory-Util/pkg-plist
+++ b/devel/p5-Class-Factory-Util/pkg-plist
@@ -3,4 +3,5 @@
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Factory/Util
 @unexec rmdir %D/%%SITE_PERL%%/Class/Factory 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Factory 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
diff --git a/devel/p5-Devel-Pointer/pkg-descr b/devel/p5-Devel-Pointer/pkg-descr
index 9620a948c0f8..e807a4f5e7e6 100644
--- a/devel/p5-Devel-Pointer/pkg-descr
+++ b/devel/p5-Devel-Pointer/pkg-descr
@@ -6,6 +6,3 @@ Be careful, though, to avoid dereferencing things that don't want to be
 dereferenced.
 
 WWW: http://search.cpan.org/dist/Devel-Pointer/
-
--- Sergey Skvortsov
-skv@FreeBSD.org
diff --git a/devel/p5-Devel-Pointer/pkg-plist b/devel/p5-Devel-Pointer/pkg-plist
index 0a24bee205be..a45efb8dbb55 100644
--- a/devel/p5-Devel-Pointer/pkg-plist
+++ b/devel/p5-Devel-Pointer/pkg-plist
@@ -3,5 +3,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Pointer/Pointer.so
 %%SITE_PERL%%/%%PERL_ARCH%%/Devel/Pointer.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Pointer
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
diff --git a/devel/p5-IPC-MM/pkg-descr b/devel/p5-IPC-MM/pkg-descr
index 7d34c51d48a8..47bf52b6b07f 100644
--- a/devel/p5-IPC-MM/pkg-descr
+++ b/devel/p5-IPC-MM/pkg-descr
@@ -8,6 +8,3 @@ as miscellaneous methods.  Additionally, it provides a tied interface
 for scalars and hashes.
 
 WWW: http://search.cpan.org/dist/IPC-MM/
-
--- Sergey Skvortsov
-skv@FreeBSD.org
diff --git a/devel/p5-IPC-MM/pkg-plist b/devel/p5-IPC-MM/pkg-plist
index daac90a0654f..653482d0c1b4 100644
--- a/devel/p5-IPC-MM/pkg-plist
+++ b/devel/p5-IPC-MM/pkg-plist
@@ -4,5 +4,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/MM/MM.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/MM/autosplit.ix
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/MM
-@unexec rmdir %D/%%SITE_PERL%%/IPC 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/IPC 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
diff --git a/devel/p5-Sys-Mmap/pkg-descr b/devel/p5-Sys-Mmap/pkg-descr
index 59238920b673..61ef32d04b6e 100644
--- a/devel/p5-Sys-Mmap/pkg-descr
+++ b/devel/p5-Sys-Mmap/pkg-descr
@@ -8,6 +8,3 @@ alternative to SysV shared memory that places no arbitrary size limits
 on the shared memory area, and efficiently handles sparse memory usage.
 
 WWW: http://search.cpan.org/dist/Sys-Mmap/
-
--- Sergey Skvortsov
-skv@FreeBSD.org
diff --git a/devel/p5-Sys-Mmap/pkg-plist b/devel/p5-Sys-Mmap/pkg-plist
index c7c2b4558251..27a19a3f9425 100644
--- a/devel/p5-Sys-Mmap/pkg-plist
+++ b/devel/p5-Sys-Mmap/pkg-plist
@@ -3,5 +3,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Mmap/Mmap.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Mmap/Mmap.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Mmap
-@unexec rmdir %D/%%SITE_PERL%%/Sys 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true