Merge branch 'master' of git+ssh://openadk.org/git/openadk

45 files changed, 459 insertions, 1034 deletions

diff --git a/package/bison/Makefile b/package/bison/Makefile
index b3642d177..bf058fc9a 100644
--- a/package/bison/Makefile
+++ b/package/bison/Makefile
@@ -4,12 +4,12 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bison
-PKG_VERSION:=		2.4.1
+PKG_VERSION:=		2.4.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c58aa1da418dc9704070872489e89bf5
+PKG_MD5SUM:=		6fc502f135738e98fecf1e5c8de38d62
 PKG_DESCR:=		GNU parser generator
 PKG_SECTION:=		lang
-PKG_URL:=		http://www.gnu.org/software/bison
+PKG_URL:=		http://www.gnu.org/software/bison/
 PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
 
 include ${TOPDIR}/mk/package.mk
diff --git a/package/bison/patches/patch-Makefile_in b/package/bison/patches/patch-Makefile_in
index 19d01c699..7f757fb29 100644
--- a/package/bison/patches/patch-Makefile_in
+++ b/package/bison/patches/patch-Makefile_in
@@ -1,11 +1,11 @@
---- bison-2.4.1.orig/Makefile.in	2008-12-11 23:05:53.000000000 +0100
-+++ bison-2.4.1/Makefile.in	2010-02-23 20:11:17.748535777 +0100
-@@ -502,7 +502,7 @@ top_build_prefix = @top_build_prefix@
+--- bison-2.4.2.orig/Makefile.in	2010-03-20 18:14:08.000000000 +0100
++++ bison-2.4.2/Makefile.in	2010-07-30 17:11:16.198057000 +0200
+@@ -871,7 +871,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  ACLOCAL_AMFLAGS = -I m4
 -SUBDIRS = build-aux po runtime-po lib data src doc examples tests etc
 +SUBDIRS = build-aux po runtime-po lib data src etc
  aclocal_DATA = m4/bison-i18n.m4
- EXTRA_DIST = .prev-version .version cfg.mk maint.mk \
+ EXTRA_DIST = .prev-version .version cfg.mk \
    OChangeLog PACKAGING \
diff --git a/package/bison/patches/patch-lib_config_hin b/package/bison/patches/patch-lib_config_hin
deleted file mode 100644
index dde4f8ee0..000000000
--- a/package/bison/patches/patch-lib_config_hin
+++ /dev/null
@@ -1,12 +0,0 @@
---- bison-2.4.1.orig/lib/config.hin	2008-12-11 23:05:52.000000000 +0100
-+++ bison-2.4.1/lib/config.hin	2010-02-23 20:09:49.477285615 +0100
-@@ -399,6 +399,9 @@
- /* Define to the one symbol short name of this package. */
- #undef PACKAGE_TARNAME
- 
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
- /* Define to the version of this package. */
- #undef PACKAGE_VERSION
- 
diff --git a/package/bison/patches/patch-lib_spawn_in_h b/package/bison/patches/patch-lib_spawn_in_h
new file mode 100644
index 000000000..a32d9eb93
--- /dev/null
+++ b/package/bison/patches/patch-lib_spawn_in_h
@@ -0,0 +1,18 @@
+--- bison-2.4.2.orig/lib/spawn.in.h	2010-03-17 20:17:04.000000000 +0100
++++ bison-2.4.2/lib/spawn.in.h	2010-07-30 17:23:46.000000000 +0200
+@@ -29,13 +29,8 @@
+ #ifndef _GL_SPAWN_H
+ #define _GL_SPAWN_H
+ 
+-/* Get definitions of 'struct sched_param' and 'sigset_t'.
+-   But avoid namespace pollution on glibc systems.  */
+-#ifndef __GLIBC__
+-# include <sched.h>
+-# include <signal.h>
+-#endif
+-
++#include <sched.h>
++#include <signal.h>
+ #include <sys/types.h>
+ 
+ #ifndef __THROW
diff --git a/package/bison/patches/patch-src_Makefile_in b/package/bison/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..0a1b9c247
--- /dev/null
+++ b/package/bison/patches/patch-src_Makefile_in
@@ -0,0 +1,11 @@
+--- bison-2.4.2.orig/src/Makefile.in	2010-03-20 18:14:10.000000000 +0100
++++ bison-2.4.2/src/Makefile.in	2010-07-30 17:28:09.000000000 +0200
+@@ -1313,7 +1313,7 @@ uninstall-am: uninstall-binPROGRAMS unin
+ 
+ yacc:
+ 	echo '#! /bin/sh' >$@
+-	echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@
++	echo "exec bison -y "'"$$@"' >>$@
+ 	chmod a+x $@
+ 
+ echo:
diff --git a/package/chillispot/patches/patch-Makefile b/package/chillispot/patches/patch-Makefile
deleted file mode 100644
index e951e5931..000000000
--- a/package/chillispot/patches/patch-Makefile
+++ /dev/null
@@ -1,178 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- chillispot-1.1.0.orig/Makefile	2006-09-24 21:35:16.000000000 +0200
-+++ chillispot-1.1.0/Makefile	2009-05-21 20:42:08.000000000 +0200
-@@ -13,9 +13,9 @@
- # PARTICULAR PURPOSE.
- 
- 
--srcdir = .
--top_srcdir = .
--
-+srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0
-+top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0
-+VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0
- pkgdatadir = $(datadir)/chillispot
- pkglibdir = $(libdir)/chillispot
- pkgincludedir = $(includedir)/chillispot
-@@ -33,8 +33,8 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--build_triplet = i686-pc-linux-gnu
--host_triplet = i686-pc-linux-gnu
-+build_triplet = x86_64-pc-linux-gnu
-+host_triplet = i586-pc-linux-gnu
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/chillispot.spec.in \
- 	$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
-@@ -72,24 +72,24 @@ DIST_ARCHIVES = $(distdir).tar.gz
- GZIP_ENV = --best
- distuninstallcheck_listfiles = find . -type f -print
- distcleancheck_listfiles = find . -type f -print
--ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9
--AMDEP_FALSE = #
--AMDEP_TRUE = 
--AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar
--AR = ar
--AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf
--AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader
--AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9
-+ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9
-+AMDEP_FALSE = 
-+AMDEP_TRUE = #
-+AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar
-+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar
-+AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf
-+AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader
-+AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9
- AWK = gawk
--CC = gcc
--CCDEPMODE = depmode=gcc3
--CFLAGS = -g -O2
--CPP = gcc -E
--CPPFLAGS = 
--CXX = g++
--CXXCPP = g++ -E
--CXXDEPMODE = depmode=gcc3
--CXXFLAGS = -g -O2
-+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc
-+CCDEPMODE = depmode=none
-+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
-+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E
-+CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG
-+CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++
-+CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E
-+CXXDEPMODE = depmode=none
-+CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
- CYGPATH_W = echo
- DEFS = -DHAVE_CONFIG_H
- DEPDIR = .deps
-@@ -99,19 +99,19 @@ ECHO_N = -n
- ECHO_T = 
- EGREP = grep -E
- EXEEXT = 
--F77 = f95
--FFLAGS = -g -O2
-+F77 = 
-+FFLAGS = 
- INSTALL_DATA = ${INSTALL} -m 644
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_SCRIPT = ${INSTALL}
- INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
--LDFLAGS = 
--LIBOBJS = 
-+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib
-+LIBOBJS =  memcmp$U.o
- LIBS = 
- LIBTOOL = $(SHELL) $(top_builddir)/libtool
- LN_S = ln -s
--LTLIBOBJS = 
--MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo
-+LTLIBOBJS =  memcmp$U.lo
-+MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo
- OBJEXT = o
- PACKAGE = chillispot
- PACKAGE_BUGREPORT = bugs@chillispot.org
-@@ -120,54 +120,54 @@ PACKAGE_STRING = chillispot 1.1.0
- PACKAGE_TARNAME = chillispot
- PACKAGE_VERSION = 1.1.0
- PATH_SEPARATOR = :
--RANLIB = ranlib
-+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib
- SET_MAKE = 
--SHELL = /bin/sh
--STRIP = strip
-+SHELL = /bin/bash
-+STRIP = i586-linux-strip
- VERSION = 1.1.0
--ac_ct_AR = ar
--ac_ct_CC = gcc
--ac_ct_CXX = g++
--ac_ct_F77 = f95
--ac_ct_RANLIB = ranlib
--ac_ct_STRIP = strip
--am__fastdepCC_FALSE = #
--am__fastdepCC_TRUE = 
--am__fastdepCXX_FALSE = #
--am__fastdepCXX_TRUE = 
-+ac_ct_AR = 
-+ac_ct_CC = 
-+ac_ct_CXX = 
-+ac_ct_F77 = 
-+ac_ct_RANLIB = 
-+ac_ct_STRIP = 
-+am__fastdepCC_FALSE = 
-+am__fastdepCC_TRUE = #
-+am__fastdepCXX_FALSE = 
-+am__fastdepCXX_TRUE = #
- am__include = include
- am__leading_dot = .
- am__quote = 
- am__tar = ${AMTAR} chof - "$$tardir"
- am__untar = ${AMTAR} xf -
- bindir = ${exec_prefix}/bin
--build = i686-pc-linux-gnu
--build_alias = 
--build_cpu = i686
-+build = x86_64-pc-linux-gnu
-+build_alias = x86_64-linux-gnu
-+build_cpu = x86_64
- build_os = linux-gnu
- build_vendor = pc
--datadir = ${prefix}/share
-+datadir = /usr/share
- exec_prefix = ${prefix}
--host = i686-pc-linux-gnu
--host_alias = 
--host_cpu = i686
-+host = i586-pc-linux-gnu
-+host_alias = i586-linux
-+host_cpu = i586
- host_os = linux-gnu
- host_vendor = pc
- includedir = ${prefix}/include
- infodir = ${prefix}/info
--install_sh = /home/jj/chillispot/install-sh
-+install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh
- libdir = ${exec_prefix}/lib
--libexecdir = ${exec_prefix}/libexec
--localstatedir = ${prefix}/var
--mandir = ${prefix}/man
-+libexecdir = /usr/sbin
-+localstatedir = /var
-+mandir = /usr/share/man
- mkdir_p = mkdir -p --
- oldincludedir = /usr/include
--prefix = /usr/local
--program_transform_name = s,x,x,
-+prefix = /usr
-+program_transform_name = s,$$,,;s,^,,
- sbindir = ${exec_prefix}/sbin
- sharedstatedir = ${prefix}/com
--sysconfdir = ${prefix}/etc
--target_alias = 
-+sysconfdir = /etc
-+target_alias = i586-linux
- SUBDIRS = src doc
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/package/chillispot/patches/patch-doc_Makefile b/package/chillispot/patches/patch-doc_Makefile
deleted file mode 100644
index a6290fc41..000000000
--- a/package/chillispot/patches/patch-doc_Makefile
+++ /dev/null
@@ -1,178 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- chillispot-1.1.0.orig/doc/Makefile	2006-09-24 21:35:16.000000000 +0200
-+++ chillispot-1.1.0/doc/Makefile	2009-05-21 20:42:08.000000000 +0200
-@@ -13,9 +13,9 @@
- # PARTICULAR PURPOSE.
- 
- 
--srcdir = .
--top_srcdir = ..
--
-+srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/doc
-+top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0
-+VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/doc
- pkgdatadir = $(datadir)/chillispot
- pkglibdir = $(libdir)/chillispot
- pkgincludedir = $(includedir)/chillispot
-@@ -33,8 +33,8 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--build_triplet = i686-pc-linux-gnu
--host_triplet = i686-pc-linux-gnu
-+build_triplet = x86_64-pc-linux-gnu
-+host_triplet = i586-pc-linux-gnu
- subdir = doc
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -51,24 +51,24 @@ am__installdirs = "$(DESTDIR)$(man8dir)"
- NROFF = nroff
- MANS = $(man_MANS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9
--AMDEP_FALSE = #
--AMDEP_TRUE = 
--AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar
--AR = ar
--AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf
--AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader
--AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9
-+ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9
-+AMDEP_FALSE = 
-+AMDEP_TRUE = #
-+AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar
-+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar
-+AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf
-+AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader
-+AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9
- AWK = gawk
--CC = gcc
--CCDEPMODE = depmode=gcc3
--CFLAGS = -g -O2
--CPP = gcc -E
--CPPFLAGS = 
--CXX = g++
--CXXCPP = g++ -E
--CXXDEPMODE = depmode=gcc3
--CXXFLAGS = -g -O2
-+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc
-+CCDEPMODE = depmode=none
-+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
-+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E
-+CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG
-+CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++
-+CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E
-+CXXDEPMODE = depmode=none
-+CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
- CYGPATH_W = echo
- DEFS = -DHAVE_CONFIG_H
- DEPDIR = .deps
-@@ -78,19 +78,19 @@ ECHO_N = -n
- ECHO_T = 
- EGREP = grep -E
- EXEEXT = 
--F77 = f95
--FFLAGS = -g -O2
-+F77 = 
-+FFLAGS = 
- INSTALL_DATA = ${INSTALL} -m 644
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_SCRIPT = ${INSTALL}
- INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
--LDFLAGS = 
--LIBOBJS = 
-+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib
-+LIBOBJS =  memcmp$U.o
- LIBS = 
- LIBTOOL = $(SHELL) $(top_builddir)/libtool
- LN_S = ln -s
--LTLIBOBJS = 
--MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo
-+LTLIBOBJS =  memcmp$U.lo
-+MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo
- OBJEXT = o
- PACKAGE = chillispot
- PACKAGE_BUGREPORT = bugs@chillispot.org
-@@ -99,54 +99,54 @@ PACKAGE_STRING = chillispot 1.1.0
- PACKAGE_TARNAME = chillispot
- PACKAGE_VERSION = 1.1.0
- PATH_SEPARATOR = :
--RANLIB = ranlib
-+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib
- SET_MAKE = 
--SHELL = /bin/sh
--STRIP = strip
-+SHELL = /bin/bash
-+STRIP = i586-linux-strip
- VERSION = 1.1.0
--ac_ct_AR = ar
--ac_ct_CC = gcc
--ac_ct_CXX = g++
--ac_ct_F77 = f95
--ac_ct_RANLIB = ranlib
--ac_ct_STRIP = strip
--am__fastdepCC_FALSE = #
--am__fastdepCC_TRUE = 
--am__fastdepCXX_FALSE = #
--am__fastdepCXX_TRUE = 
-+ac_ct_AR = 
-+ac_ct_CC = 
-+ac_ct_CXX = 
-+ac_ct_F77 = 
-+ac_ct_RANLIB = 
-+ac_ct_STRIP = 
-+am__fastdepCC_FALSE = 
-+am__fastdepCC_TRUE = #
-+am__fastdepCXX_FALSE = 
-+am__fastdepCXX_TRUE = #
- am__include = include
- am__leading_dot = .
- am__quote = 
- am__tar = ${AMTAR} chof - "$$tardir"
- am__untar = ${AMTAR} xf -
- bindir = ${exec_prefix}/bin
--build = i686-pc-linux-gnu
--build_alias = 
--build_cpu = i686
-+build = x86_64-pc-linux-gnu
-+build_alias = x86_64-linux-gnu
-+build_cpu = x86_64
- build_os = linux-gnu
- build_vendor = pc
--datadir = ${prefix}/share
-+datadir = /usr/share
- exec_prefix = ${prefix}
--host = i686-pc-linux-gnu
--host_alias = 
--host_cpu = i686
-+host = i586-pc-linux-gnu
-+host_alias = i586-linux
-+host_cpu = i586
- host_os = linux-gnu
- host_vendor = pc
- includedir = ${prefix}/include
- infodir = ${prefix}/info
--install_sh = /home/jj/chillispot/install-sh
-+install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh
- libdir = ${exec_prefix}/lib
--libexecdir = ${exec_prefix}/libexec
--localstatedir = ${prefix}/var
--mandir = ${prefix}/man
-+libexecdir = /usr/sbin
-+localstatedir = /var
-+mandir = /usr/share/man
- mkdir_p = mkdir -p --
- oldincludedir = /usr/include
--prefix = /usr/local
--program_transform_name = s,x,x,
-+prefix = /usr
-+program_transform_name = s,$$,,;s,^,,
- sbindir = ${exec_prefix}/sbin
- sharedstatedir = ${prefix}/com
--sysconfdir = ${prefix}/etc
--target_alias = 
-+sysconfdir = /etc
-+target_alias = i586-linux
- man_MANS = chilli.8 
- man_aux = $(man_MANS:.1=.x)
- EXTRA_DIST = $(man_MANS)
diff --git a/package/chillispot/patches/patch-src_Makefile b/package/chillispot/patches/patch-src_Makefile
deleted file mode 100644
index 975e6623e..000000000
--- a/package/chillispot/patches/patch-src_Makefile
+++ /dev/null
@@ -1,243 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- chillispot-1.1.0.orig/src/Makefile	2006-09-24 21:35:16.000000000 +0200
-+++ chillispot-1.1.0/src/Makefile	2009-05-21 20:42:08.000000000 +0200
-@@ -16,9 +16,9 @@
- 
- SOURCES = $(chilli_SOURCES)
- 
--srcdir = .
--top_srcdir = ..
--
-+srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/src
-+top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0
-+VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/src
- pkgdatadir = $(datadir)/chillispot
- pkglibdir = $(libdir)/chillispot
- pkgincludedir = $(includedir)/chillispot
-@@ -36,8 +36,8 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--build_triplet = i686-pc-linux-gnu
--host_triplet = i686-pc-linux-gnu
-+build_triplet = x86_64-pc-linux-gnu
-+host_triplet = i586-pc-linux-gnu
- sbin_PROGRAMS = chilli$(EXEEXT)
- subdir = src
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -73,24 +73,24 @@ DIST_SOURCES = $(chilli_SOURCES)
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9
--AMDEP_FALSE = #
--AMDEP_TRUE = 
--AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar
--AR = ar
--AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf
--AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader
--AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9
-+ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9
-+AMDEP_FALSE = 
-+AMDEP_TRUE = #
-+AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar
-+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar
-+AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf
-+AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader
-+AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9
- AWK = gawk
--CC = gcc
--CCDEPMODE = depmode=gcc3
--CFLAGS = -g -O2
--CPP = gcc -E
--CPPFLAGS = 
--CXX = g++
--CXXCPP = g++ -E
--CXXDEPMODE = depmode=gcc3
--CXXFLAGS = -g -O2
-+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc
-+CCDEPMODE = depmode=none
-+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
-+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E
-+CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG
-+CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++
-+CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E
-+CXXDEPMODE = depmode=none
-+CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
- CYGPATH_W = echo
- DEFS = -DHAVE_CONFIG_H
- DEPDIR = .deps
-@@ -100,19 +100,19 @@ ECHO_N = -n
- ECHO_T = 
- EGREP = grep -E
- EXEEXT = 
--F77 = f95
--FFLAGS = -g -O2
-+F77 = 
-+FFLAGS = 
- INSTALL_DATA = ${INSTALL} -m 644
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_SCRIPT = ${INSTALL}
- INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
--LDFLAGS = 
--LIBOBJS = 
-+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib
-+LIBOBJS =  memcmp$U.o
- LIBS = 
- LIBTOOL = $(SHELL) $(top_builddir)/libtool
- LN_S = ln -s
--LTLIBOBJS = 
--MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo
-+LTLIBOBJS =  memcmp$U.lo
-+MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo
- OBJEXT = o
- PACKAGE = chillispot
- PACKAGE_BUGREPORT = bugs@chillispot.org
-@@ -121,54 +121,54 @@ PACKAGE_STRING = chillispot 1.1.0
- PACKAGE_TARNAME = chillispot
- PACKAGE_VERSION = 1.1.0
- PATH_SEPARATOR = :
--RANLIB = ranlib
-+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib
- SET_MAKE = 
--SHELL = /bin/sh
--STRIP = strip
-+SHELL = /bin/bash
-+STRIP = i586-linux-strip
- VERSION = 1.1.0
--ac_ct_AR = ar
--ac_ct_CC = gcc
--ac_ct_CXX = g++
--ac_ct_F77 = f95
--ac_ct_RANLIB = ranlib
--ac_ct_STRIP = strip
--am__fastdepCC_FALSE = #
--am__fastdepCC_TRUE = 
--am__fastdepCXX_FALSE = #
--am__fastdepCXX_TRUE = 
-+ac_ct_AR = 
-+ac_ct_CC = 
-+ac_ct_CXX = 
-+ac_ct_F77 = 
-+ac_ct_RANLIB = 
-+ac_ct_STRIP = 
-+am__fastdepCC_FALSE = 
-+am__fastdepCC_TRUE = #
-+am__fastdepCXX_FALSE = 
-+am__fastdepCXX_TRUE = #
- am__include = include
- am__leading_dot = .
- am__quote = 
- am__tar = ${AMTAR} chof - "$$tardir"
- am__untar = ${AMTAR} xf -
- bindir = ${exec_prefix}/bin
--build = i686-pc-linux-gnu
--build_alias = 
--build_cpu = i686
-+build = x86_64-pc-linux-gnu
-+build_alias = x86_64-linux-gnu
-+build_cpu = x86_64
- build_os = linux-gnu
- build_vendor = pc
--datadir = ${prefix}/share
-+datadir = /usr/share
- exec_prefix = ${prefix}
--host = i686-pc-linux-gnu
--host_alias = 
--host_cpu = i686
-+host = i586-pc-linux-gnu
-+host_alias = i586-linux
-+host_cpu = i586
- host_os = linux-gnu
- host_vendor = pc
- includedir = ${prefix}/include
- infodir = ${prefix}/info
--install_sh = /home/jj/chillispot/install-sh
-+install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh
- libdir = ${exec_prefix}/lib
--libexecdir = ${exec_prefix}/libexec
--localstatedir = ${prefix}/var
--mandir = ${prefix}/man
-+libexecdir = /usr/sbin
-+localstatedir = /var
-+mandir = /usr/share/man
- mkdir_p = mkdir -p --
- oldincludedir = /usr/include
--prefix = /usr/local
--program_transform_name = s,x,x,
-+prefix = /usr
-+program_transform_name = s,$$,,;s,^,,
- sbindir = ${exec_prefix}/sbin
- sharedstatedir = ${prefix}/com
--sysconfdir = ${prefix}/etc
--target_alias = 
-+sysconfdir = /etc
-+target_alias = i586-linux
- 
- # add -pg to enable gprof
- AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -DSBINDIR='"$(sbindir)"' 
-@@ -244,38 +244,38 @@ mostlyclean-compile:
- distclean-compile:
- 	-rm -f *.tab.c
- 
--include ./$(DEPDIR)/chilli.Po
--include ./$(DEPDIR)/cmdline.Po
--include ./$(DEPDIR)/dhcp.Po
--include ./$(DEPDIR)/iphash.Po
--include ./$(DEPDIR)/ippool.Po
--include ./$(DEPDIR)/lookup.Po
--include ./$(DEPDIR)/md5.Po
--include ./$(DEPDIR)/radius.Po
--include ./$(DEPDIR)/redir.Po
--include ./$(DEPDIR)/syserr.Po
--include ./$(DEPDIR)/tun.Po
-+#include ./$(DEPDIR)/chilli.Po
-+#include ./$(DEPDIR)/cmdline.Po
-+#include ./$(DEPDIR)/dhcp.Po
-+#include ./$(DEPDIR)/iphash.Po
-+#include ./$(DEPDIR)/ippool.Po
-+#include ./$(DEPDIR)/lookup.Po
-+#include ./$(DEPDIR)/md5.Po
-+#include ./$(DEPDIR)/radius.Po
-+#include ./$(DEPDIR)/redir.Po
-+#include ./$(DEPDIR)/syserr.Po
-+#include ./$(DEPDIR)/tun.Po
- 
- .c.o:
--	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
--	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
--#	source='$<' object='$@' libtool=no \
--#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
--#	$(COMPILE) -c $<
-+#	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+#	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+#	source='$<' object='$@' libtool=no 
-+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) 
-+	$(COMPILE) -c $<
- 
- .c.obj:
--	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
--	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
--#	source='$<' object='$@' libtool=no \
--#	DEPDI