aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/p5-CPAN-Meta/pkg-plist6
-rw-r--r--devel/p5-Config-YAML/pkg-plist6
-rw-r--r--devel/p5-Log-Log4perl-Appender-RabbitMQ/pkg-plist6
-rw-r--r--devel/p5-Moose-Autobox/pkg-plist6
-rw-r--r--devel/p5-MooseX-AttributeHelpers/pkg-plist2
-rw-r--r--devel/p5-MooseX-Traits-Pluggable/pkg-plist8
-rw-r--r--devel/p5-Object-Event/pkg-plist2
-rw-r--r--devel/p5-Test-Net-RabbitMQ/pkg-plist6
-rw-r--r--devel/p5-Version-Requirements/pkg-plist6
-rw-r--r--devel/p5-autobox/pkg-plist16
-rw-r--r--devel/p5-libxml-enno/pkg-plist4
-rw-r--r--devel/p5-self-init/pkg-plist2
-rw-r--r--dns/p5-Net-DNS-TestNS/pkg-plist4
-rw-r--r--editors/p5-Vimana/pkg-plist2
-rw-r--r--math/p5-Math-SigFigs/pkg-plist6
-rw-r--r--math/p5-Number-Fraction/pkg-plist6
-rw-r--r--math/p5-Statistics-Frequency/pkg-plist6
-rw-r--r--net/p5-Net-Cassandra-Easy/pkg-plist8
-rw-r--r--net/p5-Net-RabbitMQ/pkg-plist14
-rw-r--r--science/p5-Chemistry-3DBuilder/pkg-plist4
-rw-r--r--science/p5-Chemistry-Bond-Find/pkg-plist8
-rw-r--r--science/p5-Chemistry-Canonicalize/pkg-plist6
-rw-r--r--science/p5-Chemistry-File-MDLMol/pkg-plist8
-rw-r--r--science/p5-Chemistry-File-Mopac/pkg-plist8
-rw-r--r--science/p5-Chemistry-File-SLN/pkg-plist6
-rw-r--r--science/p5-Chemistry-File-SMARTS/pkg-plist6
-rw-r--r--science/p5-Chemistry-File-SMILES/pkg-plist8
-rw-r--r--science/p5-Chemistry-File-VRML/pkg-plist6
-rw-r--r--science/p5-Chemistry-File-XYZ/pkg-plist8
-rw-r--r--science/p5-Chemistry-FormulaPattern/pkg-plist6
-rw-r--r--science/p5-Chemistry-InternalCoords/pkg-plist6
-rw-r--r--science/p5-Chemistry-Isotope/pkg-plist6
-rw-r--r--science/p5-Chemistry-MidasPattern/pkg-plist6
-rw-r--r--science/p5-Chemistry-Mok/pkg-plist4
-rw-r--r--science/p5-Chemistry-Pattern/pkg-plist4
-rw-r--r--science/p5-Chemistry-Reaction/pkg-plist6
-rw-r--r--science/p5-Chemistry-Ring/pkg-plist4
-rw-r--r--science/p5-PerlMol/pkg-plist4
-rw-r--r--security/p5-Crypt-T_e_a/pkg-plist6
-rw-r--r--textproc/p5-HTML-HTML5-Parser/pkg-plist8
-rw-r--r--textproc/p5-POD2-Base/pkg-plist6
-rw-r--r--textproc/p5-Pod-Perldoc/pkg-plist4
-rw-r--r--textproc/p5-Spreadsheet-Read/pkg-plist6
-rw-r--r--textproc/p5-Spreadsheet-ReadSXC/pkg-plist6
-rw-r--r--textproc/p5-String-RewritePrefix/pkg-plist6
-rw-r--r--textproc/p5-XML-CanonicalizeXML/pkg-plist2
-rw-r--r--textproc/p5-XML-Validate/pkg-plist2
-rw-r--r--www/p5-CGI-Application-Plugin-Config-YAML/pkg-plist8
-rw-r--r--www/p5-CGI-EncryptForm/pkg-plist6
-rw-r--r--www/p5-Catalyst-Controller-RequestToken/pkg-plist8
-rw-r--r--www/p5-Catalyst-Plugin-Unicode-Encoding/pkg-plist10
-rw-r--r--www/p5-CatalystX-Component-Traits/pkg-plist8
52 files changed, 158 insertions, 158 deletions
diff --git a/devel/p5-CPAN-Meta/pkg-plist b/devel/p5-CPAN-Meta/pkg-plist
index b9610dc3b112..df979768a8d7 100644
--- a/devel/p5-CPAN-Meta/pkg-plist
+++ b/devel/p5-CPAN-Meta/pkg-plist
@@ -5,9 +5,9 @@
%%SITE_PERL%%/CPAN/Meta/Prereqs.pm
%%SITE_PERL%%/CPAN/Meta/Spec.pm
%%SITE_PERL%%/CPAN/Meta/Validator.pm
-%%SITE_PERL%%/mach/auto/CPAN/Meta/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Meta/.packlist
@dirrm %%SITE_PERL%%/CPAN/Meta
@dirrmtry %%SITE_PERL%%/CPAN
-@dirrm %%SITE_PERL%%/mach/auto/CPAN/Meta
-@dirrmtry %%SITE_PERL%%/mach/auto/CPAN
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Meta
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN
diff --git a/devel/p5-Config-YAML/pkg-plist b/devel/p5-Config-YAML/pkg-plist
index d86fde93da5b..c09e568e6041 100644
--- a/devel/p5-Config-YAML/pkg-plist
+++ b/devel/p5-Config-YAML/pkg-plist
@@ -1,6 +1,6 @@
@comment $FreeBSD$
%%SITE_PERL%%/Config/YAML.pm
-%%SITE_PERL%%/mach/auto/Config/YAML/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/Config/YAML
-@dirrmtry %%SITE_PERL%%/mach/auto/Config
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/YAML/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/YAML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config
@dirrmtry %%SITE_PERL%%/Config
diff --git a/devel/p5-Log-Log4perl-Appender-RabbitMQ/pkg-plist b/devel/p5-Log-Log4perl-Appender-RabbitMQ/pkg-plist
index af62b8d50179..b2ea7e5dfb35 100644
--- a/devel/p5-Log-Log4perl-Appender-RabbitMQ/pkg-plist
+++ b/devel/p5-Log-Log4perl-Appender-RabbitMQ/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Log/Log4perl/Appender/RabbitMQ.pm
-%%SITE_PERL%%/mach/auto/Log/Log4perl/Appender/RabbitMQ/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/Log/Log4perl/Appender/RabbitMQ
-@dirrm %%SITE_PERL%%/mach/auto/Log/Log4perl/Appender
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Log4perl/Appender/RabbitMQ/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Log4perl/Appender/RabbitMQ
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Log4perl/Appender
diff --git a/devel/p5-Moose-Autobox/pkg-plist b/devel/p5-Moose-Autobox/pkg-plist
index 494419b0b3c6..6c2767d8a061 100644
--- a/devel/p5-Moose-Autobox/pkg-plist
+++ b/devel/p5-Moose-Autobox/pkg-plist
@@ -12,8 +12,8 @@
%%SITE_PERL%%/Moose/Autobox/String.pm
%%SITE_PERL%%/Moose/Autobox/Undef.pm
%%SITE_PERL%%/Moose/Autobox/Value.pm
-%%SITE_PERL%%/mach/auto/Moose/Autobox/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Moose/Autobox
-@dirrmtry %%SITE_PERL%%/mach/auto/Moose
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Moose/Autobox/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Moose/Autobox
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Moose
@dirrmtry %%SITE_PERL%%/Moose/Autobox
@dirrmtry %%SITE_PERL%%/Moose
diff --git a/devel/p5-MooseX-AttributeHelpers/pkg-plist b/devel/p5-MooseX-AttributeHelpers/pkg-plist
index 852074c1d7d4..8cb4cbfd3c2b 100644
--- a/devel/p5-MooseX-AttributeHelpers/pkg-plist
+++ b/devel/p5-MooseX-AttributeHelpers/pkg-plist
@@ -31,7 +31,7 @@
%%SITE_PERL%%/MooseX/AttributeHelpers/Trait/Counter.pm
%%SITE_PERL%%/MooseX/AttributeHelpers/Trait/Number.pm
%%SITE_PERL%%/MooseX/AttributeHelpers/Trait/String.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/MooseX
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX
@dirrmtry %%SITE_PERL%%/MooseX/AttributeHelpers/Trait/Collection
@dirrmtry %%SITE_PERL%%/MooseX/AttributeHelpers/Trait
@dirrmtry %%SITE_PERL%%/MooseX/AttributeHelpers/MethodProvider
diff --git a/devel/p5-MooseX-Traits-Pluggable/pkg-plist b/devel/p5-MooseX-Traits-Pluggable/pkg-plist
index 5676cfa13852..8f6e061eacd6 100644
--- a/devel/p5-MooseX-Traits-Pluggable/pkg-plist
+++ b/devel/p5-MooseX-Traits-Pluggable/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/MooseX/Traits/Pluggable.pm
-%%SITE_PERL%%/mach/auto/MooseX/Traits/Pluggable/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/MooseX/Traits/Pluggable
-@dirrmtry %%SITE_PERL%%/mach/auto/MooseX/Traits
-@dirrmtry %%SITE_PERL%%/mach/auto/MooseX
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Traits/Pluggable/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Traits/Pluggable
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Traits
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX
@dirrmtry %%SITE_PERL%%/MooseX/Traits
@dirrmtry %%SITE_PERL%%/MooseX
diff --git a/devel/p5-Object-Event/pkg-plist b/devel/p5-Object-Event/pkg-plist
index 77e8ea07e722..18b8f77eadb8 100644
--- a/devel/p5-Object-Event/pkg-plist
+++ b/devel/p5-Object-Event/pkg-plist
@@ -1,6 +1,6 @@
@comment $FreeBSD$
%%SITE_PERL%%/Object/Event.pm
-%%SITE_PERL%%/mach/auto/Object/Event/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Event/.packlist
@dirrmtry %%SITE_PERL%%/Object/Event
@dirrmtry %%SITE_PERL%%/Object
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Event
diff --git a/devel/p5-Test-Net-RabbitMQ/pkg-plist b/devel/p5-Test-Net-RabbitMQ/pkg-plist
index f5e498206c81..62e9ef02724e 100644
--- a/devel/p5-Test-Net-RabbitMQ/pkg-plist
+++ b/devel/p5-Test-Net-RabbitMQ/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Test/Net/RabbitMQ.pm
-%%SITE_PERL%%/mach/auto/Test/Net/RabbitMQ/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Net/RabbitMQ/.packlist
@dirrmtry %%SITE_PERL%%/Test/Net
-@dirrmtry %%SITE_PERL%%/mach/auto/Test/Net/RabbitMQ
-@dirrmtry %%SITE_PERL%%/mach/auto/Test/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Net/RabbitMQ
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Net
diff --git a/devel/p5-Version-Requirements/pkg-plist b/devel/p5-Version-Requirements/pkg-plist
index b54a14949c52..49421179ef45 100644
--- a/devel/p5-Version-Requirements/pkg-plist
+++ b/devel/p5-Version-Requirements/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Version/Requirements.pm
-%%SITE_PERL%%/mach/auto/Version/Requirements/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/Version/Requirements
-@dirrmtry %%SITE_PERL%%/mach/auto/Version
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Version/Requirements/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Version/Requirements
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Version
@dirrmtry %%SITE_PERL%%/Version
diff --git a/devel/p5-autobox/pkg-plist b/devel/p5-autobox/pkg-plist
index f8cd1e92dc74..ba56fec6dcb4 100644
--- a/devel/p5-autobox/pkg-plist
+++ b/devel/p5-autobox/pkg-plist
@@ -1,8 +1,8 @@
-%%SITE_PERL%%/mach/auto/autobox/.packlist
-%%SITE_PERL%%/mach/auto/autobox/autobox.bs
-%%SITE_PERL%%/mach/auto/autobox/autobox.so
-%%SITE_PERL%%/mach/autobox.pm
-%%SITE_PERL%%/mach/autobox.pod
-%%SITE_PERL%%/mach/autobox/universal.pm
-@dirrmtry %%SITE_PERL%%/mach/autobox
-@dirrmtry %%SITE_PERL%%/mach/auto/autobox
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/autobox/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/autobox/autobox.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/autobox/autobox.so
+%%SITE_PERL%%/%%PERL_ARCH%%/autobox.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/autobox.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/autobox/universal.pm
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/autobox
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/autobox
diff --git a/devel/p5-libxml-enno/pkg-plist b/devel/p5-libxml-enno/pkg-plist
index fb9ea3403a0d..b3fab7e3a460 100644
--- a/devel/p5-libxml-enno/pkg-plist
+++ b/devel/p5-libxml-enno/pkg-plist
@@ -48,8 +48,8 @@ bin/xql.pl
%%SITE_PERL%%/XML/XQL/Plus.pm
%%SITE_PERL%%/XML/XQL/Parser.pm
%%SITE_PERL%%/XML/XQL.pm
-%%SITE_PERL%%/mach/auto/libxml-enno/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/libxml-enno
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/libxml-enno/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/libxml-enno
@dirrmtry %%SITE_PERL%%/XML/XQL
@dirrmtry %%SITE_PERL%%/XML/Filter
@dirrmtry %%SITE_PERL%%/XML/Checker
diff --git a/devel/p5-self-init/pkg-plist b/devel/p5-self-init/pkg-plist
index 9b0302b9f0f6..5facdbbad0f5 100644
--- a/devel/p5-self-init/pkg-plist
+++ b/devel/p5-self-init/pkg-plist
@@ -1,6 +1,6 @@
@comment $FreeBSD$
%%SITE_PERL%%/self/init.pm
-%%SITE_PERL%%/mach/auto/self/init/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/self/init/.packlist
@dirrmtry %%SITE_PERL%%/self
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/self/init
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/self
diff --git a/dns/p5-Net-DNS-TestNS/pkg-plist b/dns/p5-Net-DNS-TestNS/pkg-plist
index 9dfec8898d0a..ac6065fffbfd 100644
--- a/dns/p5-Net-DNS-TestNS/pkg-plist
+++ b/dns/p5-Net-DNS-TestNS/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/Net/DNS/TestNS/DTD.pm
%%SITE_PERL%%/Net/DNS/TestNS/Nameserver.pm
%%SITE_PERL%%/Net/DNS/TestNS/Packet.pm
-%%SITE_PERL%%/mach/auto/Net/DNS/TestNS/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/Net/DNS/TestNS
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/TestNS/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DNS/TestNS
@dirrm %%SITE_PERL%%/Net/DNS/TestNS
@dirrmtry %%SITE_PERL%%/Net/DNS
diff --git a/editors/p5-Vimana/pkg-plist b/editors/p5-Vimana/pkg-plist
index 8673e3f56629..f8451e3cc448 100644
--- a/editors/p5-Vimana/pkg-plist
+++ b/editors/p5-Vimana/pkg-plist
@@ -29,7 +29,7 @@
%%SITE_PERL%%/Vimana/VimOnline/ScriptPage.pm
%%SITE_PERL%%/Vimana/VimOnline/Search.pm
%%SITE_PERL%%/Vimana/VimballInstall.pm
-%%SITE_PERL%%/mach/auto/Vimana/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Vimana/.packlist
bin/vimana
@dirrmtry %%SITE_PERL%%/Vimana/VimOnline
@dirrmtry %%SITE_PERL%%/Vimana/Installer
diff --git a/math/p5-Math-SigFigs/pkg-plist b/math/p5-Math-SigFigs/pkg-plist
index dee90efa0f1d..e81e85a67e09 100644
--- a/math/p5-Math-SigFigs/pkg-plist
+++ b/math/p5-Math-SigFigs/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Math/SigFigs.pm
%%SITE_PERL%%/Math/SigFigs.pod
-%%SITE_PERL%%/mach/auto/Math/SigFigs/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Math/SigFigs
-@dirrmtry %%SITE_PERL%%/mach/auto/Math
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SigFigs/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SigFigs
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Number-Fraction/pkg-plist b/math/p5-Number-Fraction/pkg-plist
index ba8239971469..ef55dc1ca01a 100644
--- a/math/p5-Number-Fraction/pkg-plist
+++ b/math/p5-Number-Fraction/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Number/Fraction.pm
-%%SITE_PERL%%/mach/auto/Number/Fraction/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Number/Fraction
-@dirrmtry %%SITE_PERL%%/mach/auto/Number
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Fraction/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Fraction
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number
@dirrmtry %%SITE_PERL%%/Number
diff --git a/math/p5-Statistics-Frequency/pkg-plist b/math/p5-Statistics-Frequency/pkg-plist
index a62c48953e84..d67db026bfb3 100644
--- a/math/p5-Statistics-Frequency/pkg-plist
+++ b/math/p5-Statistics-Frequency/pkg-plist
@@ -1,5 +1,5 @@
-%%SITE_PERL%%/mach/auto/Statistics/Frequency/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Frequency/.packlist
%%SITE_PERL%%/Statistics/Frequency.pm
@dirrmtry %%SITE_PERL%%/Statistics
-@dirrmtry %%SITE_PERL%%/mach/auto/Statistics/Frequency
-@dirrmtry %%SITE_PERL%%/mach/auto/Statistics
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Frequency
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
diff --git a/net/p5-Net-Cassandra-Easy/pkg-plist b/net/p5-Net-Cassandra-Easy/pkg-plist
index 6a24fe5630f5..016e0e3007da 100644
--- a/net/p5-Net-Cassandra-Easy/pkg-plist
+++ b/net/p5-Net-Cassandra-Easy/pkg-plist
@@ -15,10 +15,10 @@ bin/cassidy.pl
%%SITE_PERL%%/Net/GenThrift/Thrift/Protocol.pm
%%SITE_PERL%%/Net/GenThrift/Thrift/Socket.pm
%%SITE_PERL%%/Net/GenThrift/Thrift/Transport.pm
-%%SITE_PERL%%/mach/auto/Net/Cassandra/Easy/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Net/Cassandra/Easy
-@dirrmtry %%SITE_PERL%%/mach/auto/Net/Cassandra
-@dirrmtry %%SITE_PERL%%/mach/auto/Net
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Cassandra/Easy/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Cassandra/Easy
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Cassandra
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
@dirrmtry %%SITE_PERL%%/Net/GenThrift/Thrift
@dirrmtry %%SITE_PERL%%/Net/GenThrift
@dirrmtry %%SITE_PERL%%/Net/GenCassandra
diff --git a/net/p5-Net-RabbitMQ/pkg-plist b/net/p5-Net-RabbitMQ/pkg-plist
index 50c5609e13ab..59d312304390 100644
--- a/net/p5-Net-RabbitMQ/pkg-plist
+++ b/net/p5-Net-RabbitMQ/pkg-plist
@@ -1,7 +1,7 @@
-%%SITE_PERL%%/mach/Net/RabbitMQ.pm
-%%SITE_PERL%%/mach/auto/Net/RabbitMQ/RabbitMQ.bs
-%%SITE_PERL%%/mach/auto/Net/RabbitMQ/RabbitMQ.so
-%%SITE_PERL%%/mach/auto/Net/RabbitMQ/.packlist
-@dirrmtry %%SITE_PERL%%/mach/Net
-@dirrmtry %%SITE_PERL%%/mach/auto/Net/RabbitMQ
-@dirrmtry %%SITE_PERL%%/mach/auto/Net
+%%SITE_PERL%%/%%PERL_ARCH%%/Net/RabbitMQ.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RabbitMQ/RabbitMQ.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RabbitMQ/RabbitMQ.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RabbitMQ/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RabbitMQ
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/science/p5-Chemistry-3DBuilder/pkg-plist b/science/p5-Chemistry-3DBuilder/pkg-plist
index 1ca91b6262ee..7783faa902f0 100644
--- a/science/p5-Chemistry-3DBuilder/pkg-plist
+++ b/science/p5-Chemistry-3DBuilder/pkg-plist
@@ -1,3 +1,3 @@
-%%SITE_PERL%%/mach/auto/Chemistry/3DBuilder/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/3DBuilder/.packlist
%%SITE_PERL%%/Chemistry/3DBuilder.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/3DBuilder
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/3DBuilder
diff --git a/science/p5-Chemistry-Bond-Find/pkg-plist b/science/p5-Chemistry-Bond-Find/pkg-plist
index 74f8f5c0f545..f333a8c0bf47 100644
--- a/science/p5-Chemistry-Bond-Find/pkg-plist
+++ b/science/p5-Chemistry-Bond-Find/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Chemistry/Bond/Find.pm
-%%SITE_PERL%%/mach/auto/Chemistry/Bond/Find/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Bond/Find/.packlist
@dirrmtry %%SITE_PERL%%/Chemistry
@dirrmtry %%SITE_PERL%%/Chemistry/Bond
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/Bond/Find
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/Bond
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Bond/Find
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Bond
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-Canonicalize/pkg-plist b/science/p5-Chemistry-Canonicalize/pkg-plist
index 9295230575cf..9940ccd47fa1 100644
--- a/science/p5-Chemistry-Canonicalize/pkg-plist
+++ b/science/p5-Chemistry-Canonicalize/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Chemistry/Canonicalize.pm
-%%SITE_PERL%%/mach/auto/Chemistry/Canonicalize/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/Canonicalize
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Canonicalize/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Canonicalize
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-File-MDLMol/pkg-plist b/science/p5-Chemistry-File-MDLMol/pkg-plist
index 6a4e888825f6..96c2c565b45c 100644
--- a/science/p5-Chemistry-File-MDLMol/pkg-plist
+++ b/science/p5-Chemistry-File-MDLMol/pkg-plist
@@ -1,6 +1,6 @@
-%%SITE_PERL%%/mach/auto/Chemistry/File/MDLMol/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/MDLMol/.packlist
%%SITE_PERL%%/Chemistry/File/MDLMol.pm
%%SITE_PERL%%/Chemistry/File/SDF.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/File/MDLMol
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/File
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/MDLMol
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-File-Mopac/pkg-plist b/science/p5-Chemistry-File-Mopac/pkg-plist
index 2c0b401ab335..cc29fa4ba54a 100644
--- a/science/p5-Chemistry-File-Mopac/pkg-plist
+++ b/science/p5-Chemistry-File-Mopac/pkg-plist
@@ -1,5 +1,5 @@
-%%SITE_PERL%%/mach/auto/Chemistry/File/Mopac/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/Mopac/.packlist
%%SITE_PERL%%/Chemistry/File/Mopac.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/File/Mopac
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/File
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/Mopac
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-File-SLN/pkg-plist b/science/p5-Chemistry-File-SLN/pkg-plist
index d76b9dbbc660..769f57eec4b6 100644
--- a/science/p5-Chemistry-File-SLN/pkg-plist
+++ b/science/p5-Chemistry-File-SLN/pkg-plist
@@ -1,6 +1,6 @@
-%%SITE_PERL%%/mach/auto/Chemistry/File/SLN/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SLN/.packlist
%%SITE_PERL%%/Chemistry/File/SLN/Parser.pm
%%SITE_PERL%%/Chemistry/File/SLN.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/File/SLN
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SLN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
@dirrmtry %%SITE_PERL%%/Chemistry/File/SLN
diff --git a/science/p5-Chemistry-File-SMARTS/pkg-plist b/science/p5-Chemistry-File-SMARTS/pkg-plist
index a756d714e155..36122a867719 100644
--- a/science/p5-Chemistry-File-SMARTS/pkg-plist
+++ b/science/p5-Chemistry-File-SMARTS/pkg-plist
@@ -1,4 +1,4 @@
-%%SITE_PERL%%/mach/auto/Chemistry/File/SMARTS/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SMARTS/.packlist
%%SITE_PERL%%/Chemistry/File/SMARTS.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/File/SMARTS
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SMARTS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
diff --git a/science/p5-Chemistry-File-SMILES/pkg-plist b/science/p5-Chemistry-File-SMILES/pkg-plist
index d539020fe035..95fd708bcb1a 100644
--- a/science/p5-Chemistry-File-SMILES/pkg-plist
+++ b/science/p5-Chemistry-File-SMILES/pkg-plist
@@ -1,6 +1,6 @@
-%%SITE_PERL%%/mach/auto/Chemistry/File/SMILES/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SMILES/.packlist
%%SITE_PERL%%/Chemistry/File/SMILES.pm
%%SITE_PERL%%/Chemistry/File/write.pl
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/File/SMILES
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/File
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SMILES
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-File-VRML/pkg-plist b/science/p5-Chemistry-File-VRML/pkg-plist
index 2de4bc3ea142..aa788f61d75a 100644
--- a/science/p5-Chemistry-File-VRML/pkg-plist
+++ b/science/p5-Chemistry-File-VRML/pkg-plist
@@ -1,4 +1,4 @@
-%%SITE_PERL%%/mach/auto/Chemistry/File/VRML/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/VRML/.packlist
%%SITE_PERL%%/Chemistry/File/VRML.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/File/VRML
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/VRML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
diff --git a/science/p5-Chemistry-File-XYZ/pkg-plist b/science/p5-Chemistry-File-XYZ/pkg-plist
index 1efa2bc00de7..3c7e16a876bb 100644
--- a/science/p5-Chemistry-File-XYZ/pkg-plist
+++ b/science/p5-Chemistry-File-XYZ/pkg-plist
@@ -1,7 +1,7 @@
-%%SITE_PERL%%/mach/auto/Chemistry/File/XYZ/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/XYZ/.packlist
%%SITE_PERL%%/Chemistry/File/XYZ.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/File/XYZ
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/File
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/XYZ
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
@dirrmtry %%SITE_PERL%%/Chemistry/File
@dirrmtry %%SITE_PERL%%/Chemistry
diff --git a/science/p5-Chemistry-FormulaPattern/pkg-plist b/science/p5-Chemistry-FormulaPattern/pkg-plist
index 81d884bee17b..db576c29b344 100644
--- a/science/p5-Chemistry-FormulaPattern/pkg-plist
+++ b/science/p5-Chemistry-FormulaPattern/pkg-plist
@@ -1,5 +1,5 @@
-%%SITE_PERL%%/mach/auto/Chemistry/FormulaPattern/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/FormulaPattern/.packlist
%%SITE_PERL%%/Chemistry/File/FormulaPattern.pm
%%SITE_PERL%%/Chemistry/FormulaPattern.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/FormulaPattern
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/FormulaPattern
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-InternalCoords/pkg-plist b/science/p5-Chemistry-InternalCoords/pkg-plist
index 853a67d3391d..e43b10d977a9 100644
--- a/science/p5-Chemistry-InternalCoords/pkg-plist
+++ b/science/p5-Chemistry-InternalCoords/pkg-plist
@@ -1,7 +1,7 @@
-%%SITE_PERL%%/mach/auto/Chemistry/InternalCoords/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/InternalCoords/.packlist
%%SITE_PERL%%/Chemistry/InternalCoords/Builder.pm
%%SITE_PERL%%/Chemistry/InternalCoords.pm
@dirrmtry %%SITE_PERL%%/Chemistry/InternalCoords
@dirrmtry %%SITE_PERL%%/Chemistry
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/InternalCoords
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/InternalCoords
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-Isotope/pkg-plist b/science/p5-Chemistry-Isotope/pkg-plist
index ce9f3f138825..e2e6fc779466 100644
--- a/science/p5-Chemistry-Isotope/pkg-plist
+++ b/science/p5-Chemistry-Isotope/pkg-plist
@@ -1,5 +1,5 @@
-%%SITE_PERL%%/mach/auto/Chemistry/Isotope/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Isotope/.packlist
%%SITE_PERL%%/Chemistry/Isotope.pm
@dirrmtry %%SITE_PERL%%/Chemistry
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/Isotope
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Isotope
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-MidasPattern/pkg-plist b/science/p5-Chemistry-MidasPattern/pkg-plist
index 0a419c491071..deef825c440e 100644
--- a/science/p5-Chemistry-MidasPattern/pkg-plist
+++ b/science/p5-Chemistry-MidasPattern/pkg-plist
@@ -1,5 +1,5 @@
-%%SITE_PERL%%/mach/auto/Chemistry/MidasPattern/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/MidasPattern/.packlist
%%SITE_PERL%%/Chemistry/File/MidasPattern.pm
%%SITE_PERL%%/Chemistry/MidasPattern.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/MidasPattern
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/MidasPattern
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-Mok/pkg-plist b/science/p5-Chemistry-Mok/pkg-plist
index 29b42eb46159..2e690055d39f 100644
--- a/science/p5-Chemistry-Mok/pkg-plist
+++ b/science/p5-Chemistry-Mok/pkg-plist
@@ -1,4 +1,4 @@
bin/mok
%%SITE_PERL%%/Chemistry/Mok.pm
-%%SITE_PERL%%/mach/auto/Chemistry/Mok/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/Mok
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Mok/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Mok
diff --git a/science/p5-Chemistry-Pattern/pkg-plist b/science/p5-Chemistry-Pattern/pkg-plist
index e76780fe37a7..1128c8b09a14 100644
--- a/science/p5-Chemistry-Pattern/pkg-plist
+++ b/science/p5-Chemistry-Pattern/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Chemistry/Pattern/Atom.pm
%%SITE_PERL%%/Chemistry/Pattern/Bond.pm
%%SITE_PERL%%/Chemistry/Pattern.pm
-%%SITE_PERL%%/mach/auto/Chemistry/Pattern/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/Pattern
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Pattern/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Pattern
@dirrmtry %%SITE_PERL%%/Chemistry/Pattern
@dirrmtry %%SITE_PERL%%/Chemistry
diff --git a/science/p5-Chemistry-Reaction/pkg-plist b/science/p5-Chemistry-Reaction/pkg-plist
index aabe62a95dca..e29ce60303dc 100644
--- a/science/p5-Chemistry-Reaction/pkg-plist
+++ b/science/p5-Chemistry-Reaction/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Chemistry/Reaction.pm
-%%SITE_PERL%%/mach/auto/Chemistry/Reaction/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/Reaction
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Reaction/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Reaction
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-Ring/pkg-plist b/science/p5-Chemistry-Ring/pkg-plist
index cf0cae7f3ad5..4786e619393d 100644
--- a/science/p5-Chemistry-Ring/pkg-plist
+++ b/science/p5-Chemistry-Ring/pkg-plist
@@ -1,5 +1,5 @@
-%%SITE_PERL%%/mach/auto/Chemistry/Ring/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Ring/.packlist
%%SITE_PERL%%/Chemistry/Ring/Find.pm
%%SITE_PERL%%/Chemistry/Ring.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/Chemistry/Ring
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Ring
@dirrmtry %%SITE_PERL%%/Chemistry/Ring
diff --git a/science/p5-PerlMol/pkg-plist b/science/p5-PerlMol/pkg-plist
index 28ab912610e4..7a8805d74de3 100644
--- a/science/p5-PerlMol/pkg-plist
+++ b/science/p5-PerlMol/pkg-plist
@@ -1,3 +1,3 @@
-%%SITE_PERL%%/mach/auto/PerlMol/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlMol/.packlist
%%SITE_PERL%%/PerlMol.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/PerlMol
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlMol
diff --git a/security/p5-Crypt-T_e_a/pkg-plist b/security/p5-Crypt-T_e_a/pkg-plist
index 74b0c4a73696..f2e53764cd04 100644
--- a/security/p5-Crypt-T_e_a/pkg-plist
+++ b/security/p5-Crypt-T_e_a/pkg-plist
@@ -1,6 +1,6 @@
bin/tea
%%SITE_PERL%%/Crypt/Tea.pm
-%%SITE_PERL%%/mach/auto/Crypt/Tea/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Crypt/Tea
-@dirrmtry %%SITE_PERL%%/mach/auto/Crypt
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Tea/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Tea
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/textproc/p5-HTML-HTML5-Parser/pkg-plist b/textproc/p5-HTML-HTML5-Parser/pkg-plist
index 0ff60b06c09b..276ce382c84c 100644
--- a/textproc/p5-HTML-HTML5-Parser/pkg-plist
+++ b/textproc/p5-HTML-HTML5-Parser/pkg-plist
@@ -9,11 +9,11 @@ bin/html2xhtml
%%SITE_PERL%%/HTML/HTML5/Parser/Tokenizer.pm
%%SITE_PERL%%/HTML/HTML5/Parser/NamedEntityList.pm
%%SITE_PERL%%/HTML/HTML5/Parser.pm
-%%SITE_PERL%%/mach/auto/HTML/HTML5/Parser/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/HTML5/Parser/.packlist
@dirrm %%SITE_PERL%%/HTML/HTML5/Parser/Charset
@dirrm %%SITE_PERL%%/HTML/HTML5/Parser
@dirrmtry %%SITE_PERL%%/HTML/HTML5
@dirrmtry %%SITE_PERL%%/HTML
-@dirrm %%SITE_PERL%%/mach/auto/HTML/HTML5/Parser
-@dirrmtry %%SITE_PERL%%/mach/auto/HTML/HTML5
-@dirrmtry %%SITE_PERL%%/mach/auto/HTML
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/HTML5/Parser
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/HTML5
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/textproc/p5-POD2-Base/pkg-plist b/textproc/p5-POD2-Base/pkg-plist
index dac077cafa77..d821bd9571d0 100644
--- a/textproc/p5-POD2-Base/pkg-plist
+++ b/textproc/p5-POD2-Base/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/POD2/Base.pm
%%SITE_PERL%%/POD2/Base.pod
%%SITE_PERL%%/POD2/PT/POD2/Base.pod
-%%SITE_PERL%%/mach/auto/POD2/Base/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/POD2/Base
-@dirrmtry %%SITE_PERL%%/mach/auto/POD2
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POD2/Base/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POD2/Base
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POD2
@dirrm %%SITE_PERL%%/POD2/PT/POD2
@dirrm %%SITE_PERL%%/POD2/PT
@dirrmtry %%SITE_PERL%%/POD2
diff --git a/textproc/p5-Pod-Perldoc/pkg-plist b/textproc/p5-Pod-Perldoc/pkg-plist
index b7cd11cd24fe..5a7b66209c63 100644
--- a/textproc/p5-Pod-Perldoc/pkg-plist
+++ b/textproc/p5-Pod-Perldoc/pkg-plist
@@ -11,7 +11,7 @@
%%SITE_PERL%%/Pod/Perldoc/ToXml.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Perldoc/.packlist
%%SITE_PERL%%/perldoc.pod
-@dirrm %%SITE_PERL%%/mach/auto/Pod/Perldoc
-@dirrmtry %%SITE_PERL%%/mach/auto/Pod
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Perldoc
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
@dirrm %%SITE_PERL%%/Pod/Perldoc
@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Spreadsheet-Read/pkg-plist b/textproc/p5-Spreadsheet-Read/pkg-plist
index ed3353a8a6da..eff6ba56d3f9 100644
--- a/textproc/p5-Spreadsheet-Read/pkg-plist
+++ b/textproc/p5-Spreadsheet-Read/pkg-plist
@@ -1,5 +1,5 @@
-%%SITE_PERL%%/mach/auto/Spreadsheet/Read/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/Read/.packlist
%%SITE_PERL%%/Spreadsheet/Read.pm
@dirrmtry %%SITE_PERL%%/Spreadsheet
-@dirrmtry %%SITE_PERL%%/mach/auto/Spreadsheet/Read
-@dirrmtry %%SITE_PERL%%/mach/auto/Spreadsheet
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/Read
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet
diff --git a/textproc/p5-Spreadsheet-ReadSXC/pkg-plist b/textproc/p5-Spreadsheet-ReadSXC/pkg-plist
index 50b6ab85f869..382f2df80a60 100644
--- a/textproc/p5-Spreadsheet-ReadSXC/pkg-plist
+++ b/textproc/p5-Spreadsheet-ReadSXC/pkg-plist
@@ -1,5 +1,5 @@
-%%SITE_PERL%%/mach/auto/Spreadsheet/ReadSXC/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/ReadSXC/.packlist
%%SITE_PERL%%/Spreadsheet/ReadSXC.pm
@dirrmtry %%SITE_PERL%%/Spreadsheet
-@dirrmtry %%SITE_PERL%%/mach/auto/Spreadsheet/ReadSXC
-@dirrmtry %%SITE_PERL%%/mach/auto/Spreadsheet
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/ReadSXC
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet
diff --git a/textproc/p5-String-RewritePrefix/pkg-plist b/textproc/p5-String-RewritePrefix/pkg-plist
index f7e7b943a7af..050f0fd50c7a 100644
--- a/textproc/p5-String-RewritePrefix/pkg-plist
+++ b/textproc/p5-String-RewritePrefix/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/String/RewritePrefix.pm
-%%SITE_PERL%%/mach/auto/String/RewritePrefix/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/String/RewritePrefix
-@dirrmtry %%SITE_PERL%%/mach/auto/String
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/RewritePrefix/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/RewritePrefix
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-XML-CanonicalizeXML/pkg-plist b/textproc/p5-XML-CanonicalizeXML/pkg-plist
index 1dca03b44784..70a7f98bc1c9 100644
--- a/textproc/p5-XML-CanonicalizeXML/pkg-plist
+++ b/textproc/p5-XML-CanonicalizeXML/pkg-plist
@@ -6,5 +6,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/CanonicalizeXML/autosplit.ix
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/CanonicalizeXML
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/mach/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
@dirrmtry %%SITE_PERL%%/mach
diff --git a/textproc/p5-XML-Validate/pkg-plist b/textproc/p5-XML-Validate/pkg-plist
index 9dc876d59684..1be253e75f15 100644
--- a/textproc/p5-XML-Validate/pkg-plist
+++ b/textproc/p5-XML-Validate/pkg-plist
@@ -4,7 +4,7 @@ bin/validxml.pl
%%SITE_PERL%%/XML/Validate/LibXML.pm
%%SITE_PERL%%/XML/Validate/MSXML.pm
%%SITE_PERL%%/XML/Validate/Xerces.pm
-%%SITE_PERL%%/mach/auto/XML/Validate/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Validate/.packlist
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Validate
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
@dirrmtry %%SITE_PERL%%/XML/Validate
diff --git a/www/p5-CGI-Application-Plugin-Config-YAML/pkg-plist b/www/p5-CGI-Application-Plugin-Config-YAML/pkg-plist
index 385c705308fc..0f6c4395f349 100644
--- a/www/p5-CGI-Application-Plugin-Config-YAML/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-Config-YAML/pkg-plist
@@ -1,7 +1,7 @@
-%%SITE_PERL%%/mach/auto/CGI/Application/Plugin/Config/YAML/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/Config/YAML/.packlist
%%SITE_PERL%%/CGI/Application/Plugin/Config/YAML.pm
@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin/Config
@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
-@dirrmtry %%SITE_PERL%%/mach/auto/CGI/Application/Plugin/Config/YAML
-@dirrmtry %%SITE_PERL%%/mach/auto/CGI/Application/Plugin/Config
-@dirrmtry %%SITE_PERL%%/mach/auto/CGI/Application/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/Config/YAML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin/Config
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/Plugin
diff --git a/www/p5-CGI-EncryptForm/pkg-plist b/www/p5-CGI-EncryptForm/pkg-plist
index c874a4c4bda3..690cd55a3ceb 100644
--- a/www/p5-CGI-EncryptForm/pkg-plist
+++ b/www/p5-CGI-EncryptForm/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/CGI/EncryptForm.pm
-%%SITE_PERL%%/mach/auto/CGI/EncryptForm/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/CGI/EncryptForm
-@dirrmtry %%SITE_PERL%%/mach/auto/CGI
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/EncryptForm/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/EncryptForm
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-Catalyst-Controller-RequestToken/pkg-plist b/www/p5-Catalyst-Controller-RequestToken/pkg-plist
index 883448c6c8d5..e33519fd105b 100644
--- a/www/p5-Catalyst-Controller-RequestToken/pkg-plist
+++ b/www/p5-Catalyst-Controller-RequestToken/pkg-plist
@@ -2,10 +2,10 @@
%%SITE_PERL%%/Catalyst/Controller/RequestToken/Action/CreateToken.pm
%%SITE_PERL%%/Catalyst/Controller/RequestToken/Action/RemoveToken.pm
%%SITE_PERL%%/Catalyst/Controller/RequestToken/Action/ValidateToken.pm
-%%SITE_PERL%%/mach/auto/Catalyst/Controller/RequestToken/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Catalyst/Controller/RequestToken
-@dirrmtry %%SITE_PERL%%/mach/auto/Catalyst/Controller
-@dirrmtry %%SITE_PERL%%/mach/auto/Catalyst
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller/RequestToken/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller/RequestToken
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Controller
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
@dirrmtry %%SITE_PERL%%/mach
@dirrmtry %%SITE_PERL%%/Catalyst/Controller/RequestToken/Action
@dirrmtry %%SITE_PERL%%/Catalyst/Controller/RequestToken
diff --git a/www/p5-Catalyst-Plugin-Unicode-Encoding/pkg-plist b/www/p5-Catalyst-Plugin-Unicode-Encoding/pkg-plist
index 4aa7bc8d3bc4..dc0aba55c41f 100644
--- a/www/p5-Catalyst-Plugin-Unicode-Encoding/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Unicode-Encoding/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/Catalyst/Plugin/Unicode/Encoding.pm
-%%SITE_PERL%%/mach/auto/Catalyst/Plugin/Unicode/Encoding/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Catalyst/Plugin/Unicode/Encoding
-@dirrmtry %%SITE_PERL%%/mach/auto/Catalyst/Plugin/Unicode
-@dirrmtry %%SITE_PERL%%/mach/auto/Catalyst/Plugin
-@dirrmtry %%SITE_PERL%%/mach/auto/Catalyst
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Unicode/Encoding/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Unicode/Encoding
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Unicode
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
@dirrmtry %%SITE_PERL%%/mach
@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Unicode
@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
diff --git a/www/p5-CatalystX-Component-Traits/pkg-plist b/www/p5-CatalystX-Component-Traits/pkg-plist
index d37e68df98ff..6bc074ee7b54 100644
--- a/www/p5-CatalystX-Component-Traits/pkg-plist
+++ b/www/p5-CatalystX-Component-Traits/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/CatalystX/Component/Traits.pm
-%%SITE_PERL%%/mach/auto/CatalystX/Component/Traits/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/CatalystX/Component/Traits
-@dirrmtry %%SITE_PERL%%/mach/auto/CatalystX/Component
-@dirrmtry %%SITE_PERL%%/mach/auto/CatalystX
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/Component/Traits/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/Component/Traits
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CatalystX
@dirrmtry %%SITE_PERL%%/CatalystX/Component
@dirrmtry %%SITE_PERL%%/CatalystX