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

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

8 files changed, 26 insertions, 26 deletions

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