Index: patches/perl-5.12.1-Configure_multilib-1.patch
===================================================================
--- patches/perl-5.12.1-Configure_multilib-1.patch	(revision c57b6236f890105225a58e4669030eca28d4768f)
+++ 	(revision )
@@ -1,42 +1,0 @@
-Submitted By: Ryan Oliver <ryan dot oliver at pha dot com dot au>
-Date: 2010-08-01
-Initial Package Version: 5.8.8
-Origin: Ryan Oliver
-Upstream Status: Unknown
-Description: This patch allows perl to be installed in /usr/lib32
-             or /usr/lib64 instead of /usr/lib.
-
-Rediffed: Against 5.10.0 by Joe Ciccone on 2008-08-30
-          Against 5.10.1 By Jim Gifford on 2009-08-25
-          Against 5.12.1 By Joe Ciccone on 2010-08-01
-
-diff -Naur perl-5.12.1.orig/Configure perl-5.12.1/Configure
---- perl-5.12.1.orig/Configure	2010-05-13 18:01:07.000000000 -0400
-+++ perl-5.12.1/Configure	2010-08-01 18:18:19.614326794 -0400
-@@ -6254,6 +6254,8 @@
- : The default "style" setting is made in installstyle.U
- case "$installstyle" in
- *lib/perl5*) set dflt privlib lib/$package/$version ;;
-+*lib32/perl5*) set dflt privlib lib32/$package/$version ;;
-+*lib64/perl5*) set dflt privlib lib64/$package/$version ;;
- *)	 set dflt privlib lib/$version ;;
- esac
- eval $prefixit
-@@ -6502,6 +6504,8 @@
- case "$sitelib" in
- '') case "$installstyle" in
- 	*lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
-+	*lib32/perl5*) dflt=$siteprefix/lib32/$package/site_$prog/$version ;;
-+	*lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;;
- 	*)	 dflt=$siteprefix/lib/site_$prog/$version ;;
- 	esac
- 	;;
-@@ -7020,6 +7024,8 @@
- 		prog=`echo $package | $sed 's/-*[0-9.]*$//'`
- 		case "$installstyle" in
- 		*lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
-+		*lib32/perl5*) dflt=$vendorprefix/lib32/$package/vendor_$prog/$version ;;
-+		*lib64/perl5*) dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;;
- 		*)	     dflt=$vendorprefix/lib/vendor_$prog/$version ;;
- 		esac
- 		;;
Index: patches/perl-5.12.1-libc-1.patch
===================================================================
--- patches/perl-5.12.1-libc-1.patch	(revision c57b6236f890105225a58e4669030eca28d4768f)
+++ 	(revision )
@@ -1,37 +1,0 @@
-Submitted By: Ryan Oliver <ryan dot oliver at pha dot com dot au>
-Date: 2010-08-01
-Initial Package Version: 5.8.8
-Origin: Ryan Oliver
-Upstream Status: Unknown
-Description: This patch adapts some hard-wired paths to the C library.
-             It uses the $prefix variable to locate the correct libc.
-
-Rediffed: Against 5.10.0 by Joe Ciccone on 2008-08-30
-          Against 5.10.1 By Jim Gifford on 2009-08-25
-          Against 5.12.1 By Joe Ciccone on 2010-08-01
-
-diff -Naur perl-5.12.1.orig/hints/linux.sh perl-5.12.1/hints/linux.sh
---- perl-5.12.1.orig/hints/linux.sh	2010-04-26 04:09:20.000000000 -0400
-+++ perl-5.12.1/hints/linux.sh	2010-08-01 18:19:24.558078088 -0400
-@@ -63,9 +63,9 @@
- # We don't use __GLIBC__ and  __GLIBC_MINOR__ because they
- # are insufficiently precise to distinguish things like
- # libc-2.0.6 and libc-2.0.7.
--if test -L /lib/libc.so.6; then
--    libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'`
--    libc=/lib/$libc
-+if test -L ${prefix}/lib/libc.so.6; then
-+    libc=`ls -l ${prefix}/lib/libc.so.6 | awk '{print $NF}'`
-+    libc=${prefix}/lib/$libc
- fi
- 
- # Configure may fail to find lstat() since it's a static/inline
-@@ -441,3 +441,8 @@
-     libswanted="$libswanted pthread"
-     ;;
- esac
-+
-+locincpth=""
-+loclibpth=""
-+glibpth="${prefix}/lib"
-+usrinc="${prefix}/include"
Index: patches/perl-5.12.2-Configure_multilib-1.patch
===================================================================
--- patches/perl-5.12.2-Configure_multilib-1.patch	(revision a81c020c128ae052685ff986e078e1bcb246bd89)
+++ patches/perl-5.12.2-Configure_multilib-1.patch	(revision a81c020c128ae052685ff986e078e1bcb246bd89)
@@ -0,0 +1,42 @@
+Submitted By: Ryan Oliver <ryan dot oliver at pha dot com dot au>
+Date: 2010-08-01
+Initial Package Version: 5.8.8
+Origin: Ryan Oliver
+Upstream Status: Unknown
+Description: This patch allows perl to be installed in /usr/lib32
+             or /usr/lib64 instead of /usr/lib.
+
+Rediffed: Against 5.10.0 by Joe Ciccone on 2008-08-30
+          Against 5.10.1 By Jim Gifford on 2009-08-25
+          Against 5.12.1 By Joe Ciccone on 2010-08-01
+
+diff -Naur perl-5.12.1.orig/Configure perl-5.12.1/Configure
+--- perl-5.12.1.orig/Configure	2010-05-13 18:01:07.000000000 -0400
++++ perl-5.12.1/Configure	2010-08-01 18:18:19.614326794 -0400
+@@ -6254,6 +6254,8 @@
+ : The default "style" setting is made in installstyle.U
+ case "$installstyle" in
+ *lib/perl5*) set dflt privlib lib/$package/$version ;;
++*lib32/perl5*) set dflt privlib lib32/$package/$version ;;
++*lib64/perl5*) set dflt privlib lib64/$package/$version ;;
+ *)	 set dflt privlib lib/$version ;;
+ esac
+ eval $prefixit
+@@ -6502,6 +6504,8 @@
+ case "$sitelib" in
+ '') case "$installstyle" in
+ 	*lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
++	*lib32/perl5*) dflt=$siteprefix/lib32/$package/site_$prog/$version ;;
++	*lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;;
+ 	*)	 dflt=$siteprefix/lib/site_$prog/$version ;;
+ 	esac
+ 	;;
+@@ -7020,6 +7024,8 @@
+ 		prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+ 		case "$installstyle" in
+ 		*lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
++		*lib32/perl5*) dflt=$vendorprefix/lib32/$package/vendor_$prog/$version ;;
++		*lib64/perl5*) dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;;
+ 		*)	     dflt=$vendorprefix/lib/vendor_$prog/$version ;;
+ 		esac
+ 		;;
Index: patches/perl-5.12.2-libc-1.patch
===================================================================
--- patches/perl-5.12.2-libc-1.patch	(revision a81c020c128ae052685ff986e078e1bcb246bd89)
+++ patches/perl-5.12.2-libc-1.patch	(revision a81c020c128ae052685ff986e078e1bcb246bd89)
@@ -0,0 +1,37 @@
+Submitted By: Ryan Oliver <ryan dot oliver at pha dot com dot au>
+Date: 2010-08-01
+Initial Package Version: 5.8.8
+Origin: Ryan Oliver
+Upstream Status: Unknown
+Description: This patch adapts some hard-wired paths to the C library.
+             It uses the $prefix variable to locate the correct libc.
+
+Rediffed: Against 5.10.0 by Joe Ciccone on 2008-08-30
+          Against 5.10.1 By Jim Gifford on 2009-08-25
+          Against 5.12.1 By Joe Ciccone on 2010-08-01
+
+diff -Naur perl-5.12.1.orig/hints/linux.sh perl-5.12.1/hints/linux.sh
+--- perl-5.12.1.orig/hints/linux.sh	2010-04-26 04:09:20.000000000 -0400
++++ perl-5.12.1/hints/linux.sh	2010-08-01 18:19:24.558078088 -0400
+@@ -63,9 +63,9 @@
+ # We don't use __GLIBC__ and  __GLIBC_MINOR__ because they
+ # are insufficiently precise to distinguish things like
+ # libc-2.0.6 and libc-2.0.7.
+-if test -L /lib/libc.so.6; then
+-    libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'`
+-    libc=/lib/$libc
++if test -L ${prefix}/lib/libc.so.6; then
++    libc=`ls -l ${prefix}/lib/libc.so.6 | awk '{print $NF}'`
++    libc=${prefix}/lib/$libc
+ fi
+ 
+ # Configure may fail to find lstat() since it's a static/inline
+@@ -441,3 +441,8 @@
+     libswanted="$libswanted pthread"
+     ;;
+ esac
++
++locincpth=""
++loclibpth=""
++glibpth="${prefix}/lib"
++usrinc="${prefix}/include"
