8 files changed, 20 insertions, 20 deletions

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