aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/p5-IO-Compress-Base/pkg-plist8
-rw-r--r--archivers/p5-IO-Compress-Bzip2/pkg-plist8
-rw-r--r--audio/p5-Audio-Scrobbler/pkg-plist8
-rw-r--r--audio/p5-Ogg-Vorbis-Header-PurePerl/pkg-plist10
-rw-r--r--biology/p5-Bio-MAGETAB/pkg-plist6
-rw-r--r--comms/gscmxx/pkg-plist4
-rw-r--r--comms/hamlib/pkg-plist4
-rw-r--r--converters/p5-Encode-compat/pkg-plist6
-rw-r--r--databases/p5-DBICx-TxnInsert/pkg-plist10
-rw-r--r--databases/p5-T2/pkg-plist4
-rw-r--r--deskutils/adesklets/pkg-plist2
-rw-r--r--devel/adocman/pkg-plist2
-rw-r--r--devel/p5-Attribute-Handlers/pkg-plist6
-rw-r--r--devel/p5-Capture-Tiny/pkg-plist6
-rw-r--r--devel/p5-Class-Component/pkg-plist4
-rw-r--r--devel/p5-Class-Std-Fast/pkg-plist8
-rw-r--r--devel/p5-Devel-Required/pkg-plist6
-rw-r--r--devel/p5-Devel-SimpleTrace/pkg-plist2
-rw-r--r--devel/p5-Device-USB/pkg-plist32
-rw-r--r--devel/p5-Geo-ShapeFile/pkg-plist4
-rw-r--r--devel/p5-IO-Lambda/pkg-plist4
-rw-r--r--devel/p5-Locale-libintl/pkg-plist4
-rw-r--r--devel/p5-Make-Cache/pkg-plist2
-rw-r--r--devel/p5-Module-Recursive-Require/pkg-plist8
-rw-r--r--devel/p5-Sub-Override/pkg-plist2
-rw-r--r--devel/p5-Sub-Uplevel/pkg-plist6
-rw-r--r--devel/p5-Test-Exception/pkg-plist6
-rw-r--r--devel/p5-Test-Mock-LWP/pkg-plist2
-rw-r--r--devel/p5-Text-LevenshteinXS/pkg-plist16
-rw-r--r--devel/p5-ZConf-GUI/pkg-plist6
-rw-r--r--devel/p5-ZML/pkg-plist4
-rw-r--r--devel/p5-doxygenfilter/pkg-plist6
-rw-r--r--devel/p5-usb/pkg-plist32
-rw-r--r--graphics/mapserver/pkg-plist12
-rw-r--r--graphics/p5-Geo-EOP/pkg-plist8
-rw-r--r--graphics/p5-Geo-GML/pkg-plist8
-rw-r--r--graphics/p5-Geo-Gpx/pkg-plist8
-rw-r--r--graphics/p5-Geo-KML/pkg-plist8
-rw-r--r--graphics/p5-Geo-Point/pkg-plist8
-rw-r--r--graphics/p5-Geo-Proj4/pkg-plist16
-rw-r--r--graphics/p5-Google-Chart/pkg-plist8
-rw-r--r--graphics/p5-Graphics-ColorNames-WWW/pkg-plist8
-rw-r--r--lang/gdc/pkg-plist4
-rw-r--r--mail/p5-Email-Sender/pkg-plist6
-rw-r--r--mail/p5-Mail-Mbox-MessageParser/pkg-plist4
-rw-r--r--math/p5-Math-BigInt-Pari/pkg-plist6
-rw-r--r--math/p5-Math-Evol/pkg-plist6
-rw-r--r--math/p5-Math-GSL/pkg-plist312
-rw-r--r--math/p5-Math-MPC/pkg-plist14
-rw-r--r--math/p5-Math-MPFR/pkg-plist14
-rw-r--r--math/p5-Math-Polygon/pkg-plist4
-rw-r--r--multimedia/mp3cd/pkg-plist4
-rw-r--r--net-mgmt/p5-NetAddr-IP-Lite/pkg-plist8
-rw-r--r--net/p5-JavaScript-RPC/pkg-plist6
-rw-r--r--net/p5-Net-Analysis/pkg-plist4
-rw-r--r--net/p5-Net-HL7/pkg-plist4
-rw-r--r--net/p5-OAI-Harvester/pkg-plist4
-rw-r--r--textproc/p5-Bloom-Filter/pkg-plist6
-rw-r--r--textproc/p5-Devel-TraceSAX/pkg-plist2
-rw-r--r--textproc/p5-IDNA-Punycode/pkg-plist6
-rw-r--r--textproc/p5-LaTeX-Driver/pkg-plist4
-rw-r--r--textproc/p5-LaTeX-Encode/pkg-plist6
-rw-r--r--textproc/p5-LaTeX-Pod/pkg-plist6
-rw-r--r--textproc/p5-LaTeX-TOM/pkg-plist6
-rw-r--r--textproc/p5-Lingua-Stem-It/pkg-plist6
-rw-r--r--textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist8
-rw-r--r--textproc/p5-Lingua-Stem-Snowball-No/pkg-plist8
-rw-r--r--textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist8
-rw-r--r--textproc/p5-PDF-API2/pkg-plist6
-rw-r--r--textproc/p5-PDF-API3/pkg-plist6
-rw-r--r--textproc/p5-PDF-Table/pkg-plist6
-rw-r--r--textproc/p5-Pod-Abstract/pkg-plist6
-rw-r--r--textproc/p5-Text-Quoted/pkg-plist4
-rw-r--r--textproc/p5-XML-Filter-DOMFilter-LibXML/pkg-plist10
-rw-r--r--www/bricolage/pkg-plist8
-rw-r--r--www/p5-Catalyst-Model-DynamicAdaptor/pkg-plist8
-rw-r--r--www/p5-Catalyst-View-Email/pkg-plist8
-rw-r--r--www/p5-HTML-FillInForm-ForceUTF8/pkg-plist4
-rw-r--r--www/p5-HTML-Template-Associate/pkg-plist6
-rw-r--r--www/p5-HTTP-MobileAttribute/pkg-plist6
-rw-r--r--www/p5-Net-Amazon-AWIS/pkg-plist8
-rw-r--r--www/perlbal/pkg-plist4
-rw-r--r--x11-toolkits/p5-Gtk2-Ex-Dialogs/pkg-plist2
-rw-r--r--x11-toolkits/p5-Gtk2-GladeXML/pkg-plist24
84 files changed, 452 insertions, 452 deletions
diff --git a/archivers/p5-IO-Compress-Base/pkg-plist b/archivers/p5-IO-Compress-Base/pkg-plist
index e806768a8045..60f174867b06 100644
--- a/archivers/p5-IO-Compress-Base/pkg-plist
+++ b/archivers/p5-IO-Compress-Base/pkg-plist
@@ -3,10 +3,10 @@
%%SITE_PERL%%/IO/Compress/Base/Common.pm
%%SITE_PERL%%/IO/Uncompress/AnyUncompress.pm
%%SITE_PERL%%/IO/Uncompress/Base.pm
-%%SITE_PERL%%/mach/auto/IO/Compress/Base/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/IO/Compress/Base
-@dirrmtry %%SITE_PERL%%/mach/auto/IO/Compress
-@dirrmtry %%SITE_PERL%%/mach/auto/IO
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Compress/Base/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Compress/Base
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Compress
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
@dirrmtry %%SITE_PERL%%/IO/Uncompress
@dirrmtry %%SITE_PERL%%/IO/Compress/Base
@dirrmtry %%SITE_PERL%%/IO/Compress
diff --git a/archivers/p5-IO-Compress-Bzip2/pkg-plist b/archivers/p5-IO-Compress-Bzip2/pkg-plist
index 40a58e621384..0ab08aad62a4 100644
--- a/archivers/p5-IO-Compress-Bzip2/pkg-plist
+++ b/archivers/p5-IO-Compress-Bzip2/pkg-plist
@@ -2,10 +2,10 @@
%%SITE_PERL%%/IO/Compress/Bzip2.pm
%%SITE_PERL%%/IO/Uncompress/Adapter/Bunzip2.pm
%%SITE_PERL%%/IO/Uncompress/Bunzip2.pm
-%%SITE_PERL%%/mach/auto/IO/Compress/Bzip2/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/IO/Compress/Bzip2
-@dirrmtry %%SITE_PERL%%/mach/auto/IO/Compress
-@dirrmtry %%SITE_PERL%%/mach/auto/IO
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Compress/Bzip2/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Compress/Bzip2
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Compress
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
@dirrmtry %%SITE_PERL%%/IO/Uncompress/Adapter
@dirrmtry %%SITE_PERL%%/IO/Uncompress
@dirrmtry %%SITE_PERL%%/IO/Compress/Adapter
diff --git a/audio/p5-Audio-Scrobbler/pkg-plist b/audio/p5-Audio-Scrobbler/pkg-plist
index 82e3e369e4dd..6d5438c7d3d8 100644
--- a/audio/p5-Audio-Scrobbler/pkg-plist
+++ b/audio/p5-Audio-Scrobbler/pkg-plist
@@ -1,8 +1,8 @@
bin/scrobbler-helper
-%%SITE_PERL%%/mach/auto/Audio/Scrobbler/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Scrobbler/.packlist
%%SITE_PERL%%/Audio/Scrobbler.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/Audio/Scrobbler
-@dirrmtry %%SITE_PERL%%/mach/auto/Audio
-@dirrmtry %%SITE_PERL%%/mach/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Scrobbler
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
@dirrmtry %%SITE_PERL%%/mach
@dirrmtry %%SITE_PERL%%/Audio
diff --git a/audio/p5-Ogg-Vorbis-Header-PurePerl/pkg-plist b/audio/p5-Ogg-Vorbis-Header-PurePerl/pkg-plist
index 13c0c5c1c76d..d953bdc609c6 100644
--- a/audio/p5-Ogg-Vorbis-Header-PurePerl/pkg-plist
+++ b/audio/p5-Ogg-Vorbis-Header-PurePerl/pkg-plist
@@ -1,10 +1,10 @@
%%SITE_PERL%%/Ogg/Vorbis/Header/PurePerl.pm
%%SITE_PERL%%/Ogg/Vorbis/Header/ogginfo.pl
-%%SITE_PERL%%/mach/auto/Ogg/Vorbis/Header/PurePerl/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Ogg/Vorbis/Header/PurePerl
-@dirrmtry %%SITE_PERL%%/mach/auto/Ogg/Vorbis/Header
-@dirrmtry %%SITE_PERL%%/mach/auto/Ogg/Vorbis
-@dirrmtry %%SITE_PERL%%/mach/auto/Ogg
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/Header/PurePerl/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/Header/PurePerl
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/Header
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg
@dirrmtry %%SITE_PERL%%/Ogg/Vorbis/Header
@dirrmtry %%SITE_PERL%%/Ogg/Vorbis
@dirrmtry %%SITE_PERL%%/Ogg
diff --git a/biology/p5-Bio-MAGETAB/pkg-plist b/biology/p5-Bio-MAGETAB/pkg-plist
index 02398f400a64..b67a1e5aa664 100644
--- a/biology/p5-Bio-MAGETAB/pkg-plist
+++ b/biology/p5-Bio-MAGETAB/pkg-plist
@@ -2,7 +2,7 @@ bin/deploy_magetab_db.pl
bin/fix_ae_magetab.pl
bin/read_magetab.pl
bin/unload_magetab_namespace.pl
-%%SITE_PERL%%/mach/auto/Bio/MAGETAB/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/MAGETAB/.packlist
%%SITE_PERL%%/Bio/MAGETAB/Util/Reader/DataMatrix.pm
%%SITE_PERL%%/Bio/MAGETAB/Util/Reader/TagValueFile.pm
%%SITE_PERL%%/Bio/MAGETAB/Util/Reader/Tabfile.pm
@@ -60,8 +60,8 @@ bin/unload_magetab_namespace.pl
%%SITE_PERL%%/Bio/MAGETAB/FactorValue.pm
%%SITE_PERL%%/Bio/MAGETAB/DataMatrix.pm
%%SITE_PERL%%/Bio/MAGETAB.pm
-@dirrm %%SITE_PERL%%/mach/auto/Bio/MAGETAB
-@dirrmtry %%SITE_PERL%%/mach/auto/Bio
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/MAGETAB
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio
@dirrm %%SITE_PERL%%/Bio/MAGETAB/Util/Reader
@dirrm %%SITE_PERL%%/Bio/MAGETAB/Util/Writer
@dirrm %%SITE_PERL%%/Bio/MAGETAB/Util
diff --git a/comms/gscmxx/pkg-plist b/comms/gscmxx/pkg-plist
index b8dc4e31c1e3..5de812c9e10d 100644
--- a/comms/gscmxx/pkg-plist
+++ b/comms/gscmxx/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/SCMxx.pm
%%SITE_PERL%%/SCMxx/Config.pm
-%%SITE_PERL%%/mach/auto/gscmxx/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/gscmxx
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/gscmxx/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/gscmxx
@dirrm %%SITE_PERL%%/SCMxx
bin/gscmxx
share/pixmaps/gscmxx/phonebook_30.xpm
diff --git a/comms/hamlib/pkg-plist b/comms/hamlib/pkg-plist
index b94c77343051..8e4d96e5aa89 100644
--- a/comms/hamlib/pkg-plist
+++ b/comms/hamlib/pkg-plist
@@ -122,7 +122,7 @@ lib/libhamlib.la
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hamlib/Hamlib.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hamlib/Hamlib.bs
%%SITE_PERL%%/%%PERL_ARCH%%/Hamlib.pm
-%%SITE_PERL%%/mach/perltest.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/perltest.pl
%%PYTHON_SITELIBDIR%%/Hamlib.py
%%PYTHON_SITELIBDIR%%/Hamlib.pyc
%%PYTHON_SITELIBDIR%%/Hamlib.pyo
@@ -131,5 +131,5 @@ sbin/rpc.rigd
sbin/rpc.rotd
share/aclocal/hamlib.m4
@dirrm lib/tcl%%TCL_VER%%/hamlib
-@dirrm %%SITE_PERL%%/mach/auto/Hamlib
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hamlib
@dirrm include/hamlib
diff --git a/converters/p5-Encode-compat/pkg-plist b/converters/p5-Encode-compat/pkg-plist
index 4446e51ffef3..db3d8a7ac623 100644
--- a/converters/p5-Encode-compat/pkg-plist
+++ b/converters/p5-Encode-compat/pkg-plist
@@ -1,9 +1,9 @@
-%%SITE_PERL%%/mach/auto/Encode/compat/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/compat/.packlist
%%SITE_PERL%%/Encode/compat.pm
%%SITE_PERL%%/Encode/compat/5006001.pm
%%SITE_PERL%%/Encode/compat/common.pm
%%SITE_PERL%%/Encode/compat/Alias.pm
-@dirrm %%SITE_PERL%%/mach/auto/Encode/compat
-@dirrmtry %%SITE_PERL%%/mach/auto/Encode
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/compat
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode
@dirrm %%SITE_PERL%%/Encode/compat
@dirrmtry %%SITE_PERL%%/Encode
diff --git a/databases/p5-DBICx-TxnInsert/pkg-plist b/databases/p5-DBICx-TxnInsert/pkg-plist
index d3e542bd7908..d2b910b45391 100644
--- a/databases/p5-DBICx-TxnInsert/pkg-plist
+++ b/databases/p5-DBICx-TxnInsert/pkg-plist
@@ -1,6 +1,6 @@
@comment $FreeBSD$
-lib/perl5/site_perl/5.8.9/DBICx/TxnInsert.pm
-lib/perl5/site_perl/5.8.9/mach/auto/DBICx/TxnInsert/.packlist
-@dirrmtry lib/perl5/site_perl/5.8.9/mach/auto/DBICx/TxnInsert
-@dirrmtry lib/perl5/site_perl/5.8.9/mach/auto/DBICx
-@dirrmtry lib/perl5/site_perl/5.8.9/DBICx
+%%SITE_PERL%%/DBICx/TxnInsert.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBICx/TxnInsert/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBICx/TxnInsert
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBICx
+@dirrmtry %%SITE_PERL%%/DBICx
diff --git a/databases/p5-T2/pkg-plist b/databases/p5-T2/pkg-plist
index 9a36120382cb..60d67021eaa1 100644
--- a/databases/p5-T2/pkg-plist
+++ b/databases/p5-T2/pkg-plist
@@ -10,6 +10,6 @@ bin/t2-write-js.pl
%%SITE_PERL%%/T2/Method.pm
%%SITE_PERL%%/T2/Schema.pm
%%SITE_PERL%%/T2/Storage.pm
-%%SITE_PERL%%/mach/auto/T2/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/T2
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/T2/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/T2
@dirrm %%SITE_PERL%%/T2
diff --git a/deskutils/adesklets/pkg-plist b/deskutils/adesklets/pkg-plist
index de1ac11a8f2c..bf52f63a1d42 100644
--- a/deskutils/adesklets/pkg-plist
+++ b/deskutils/adesklets/pkg-plist
@@ -10,7 +10,7 @@ bin/adesklets_submit
%%PERL%%%%SITE_PERL%%/adesklets.pm
%%PERL%%%%SITE_PERL%%/updateproto.pl
%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/adesklets/.packlist
-%%PERL%%lib/perl5/%%PERL_VER%%/mach/perllocal.pod
+%%PERL%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/perllocal.pod
%%PERL%%lib/perl5/%%PERL_VER%%/man/man3/adesklets.3
%%PYTHON_SITELIBDIR%%/posix_signal.so
%%PYTHON_SITELIBDIR%%/adesklets/__init__.py
diff --git a/devel/adocman/pkg-plist b/devel/adocman/pkg-plist
index 1d78bc5b9614..2329990c1c4a 100644
--- a/devel/adocman/pkg-plist
+++ b/devel/adocman/pkg-plist
@@ -11,5 +11,5 @@ bin/xml_export
%%PORTDOCS%%%%DOCSDIR%%/adocman.html
%%PORTDOCS%%%%DOCSDIR%%/xml_export.html
@dirrm %%SITE_PERL%%/Alexandria
-@dirrm %%SITE_PERL%%/mach/auto/Alexandria
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Alexandria
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/devel/p5-Attribute-Handlers/pkg-plist b/devel/p5-Attribute-Handlers/pkg-plist
index 26f065a7835b..24e337b44224 100644
--- a/devel/p5-Attribute-Handlers/pkg-plist
+++ b/devel/p5-Attribute-Handlers/pkg-plist
@@ -1,5 +1,5 @@
-%%SITE_PERL%%/mach/auto/Attribute/Handlers/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Handlers/.packlist
%%SITE_PERL%%/Attribute/Handlers.pm
-@dirrm %%SITE_PERL%%/mach/auto/Attribute/Handlers
-@dirrm %%SITE_PERL%%/mach/auto/Attribute
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Handlers
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute
@dirrm %%SITE_PERL%%/Attribute
diff --git a/devel/p5-Capture-Tiny/pkg-plist b/devel/p5-Capture-Tiny/pkg-plist
index be3e6a2c2fe9..99f50c04a80e 100644
--- a/devel/p5-Capture-Tiny/pkg-plist
+++ b/devel/p5-Capture-Tiny/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Capture/Tiny.pm
%%SITE_PERL%%/Capture/Tiny.pod
-%%SITE_PERL%%/mach/auto/Capture/Tiny/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Capture/Tiny
-@dirrmtry %%SITE_PERL%%/mach/auto/Capture
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Capture/Tiny/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Capture/Tiny
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Capture
@dirrmtry %%SITE_PERL%%/Capture
diff --git a/devel/p5-Class-Component/pkg-plist b/devel/p5-Class-Component/pkg-plist
index 48cbdbb0aad0..fd98f7f8689d 100644
--- a/devel/p5-Class-Component/pkg-plist
+++ b/devel/p5-Class-Component/pkg-plist
@@ -16,8 +16,8 @@
%%SITE_PERL%%/Class/Component/Attribute.pm
%%SITE_PERL%%/Class/Component/Plugin.pm
%%SITE_PERL%%/Class/Component.pm
-%%SITE_PERL%%/mach/auto/Class/Component/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Class/Component
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Component/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Component
@dirrmtry %%SITE_PERL%%/Class/Component/Component/Plaggerize
@dirrmtry %%SITE_PERL%%/Class/Component/Component/Autocall
@dirrmtry %%SITE_PERL%%/Class/Component/Component
diff --git a/devel/p5-Class-Std-Fast/pkg-plist b/devel/p5-Class-Std-Fast/pkg-plist
index 83ac1291dfaa..15040f6b383a 100644
--- a/devel/p5-Class-Std-Fast/pkg-plist
+++ b/devel/p5-Class-Std-Fast/pkg-plist
@@ -1,9 +1,9 @@
-%%SITE_PERL%%/mach/auto/Class/Std/Fast/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Std/Fast/.packlist
%%SITE_PERL%%/Class/Std/Fast.pm
%%SITE_PERL%%/Class/Std/Fast/Storable.pm
-@dirrm %%SITE_PERL%%/mach/auto/Class/Std/Fast
-@dirrmtry %%SITE_PERL%%/mach/auto/Class/Std
-@dirrmtry %%SITE_PERL%%/mach/auto/Class
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Std/Fast
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Std
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
@dirrmtry %%SITE_PERL%%/Class/Std/Fast
@dirrmtry %%SITE_PERL%%/Class/Std
@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Devel-Required/pkg-plist b/devel/p5-Devel-Required/pkg-plist
index 72e868648d62..017b4ffa3855 100644
--- a/devel/p5-Devel-Required/pkg-plist
+++ b/devel/p5-Devel-Required/pkg-plist
@@ -1,5 +1,5 @@
-%%SITE_PERL%%/mach/auto/Devel/Required/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Required/.packlist
%%SITE_PERL%%/Devel/Required.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/Devel/Required
-@dirrmtry %%SITE_PERL%%/mach/auto/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Required
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
@dirrmtry %%SITE_PERL%%/Devel
diff --git a/devel/p5-Devel-SimpleTrace/pkg-plist b/devel/p5-Devel-SimpleTrace/pkg-plist
index 08aaf1ca7eb9..dea4b83e796c 100644
--- a/devel/p5-Devel-SimpleTrace/pkg-plist
+++ b/devel/p5-Devel-SimpleTrace/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Devel/SimpleTrace.pm
-%%SITE_PERL%%/mach/auto/Devel/SimpleTrace/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/SimpleTrace/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/SimpleTrace
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
@dirrmtry %%SITE_PERL%%/Devel
diff --git a/devel/p5-Device-USB/pkg-plist b/devel/p5-Device-USB/pkg-plist
index 9daec75cdc89..7a033f78b452 100644
--- a/devel/p5-Device-USB/pkg-plist
+++ b/devel/p5-Device-USB/pkg-plist
@@ -1,17 +1,17 @@
-%%SITE_PERL%%/mach/Device/USB.pm
-%%SITE_PERL%%/mach/Device/USB/Bus.pm
-%%SITE_PERL%%/mach/Device/USB/DevConfig.pm
-%%SITE_PERL%%/mach/Device/USB/DevEndpoint.pm
-%%SITE_PERL%%/mach/Device/USB/DevInterface.pm
-%%SITE_PERL%%/mach/Device/USB/Device.pm
-%%SITE_PERL%%/mach/Device/USB/FAQ.pod
-%%SITE_PERL%%/mach/Device/dump_usb.pl
-%%SITE_PERL%%/mach/auto/Device/USB/.packlist
-%%SITE_PERL%%/mach/auto/Device/USB/USB.bs
-%%SITE_PERL%%/mach/auto/Device/USB/USB.so
-@dirrm %%SITE_PERL%%/mach/auto/Device/USB
-@dirrmtry %%SITE_PERL%%/mach/auto/Device
-@dirrmtry %%SITE_PERL%%/mach/auto
-@dirrmtry %%SITE_PERL%%/mach/Device/USB
-@dirrmtry %%SITE_PERL%%/mach/Device
+%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/Bus.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/DevConfig.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/DevEndpoint.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/DevInterface.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/Device.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/FAQ.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Device/dump_usb.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/USB/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/USB/USB.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/USB/USB.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/USB
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Device/USB
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Device
@dirrmtry %%SITE_PERL%%/mach
diff --git a/devel/p5-Geo-ShapeFile/pkg-plist b/devel/p5-Geo-ShapeFile/pkg-plist
index 820743315b0d..0befa512b828 100644
--- a/devel/p5-Geo-ShapeFile/pkg-plist
+++ b/devel/p5-Geo-ShapeFile/pkg-plist
@@ -1,8 +1,8 @@
%%SITE_PERL%%/Geo/ShapeFile.pm
%%SITE_PERL%%/Geo/ShapeFile/Point.pm
%%SITE_PERL%%/Geo/ShapeFile/Shape.pm
-%%SITE_PERL%%/mach/auto/Geo/ShapeFile/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/Geo/ShapeFile
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/ShapeFile/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/ShapeFile
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
@dirrmtry %%SITE_PERL%%/Geo/ShapeFile
@dirrmtry %%SITE_PERL%%/Geo
diff --git a/devel/p5-IO-Lambda/pkg-plist b/devel/p5-IO-Lambda/pkg-plist
index 1ae0d44fb92d..d740c366017c 100644
--- a/devel/p5-IO-Lambda/pkg-plist
+++ b/devel/p5-IO-Lambda/pkg-plist
@@ -19,8 +19,8 @@
%%SITE_PERL%%/IO/Lambda/Signal.pm
%%SITE_PERL%%/IO/Lambda/Socket.pm
%%SITE_PERL%%/IO/Lambda/Thread.pm
-%%SITE_PERL%%/mach/auto/IO/Lambda/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/IO/Lambda
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Lambda/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Lambda
@dirrm %%SITE_PERL%%/IO/Lambda/Loop
@dirrm %%SITE_PERL%%/IO/Lambda/HTTP/Authen
@dirrm %%SITE_PERL%%/IO/Lambda/HTTP
diff --git a/devel/p5-Locale-libintl/pkg-plist b/devel/p5-Locale-libintl/pkg-plist
index 238e0a213e22..2ae26b26555c 100644
--- a/devel/p5-Locale-libintl/pkg-plist
+++ b/devel/p5-Locale-libintl/pkg-plist
@@ -148,8 +148,8 @@
%%SITE_PERL%%/Locale/gettext_xs.pm
%%SITE_PERL%%/Locale/gettext_xs.pod
%%SITE_PERL%%/Locale/libintlFAQ.pod
-%%SITE_PERL%%/mach/auto/Locale/gettext_xs/gettext_xs.bs
-%%SITE_PERL%%/mach/auto/Locale/gettext_xs/gettext_xs.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/gettext_xs/gettext_xs.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/gettext_xs/gettext_xs.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libintl-perl
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/gettext_xs
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
diff --git a/devel/p5-Make-Cache/pkg-plist b/devel/p5-Make-Cache/pkg-plist
index a9d3fd8dd520..d7e79ebeb833 100644
--- a/devel/p5-Make-Cache/pkg-plist
+++ b/devel/p5-Make-Cache/pkg-plist
@@ -5,7 +5,7 @@ bin/objcache
%%SITE_PERL%%/Make/Cache/Hash.pm
%%SITE_PERL%%/Make/Cache/Obj.pm
%%SITE_PERL%%/Make/Cache/Runtime.pm
-%%SITE_PERL%%/mach/auto/Make/Cache/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Make/Cache/.packlist
@dirrm %%SITE_PERL%%/Make/Cache
@dirrmtry %%SITE_PERL%%/Make
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Make/Cache
diff --git a/devel/p5-Module-Recursive-Require/pkg-plist b/devel/p5-Module-Recursive-Require/pkg-plist
index 3d0cf80f7c6c..9568de44c9f6 100644
--- a/devel/p5-Module-Recursive-Require/pkg-plist
+++ b/devel/p5-Module-Recursive-Require/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Module/Recursive/Require.pm
-%%SITE_PERL%%/mach/auto/Module/Recursive/Require/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Module/Recursive/Require
-@dirrmtry %%SITE_PERL%%/mach/auto/Module/Recursive
-@dirrmtry %%SITE_PERL%%/mach/auto/Module
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Recursive/Require/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Recursive/Require
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Recursive
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
@dirrmtry %%SITE_PERL%%/Module/Recursive
@dirrmtry %%SITE_PERL%%/Module
diff --git a/devel/p5-Sub-Override/pkg-plist b/devel/p5-Sub-Override/pkg-plist
index 87e18a5b732f..4ccd7358ef6d 100644
--- a/devel/p5-Sub-Override/pkg-plist
+++ b/devel/p5-Sub-Override/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sub/Override.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Override/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Override
-@dirrmtry %%SITE_PERL%%/mach/auto/Sub
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub
@dirrmtry %%SITE_PERL%%/Sub
diff --git a/devel/p5-Sub-Uplevel/pkg-plist b/devel/p5-Sub-Uplevel/pkg-plist
index 579f9c4167de..d4f7e66696df 100644
--- a/devel/p5-Sub-Uplevel/pkg-plist
+++ b/devel/p5-Sub-Uplevel/pkg-plist
@@ -1,6 +1,6 @@
-%%SITE_PERL%%/mach/auto/Sub/Uplevel/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Uplevel/.packlist
%%SITE_PERL%%/Sub/Uplevel.pm
%%SITE_PERL%%/Sub/Uplevel.pod
-@dirrm %%SITE_PERL%%/mach/auto/Sub/Uplevel
-@dirrmtry %%SITE_PERL%%/mach/auto/Sub
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Uplevel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub
@dirrmtry %%SITE_PERL%%/Sub
diff --git a/devel/p5-Test-Exception/pkg-plist b/devel/p5-Test-Exception/pkg-plist
index 72f8937e9e2a..41409a33d1d0 100644
--- a/devel/p5-Test-Exception/pkg-plist
+++ b/devel/p5-Test-Exception/pkg-plist
@@ -1,5 +1,5 @@
-%%SITE_PERL%%/mach/auto/Test/Exception/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Exception/.packlist
%%SITE_PERL%%/Test/Exception.pm
-@dirrm %%SITE_PERL%%/mach/auto/Test/Exception
-@dirrmtry %%SITE_PERL%%/mach/auto/Test
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Exception
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-Mock-LWP/pkg-plist b/devel/p5-Test-Mock-LWP/pkg-plist
index 6dde0c0f06e4..b2d544c59b44 100644
--- a/devel/p5-Test-Mock-LWP/pkg-plist
+++ b/devel/p5-Test-Mock-LWP/pkg-plist
@@ -5,7 +5,7 @@
%%SITE_PERL%%/Test/Mock/LWP/UserAgent.pm
%%SITE_PERL%%/Test/Mock/LWP.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Mock/LWP
-@dirrmtry %%SITE_PERL%%/mach/auto/Test/Mock
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Mock
@dirrmtry %%SITE_PERL%%/Test/Mock/LWP
@dirrmtry %%SITE_PERL%%/Test/Mock/HTTP
@dirrmtry %%SITE_PERL%%/Test/Mock
diff --git a/devel/p5-Text-LevenshteinXS/pkg-plist b/devel/p5-Text-LevenshteinXS/pkg-plist
index 37ab447d311c..cf64caf42c7d 100644
--- a/devel/p5-Text-LevenshteinXS/pkg-plist
+++ b/devel/p5-Text-LevenshteinXS/pkg-plist
@@ -1,8 +1,8 @@
-%%SITE_PERL%%/mach/auto/Text/LevenshteinXS/LevenshteinXS.so
-%%SITE_PERL%%/mach/auto/Text/LevenshteinXS/LevenshteinXS.bs
-%%SITE_PERL%%/mach/auto/Text/LevenshteinXS/autosplit.ix
-%%SITE_PERL%%/mach/auto/Text/LevenshteinXS/.packlist
-%%SITE_PERL%%/mach/Text/LevenshteinXS.pm
-@dirrm %%SITE_PERL%%/mach/auto/Text/LevenshteinXS
-@dirrmtry %%SITE_PERL%%/mach/auto/Text
-@dirrmtry %%SITE_PERL%%/mach/Text
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/LevenshteinXS/LevenshteinXS.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/LevenshteinXS/LevenshteinXS.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/LevenshteinXS/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/LevenshteinXS/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/LevenshteinXS.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/LevenshteinXS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
diff --git a/devel/p5-ZConf-GUI/pkg-plist b/devel/p5-ZConf-GUI/pkg-plist
index 7586f03d7f5a..d442b74bf8c5 100644
--- a/devel/p5-ZConf-GUI/pkg-plist
+++ b/devel/p5-ZConf-GUI/pkg-plist
@@ -6,7 +6,7 @@ bin/zcgui-get
bin/zcgui-sux
bin/zcgui-gux
%%SITE_PERL%%/ZConf/GUI.pm
-%%SITE_PERL%%/mach/auto/ZConf/GUI/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/ZConf/GUI
-@dirrmtry %%SITE_PERL%%/mach/auto/ZConf
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/GUI/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/GUI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf
@dirrmtry %%SITE_PERL%%/ZConf/
diff --git a/devel/p5-ZML/pkg-plist b/devel/p5-ZML/pkg-plist
index 68f1a94dc623..829db27effc4 100644
--- a/devel/p5-ZML/pkg-plist
+++ b/devel/p5-ZML/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/ZML.pm
-%%SITE_PERL%%/mach/auto/ZML/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/ZML
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/ZML/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZML
diff --git a/devel/p5-doxygenfilter/pkg-plist b/devel/p5-doxygenfilter/pkg-plist
index 468422fee09c..9199e9f756db 100644
--- a/devel/p5-doxygenfilter/pkg-plist
+++ b/devel/p5-doxygenfilter/pkg-plist
@@ -1,8 +1,8 @@
bin/doxygenfilter
-%%SITE_PERL%%/mach/auto/DoxyGen/Filter/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/DoxyGen/Filter/.packlist
%%SITE_PERL%%/DoxyGen/SQLFilter.pm
%%SITE_PERL%%/DoxyGen/Filter.pm
%%SITE_PERL%%/DoxyGen/PerlFilter.pm
-@dirrm %%SITE_PERL%%/mach/auto/DoxyGen/Filter
-@dirrm %%SITE_PERL%%/mach/auto/DoxyGen
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DoxyGen/Filter
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DoxyGen
@dirrm %%SITE_PERL%%/DoxyGen
diff --git a/devel/p5-usb/pkg-plist b/devel/p5-usb/pkg-plist
index 9daec75cdc89..7a033f78b452 100644
--- a/devel/p5-usb/pkg-plist
+++ b/devel/p5-usb/pkg-plist
@@ -1,17 +1,17 @@
-%%SITE_PERL%%/mach/Device/USB.pm
-%%SITE_PERL%%/mach/Device/USB/Bus.pm
-%%SITE_PERL%%/mach/Device/USB/DevConfig.pm
-%%SITE_PERL%%/mach/Device/USB/DevEndpoint.pm
-%%SITE_PERL%%/mach/Device/USB/DevInterface.pm
-%%SITE_PERL%%/mach/Device/USB/Device.pm
-%%SITE_PERL%%/mach/Device/USB/FAQ.pod
-%%SITE_PERL%%/mach/Device/dump_usb.pl
-%%SITE_PERL%%/mach/auto/Device/USB/.packlist
-%%SITE_PERL%%/mach/auto/Device/USB/USB.bs
-%%SITE_PERL%%/mach/auto/Device/USB/USB.so
-@dirrm %%SITE_PERL%%/mach/auto/Device/USB
-@dirrmtry %%SITE_PERL%%/mach/auto/Device
-@dirrmtry %%SITE_PERL%%/mach/auto
-@dirrmtry %%SITE_PERL%%/mach/Device/USB
-@dirrmtry %%SITE_PERL%%/mach/Device
+%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/Bus.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/DevConfig.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/DevEndpoint.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/DevInterface.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/Device.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Device/USB/FAQ.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Device/dump_usb.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/USB/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/USB/USB.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/USB/USB.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/USB
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Device/USB
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Device
@dirrmtry %%SITE_PERL%%/mach
diff --git a/graphics/mapserver/pkg-plist b/graphics/mapserver/pkg-plist
index 4c5bd3180136..16c8d62da043 100644
--- a/graphics/mapserver/pkg-plist
+++ b/graphics/mapserver/pkg-plist
@@ -8,12 +8,12 @@ bin/shptreetst
bin/shptreevis
bin/sortshp
%%WITH_MAPSERV%%www/cgi-bin/mapserv
-%%WITH_PERL%%%%SITE_PERL%%/mach/auto/mapscript/mapscript.so
-%%WITH_PERL%%%%SITE_PERL%%/mach/auto/mapscript/mapscript.bs
-%%WITH_PERL%%%%SITE_PERL%%/mach/auto/mapscript/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/mach/mapscript.pm
-%%WITH_PERL%%lib/perl5/%%PERL_VER%%/mach/perllocal.pod
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/mach/auto/mapscript
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/mapscript/mapscript.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/mapscript/mapscript.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/mapscript/.packlist
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/mapscript.pm
+%%WITH_PERL%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/perllocal.pod
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mapscript
%%WITH_PHP%%%%PHP_EXTENSION_DIR%%/php_mapscript.so
%%WITH_PHP%%@dirrmtry %%PHP_EXTENSION_DIR%%
%%WITH_PHP%%@dirrmtry etc/php
diff --git a/graphics/p5-Geo-EOP/pkg-plist b/graphics/p5-Geo-EOP/pkg-plist
index df55f76e6390..3edc92c5931c 100644
--- a/graphics/p5-Geo-EOP/pkg-plist
+++ b/graphics/p5-Geo-EOP/pkg-plist
@@ -1,4 +1,4 @@
-%%SITE_PERL%%/mach/auto/Geo/EOP/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/EOP/.packlist
%%SITE_PERL%%/Geo/EOP.pm
%%SITE_PERL%%/Geo/EOP.pod
%%SITE_PERL%%/Geo/EOP/Util.pm
@@ -31,7 +31,7 @@
@dirrmtry %%SITE_PERL%%/Geo/EOP/xsd
@dirrmtry %%SITE_PERL%%/Geo/EOP
@dirrmtry %%SITE_PERL%%/Geo
-@dirrmtry %%SITE_PERL%%/mach/auto/Geo/EOP
-@dirrmtry %%SITE_PERL%%/mach/auto/Geo
-@dirrmtry %%SITE_PERL%%/mach/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/EOP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
@dirrmtry %%SITE_PERL%%/mach
diff --git a/graphics/p5-Geo-GML/pkg-plist b/graphics/p5-Geo-GML/pkg-plist
index 04f5f2ac35f6..a8708e9b4cd3 100644
--- a/graphics/p5-Geo-GML/pkg-plist
+++ b/graphics/p5-Geo-GML/pkg-plist
@@ -1,4 +1,4 @@
-%%SITE_PERL%%/mach/auto/Geo/GML/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/GML/.packlist
%%SITE_PERL%%/Geo/GML.pm
%%SITE_PERL%%/Geo/GML.pod
%%SITE_PERL%%/Geo/GML/GeoPoint.pod
@@ -332,7 +332,7 @@
@dirrmtry %%SITE_PERL%%/Geo/GML/xsd
@dirrmtry %%SITE_PERL%%/Geo/GML
@dirrmtry %%SITE_PERL%%/Geo
-@dirrmtry %%SITE_PERL%%/mach/auto/Geo/GML
-@dirrmtry %%SITE_PERL%%/mach/auto/Geo
-@dirrmtry %%SITE_PERL%%/mach/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/GML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
@dirrmtry %%SITE_PERL%%/mach
diff --git a/graphics/p5-Geo-Gpx/pkg-plist b/graphics/p5-Geo-Gpx/pkg-plist
index b4fc0f04e441..a00cda2681f4 100644
--- a/graphics/p5-Geo-Gpx/pkg-plist
+++ b/graphics/p5-Geo-Gpx/pkg-plist
@@ -1,7 +1,7 @@
-%%SITE_PERL%%/mach/auto/Geo/Gpx/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Gpx/.packlist
%%SITE_PERL%%/Geo/Gpx.pm
@dirrmtry %%SITE_PERL%%/Geo
-@dirrmtry %%SITE_PERL%%/mach/auto/Geo/Gpx
-@dirrmtry %%SITE_PERL%%/mach/auto/Geo
-@dirrmtry %%SITE_PERL%%/mach/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Gpx
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
@dirrmtry %%SITE_PERL%%/mach
diff --git a/graphics/p5-Geo-KML/pkg-plist b/graphics/p5-Geo-KML/pkg-plist
index b1030b0b5302..1e86405578e6 100644
--- a/graphics/p5-Geo-KML/pkg-plist
+++ b/graphics/p5-Geo-KML/pkg-plist
@@ -1,4 +1,4 @@
-%%SITE_PERL%%/mach/auto/Geo/KML/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/KML/.packlist
%%SITE_PERL%%/Geo/KML.pm
%%SITE_PERL%%/Geo/KML.pod
%%SITE_PERL%%/Geo/KML/Util.pm
@@ -18,8 +18,8 @@
@dirrmtry %%SITE_PERL%%/Geo/KML/xsd/xal-2.0
@dirrmtry %%SITE_PERL%%/Geo/KML/xsd
@dirrmtry %%SITE_PERL%%/Geo/KML
-@dirrmtry %%SITE_PERL%%/mach/auto/Geo/KML
-@dirrmtry %%SITE_PERL%%/mach/auto/Geo
-@dirrmtry %%SITE_PERL%%/mach/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/KML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
@dirrmtry %%SITE_PERL%%/mach
@dirrmtry %%SITE_PERL%%/Geo
diff --git a/graphics/p5-Geo-Point/pkg-plist b/graphics/p5-Geo-Point/pkg-plist
index a35d67c3eea5..0cb66fc9292d 100644
--- a/graphics/p5-Geo-Point/pkg-plist
+++ b/graphics/p5-Geo-Point/pkg-plist
@@ -1,4 +1,4 @@
-%%SITE_PERL%%/mach/auto/Geo/Point/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Point/.packlist
%%SITE_PERL%%/Geo/Surface.pod
%%SITE_PERL%%/Geo/Point.pod
%%SITE_PERL%%/Geo/Point.pm
@@ -11,8 +11,8 @@
%%SITE_PERL%%/Geo/Space.pod
%%SITE_PERL%%/Geo/Proj.pod
%%SITE_PERL%%/Geo/Shape.pod
-@dirrmtry %%SITE_PERL%%/mach/auto/Geo/Point
-@dirrmtry %%SITE_PERL%%/mach/auto/Geo
-@dirrmtry %%SITE_PERL%%/mach/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Point
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
@dirrmtry %%SITE_PERL%%/mach
@dirrmtry %%SITE_PERL%%/Geo
diff --git a/graphics/p5-Geo-Proj4/pkg-plist b/graphics/p5-Geo-Proj4/pkg-plist
index ca14165bdf73..f187584473de 100644
--- a/graphics/p5-Geo-Proj4/pkg-plist
+++ b/graphics/p5-Geo-Proj4/pkg-plist
@@ -1,8 +1,8 @@
-%%SITE_PERL%%/mach/Geo/Proj4.pm
-%%SITE_PERL%%/mach/Geo/Proj4.pod
-%%SITE_PERL%%/mach/auto/Geo/Proj4/.packlist
-%%SITE_PERL%%/mach/auto/Geo/Proj4/Proj4.bs
-%%SITE_PERL%%/mach/auto/Geo/Proj4/Proj4.so
-@dirrm %%SITE_PERL%%/mach/auto/Geo/Proj4
-@dirrmtry %%SITE_PERL%%/mach/auto/Geo
-@dirrmtry %%SITE_PERL%%/mach/Geo
+%%SITE_PERL%%/%%PERL_ARCH%%/Geo/Proj4.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Geo/Proj4.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Proj4/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Proj4/Proj4.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Proj4/Proj4.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Proj4
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Geo
diff --git a/graphics/p5-Google-Chart/pkg-plist b/graphics/p5-Google-Chart/pkg-plist
index f3565937f58f..ec07483a7a12 100644
--- a/graphics/p5-Google-Chart/pkg-plist
+++ b/graphics/p5-Google-Chart/pkg-plist
@@ -36,8 +36,8 @@
@dirrm %%SITE_PERL%%/Google/Chart/Axis
@dirrm %%SITE_PERL%%/Google/Chart
@dirrmtry %%SITE_PERL%%/Google
-%%SITE_PERL%%/mach/auto/Google/Chart/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/Google/Chart
-@dirrm %%SITE_PERL%%/mach/auto/Google
-@dirrmtry %%SITE_PERL%%/mach/auto
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Google/Chart/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Google/Chart
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Google
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
@dirrmtry %%SITE_PERL%%/mach
diff --git a/graphics/p5-Graphics-ColorNames-WWW/pkg-plist b/graphics/p5-Graphics-ColorNames-WWW/pkg-plist
index f559e07ddd8d..6ac191212f4d 100644
--- a/graphics/p5-Graphics-ColorNames-WWW/pkg-plist
+++ b/graphics/p5-Graphics-ColorNames-WWW/pkg-plist
@@ -1,9 +1,9 @@
-%%SITE_PERL%%/mach/auto/Graphics/ColorNames/WWW/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/ColorNames/WWW/.packlist
%%SITE_PERL%%/Graphics/ColorNames/IE.pm
%%SITE_PERL%%/Graphics/ColorNames/WWW.pm
%%SITE_PERL%%/Graphics/ColorNames/SVG.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/Graphics/ColorNames/WWW
-@dirrmtry %%SITE_PERL%%/mach/auto/Graphics/ColorNames
-@dirrmtry %%SITE_PERL%%/mach/auto/Graphics
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/ColorNames/WWW
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/ColorNames
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics
@dirrmtry %%SITE_PERL%%/Graphics/ColorNames
@dirrmtry %%SITE_PERL%%/Graphics
diff --git a/lang/gdc/pkg-plist b/lang/gdc/pkg-plist
index 8cf347aaf92d..c3caa0d4f1c2 100644
--- a/lang/gdc/pkg-plist
+++ b/lang/gdc/pkg-plist
@@ -91,8 +91,8 @@ include/d/%%GCC_VER%%/std/c/linux/ldblcompat.d
include/d/%%GCC_VER%%/std/c/linux/linux.d
include/d/%%GCC_VER%%/std/c/linux/linuxextern.d
include/d/%%GCC_VER%%/std/c/linux/socket.d
-include/d/%%GCC_VER%%/std/c/mach/mach.d
-include/d/%%GCC_VER%%/std/c/mach/mach_extern.d
+include/d/%%GCC_VER%%/std/c/%%PERL_ARCH%%/mach.d
+include/d/%%GCC_VER%%/std/c/%%PERL_ARCH%%/mach_extern.d
include/d/%%GCC_VER%%/std/c/skyos/compat.d
include/d/%%GCC_VER%%/std/c/skyos/skyos.d
include/d/%%GCC_VER%%/std/c/unix/unix.d
diff --git a/mail/p5-Email-Sender/pkg-plist b/mail/p5-Email-Sender/pkg-plist
index aef8be4f28b0..47199c0c2dcc 100644
--- a/mail/p5-Email-Sender/pkg-plist
+++ b/mail/p5-Email-Sender/pkg-plist
@@ -21,9 +21,9 @@
%%SITE_PERL%%/Email/Sender/Transport/Test.pm
%%SITE_PERL%%/Email/Sender/Transport/Wrapper.pm
%%SITE_PERL%%/Email/Sender/Util.pm
-%%SITE_PERL%%/mach/auto/Email/Sender/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Email/Sender
-@dirrmtry %%SITE_PERL%%/mach/auto/Email
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Sender
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
@dirrmtry %%SITE_PERL%%/Email/Sender/Transport/SMTP
@dirrmtry %%SITE_PERL%%/Email/Sender/Transport
@dirrmtry %%SITE_PERL%%/Email/Sender/Success
diff --git a/mail/p5-Mail-Mbox-MessageParser/pkg-plist b/mail/p5-Mail-Mbox-MessageParser/pkg-plist
index 8902346db21c..ddd1ee552d28 100644
--- a/mail/p5-Mail-Mbox-MessageParser/pkg-plist
+++ b/mail/p5-Mail-Mbox-MessageParser/pkg-plist
@@ -10,5 +10,5 @@
@dirrmtry %%SITE_PERL%%/Mail/Mbox
@dirrmtry %%SITE_PERL%%/Mail
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Mbox/MessageParser
-@dirrmtry %%SITE_PERL%%/mach/auto/Mail/Mbox
-@dirrmtry %%SITE_PERL%%/mach/auto/Mail
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Mbox
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/math/p5-Math-BigInt-Pari/pkg-plist b/math/p5-Math-BigInt-Pari/pkg-plist
index e31718cd548d..ed803a391c18 100644
--- a/math/p5-Math-BigInt-Pari/pkg-plist
+++ b/math/p5-Math-BigInt-Pari/pkg-plist
@@ -1,4 +1,4 @@
@comment $FreeBSD$
-lib/perl5/site_perl/5.8.9/Math/BigInt/Pari.pm
-lib/perl5/site_perl/5.8.9/mach/auto/Math/BigInt/Pari/.packlist
-@dirrmtry lib/perl5/site_perl/5.8.9/mach/auto/Math/BigInt/Pari
+%%SITE_PERL%%/Math/BigInt/Pari.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInt/Pari/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BigInt/Pari
diff --git a/math/p5-Math-Evol/pkg-plist b/math/p5-Math-Evol/pkg-plist
index 2b901f4d8f0e..98572f929bdd 100644
--- a/math/p5-Math-Evol/pkg-plist
+++ b/math/p5-Math-Evol/pkg-plist
@@ -1,6 +1,6 @@
bin/ps_evol
%%SITE_PERL%%/Math/Evol.pm
-%%SITE_PERL%%/mach/auto/Math/Evol/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Evol/.packlist
@dirrmtry %%SITE_PERL%%/Math
-@dirrm %%SITE_PERL%%/mach/auto/Math/Evol
-@dirrmtry %%SITE_PERL%%/mach/auto/Math
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Evol
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-GSL/pkg-plist b/math/p5-Math-GSL/pkg-plist
index 84acd0b34519..8abb52f8789b 100644
--- a/math/p5-Math-GSL/pkg-plist
+++ b/math/p5-Math-GSL/pkg-plist
@@ -1,159 +1,159 @@
bin/smoke_some_mathgsl
bin/smolder_mathgsl
bin/smolder_smoke_signal
-%%SITE_PERL%%/mach/Math/GSL/BLAS.pm
-%%SITE_PERL%%/mach/Math/GSL/BSpline.pm
-%%SITE_PERL%%/mach/Math/GSL/CBLAS.pm
-%%SITE_PERL%%/mach/Math/GSL/CDF.pm
-%%SITE_PERL%%/mach/Math/GSL/Chebyshev.pm
-%%SITE_PERL%%/mach/Math/GSL/Combination.pm
-%%SITE_PERL%%/mach/Math/GSL/Complex.pm
-%%SITE_PERL%%/mach/Math/GSL/Const.pm
-%%SITE_PERL%%/mach/Math/GSL/DHT.pm
-%%SITE_PERL%%/mach/Math/GSL/Deriv.pm
-%%SITE_PERL%%/mach/Math/GSL/Diff.pm
-%%SITE_PERL%%/mach/Math/GSL/Eigen.pm
-%%SITE_PERL%%/mach/Math/GSL/Errno.pm
-%%SITE_PERL%%/mach/Math/GSL/FFT.pm
-%%SITE_PERL%%/mach/Math/GSL/Fit.pm
-%%SITE_PERL%%/mach/Math/GSL/Heapsort.pm
-%%SITE_PERL%%/mach/Math/GSL/Histogram.pm
-%%SITE_PERL%%/mach/Math/GSL/Histogram2D.pm
-%%SITE_PERL%%/mach/Math/GSL/IEEEUtils.pm
-%%SITE_PERL%%/mach/Math/GSL/Integration.pm
-%%SITE_PERL%%/mach/Math/GSL/Interp.pm
-%%SITE_PERL%%/mach/Math/GSL/Linalg.pm
-%%SITE_PERL%%/mach/Math/GSL/Machine.pm
-%%SITE_PERL%%/mach/Math/GSL/Matrix.pm
-%%SITE_PERL%%/mach/Math/GSL/MatrixComplex.pm
-%%SITE_PERL%%/mach/Math/GSL/Min.pm
-%%SITE_PERL%%/mach/Math/GSL/Monte.pm
-%%SITE_PERL%%/mach/Math/GSL/Multifit.pm
-%%SITE_PERL%%/mach/Math/GSL/Multimin.pm
-%%SITE_PERL%%/mach/Math/GSL/Multiroots.pm
-%%SITE_PERL%%/mach/Math/GSL/NTuple.pm
-%%SITE_PERL%%/mach/Math/GSL/ODEIV.pm
-%%SITE_PERL%%/mach/Math/GSL/Permutation.pm
-%%SITE_PERL%%/mach/Math/GSL/Poly.pm
-%%SITE_PERL%%/mach/Math/GSL/PowInt.pm
-%%SITE_PERL%%/mach/Math/GSL/QRNG.pm
-%%SITE_PERL%%/mach/Math/GSL/RNG.pm
-%%SITE_PERL%%/mach/Math/GSL/Randist.pm
-%%SITE_PERL%%/mach/Math/GSL/Roots.pm
-%%SITE_PERL%%/mach/Math/GSL/SF.pm
-%%SITE_PERL%%/mach/Math/GSL/Siman.pm
-%%SITE_PERL%%/mach/Math/GSL/Sort.pm
-%%SITE_PERL%%/mach/Math/GSL/Spline.pm
-%%SITE_PERL%%/mach/Math/GSL/Statistics.pm
-%%SITE_PERL%%/mach/Math/GSL/Sum.pm
-%%SITE_PERL%%/mach/Math/GSL/Sys.pm
-%%SITE_PERL%%/mach/Math/GSL/Test.pm
-%%SITE_PERL%%/mach/Math/GSL/Vector.pm
-%%SITE_PERL%%/mach/Math/GSL/VectorComplex.pm
-%%SITE_PERL%%/mach/Math/GSL/Wavelet.pm
-%%SITE_PERL%%/mach/Math/GSL/Wavelet2D.pm
-%%SITE_PERL%%/mach/Math/GSL.pm
-@dirrm %%SITE_PERL%%/mach/Math/GSL
-@dirrm %%SITE_PERL%%/mach/Math
-%%SITE_PERL%%/mach/auto/Math/GSL/BLAS/BLAS.so
-%%SITE_PERL%%/mach/auto/Math/GSL/BSpline/BSpline.so
-%%SITE_PERL%%/mach/auto/Math/GSL/CBLAS/CBLAS.so
-%%SITE_PERL%%/mach/auto/Math/GSL/CDF/CDF.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Chebyshev/Chebyshev.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Combination/Combination.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Complex/Complex.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Const/Const.so
-%%SITE_PERL%%/mach/auto/Math/GSL/DHT/DHT.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Deriv/Deriv.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Diff/Diff.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Eigen/Eigen.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Errno/Errno.so
-%%SITE_PERL%%/mach/auto/Math/GSL/FFT/FFT.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Fit/Fit.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Heapsort/Heapsort.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Histogram/Histogram.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Histogram2D/Histogram2D.so
-%%SITE_PERL%%/mach/auto/Math/GSL/IEEEUtils/IEEEUtils.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Integration/Integration.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Interp/Interp.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Linalg/Linalg.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Machine/Machine.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Matrix/Matrix.so
-%%SITE_PERL%%/mach/auto/Math/GSL/MatrixComplex/MatrixComplex.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Min/Min.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Monte/Monte.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Multifit/Multifit.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Multimin/Multimin.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Multiroots/Multiroots.so
-%%SITE_PERL%%/mach/auto/Math/GSL/NTuple/NTuple.so
-%%SITE_PERL%%/mach/auto/Math/GSL/ODEIV/ODEIV.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Permutation/Permutation.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Poly/Poly.so
-%%SITE_PERL%%/mach/auto/Math/GSL/PowInt/PowInt.so
-%%SITE_PERL%%/mach/auto/Math/GSL/QRNG/QRNG.so
-%%SITE_PERL%%/mach/auto/Math/GSL/RNG/RNG.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Randist/Randist.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Roots/Roots.so
-%%SITE_PERL%%/mach/auto/Math/GSL/SF/SF.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Siman/Siman.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Sort/Sort.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Spline/Spline.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Statistics/Statistics.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Sum/Sum.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Sys/Sys.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Vector/Vector.so
-%%SITE_PERL%%/mach/auto/Math/GSL/VectorComplex/VectorComplex.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Wavelet/Wavelet.so
-%%SITE_PERL%%/mach/auto/Math/GSL/Wavelet2D/Wavelet2D.so
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/BLAS
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/BSpline
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/CBLAS
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/CDF
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Chebyshev
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Combination
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Complex
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Const
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/DHT
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Deriv
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Diff
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Eigen
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Errno
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/FFT
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Fit
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Heapsort
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Histogram
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Histogram2D
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/IEEEUtils
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Integration
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Interp
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Linalg
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Machine
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Matrix
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/MatrixComplex
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Min
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Monte
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Multifit
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Multimin
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Multiroots
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/NTuple
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/ODEIV
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Permutation
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Poly
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/PowInt
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/QRNG
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/RNG
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Randist
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Roots
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/SF
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Siman
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Sort
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Spline
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Statistics
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Sum
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Sys
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Vector
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/VectorComplex
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Wavelet
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL/Wavelet2D
-@dirrm %%SITE_PERL%%/mach/auto/Math/GSL
-@dirrm %%SITE_PERL%%/mach/auto/Math
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/BLAS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/BSpline.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/CBLAS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/CDF.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Chebyshev.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Combination.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Complex.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Const.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/DHT.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Deriv.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Diff.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Eigen.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Errno.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/FFT.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Fit.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Heapsort.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Histogram.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Histogram2D.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/IEEEUtils.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Integration.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Interp.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Linalg.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Machine.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Matrix.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/MatrixComplex.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Min.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Monte.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Multifit.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Multimin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Multiroots.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/NTuple.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/ODEIV.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Permutation.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Poly.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/PowInt.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/QRNG.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/RNG.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Randist.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Roots.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/SF.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Siman.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Sort.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Spline.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Statistics.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Sum.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Sys.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Test.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Vector.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/VectorComplex.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Wavelet.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL/Wavelet2D.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Math/GSL
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Math
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/BLAS/BLAS.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/BSpline/BSpline.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/CBLAS/CBLAS.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/CDF/CDF.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Chebyshev/Chebyshev.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Combination/Combination.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Complex/Complex.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Const/Const.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/DHT/DHT.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Deriv/Deriv.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Diff/Diff.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Eigen/Eigen.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Errno/Errno.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/FFT/FFT.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Fit/Fit.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Heapsort/Heapsort.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Histogram/Histogram.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Histogram2D/Histogram2D.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/IEEEUtils/IEEEUtils.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Integration/Integration.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Interp/Interp.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Linalg/Linalg.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Machine/Machine.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Matrix/Matrix.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/MatrixComplex/MatrixComplex.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Min/Min.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Monte/Monte.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Multifit/Multifit.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Multimin/Multimin.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Multiroots/Multiroots.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/NTuple/NTuple.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/ODEIV/ODEIV.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Permutation/Permutation.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Poly/Poly.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/PowInt/PowInt.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/QRNG/QRNG.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/RNG/RNG.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Randist/Randist.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Roots/Roots.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/SF/SF.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Siman/Siman.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Sort/Sort.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Spline/Spline.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Statistics/Statistics.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Sum/Sum.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Sys/Sys.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Vector/Vector.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/VectorComplex/VectorComplex.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Wavelet/Wavelet.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Wavelet2D/Wavelet2D.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/BLAS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/BSpline
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/CBLAS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/CDF
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Chebyshev
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Combination
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Complex
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Const
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/DHT
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Deriv
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Diff
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Eigen
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Errno
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/FFT
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Fit
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Heapsort
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Histogram
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Histogram2D
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/IEEEUtils
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Integration
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Interp
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Linalg
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Machine
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Matrix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/MatrixComplex
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Min
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Monte
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Multifit
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Multimin
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Multiroots
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/NTuple
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/ODEIV
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Permutation
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Poly
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/PowInt
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/QRNG
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/RNG
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Randist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Roots
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/SF
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Siman
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Sort
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Spline
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Statistics
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Sum
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Sys
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Vector
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/VectorComplex
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Wavelet
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Wavelet2D
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-MPC/pkg-plist b/math/p5-Math-MPC/pkg-plist
index 1c16eab43178..8d73674cf71a 100644
--- a/math/p5-Math-MPC/pkg-plist
+++ b/math/p5-Math-MPC/pkg-plist
@@ -1,7 +1,7 @@
-%%SITE_PERL%%/mach/Math/MPC.pm
-%%SITE_PERL%%/mach/auto/Math/MPC/.packlist
-%%SITE_PERL%%/mach/auto/Math/MPC/MPC.bs
-%%SITE_PERL%%/mach/auto/Math/MPC/MPC.so
-@dirrm %%SITE_PERL%%/mach/Math
-@dirrm %%SITE_PERL%%/mach/auto/Math/MPC
-@dirrmtry %%SITE_PERL%%/mach/auto/Math
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/MPC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPC/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPC/MPC.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPC/MPC.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Math
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPC
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-MPFR/pkg-plist b/math/p5-Math-MPFR/pkg-plist
index 7b309c4a5658..3df0ca8615be 100644
--- a/math/p5-Math-MPFR/pkg-plist
+++ b/math/p5-Math-MPFR/pkg-plist
@@ -1,7 +1,7 @@
-%%SITE_PERL%%/mach/Math/MPFR.pm
-%%SITE_PERL%%/mach/auto/Math/MPFR/.packlist
-%%SITE_PERL%%/mach/auto/Math/MPFR/MPFR.bs
-%%SITE_PERL%%/mach/auto/Math/MPFR/MPFR.so
-@dirrm %%SITE_PERL%%/mach/Math
-@dirrm %%SITE_PERL%%/mach/auto/Math/MPFR
-@dirrmtry %%SITE_PERL%%/mach/auto/Math
+%%SITE_PERL%%/%%PERL_ARCH%%/Math/MPFR.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPFR/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPFR/MPFR.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPFR/MPFR.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Math
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MPFR
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-Polygon/pkg-plist b/math/p5-Math-Polygon/pkg-plist
index a6a841b0c6eb..6f6830b72e25 100644
--- a/math/p5-Math-Polygon/pkg-plist
+++ b/math/p5-Math-Polygon/pkg-plist
@@ -14,5 +14,5 @@
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
@dirrmtry %%SITE_PERL%%/Math/Polygon
@dirrmtry %%SITE_PERL%%/Math
-@dirrmtry %%SITE_PERL%%/mach/auto/Math/Polygon
-@dirrmtry %%SITE_PERL%%/mach/auto/Math
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Polygon
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/multimedia/mp3cd/pkg-plist b/multimedia/mp3cd/pkg-plist
index bb70b32f7932..64dfe4cb2edc 100644
--- a/multimedia/mp3cd/pkg-plist
+++ b/multimedia/mp3cd/pkg-plist
@@ -1,3 +1,3 @@
bin/mp3cd
-%%SITE_PERL%%/mach/auto/mp3cd/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/mp3cd
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/mp3cd/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/mp3cd
diff --git a/net-mgmt/p5-NetAddr-IP-Lite/pkg-plist b/net-mgmt/p5-NetAddr-IP-Lite/pkg-plist
index 115ca96c4fa5..28c9e4dd59e1 100644
--- a/net-mgmt/p5-NetAddr-IP-Lite/pkg-plist
+++ b/net-mgmt/p5-NetAddr-IP-Lite/pkg-plist
@@ -37,13 +37,13 @@
%%SITE_PERL%%/auto/NetAddr/IP/UtilPP/_bcdcheck.al
%%SITE_PERL%%/auto/NetAddr/IP/UtilPP/simple_pack.al
%%SITE_PERL%%/auto/NetAddr/IP/UtilPP/autosplit.ix
-%%SITE_PERL%%/mach/auto/NetAddr/IP/Lite/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Lite/.packlist
@dirrm %%SITE_PERL%%/NetAddr/IP
@dirrm %%SITE_PERL%%/auto/NetAddr/IP/UtilPP
@dirrm %%SITE_PERL%%/auto/NetAddr/IP/Util
@dirrm %%SITE_PERL%%/auto/NetAddr/IP
-@dirrm %%SITE_PERL%%/mach/auto/NetAddr/IP/Lite
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Lite
@dirrmtry %%SITE_PERL%%/NetAddr
-@dirrmtry %%SITE_PERL%%/mach/auto/NetAddr/IP
-@dirrmtry %%SITE_PERL%%/mach/auto/NetAddr
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr
@dirrmtry %%SITE_PERL%%/auto/NetAddr/
diff --git a/net/p5-JavaScript-RPC/pkg-plist b/net/p5-JavaScript-RPC/pkg-plist
index 9b78f0b4dc7d..9679aea4cf57 100644
--- a/net/p5-JavaScript-RPC/pkg-plist
+++ b/net/p5-JavaScript-RPC/pkg-plist
@@ -1,8 +1,8 @@
%%SITE_PERL%%/JavaScript/RPC/Server/CGI.pm
-%%SITE_PERL%%/mach/auto/JavaScript/RPC/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/RPC/.packlist
%%SITE_PERL%%/JavaScript/RPC.pm
-@dirrm %%SITE_PERL%%/mach/auto/JavaScript/RPC
-@dirrmtry %%SITE_PERL%%/mach/auto/JavaScript
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/RPC
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript
@dirrm %%SITE_PERL%%/JavaScript/RPC/Server
@dirrm %%SITE_PERL%%/JavaScript/RPC
@dirrmtry %%SITE_PERL%%/JavaScript
diff --git a/net/p5-Net-Analysis/pkg-plist b/net/p5-Net-Analysis/pkg-plist
index 11c958b4e5c0..eae874413583 100644
--- a/net/p5-Net-Analysis/pkg-plist
+++ b/net/p5-Net-Analysis/pkg-plist
@@ -13,8 +13,8 @@
%%SITE_PERL%%/Net/Analysis/TCPMonologue.pm
%%SITE_PERL%%/Net/Analysis/TCPSession.pm
%%SITE_PERL%%/Net/Analysis/Time.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/Net/Analysis
-@dirrmtry %%SITE_PERL%%/mach/auto/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Analysis
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
@dirrmtry %%SITE_PERL%%/Net/Analysis/Listener
@dirrmtry %%SITE_PERL%%/Net/Analysis
@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-HL7/pkg-plist b/net/p5-Net-HL7/pkg-plist
index 4c9f247f4bfe..a27e7b96bf8e 100644
--- a/net/p5-Net-HL7/pkg-plist
+++ b/net/p5-Net-HL7/pkg-plist
@@ -7,8 +7,8 @@
%%SITE_PERL%%/Net/HL7/Daemon.pm
%%SITE_PERL%%/Net/HL7/Messages/ACK.pm
%%SITE_PERL%%/Net/HL7/Segments/MSH.pm
-%%SITE_PERL%%/mach/auto/Net-HL7/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/Net-HL7/
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net-HL7/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net-HL7/
@dirrm %%SITE_PERL%%/Net/HL7/Segments
@dirrm %%SITE_PERL%%/Net/HL7/Messages
@dirrmtry %%SITE_PERL%%/Net/HL7
diff --git a/net/p5-OAI-Harvester/pkg-plist b/net/p5-OAI-Harvester/pkg-plist
index a6aaec534d69..760451357bf3 100644
--- a/net/p5-OAI-Harvester/pkg-plist
+++ b/net/p5-OAI-Harvester/pkg-plist
@@ -14,7 +14,7 @@ bin/oai-listsets
%%SITE_PERL%%/Net/OAI/Record/Header.pm
%%SITE_PERL%%/Net/OAI/Record/OAI_DC.pm
%%SITE_PERL%%/Net/OAI/ResumptionToken.pm
-%%SITE_PERL%%/mach/auto/OAI-Harvester/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/OAI-Harvester
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/OAI-Harvester/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OAI-Harvester
@dirrm %%SITE_PERL%%/Net/OAI/Record
@dirrm %%SITE_PERL%%/Net/OAI
diff --git a/textproc/p5-Bloom-Filter/pkg-plist b/textproc/p5-Bloom-Filter/pkg-plist
index 36d2bdee7814..f81fb83ff28f 100644
--- a/textproc/p5-Bloom-Filter/pkg-plist
+++ b/textproc/p5-Bloom-Filter/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Bloom/Filter.pm
@dirrmtry %%SITE_PERL%%/Bloom
-%%SITE_PERL%%/mach/auto/Bloom/Filter/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Bloom/Filter
-@dirrmtry %%SITE_PERL%%/mach/auto/Bloom
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bloom/Filter/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bloom/Filter
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bloom
diff --git a/textproc/p5-Devel-TraceSAX/pkg-plist b/textproc/p5-Devel-TraceSAX/pkg-plist
index 831a9a368040..dbc973c34a33 100644
--- a/textproc/p5-Devel-TraceSAX/pkg-plist
+++ b/textproc/p5-Devel-TraceSAX/pkg-plist
@@ -4,4 +4,4 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/TraceSAX
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
@dirrm %%SITE_PERL%%/Devel/TraceSAX
-@dirrmtry lib/perl5/site_perl/5.8.7/Devel
+@dirrmtry %%SITE_PERL%%/Devel
diff --git a/textproc/p5-IDNA-Punycode/pkg-plist b/textproc/p5-IDNA-Punycode/pkg-plist
index 8633ed251d7f..410fb46c8877 100644
--- a/textproc/p5-IDNA-Punycode/pkg-plist
+++ b/textproc/p5-IDNA-Punycode/pkg-plist
@@ -1,6 +1,6 @@
-%%SITE_PERL%%/mach/auto/IDNA/Punycode/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/IDNA/Punycode/.packlist
%%SITE_PERL%%/IDNA/Punycode.pm
%%SITE_PERL%%/IDNA/.Punycode.pm.swp
-@dirrm %%SITE_PERL%%/mach/auto/IDNA/Punycode
-@dirrmtry %%SITE_PERL%%/mach/auto/IDNA
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IDNA/Punycode
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IDNA
@dirrmtry %%SITE_PERL%%/IDNA
diff --git a/textproc/p5-LaTeX-Driver/pkg-plist b/textproc/p5-LaTeX-Driver/pkg-plist
index 5ebf0cb6bfb5..120a39fd1b77 100644
--- a/textproc/p5-LaTeX-Driver/pkg-plist
+++ b/textproc/p5-LaTeX-Driver/pkg-plist
@@ -4,7 +4,7 @@ bin/latex2ps
%%SITE_PERL%%/LaTeX/Driver.pm
%%SITE_PERL%%/LaTeX/Driver/Paths.pm
%%SITE_PERL%%/LaTeX/Driver/FilterProgram.pm
-%%SITE_PERL%%/mach/auto/LaTeX-Driver/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/LaTeX-Driver
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX-Driver/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX-Driver
@dirrm %%SITE_PERL%%/LaTeX/Driver
@dirrmtry %%SITE_PERL%%/LaTeX
diff --git a/textproc/p5-LaTeX-Encode/pkg-plist b/textproc/p5-LaTeX-Encode/pkg-plist
index f6200ce3ba03..4fd4850934fa 100644
--- a/textproc/p5-LaTeX-Encode/pkg-plist
+++ b/textproc/p5-LaTeX-Encode/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/LaTeX/Encode.pm
%%SITE_PERL%%/LaTeX/Encode/EncodingTable.pm
-%%SITE_PERL%%/mach/auto/LaTeX/Encode/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/LaTeX/Encode
-@dirrmtry %%SITE_PERL%%/mach/auto/LaTeX
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX/Encode/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX/Encode
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX
@dirrm %%SITE_PERL%%/LaTeX/Encode
@dirrmtry %%SITE_PERL%%/LaTeX
diff --git a/textproc/p5-LaTeX-Pod/pkg-plist b/textproc/p5-LaTeX-Pod/pkg-plist
index 6da7089804c6..07eb3f10ba46 100644
--- a/textproc/p5-LaTeX-Pod/pkg-plist
+++ b/textproc/p5-LaTeX-Pod/pkg-plist
@@ -1,6 +1,6 @@
bin/latex2pod
%%SITE_PERL%%/LaTeX/Pod.pm
-%%SITE_PERL%%/mach/auto/LaTeX/Pod/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/LaTeX/Pod
-@dirrmtry %%SITE_PERL%%/mach/auto/LaTeX
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX/Pod/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX/Pod
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX
@dirrmtry %%SITE_PERL%%/LaTeX
diff --git a/textproc/p5-LaTeX-TOM/pkg-plist b/textproc/p5-LaTeX-TOM/pkg-plist
index cf47f39cddfc..a13f7509abf6 100644
--- a/textproc/p5-LaTeX-TOM/pkg-plist
+++ b/textproc/p5-LaTeX-TOM/pkg-plist
@@ -2,8 +2,8 @@
%%SITE_PERL%%/LaTeX/TOM/Node.pm
%%SITE_PERL%%/LaTeX/TOM/Tree.pm
%%SITE_PERL%%/LaTeX/TOM/Parser.pm
-%%SITE_PERL%%/mach/auto/LaTeX/TOM/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/LaTeX/TOM
-@dirrmtry %%SITE_PERL%%/mach/auto/LaTeX
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX/TOM/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX/TOM
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LaTeX
@dirrm %%SITE_PERL%%/LaTeX/TOM
@dirrmtry %%SITE_PERL%%/LaTeX
diff --git a/textproc/p5-Lingua-Stem-It/pkg-plist b/textproc/p5-Lingua-Stem-It/pkg-plist
index cbb5addd3ca4..afbecfcddd25 100644
--- a/textproc/p5-Lingua-Stem-It/pkg-plist
+++ b/textproc/p5-Lingua-Stem-It/pkg-plist
@@ -1,8 +1,8 @@
%%SITE_PERL%%/Lingua/Stem/It.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/It/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/Lingua/Stem/It
-@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/mach/auto/Lingua
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/It
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
@dirrmtry %%SITE_PERL%%/Lingua/Stem
@dirrmtry %%SITE_PERL%%/Lingua
@dirrmtry %%SITE_PERL%%
diff --git a/textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist b/textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist
index c2469ad7a76f..24fb20313dae 100644
--- a/textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist
+++ b/textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist
@@ -1,10 +1,10 @@
%%SITE_PERL%%/Lingua/Stem/Snowball/stemmer.pl
%%SITE_PERL%%/Lingua/Stem/Snowball/Da.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/Da/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball/Da
-@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball
-@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/mach/auto/Lingua
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/Da
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
@dirrmtry %%SITE_PERL%%/Lingua/Stem/Snowball
@dirrmtry %%SITE_PERL%%/Lingua/Stem
@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Stem-Snowball-No/pkg-plist b/textproc/p5-Lingua-Stem-Snowball-No/pkg-plist
index 0c5c78e19276..a4b5ef7f6c8f 100644
--- a/textproc/p5-Lingua-Stem-Snowball-No/pkg-plist
+++ b/textproc/p5-Lingua-Stem-Snowball-No/pkg-plist
@@ -2,10 +2,10 @@
bin/stemmer-no.pl
%%SITE_PERL%%/Lingua/Stem/Snowball/No.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/No/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball/No
-@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball
-@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/mach/auto/Lingua
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/No
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
@dirrmtry %%SITE_PERL%%/Lingua/Stem/Snowball
@dirrmtry %%SITE_PERL%%/Lingua/Stem
@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist b/textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist
index 65e8a2cc7da1..32e42532c9fb 100644
--- a/textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist
+++ b/textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist
@@ -2,10 +2,10 @@
bin/stemmer-se.pl
%%SITE_PERL%%/Lingua/Stem/Snowball/Se.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/Se/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball/Se
-@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball
-@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem
-@dirrmtry %%SITE_PERL%%/mach/auto/Lingua
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/Se
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
@dirrmtry %%SITE_PERL%%/Lingua/Stem/Snowball
@dirrmtry %%SITE_PERL%%/Lingua/Stem
@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-PDF-API2/pkg-plist b/textproc/p5-PDF-API2/pkg-plist
index 0eba486ce368..f852e49405b8 100644
--- a/textproc/p5-PDF-API2/pkg-plist
+++ b/textproc/p5-PDF-API2/pkg-plist
@@ -1,4 +1,4 @@
-%%SITE_PERL%%/mach/auto/PDF/API2/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/API2/.packlist
%%SITE_PERL%%/PDF/API2.pm
%%SITE_PERL%%/PDF/API2/Content.pm
%%SITE_PERL%%/PDF/API2/Lite.pm
@@ -195,8 +195,8 @@
%%SITE_PERL%%/PDF/API2/fonts/langcover.txt
%%SITE_PERL%%/PDF/API2/fonts/status.txt
%%SITE_PERL%%/PDF/API2/fonts/unicover.txt
-@dirrm %%SITE_PERL%%/mach/auto/PDF/API2
-@dirrmtry %%SITE_PERL%%/mach/auto/PDF
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/API2
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF
@dirrm %%SITE_PERL%%/PDF/API2/Basic/PDF
@dirrm %%SITE_PERL%%/PDF/API2/Basic/TTF/Mort
@dirrm %%SITE_PERL%%/PDF/API2/Basic/TTF/Kern
diff --git a/textproc/p5-PDF-API3/pkg-plist b/textproc/p5-PDF-API3/pkg-plist
index d51b994d8d98..56cc22885860 100644
--- a/textproc/p5-PDF-API3/pkg-plist
+++ b/textproc/p5-PDF-API3/pkg-plist
@@ -1,4 +1,4 @@
-%%SITE_PERL%%/mach/auto/PDF/API3/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/API3/.packlist
%%SITE_PERL%%/PDF/API3.pm
%%SITE_PERL%%/PDF/API3/Compat/API2/Annotation.pm
%%SITE_PERL%%/PDF/API3/Compat/API2/Basic/PDF/Array.pm
@@ -219,5 +219,5 @@
@dirrm %%SITE_PERL%%/PDF/API3/Compat
@dirrm %%SITE_PERL%%/PDF/API3
@dirrmtry %%SITE_PERL%%/PDF
-@dirrm %%SITE_PERL%%/mach/auto/PDF/API3
-@dirrmtry %%SITE_PERL%%/mach/auto/PDF
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/API3
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF
diff --git a/textproc/p5-PDF-Table/pkg-plist b/textproc/p5-PDF-Table/pkg-plist
index 0079dedc7ce7..7f422b8b3aae 100644
--- a/textproc/p5-PDF-Table/pkg-plist
+++ b/textproc/p5-PDF-Table/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/PDF/Table.pm
-%%SITE_PERL%%/mach/auto/PDF/Table/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/Table/.packlist
@dirrmtry %%SITE_PERL%%/PDF
-@dirrm %%SITE_PERL%%/mach/auto/PDF/Table
-@dirrmtry %%SITE_PERL%%/mach/auto/PDF
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/Table
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF
diff --git a/textproc/p5-Pod-Abstract/pkg-plist b/textproc/p5-Pod-Abstract/pkg-plist
index 2b7129690a64..0fb662940979 100644
--- a/textproc/p5-Pod-Abstract/pkg-plist
+++ b/textproc/p5-Pod-Abstract/pkg-plist
@@ -17,9 +17,9 @@ bin/paf
%%SITE_PERL%%/Pod/Abstract/Path.pm
%%SITE_PERL%%/Pod/Abstract/Serial.pm
%%SITE_PERL%%/Pod/Abstract/Tree.pm
-%%SITE_PERL%%/mach/auto/Pod/Abstract/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Pod/Abstract
-@dirrmtry %%SITE_PERL%%/mach/auto/Pod
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Abstract/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Abstract
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
@dirrmtry %%SITE_PERL%%/Pod/Abstract/Filter
@dirrmtry %%SITE_PERL%%/Pod/Abstract
@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Text-Quoted/pkg-plist b/textproc/p5-Text-Quoted/pkg-plist
index 27c1a744bdca..fa8ee0de8bde 100644
--- a/textproc/p5-Text-Quoted/pkg-plist
+++ b/textproc/p5-Text-Quoted/pkg-plist
@@ -1,4 +1,4 @@
-%%SITE_PERL%%/mach/auto/Text/Quoted/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Quoted/.packlist
%%SITE_PERL%%/Text/Quoted.pm
-@dirrm %%SITE_PERL%%/mach/auto/Text/Quoted
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Quoted
@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-XML-Filter-DOMFilter-LibXML/pkg-plist b/textproc/p5-XML-Filter-DOMFilter-LibXML/pkg-plist
index 3a3bc7061d4a..3649f1ac4aa4 100644
--- a/textproc/p5-XML-Filter-DOMFilter-LibXML/pkg-plist
+++ b/textproc/p5-XML-Filter-DOMFilter-LibXML/pkg-plist
@@ -1,8 +1,8 @@
%%SITE_PERL%%/XML/Filter/DOMFilter/LibXML.pm
@dirrm %%SITE_PERL%%/XML/Filter/DOMFilter
@dirrm %%SITE_PERL%%/XML/Filter
-%%SITE_PERL%%/mach/auto/XML/Filter/DOMFilter/LibXML/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/XML/Filter/DOMFilter/LibXML
-@dirrm %%SITE_PERL%%/mach/auto/XML/Filter/DOMFilter
-@dirrm %%SITE_PERL%%/mach/auto/XML/Filter
-@dirrm %%SITE_PERL%%/mach/auto/XML
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/DOMFilter/LibXML/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/DOMFilter/LibXML
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/DOMFilter
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/www/bricolage/pkg-plist b/www/bricolage/pkg-plist
index 40b900f55c8f..ce2ea874cc2e 100644
--- a/www/bricolage/pkg-plist
+++ b/www/bricolage/pkg-plist
@@ -2908,8 +2908,8 @@ bricolage/data/burn/comp/oc_1/story.mc
%%SITE_PERL%%/Bric/Util/Trans/SFTP.pm
%%SITE_PERL%%/Bric/Util/Trans/WebDAV.pm
%%SITE_PERL%%/Bric/Util/UserPref.pm
-%%SITE_PERL%%/mach/auto/Bric/.packlist
-%%SITE_PERL%%/mach/auto/bric_bin/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bric/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/bric_bin/.packlist
%%DATADIR%%/Pg.sql
@dirrm %%DATADIR%%
@@ -2959,8 +2959,8 @@ bricolage/data/burn/comp/oc_1/story.mc
@dirrm %%SITE_PERL%%/Bric/App/Callback
@dirrm %%SITE_PERL%%/Bric/App
@dirrm %%SITE_PERL%%/Bric
-@dirrm %%SITE_PERL%%/mach/auto/Bric
-@dirrm %%SITE_PERL%%/mach/auto/bric_bin
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bric
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/bric_bin
@dirrm bricolage/upgrade/1.10.3
@dirrm bricolage/upgrade/1.10.2
@dirrm bricolage/upgrade/1.10.1
diff --git a/www/p5-Catalyst-Model-DynamicAdaptor/pkg-plist b/www/p5-Catalyst-Model-DynamicAdaptor/pkg-plist
index 3b3c3bd32d21..2fc3ad0c1790 100644
--- a/www/p5-Catalyst-Model-DynamicAdaptor/pkg-plist
+++ b/www/p5-Catalyst-Model-DynamicAdaptor/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Catalyst/Model/DynamicAdaptor.pm
-%%SITE_PERL%%/mach/auto/Catalyst/Model/DynamicAdaptor/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Catalyst/Model/DynamicAdaptor
-@dirrmtry %%SITE_PERL%%/mach/auto/Catalyst/Model
-@dirrmtry %%SITE_PERL%%/mach/auto/Catalyst
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DynamicAdaptor/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DynamicAdaptor
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
@dirrmtry %%SITE_PERL%%/Catalyst/Model
@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-Email/pkg-plist b/www/p5-Catalyst-View-Email/pkg-plist
index e0349f6ff5a4..66d2a6d60925 100644
--- a/www/p5-Catalyst-View-Email/pkg-plist
+++ b/www/p5-Catalyst-View-Email/pkg-plist
@@ -1,12 +1,12 @@
@comment $FreeBSD$
-%%SITE_PERL%%/mach/auto/Catalyst/View/Email/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Email/.packlist
%%SITE_PERL%%/Catalyst/View/Email.pm
%%SITE_PERL%%/Catalyst/View/Email/Template.pm
%%SITE_PERL%%/Catalyst/Helper/View/Email.pm
%%SITE_PERL%%/Catalyst/Helper/View/Email/Template.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/Catalyst/View/Email
-@dirrmtry %%SITE_PERL%%/mach/auto/Catalyst/View
-@dirrmtry %%SITE_PERL%%/mach/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/Email
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
@dirrmtry %%SITE_PERL%%/Catalyst/View/Email
@dirrmtry %%SITE_PERL%%/Catalyst/View
@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View/Email
diff --git a/www/p5-HTML-FillInForm-ForceUTF8/pkg-plist b/www/p5-HTML-FillInForm-ForceUTF8/pkg-plist
index 2530db180e27..9e3d3272e99a 100644
--- a/www/p5-HTML-FillInForm-ForceUTF8/pkg-plist
+++ b/www/p5-HTML-FillInForm-ForceUTF8/pkg-plist
@@ -1,5 +1,5 @@
@comment $FreeBSD$
-%%SITE_PERL%%/mach/auto/HTML/FillInForm/ForceUTF8/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FillInForm/ForceUTF8/.packlist
%%SITE_PERL%%/HTML/FillInForm/ForceUTF8.pm
-@dirrmtry %%SITE_PERL%%/mach/auto/HTML/FillInForm/ForceUTF8
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FillInForm/ForceUTF8
@dirrmtry %%SITE_PERL%%/HTML/FillInForm
diff --git a/www/p5-HTML-Template-Associate/pkg-plist b/www/p5-HTML-Template-Associate/pkg-plist
index 8e0cf206bc59..5f9337cdb832 100644
--- a/www/p5-HTML-Template-Associate/pkg-plist
+++ b/www/p5-HTML-Template-Associate/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/HTML/Template/Associate/DBI.pm
%%SITE_PERL%%/HTML/Template/Associate/FormValidator.pm
@dirrm %%SITE_PERL%%/HTML/Template/Associate
-%%SITE_PERL%%/mach/auto/HTML/Template/Associate/.packlist
-@dirrm %%SITE_PERL%%/mach/auto/HTML/Template/Associate
-@dirrm %%SITE_PERL%%/mach/auto/HTML/Template
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Associate/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Associate
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template
@dirrmtry %%SITE_PERL%%/HTML/Template
diff --git a/www/p5-HTTP-MobileAttribute/pkg-plist b/www/p5-HTTP-MobileAttribute/pkg-plist
index 98da253f3841..02cebea0aec1 100644
--- a/www/p5-HTTP-MobileAttribute/pkg-plist
+++ b/www/p5-HTTP-MobileAttribute/pkg-plist
@@ -24,9 +24,9 @@
%%SITE_PERL%%/HTTP/MobileAttribute/Plugin.pm
%%SITE_PERL%%/HTTP/MobileAttribute/Request.pm
%%SITE_PERL%%/HTTP/MobileAttribute.pm
-%%SITE_PERL%%/mach/auto/HTTP/MobileAttribute/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/HTTP/MobileAttribute
-@dirrmtry %%SITE_PERL%%/mach/auto/HTTP
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAttribute/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAttribute
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
@dirrmtry %%SITE_PERL%%/HTTP/MobileAttribute/Request
@dirrmtry %%SITE_PERL%%/HTTP/MobileAttribute/Plugin/IS
@dirrmtry %%SITE_PERL%%/HTTP/MobileAttribute/Plugin
diff --git a/www/p5-Net-Amazon-AWIS/pkg-plist b/www/p5-Net-Amazon-AWIS/pkg-plist
index 79feed4799a7..c1d8b9f4d1a6 100644
--- a/www/p5-Net-Amazon-AWIS/pkg-plist
+++ b/www/p5-Net-Amazon-AWIS/pkg-plist
@@ -1,8 +1,8 @@
@comment $FreeBSD$
%%SITE_PERL%%/Net/Amazon/AWIS.pm
-%%SITE_PERL%%/mach/auto/Net/Amazon/AWIS/.packlist
-@dirrmtry %%SITE_PERL%%/mach/auto/Net/Amazon/AWIS
-@dirrmtry %%SITE_PERL%%/mach/auto/Net/Amazon
-@dirrmtry %%SITE_PERL%%/mach/auto/Net
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/AWIS/.packlist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon/AWIS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
@dirrmtry %%SITE_PERL%%/Net/Amazon
@dirrmtry %%SITE_PERL%%/Net
diff --git a/www/perlbal/pkg-plist b/www/perlbal/pkg-plist
index 946b2c425624..78f9e687dc95 100644
--- a/www/perlbal/pkg-plist
+++ b/www/perlbal/pkg-plist
@@ -43,9 +43,9 @@
%%SITE_PERL%%/Perlbal/Test/WebServer.pm
%%SITE_PERL%%/Perlbal/UploadListener.pm
%%SITE_PERL%%/Perlbal/Util.pm
-%%SITE_PERL%%/mach/auto/Perlbal/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perlbal/.packlist
bin/perlbal
-@dirrm %%SITE_PERL%%/mach/auto/Perlbal
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perlbal
@dirrm %%SITE_PERL%%/Perlbal/Test
@dirrm %%SITE_PERL%%/Perlbal/Plugin
@dirrm %%SITE_PERL%%/Perlbal
diff --git a/x11-toolkits/p5-Gtk2-Ex-Dialogs/pkg-plist b/x11-toolkits/p5-Gtk2-Ex-Dialogs/pkg-plist
index fd5008a3eafa..1727735ed7ee 100644
--- a/x11-toolkits/p5-Gtk2-Ex-Dialogs/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-Ex-Dialogs/pkg-plist
@@ -5,7 +5,7 @@
%%SITE_PERL%%/Gtk2/Ex/Dialogs/ChooseFile.pm
%%SITE_PERL%%/Gtk2/Ex/Dialogs/ErrorMsg.pm
%%SITE_PERL%%/Gtk2/Ex/Dialogs/ChoosePreviewFile.pm
-%%SITE_PERL%%/mach/auto/Gtk2/Ex/Dialogs/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex/Dialogs/.packlist
@dirrmtry %%SITE_PERL%%/Gtk2/Ex/Dialogs
@dirrmtry %%SITE_PERL%%/Gtk2/Ex
@dirrmtry %%SITE_PERL%%/Gtk2
diff --git a/x11-toolkits/p5-Gtk2-GladeXML/pkg-plist b/x11-toolkits/p5-Gtk2-GladeXML/pkg-plist
index aa75f143bbbb..fea1b9c0403b 100644
--- a/x11-toolkits/p5-Gtk2-GladeXML/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-GladeXML/pkg-plist
@@ -1,12 +1,12 @@
-%%SITE_PERL%%/mach/Gtk2/GladeXML.pm
-%%SITE_PERL%%/mach/Gtk2/GladeXML/Install/Files.pm
-%%SITE_PERL%%/mach/Gtk2/GladeXML/Install/gladexmlperl.h
-%%SITE_PERL%%/mach/Gtk2/GladeXML/Install/gladexmlperl.typemap
-%%SITE_PERL%%/mach/auto/Gtk2/GladeXML/.packlist
-%%SITE_PERL%%/mach/auto/Gtk2/GladeXML/GladeXML.bs
-%%SITE_PERL%%/mach/auto/Gtk2/GladeXML/GladeXML.so
-@dirrmtry %%SITE_PERL%%/mach/auto/Gtk2/GladeXML
-@dirrmtry %%SITE_PERL%%/mach/auto/Gtk2
-@dirrmtry %%SITE_PERL%%/mach/Gtk2/GladeXML/Install
-@dirrmtry %%SITE_PERL%%/mach/Gtk2/GladeXML
-@dirrmtry %%SITE_PERL%%/mach/Gtk2
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML/Install/Files.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML/Install/gladexmlperl.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML/Install/gladexmlperl.typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/GladeXML/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/GladeXML/GladeXML.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/GladeXML/GladeXML.so
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/GladeXML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML/Install
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/GladeXML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2