32 files changed, 160 insertions, 160 deletions

diff --git a/devel/p5-BSD-Resource/pkg-plist b/devel/p5-BSD-Resource/pkg-plist
index 5d369e55da42..17b008d01b1b 100644
--- a/devel/p5-BSD-Resource/pkg-plist
+++ b/devel/p5-BSD-Resource/pkg-plist
@@ -1,32 +1,32 @@
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/BSD/Resource.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/_g.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/get_rlimits.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/getpriority.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/getrlimit.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/getrusage.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/hard.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/idrss.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/inblock.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/ixrss.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/majflt.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/maxrss.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/minflt.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/msgrcv.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/msgsnd.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/nivcsw.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/nsignals.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/nswap.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/nvcsw.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/oublock.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/setpriority.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/setrlimit.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/soft.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/stime.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/times.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/utime.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/Resource.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/Resource.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/BSD
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/BSD/Resource.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/_g.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/get_rlimits.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/getpriority.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/getrlimit.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/getrusage.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/hard.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/idrss.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/inblock.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/ixrss.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/majflt.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/maxrss.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/minflt.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/msgrcv.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/msgsnd.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/nivcsw.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/nsignals.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/nswap.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/nvcsw.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/oublock.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/setpriority.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/setrlimit.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/soft.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/stime.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/times.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/utime.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/Resource.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/Resource.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/BSD/Resource
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/BSD
diff --git a/devel/p5-C-Scan/pkg-plist b/devel/p5-C-Scan/pkg-plist
index d980018d5a71..04420f8129d8 100644
--- a/devel/p5-C-Scan/pkg-plist
+++ b/devel/p5-C-Scan/pkg-plist
@@ -1,3 +1,3 @@
 lib/perl5/site_perl/%%PERL_VER%%/C/Scan.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/C/Scan/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/C/Scan
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/C/Scan/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/C/Scan
diff --git a/devel/p5-Config-IniFiles/pkg-plist b/devel/p5-Config-IniFiles/pkg-plist
index be9c914dfa37..e3fe23216cb8 100644
--- a/devel/p5-Config-IniFiles/pkg-plist
+++ b/devel/p5-Config-IniFiles/pkg-plist
@@ -1,3 +1,3 @@
 lib/perl5/site_perl/%%PERL_VER%%/IniConf.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/IniConf.pm/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/IniConf.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IniConf.pm/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IniConf.pm
diff --git a/devel/p5-Curses/pkg-plist b/devel/p5-Curses/pkg-plist
index 9acc9e606127..666976165cda 100644
--- a/devel/p5-Curses/pkg-plist
+++ b/devel/p5-Curses/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Curses.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Curses/Curses.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Curses/Curses.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Curses/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Curses
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Curses.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Curses/Curses.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Curses/Curses.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Curses/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Curses
diff --git a/devel/p5-Data-Flow/pkg-plist b/devel/p5-Data-Flow/pkg-plist
index 846f0d022aff..c8f30133ce6e 100644
--- a/devel/p5-Data-Flow/pkg-plist
+++ b/devel/p5-Data-Flow/pkg-plist
@@ -1,4 +1,4 @@
 lib/perl5/site_perl/%%PERL_VER%%/Data/Flow.pm
 lib/perl5/site_perl/%%PERL_VER%%/auto/Data/Flow/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Data/Flow/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Data/Flow
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Flow/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Flow
diff --git a/devel/p5-Data-ShowTable/pkg-plist b/devel/p5-Data-ShowTable/pkg-plist
index 5f71f7998168..4f813067e928 100644
--- a/devel/p5-Data-ShowTable/pkg-plist
+++ b/devel/p5-Data-ShowTable/pkg-plist
@@ -1,4 +1,4 @@
 bin/showtable
 lib/perl5/site_perl/%%PERL_VER%%/Data/ShowTable.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Data/ShowTable/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Data/ShowTable
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/ShowTable/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/ShowTable
diff --git a/devel/p5-Date-Manip/pkg-plist b/devel/p5-Date-Manip/pkg-plist
index c6aba5f64fad..6e8cf5311d90 100644
--- a/devel/p5-Date-Manip/pkg-plist
+++ b/devel/p5-Date-Manip/pkg-plist
@@ -1,4 +1,4 @@
 lib/perl5/site_perl/%%PERL_VER%%/Date/Manip.pm
 lib/perl5/site_perl/%%PERL_VER%%/Date/Manip.pod
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Date/Manip/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Date/Manip
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Manip/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Date/Manip
diff --git a/devel/p5-Devel-DProf/pkg-plist b/devel/p5-Devel-DProf/pkg-plist
index 40e3d9657ae8..f31a26d8600e 100644
--- a/devel/p5-Devel-DProf/pkg-plist
+++ b/devel/p5-Devel-DProf/pkg-plist
@@ -1,6 +1,6 @@
 bin/dprofpp
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Devel/DProf.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/DProf/DProf.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/DProf/DProf.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/DProf/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/DProf
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Devel/DProf.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf/DProf.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf/DProf.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf
diff --git a/devel/p5-Devel-Peek/pkg-plist b/devel/p5-Devel-Peek/pkg-plist
index 166d1f1bb6de..2b334fdc2633 100644
--- a/devel/p5-Devel-Peek/pkg-plist
+++ b/devel/p5-Devel-Peek/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Devel/Peek.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/Peek/Peek.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/Peek/Peek.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/Peek/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/Peek
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Devel/Peek.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek/Peek.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek/Peek.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek
diff --git a/devel/p5-Devel-Symdump/pkg-plist b/devel/p5-Devel-Symdump/pkg-plist
index 1a73fc8328f2..4147c4f80342 100644
--- a/devel/p5-Devel-Symdump/pkg-plist
+++ b/devel/p5-Devel-Symdump/pkg-plist
@@ -1,5 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/Devel/Symdump.pm
 lib/perl5/site_perl/%%PERL_VER%%/Devel/Symdump/Export.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/Symdump/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/Symdump
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Symdump/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Symdump
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Devel/Symdump
diff --git a/devel/p5-Errno/pkg-plist b/devel/p5-Errno/pkg-plist
index 216f79943ced..3e8c8eed9b6f 100644
--- a/devel/p5-Errno/pkg-plist
+++ b/devel/p5-Errno/pkg-plist
@@ -1,3 +1,3 @@
 lib/perl5/site_perl/%%PERL_VER%%/Errno.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Errno/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Errno
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Errno/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Errno
diff --git a/devel/p5-File-Lock/pkg-plist b/devel/p5-File-Lock/pkg-plist
index 42b6d95a2648..7654e6b09634 100644
--- a/devel/p5-File-Lock/pkg-plist
+++ b/devel/p5-File-Lock/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/File/Lock.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock/info.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock/pid.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock/sysid.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock/test.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock/Lock.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock/Lock.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File 2>/dev/null || true
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/File/Lock.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock/info.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock/pid.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock/sysid.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock/test.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock/Lock.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock/Lock.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Lock
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
diff --git a/devel/p5-File-Sync/pkg-plist b/devel/p5-File-Sync/pkg-plist
index f402ee56f505..4f307d8f8900 100644
--- a/devel/p5-File-Sync/pkg-plist
+++ b/devel/p5-File-Sync/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/File/Sync.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Sync/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Sync/Sync.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Sync/Sync.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Sync/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Sync
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/File
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/File/Sync.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Sync/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Sync/Sync.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Sync/Sync.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Sync/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Sync
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/File
diff --git a/devel/p5-Filter/pkg-plist b/devel/p5-Filter/pkg-plist
index 970c7bf6ad1b..3efc56362c7f 100644
--- a/devel/p5-Filter/pkg-plist
+++ b/devel/p5-Filter/pkg-plist
@@ -1,23 +1,23 @@
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/Util/Call.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/Util/Exec.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/cpp.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/decrypt.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/exec.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/sh.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/tee.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Call/Call.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Call/Call.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Exec/Exec.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Exec/Exec.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/decrypt/decrypt.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/decrypt/decrypt.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/tee/tee.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/tee/tee.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Call
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Exec
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/decrypt
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/tee
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/Util
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util/Call.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util/Exec.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Filter/cpp.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Filter/decrypt.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Filter/exec.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Filter/sh.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Filter/tee.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call/Call.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call/Call.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Exec/Exec.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Exec/Exec.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/decrypt/decrypt.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/decrypt/decrypt.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/tee/tee.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/tee/tee.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Exec
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/decrypt
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/tee
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Filter
diff --git a/devel/p5-FreezeThaw/pkg-plist b/devel/p5-FreezeThaw/pkg-plist
index 2b423a1805b0..12d0f55fcf9f 100644
--- a/devel/p5-FreezeThaw/pkg-plist
+++ b/devel/p5-FreezeThaw/pkg-plist
@@ -1,3 +1,3 @@
 lib/perl5/site_perl/%%PERL_VER%%/FreezeThaw.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/FreezeThaw/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/FreezeThaw
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreezeThaw/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/FreezeThaw
diff --git a/devel/p5-IO-stringy/pkg-plist b/devel/p5-IO-stringy/pkg-plist
index 711eba364d6d..dff2dcedbb1c 100644
--- a/devel/p5-IO-stringy/pkg-plist
+++ b/devel/p5-IO-stringy/pkg-plist
@@ -5,5 +5,5 @@ lib/perl5/site_perl/%%PERL_VER%%/IO/ScalarArray.pm
 lib/perl5/site_perl/%%PERL_VER%%/IO/Stringy.pm
 lib/perl5/site_perl/%%PERL_VER%%/IO/Wrap.pm
 lib/perl5/site_perl/%%PERL_VER%%/IO/WrapTie.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/IO-stringy/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/IO-stringy
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO-stringy/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO-stringy
diff --git a/devel/p5-Include/pkg-plist b/devel/p5-Include/pkg-plist
index c6d298d17be6..f1d6ee770a92 100644
--- a/devel/p5-Include/pkg-plist
+++ b/devel/p5-Include/pkg-plist
@@ -1,3 +1,3 @@
 lib/perl5/site_perl/%%PERL_VER%%/Include.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Include/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Include
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Include/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Include
diff --git a/devel/p5-IniConf/pkg-plist b/devel/p5-IniConf/pkg-plist
index be9c914dfa37..e3fe23216cb8 100644
--- a/devel/p5-IniConf/pkg-plist
+++ b/devel/p5-IniConf/pkg-plist
@@ -1,3 +1,3 @@
 lib/perl5/site_perl/%%PERL_VER%%/IniConf.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/IniConf.pm/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/IniConf.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IniConf.pm/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/IniConf.pm
diff --git a/devel/p5-Penguin-Easy/pkg-plist b/devel/p5-Penguin-Easy/pkg-plist
index 104ec5d36457..41082dc224c4 100644
--- a/devel/p5-Penguin-Easy/pkg-plist
+++ b/devel/p5-Penguin-Easy/pkg-plist
@@ -1,8 +1,8 @@
 lib/perl5/site_perl/%%PERL_VER%%/Penguin/Easy.pm
 lib/perl5/site_perl/Penguin/Easy/doc/Penguin-howto
 lib/perl5/site_perl/Penguin/Easy/bin/ep
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Penguin/Easy/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Penguin/Easy
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Penguin/Easy/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Penguin/Easy
 @dirrm lib/perl5/site_perl/Penguin/Easy/doc
 @dirrm lib/perl5/site_perl/Penguin/Easy/bin
 @dirrm lib/perl5/site_perl/Penguin/Easy
diff --git a/devel/p5-Penguin/pkg-plist b/devel/p5-Penguin/pkg-plist
index c0e76a5f5eed..f81de583c759 100644
--- a/devel/p5-Penguin/pkg-plist
+++ b/devel/p5-Penguin/pkg-plist
@@ -11,7 +11,7 @@ lib/perl5/site_perl/%%PERL_VER%%/Penguin/Trivial/Client.pm
 lib/perl5/site_perl/%%PERL_VER%%/Penguin/Trivial/Server.pm
 lib/perl5/site_perl/%%PERL_VER%%/Penguin/Wrapper/PGP.pm
 lib/perl5/site_perl/%%PERL_VER%%/Penguin/Wrapper/Transparent.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Penguin/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Penguin/.packlist
 lib/perl5/site_perl/Penguin/bin/.pen
 lib/perl5/site_perl/Penguin/bin/makeapplet
 lib/perl5/site_perl/Penguin/bin/pclient
@@ -41,4 +41,4 @@ lib/perl5/site_perl/Penguin/doc/TODO
 @dirrm lib/perl5/site_perl/Penguin/misc
 @dirrm lib/perl5/site_perl/Penguin/doc
 @unexec rmdir lib/perl5/site_perl/Penguin 2>/dev/null || true
-@unexec rmdir lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Penguin 2>/dev/null || true
+@unexec rmdir lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Penguin 2>/dev/null || true
diff --git a/devel/p5-Proc-Simple/pkg-plist b/devel/p5-Proc-Simple/pkg-plist
index 97c857755c26..be6b67ba224c 100644
--- a/devel/p5-Proc-Simple/pkg-plist
+++ b/devel/p5-Proc-Simple/pkg-plist
@@ -1,3 +1,3 @@
 lib/perl5/site_perl/%%PERL_VER%%/Proc/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Proc/Simple/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Proc/Simple
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Proc/Simple/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Proc/Simple
diff --git a/devel/p5-ReadLine-Gnu/pkg-plist b/devel/p5-ReadLine-Gnu/pkg-plist
index 49b658bb428b..2eb8add366d8 100644
--- a/devel/p5-ReadLine-Gnu/pkg-plist
+++ b/devel/p5-ReadLine-Gnu/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadLine/Gnu/Gnu.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadLine/Gnu/Gnu.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Term/ReadLine/Gnu.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadLine/Gnu/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadLine/Gnu
+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/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadLine/Gnu
diff --git a/devel/p5-ReadLine-Perl/pkg-plist b/devel/p5-ReadLine-Perl/pkg-plist
index b67f9b021796..3f123cf58bdc 100644
--- a/devel/p5-ReadLine-Perl/pkg-plist
+++ b/devel/p5-ReadLine-Perl/pkg-plist
@@ -1,3 +1,3 @@
 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%%/i386-freebsd/auto/Term/ReadLine/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadLine/.packlist
diff --git a/devel/p5-Religion/pkg-plist b/devel/p5-Religion/pkg-plist
index 1d926314e138..863f429efc39 100644
--- a/devel/p5-Religion/pkg-plist
+++ b/devel/p5-Religion/pkg-plist
@@ -1,3 +1,3 @@
 lib/perl5/site_perl/%%PERL_VER%%/Religion.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Religion/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Religion
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Religion/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Religion
diff --git a/devel/p5-Resources/pkg-plist b/devel/p5-Resources/pkg-plist
index 10458188425a..950864f620b0 100644
--- a/devel/p5-Resources/pkg-plist
+++ b/devel/p5-Resources/pkg-plist
@@ -1,3 +1,3 @@
 lib/perl5/site_perl/%%PERL_VER%%/Resources.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Resources/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Resources
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Resources/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Resources
diff --git a/devel/p5-Sort-Versions/pkg-plist b/devel/p5-Sort-Versions/pkg-plist
index ea00cb1f2f47..9da649a9e878 100644
--- a/devel/p5-Sort-Versions/pkg-plist
+++ b/devel/p5-Sort-Versions/pkg-plist
@@ -1,3 +1,3 @@
 lib/perl5/site_perl/%%PERL_VER%%/Sort/Versions.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Sort/Versions/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Sort/Versions
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/Versions/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sort/Versions
diff --git a/devel/p5-Storable/pkg-plist b/devel/p5-Storable/pkg-plist
index 7f381228d9a0..eeae98dd698a 100644
--- a/devel/p5-Storable/pkg-plist
+++ b/devel/p5-Storable/pkg-plist
@@ -1,18 +1,18 @@
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Storable.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/_freeze.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/_store.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/_store_fd.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/freeze.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/nfreeze.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/nstore.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/nstore_fd.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/retrieve.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/retrieve_fd.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/store.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/store_fd.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/thaw.al
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/Storable.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/Storable.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Storable.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable/_freeze.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable/_store.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable/_store_fd.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable/freeze.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable/nfreeze.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable/nstore.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable/nstore_fd.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable/retrieve.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable/retrieve_fd.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable/store.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable/store_fd.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable/thaw.al
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable/Storable.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable/Storable.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable
diff --git a/devel/p5-Term-Query/pkg-plist b/devel/p5-Term-Query/pkg-plist
index a05e74ca9c9c..8e2088de8428 100644
--- a/devel/p5-Term-Query/pkg-plist
+++ b/devel/p5-Term-Query/pkg-plist
@@ -1,5 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/Term/Query.pm
 lib/perl5/site_perl/%%PERL_VER%%/Term/Tester.pm
 lib/perl5/site_perl/%%PERL_VER%%/Term/Query_Test.pl
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/Query/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/Query
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/Query/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/Query
diff --git a/devel/p5-Term-ReadKey/pkg-plist b/devel/p5-Term-ReadKey/pkg-plist
index 40599d78939d..df7d266e9b4f 100644
--- a/devel/p5-Term-ReadKey/pkg-plist
+++ b/devel/p5-Term-ReadKey/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Term/ReadKey.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadKey/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadKey/ReadKey.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadKey/ReadKey.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadKey/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadKey
-@unexec rmdir lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term 2>/dev/null || true
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Term/ReadKey.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey/ReadKey.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey/ReadKey.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term/ReadKey
+@unexec rmdir lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
diff --git a/devel/p5-Time/pkg-plist b/devel/p5-Time/pkg-plist
index 66a236484cbe..03d8ac676ad9 100644
--- a/devel/p5-Time/pkg-plist
+++ b/devel/p5-Time/pkg-plist
@@ -3,5 +3,5 @@ lib/perl5/site_perl/%%PERL_VER%%/Time/DaysInMonth.pm
 lib/perl5/site_perl/%%PERL_VER%%/Time/JulianDay.pm
 lib/perl5/site_perl/%%PERL_VER%%/Time/ParseDate.pm
 lib/perl5/site_perl/%%PERL_VER%%/Time/Timezone.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Time-modules/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Time-modules
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time-modules/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time-modules
diff --git a/devel/p5-TimeDate/pkg-plist b/devel/p5-TimeDate/pkg-plist
index 43a0527c7995..f07a73ce89e0 100644
--- a/devel/p5-TimeDate/pkg-plist
+++ b/devel/p5-TimeDate/pkg-plist
@@ -2,5 +2,5 @@ lib/perl5/site_perl/%%PERL_VER%%/Date/Format.pm
 lib/perl5/site_perl/%%PERL_VER%%/Date/Language.pm
 lib/perl5/site_perl/%%PERL_VER%%/Date/Parse.pm
 lib/perl5/site_perl/%%PERL_VER%%/Time/Zone.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/TimeDate/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/TimeDate
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/TimeDate/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/TimeDate
diff --git a/devel/p5-TraceFuncs/pkg-plist b/devel/p5-TraceFuncs/pkg-plist
index 4dbd66d71c67..8b5d9685cd1b 100644
--- a/devel/p5-TraceFuncs/pkg-plist
+++ b/devel/p5-TraceFuncs/pkg-plist
@@ -1,2 +1,2 @@
 lib/perl5/site_perl/%%PERL_VER%%/Devel/TraceFuncs.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/.packlist