--- cxfe-0.9.3~pre1.orig/config.sub
+++ cxfe-0.9.3~pre1/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-17'
+timestamp='2010-01-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -72,8 +75,9 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,10 +153,13 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -281,6 +288,7 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -288,13 +296,14 @@
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -337,7 +346,7 @@
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -365,15 +374,17 @@
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -467,6 +478,10 @@
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -719,6 +734,9 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -1069,6 +1087,11 @@
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+        # This must be matched before tile*.
+        tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
+		;;
 	tile*)
 		basic_machine=tile-unknown
 		os=-linux-gnu
@@ -1240,6 +1263,9 @@
         # First match some system type aliases
         # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1260,9 +1286,9 @@
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1283,7 +1309,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1416,6 +1442,8 @@
 	-dicos*)
 		os=-dicos
 		;;
+        -nacl*)
+	        ;;
 	-none)
 		;;
 	*)
@@ -1613,7 +1641,7 @@
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
--- cxfe-0.9.3~pre1.orig/config.guess
+++ cxfe-0.9.3~pre1/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-27'
+timestamp='2009-12-30'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +56,9 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -170,7 +171,7 @@
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -333,6 +334,9 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -656,7 +660,7 @@
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -807,12 +811,12 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
     	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -822,6 +826,9 @@
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -851,6 +858,20 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -873,6 +894,17 @@
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@@ -882,78 +914,34 @@
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips64
-	#undef mips64el
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -962,8 +950,11 @@
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -986,66 +977,6 @@
     xtensa*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1074,7 +1005,7 @@
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1182,7 +1113,7 @@
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1275,6 +1206,16 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
--- cxfe-0.9.3~pre1.orig/debian/control
+++ cxfe-0.9.3~pre1/debian/control
@@ -0,0 +1,21 @@
+Source: cxfe
+Section: graphics
+Priority: optional
+Maintainer: Roman Müllenschläder <mms@prodeia.de>
+Build-Depends: debhelper (>= 5), autotools-dev, dpatch, libxine-dev, 
+ liblircclient-dev, libx11-dev, libncurses5-dev, x11proto-xext-dev,
+ libxext-dev
+Standards-Version: 3.8.4
+
+Package: cxfe
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A console frontend for the open source xine multimedia library
+ Unlike most xine frontends, cxfe is designed to run without X Windows.
+ Xine-ui and other X-Based frontends are not easily intergrated into scripts
+ or other programs.  CXFE gives the user a frontend which is callable from
+ shell scripts and other programs, and does not rely on X Windows being started
+ on the system (as long as you specify a non-X video out driver such as fb or
+ dxr3)
+ .
+ CXFE was mainly created as another movie player for MMS.
--- cxfe-0.9.3~pre1.orig/debian/cxfe.1
+++ cxfe-0.9.3~pre1/debian/cxfe.1
@@ -0,0 +1,132 @@
+.\" --------------------------------------------------------------------------
+.\" Makrodefinitionen
+.\" --------------------------------------------------------------------------
+.
+.\" Einr��ckung f��r Suboptionen
+.nr SS 5
+.\" neue Suboption hinzuf��gen
+.de IPs
+.IP "\\$1" \n(SS
+..
+.\" Beginn des ersten Suboptionen-Levels, endet mit .RE
+.de RSs
+.RS 10
+..
+.\" Beginn des zweiten Suboptionen-Levels
+.de RSss
+.PD 0
+.RS \n(SS+3
+..
+.\" Ende des zweiten Levels von Suboptionen
+.de REss
+.RE
+.PD 1
+..
+.
+.TH CXFE 1 "March 31, 2008" "Console Xine Frontend" "version 0.9.2" "user commands"
+.SH NAME
+cxfe \- a console frontend to xine library
+.SH SYNOPSIS
+.B cxfe
+.RI [ options ] " <mrl>" ...
+.br
+.SH DESCRIPTION
+This manual page documents briefly the
+.B cxfe
+commands.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBcxfe\fP is a frontend for the open source xine multimedia library.
+Unlike most xine frontends, cxfe is designed to run without X-Windows.
+Xine-ui and other X-Based frontends are not easily intergrated into scripts or
+other programs. CXFE gives the user a frontend which is callable from shell
+scripts and other programs, and does not rely on X-Windows being started on
+the system.
+.br
+(as long as you specify a non-X video out driver such as fb or dxr3)
+.PP
+CXFE has DVD menu support, On Screen Display, advanced TVTIME based post
+processing for deinterlacing video, on the fly aspect ratio change, video
+zoom in/zoom out and deinterlacing built in.
+.PP
+.B <mrl>
+Valid xine MRL (ex: dvd:/) Up to 1000 MRLs are allowed.
+.SH OPTIONS
+.TP
+.B \-ao <driver>
+Set audio out driver, where <driver> is one of alsa or oss
+.TP
+.B \-d
+Start cxfe with deinterlacing plugins on.
+.TP
+.B \-fs
+Start cxfe in fullscreen.
+.TP
+.B \-i lirc
+Sets input to lirc. Keyboard is enabled at all times.
+.TP
+.B \-p
+Specify custom deinterlacing plugin to use.
+.TP
+.B \-vo <driver>
+Set video out driver to dxr3, xv, xshm or fb
+.TP
+.B \-v
+Show version of program.
+.TP
+.B \-\-help
+Show summary of options.
+.SH "INTERACTIVE CONTROL"
+.B CXFE
+is controlable with a few simple keys (if set to keyboard as input).
+Possible controls are KEYBOARD and LIRC.
+A sample .lircrc file is provided in /usr/share/cxfe/lircrc.
+This file should be copied to the user's home directory. CXFE
+will first look in the users homedir then /usr/share/cxfe/lircrc
+The relevant keys for rudimentary keyboard-control as starting point
+are decribed here.
+
+.TP
+.B keyboard control
+.PD 0
+.RSs
+.IPs "Space"
+Pause playback.
+
+.IPs "\->"
+seek ~60s forward.
+
+.IPs "<\-"
+seek ~15s backward.
+
+.IPs "q"
+Quits.
+
+.IPs "UP and DOWN"
+Volume control.
+
+.IPs "f"
+Full Screen/Window Toggle (X only).
+
+.IPs "d"
+Toggle Deinterlace/post processing (uses default or post set with
+\-p switch)
+
+.IPs "s"
+Skip to next MRL if multiple MRLS supplied.  If only one
+mrl is supplied this will exit the program
+.RE
+.PD 1
+.PP
+For further commands and lirc configuration see \fB/usr/share/doc/cxfe/README.gz\fP.
+.SH SEE ALSO
+.BR mms (1),
+.PP
+For further documentation or information see \fBhttp://www.rtwnetwork.com/cxfe/\fP.
+.SH AUTHOR
+cxfe was written by Rett D. Walters.
+.PP
+This manual page was written by Roman Muellenschlaeder <mms@prodeia.de>,
+for the Debian project (but may be used by others).
--- cxfe-0.9.3~pre1.orig/debian/dirs
+++ cxfe-0.9.3~pre1/debian/dirs
@@ -0,0 +1 @@
+/usr/bin
--- cxfe-0.9.3~pre1.orig/debian/compat
+++ cxfe-0.9.3~pre1/debian/compat
@@ -0,0 +1 @@
+5
--- cxfe-0.9.3~pre1.orig/debian/rules
+++ cxfe-0.9.3~pre1/debian/rules
@@ -0,0 +1,97 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+LDFLAGS=
+
+include /usr/share/dpatch/dpatch.make
+
+config.status: patch-stamp configure
+	dh_testdir
+	# Add here commands to configure the package.
+#	./configure --prefix=/usr --mandir=\$${prefix}/share/man CFLAGS="-march=i486"
+	./configure --prefix=/usr --mandir=\$${prefix}/share/man
+
+	touch $@
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+
+	touch $@
+
+clean: clean-patched unpatch
+clean-patched:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	# Add here commands to clean up after the build process.
+#	Old
+#	-$(MAKE) distclean
+#	-rm config.log config.status
+	# New
+	[ ! -f Makefile ] || $(MAKE) distclean
+
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/cxfe.
+	$(MAKE) install prefix=$(CURDIR)/debian/cxfe/usr
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman debian/cxfe.1
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
--- cxfe-0.9.3~pre1.orig/debian/copyright
+++ cxfe-0.9.3~pre1/debian/copyright
@@ -0,0 +1,16 @@
+This package was debianized by Roman Müllenschläder <mms@prodeia.de> on
+Mon, 19 Mar 2007 16:14:42 +0100.
+
+It was downloaded from http://www.rtwnetwork.com/cxfe/
+
+Upstream Author: Rett D. Walters rettw@rtwnetwork.com
+
+Copyright: Rett D. Walters rettw@rtwnetwork.com
+
+License:
+
+This code is distributed under the GNU General Public License
+
+
+The Debian packaging is (C) 2007, Roman Müllenschläder <mms@prodeia.de> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
--- cxfe-0.9.3~pre1.orig/debian/docs
+++ cxfe-0.9.3~pre1/debian/docs
@@ -0,0 +1,2 @@
+README
+TODO
--- cxfe-0.9.3~pre1.orig/debian/README.Debian
+++ cxfe-0.9.3~pre1/debian/README.Debian
@@ -0,0 +1,26 @@
+cxfe for Debian
+---------------
+
+This package was created to reflect easy installation and to provide patches from Anders Rune Jensen anders@gnulinux.dk.
+
+There were some changed to the upstream like removing 'CVS' dirs.
+
+The following patches have been applied:
+
+# Disable dynamic power management saving so that the screen does not turn off when watching a movie
+01_disable-dpms
+
+# Makes cxfe work in widescreen and uses the correct aspect ratio for videos
+02_correct-aspect-ratio
+
+# Limit the onscreen display to the video resolution
+03_max-osd-fix
+
+# Adds functionality to display the position in the movie
+04_position-osd
+
+# Use xv by default if no output device has been specified
+05_xv-default
+
+
+ -- Roman Müllenschläder <mms@prodeia.de>, Mon, 19 Mar 2007 16:14:42 +0100
--- cxfe-0.9.3~pre1.orig/debian/changelog
+++ cxfe-0.9.3~pre1/debian/changelog
@@ -0,0 +1,69 @@
+cxfe (0.9.3~pre1-1) unstable; urgency=low
+
+  * Debian upload
+
+ -- Roman Müllenschläder <mms@prodeia.de>  Tue, 07 Sep 2010 10:04:02 +0200
+
+cxfe (0.9.3~pre1-0~prodeia1~gutsy1) gutsy; urgency=low
+
+  * New upstream release
+  * Bumped standards version to 3.8.4
+  * debian/rules: change clean target to make use of new distclean
+    target
+  * debian/rules: Fix debian-rules-ignores-make-clean-error
+
+ -- Roman Müllenschläder <mms@prodeia.de>  Fri, 05 Mar 2010 09:27:50 +0100
+
+cxfe (0.9.2-4~prodeia1~lucid1) lucid; urgency=low
+
+  * debian/cxfe.1: Corrected path for Readme.gz in manpage
+
+ -- Roman Müllenschläder <mms@prodeia.de>  Sat, 07 Mar 2009 12:04:07 +0100
+
+cxfe (0.9.2-3~ppa1~hardy2) hardy; urgency=low
+
+  * debian/rules: Removed CFLAGS=-march=i486 from configure call
+
+ -- Roman Müllenschläder <mms@prodeia.de>  Tue, 27 Jan 2009 13:06:32 +0100
+
+cxfe (0.9.2-3~ppa1~intrepid1) intrepid; urgency=low
+
+  * Prepare for PPA upload
+  * debian/control: Updated standards-version
+
+ -- Roman Müllenschläder <mms@prodeia.de>  Mon, 26 Jan 2009 19:30:41 +0100
+
+cxfe (0.9.2-2) unstable; urgency=low
+
+  * debian/rules: Added empty LDFLAGS for to make it compile with hardy
+  * debian/README.Debian: Corrected spelling error in Anders' mail
+    adress ;)
+
+ -- Roman Müllenschläder <mms@prodeia.de>  Wed, 14 May 2008 20:53:22 +0200
+
+cxfe (0.9.2-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/patches/01_disable-dpms.dpatch: Removed as it is upstream
+    (Disable dynamic power management saving so that the screen does not
+    turn off when watching a movie)
+  * debian/patches/02_correct-aspect-ratio.dpatch: Removed as it is
+    upstream (Makes cxfe work in widescreen and uses the correct aspect
+    ratio for videos)
+  * debian/patches/03_max-osd-fix.dpatch: Removed as it is upstream
+    (Limit the onscreen display to the video resolution)
+  * debian/patches/04_position-osd.dpatch: Removed as it is upstream
+    (Adds functionality to display the position in the movie)
+  * debian/patches/05_xv-default.dpatch: Removed as it is upstream (Use
+    xv by default if no output device has been specified)
+  * debian/patches/00list: Adapted
+  * debian/control: Enhanced long description
+  * debian/cxfe.1: Manpage adapted to new version
+
+ -- Roman Müllenschläder <mms@prodeia.de>  Mon, 31 Mar 2008 11:33:26 +0200
+
+cxfe (0.9.1-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Roman Müllenschläder <mms@prodeia.de>  Mon, 19 Mar 2007 16:14:42 +0100
--- cxfe-0.9.3~pre1.orig/debian/patches/00list
+++ cxfe-0.9.3~pre1/debian/patches/00list
@@ -0,0 +1 @@
+# No patches needed yet

