8 files changed, 82 insertions, 82 deletions

diff --git a/databases/p5-DBD-Pg-13/pkg-plist b/databases/p5-DBD-Pg-13/pkg-plist
index d5bcbb9eeda9..7606095b422d 100644
--- a/databases/p5-DBD-Pg-13/pkg-plist
+++ b/databases/p5-DBD-Pg-13/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBD/Pg.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBD/Pg/Pg.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBD/Pg/Pg.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBD/Pg/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBD/Pg
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/Pg.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/Pg/Pg.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/Pg/Pg.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/Pg/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/Pg
diff --git a/databases/p5-DBD-Pg/pkg-plist b/databases/p5-DBD-Pg/pkg-plist
index d5bcbb9eeda9..7606095b422d 100644
--- a/databases/p5-DBD-Pg/pkg-plist
+++ b/databases/p5-DBD-Pg/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBD/Pg.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBD/Pg/Pg.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBD/Pg/Pg.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBD/Pg/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBD/Pg
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/Pg.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/Pg/Pg.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/Pg/Pg.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/Pg/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/Pg
diff --git a/databases/p5-DBD-mysql/pkg-plist b/databases/p5-DBD-mysql/pkg-plist
index feb7ae8a0042..c5b04826b34f 100644
--- a/databases/p5-DBD-mysql/pkg-plist
+++ b/databases/p5-DBD-mysql/pkg-plist
@@ -1,11 +1,11 @@
 bin/dbimon
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Mysql.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Bundle/Mysql.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBD/mysql.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Mysql/Statement.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBD/mysql/mysql.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBD/mysql/mysql.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Msql-Mysql-modules/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBD/mysql
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Msql-Mysql-modules
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Mysql
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mysql.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle/Mysql.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/mysql.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mysql/Statement.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/mysql/mysql.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/mysql/mysql.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Msql-Mysql-modules/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/mysql
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Msql-Mysql-modules
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mysql
diff --git a/databases/p5-DBI-137/pkg-plist b/databases/p5-DBI-137/pkg-plist
index af701e94c3ba..54f75cfe142b 100644
--- a/databases/p5-DBI-137/pkg-plist
+++ b/databases/p5-DBI-137/pkg-plist
@@ -1,24 +1,24 @@
 bin/dbiproxy
 bin/dbish
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBD/ExampleP.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBD/NullP.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBD/Proxy.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBD/Sponge.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBI/DBD.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBI/FAQ.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBI/ProxyServer.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBI/Shell.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBI/W32ODBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/DBI.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/DBI.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/DBIXS.h
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/Driver.xst
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/DriverDB.xst
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/DriverST.xst
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/dbd_xsh.h
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/dbi_sql.h
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBD
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBI
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/ExampleP.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/NullP.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/Proxy.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/Sponge.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/DBD.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/FAQ.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/ProxyServer.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Shell.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/W32ODBC.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/DBI.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/DBI.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/DBIXS.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/Driver.xst
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/DriverDB.xst
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/DriverST.xst
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/dbd_xsh.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/dbi_sql.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI
diff --git a/databases/p5-DBI/pkg-plist b/databases/p5-DBI/pkg-plist
index af701e94c3ba..54f75cfe142b 100644
--- a/databases/p5-DBI/pkg-plist
+++ b/databases/p5-DBI/pkg-plist
@@ -1,24 +1,24 @@
 bin/dbiproxy
 bin/dbish
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBD/ExampleP.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBD/NullP.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBD/Proxy.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBD/Sponge.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBI/DBD.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBI/FAQ.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBI/ProxyServer.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBI/Shell.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBI/W32ODBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/DBI.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/DBI.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/DBIXS.h
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/Driver.xst
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/DriverDB.xst
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/DriverST.xst
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/dbd_xsh.h
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/dbi_sql.h
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBD
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBI
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/ExampleP.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/NullP.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/Proxy.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/Sponge.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/DBD.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/FAQ.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/ProxyServer.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/Shell.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI/W32ODBC.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/DBI.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/DBI.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/DBIXS.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/Driver.xst
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/DriverDB.xst
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/DriverST.xst
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/dbd_xsh.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/dbi_sql.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBI
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBI
diff --git a/databases/p5-MLDBM/pkg-plist b/databases/p5-MLDBM/pkg-plist
index c885d1543560..7dbbc232f971 100644
--- a/databases/p5-MLDBM/pkg-plist
+++ b/databases/p5-MLDBM/pkg-plist
@@ -2,8 +2,8 @@ lib/perl5/site_perl/%%PERL_VER%%/MLDBM.pm
 lib/perl5/site_perl/%%PERL_VER%%/MLDBM/Serializer/FreezeThaw.pm
 lib/perl5/site_perl/%%PERL_VER%%/MLDBM/Serializer/Storable.pm
 lib/perl5/site_perl/%%PERL_VER%%/MLDBM/Serializer/Data/Dumper.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/MLDBM/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/MLDBM
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MLDBM/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MLDBM
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/MLDBM/Serializer/Data
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/MLDBM/Serializer
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/MLDBM
diff --git a/databases/p5-Mysql/pkg-plist b/databases/p5-Mysql/pkg-plist
index feb7ae8a0042..c5b04826b34f 100644
--- a/databases/p5-Mysql/pkg-plist
+++ b/databases/p5-Mysql/pkg-plist
@@ -1,11 +1,11 @@
 bin/dbimon
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Mysql.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Bundle/Mysql.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/DBD/mysql.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Mysql/Statement.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBD/mysql/mysql.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBD/mysql/mysql.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Msql-Mysql-modules/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/DBD/mysql
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Msql-Mysql-modules
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Mysql
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mysql.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle/Mysql.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/DBD/mysql.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mysql/Statement.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/mysql/mysql.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/mysql/mysql.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Msql-Mysql-modules/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/DBD/mysql
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Msql-Mysql-modules
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Mysql
diff --git a/databases/p5-Pg/pkg-plist b/databases/p5-Pg/pkg-plist
index 6eb6eaff63d9..7e1038624cc8 100644
--- a/databases/p5-Pg/pkg-plist
+++ b/databases/p5-Pg/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Pg.pm
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Pg/Pg.bs
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Pg/Pg.so
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Pg/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Pg/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Pg
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Pg.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pg/Pg.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pg/Pg.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pg/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pg/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Pg