Index: tches/coreutils-8.11-uname-1.patch
===================================================================
--- patches/coreutils-8.11-uname-1.patch	(revision 2ce95e99ad3a0d1169215caf90ba4e121ac2f591)
+++ 	(revision )
@@ -1,174 +1,0 @@
-Submitted By: Jim Gifford <jim at cross-lfs dot org>
-Date: 2010-07-26
-Initial Package Version: 5.97
-Upstream Status: Not Accepted
-Origin: Gentoo - http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/coreutils
-Description: Display CPU Information from /proc/cpuinfo or /proc/sysinfo
-
-Rediffed for 7.1 by Jim Gifford
-Rediffed for 7.5 by Jim Gifford
-Rediffed for 8.4 by Joe Ciccone
-Rediffed for 8.9 by Joe Ciccone
-
---- coreutils-8.9.orig/src/uname.c	2010-01-01 08:06:47.000000000 -0500
-+++ coreutils-8.9/src/uname.c	2010-07-26 20:44:24.389842706 -0400
-@@ -50,6 +50,11 @@
- # include <mach-o/arch.h>
- #endif
- 
-+#if defined (__linux__)
-+# define USE_PROCINFO
-+# define UNAME_HARDWARE_PLATFORM
-+#endif
-+
- #include "system.h"
- #include "error.h"
- #include "quote.h"
-@@ -155,6 +160,117 @@
-   exit (status);
- }
- 
-+#if defined(USE_PROCINFO)
-+
-+# if defined(__s390__) || defined(__s390x__)
-+#  define CPUINFO_FILE    "/proc/sysinfo"
-+#  define CPUINFO_FORMAT  "%64[^\t :]%*[ :]%256[^\n]%c"
-+# else
-+#  define CPUINFO_FILE    "/proc/cpuinfo"
-+#  define CPUINFO_FORMAT  "%64[^\t:]\t:%256[^\n]%c"
-+# endif
-+
-+# define PROCINFO_PROCESSOR      0
-+# define PROCINFO_HARDWARE_PLATFORM 1
-+
-+static void __eat_cpuinfo_space(char *buf)
-+{
-+	/* first eat trailing space */
-+	char *tmp = buf + strlen(buf) - 1;
-+	while (tmp > buf && isspace(*tmp))
-+		*tmp-- = '\0';
-+	/* then eat leading space */
-+	tmp = buf;
-+	while (*tmp && isspace(*tmp))
-+		tmp++;
-+	if (tmp != buf)
-+		memmove(buf, tmp, strlen(tmp)+1);
-+	/* finally collapse whitespace */
-+	tmp = buf;
-+	while (tmp[0] && tmp[1]) {
-+		if (isspace(tmp[0]) && isspace(tmp[1])) {
-+			memmove(tmp, tmp+1, strlen(tmp));
-+			continue;
-+		}
-+		++tmp;
-+	}
-+}
-+
-+static int __linux_procinfo (int x, char *fstr, size_t s)
-+{
-+	FILE *fp;
-+
-+	char *procinfo_keys[] = {
-+		/* --processor --hardware-platform */
-+		#if defined(__alpha__)
-+			"cpu model", "system type"
-+		#elif defined(__arm__)
-+			"Processor", "Hardware"
-+		#elif defined(__avr32__)
-+			"processor", "cpu family"
-+		#elif defined(__bfin__)
-+			"CPU", "BOARD Name"
-+		#elif defined(__cris__)
-+			"cpu", "cpu model"
-+		#elif defined(__frv__)
-+			"CPU-Core", "System"
-+		#elif defined(__i386__) || defined(__x86_64__)
-+			"model name", "vendor_id"
-+		#elif defined(__ia64__)
-+			"family", "vendor"
-+		#elif defined(__hppa__)
-+			"cpu", "model"
-+		#elif defined(__m68k__)
-+			"CPU", "MMU"
-+		#elif defined(__mips__)
-+			"cpu model", "system type"
-+		#elif defined(__powerpc__) || defined(__powerpc64__)
-+			"cpu", "machine"
-+		#elif defined(__s390__) || defined(__s390x__)
-+			"Type", "Manufacturer"
-+		#elif defined(__sh__)
-+			"cpu type", "machine"
-+		#elif defined(sparc) || defined(__sparc__)
-+			"type", "cpu"
-+		#elif defined(__vax__)
-+			"cpu type", "cpu"
-+		#else
-+			"unknown", "unknown"
-+		#endif
-+	};
-+
-+	if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) {
-+		char key[65], value[257], eol, *ret = NULL;
-+
-+		while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) {
-+			__eat_cpuinfo_space(key);
-+			if (!strcmp(key, procinfo_keys[x])) {
-+				__eat_cpuinfo_space(value);
-+				ret = value;
-+				break;
-+			}
-+			if (eol != '\n') {
-+				/* we need two fscanf's here in case the previous
-+				 * length limit caused us to read right up to the
-+				 * newline ... doing "%*[^\n]\n" wont eat the newline
-+				 */
-+				fscanf(fp, "%*[^\n]");
-+				fscanf(fp, "\n");
-+			}
-+		}
-+		fclose(fp);
-+
-+		if (ret) {
-+			strncpy(fstr, ret, s);
-+			return 0;
-+		}
-+	}
-+
-+	return -1;
-+}
-+
-+#endif
-+
- /* Print ELEMENT, preceded by a space if something has already been
-    printed.  */
- 
-@@ -302,10 +418,14 @@
-   if (toprint & PRINT_PROCESSOR)
-     {
-       char const *element = unknown;
--#if HAVE_SYSINFO && defined SI_ARCHITECTURE
-+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
-       {
-         static char processor[257];
-+#if defined(USE_PROCINFO)
-+        if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
-+#else
-         if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
-+#endif
-           element = processor;
-       }
- #endif
-@@ -358,9 +478,13 @@
-       if (element == unknown)
-         {
-           static char hardware_platform[257];
-+#if defined(USE_PROCINFO)
-+        if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform))
-+#else
-           size_t s = sizeof hardware_platform;
-           static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
-           if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
-+#endif
-             element = hardware_platform;
-         }
- #endif
Index: tches/perl-5.12.2-Configure_multilib-1.patch
===================================================================
--- patches/perl-5.12.2-Configure_multilib-1.patch	(revision 2ce95e99ad3a0d1169215caf90ba4e121ac2f591)
+++ 	(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: tches/perl-5.12.2-libc-1.patch
===================================================================
--- patches/perl-5.12.2-libc-1.patch	(revision 2ce95e99ad3a0d1169215caf90ba4e121ac2f591)
+++ 	(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"
