9 files changed, 42 insertions, 42 deletions
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