Utilize %%SITE_PERL%% and %%PERL_ARCH%% in pkg-plists

PR:             ports/136771
Exp Run by:     pav
Approved by:    portmgr (pav)

17 files changed, 52 insertions, 52 deletions

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