From 21dc31aa74ddfb6c8af225e11866a063ed6a8347 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 24 Mar 2011 10:58:48 +0100
Subject: build e2fsck.static only when choosen

---
 package/e2fsprogs/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 74c40a61a..0b8a69eea 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -58,9 +58,11 @@ MAKE_FLAGS+=		BUILD_CC="${CC_FOR_BUILD}" \
 			BUILD_CPPFLAGS="${CPPFLAGS_FOR_BUILD}"
 
 post-build:
+ifeq ($(ADK_PACKAGE_E2FSCK_STATIC),y)
 	${MAKE} -C ${WRKBUILD}/e2fsck e2fsck.static
 	${INSTALL_DIR} ${WRKINST}/usr/sbin
 	${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static ${WRKINST}/usr/sbin
+endif
 
 e2fsprogs-install:
 	${INSTALL_DIR} ${IDIR_E2FSPROGS}/etc
-- 
cgit v1.2.3


From ec16e71066199ce512767db53b913cce975e5662 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 24 Mar 2011 10:59:10 +0100
Subject: fix compile on Darwin, use wrapper m4 script

---
 package/autoconf/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile
index c499b6127..dbc662e94 100644
--- a/package/autoconf/Makefile
+++ b/package/autoconf/Makefile
@@ -18,7 +18,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,AUTOCONF,autoconf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 XAKE_FLAGS+=		PERL="/usr/bin/perl" \
-			M4="/usr/bin/m4"
+			M4="m4"
 
 autoconf-install:
 	${INSTALL_DIR} ${IDIR_AUTOCONF}/usr/bin
-- 
cgit v1.2.3


From 6aeae777249891e78bd2125a1c0eb3ac4eef1d69 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 24 Mar 2011 18:21:33 +0100
Subject: enable Java support in GCC again, add libgcj library package

---
 package/libgcj/Makefile                   | 27 +++++++++++++++++++++++++++
 package/libgcj/files/libpthread.so.x86    |  5 +++++
 package/libgcj/files/libpthread.so.x86_64 |  5 +++++
 toolchain/Config.in                       | 11 ++++++-----
 4 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 package/libgcj/Makefile
 create mode 100644 package/libgcj/files/libpthread.so.x86
 create mode 100644 package/libgcj/files/libpthread.so.x86_64

diff --git a/package/libgcj/Makefile b/package/libgcj/Makefile
new file mode 100644
index 000000000..7be43c3e1
--- /dev/null
+++ b/package/libgcj/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+include ${TOPDIR}/toolchain/gcc/Makefile.inc
+
+PKG_NAME:=		libgcj
+PKG_DESCR:=		GCJ runtime library
+PKG_SECTION:=		libs
+
+NO_DISTFILES:=		1
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,LIBGCJ,libgcj,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+libgcj-install:
+ifeq ($(ADK_NATIVE),)
+	${INSTALL_DIR} ${IDIR_LIBGCJ}/lib
+	${CP} ${STAGING_TARGET_DIR}/lib/libgcj*.so* ${IDIR_LIBGCJ}/lib
+endif
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libgcj/files/libpthread.so.x86 b/package/libgcj/files/libpthread.so.x86
new file mode 100644
index 000000000..e7555c820
--- /dev/null
+++ b/package/libgcj/files/libpthread.so.x86
@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf32-i386)
+GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a )
diff --git a/package/libgcj/files/libpthread.so.x86_64 b/package/libgcj/files/libpthread.so.x86_64
new file mode 100644
index 000000000..b0e31f904
--- /dev/null
+++ b/package/libgcj/files/libpthread.so.x86_64
@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf64-x86-64)
+GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a )
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 8df7952b2..dd0e5ab34 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -10,11 +10,12 @@ config ADK_TOOLCHAIN_GCC_CXX
 	boolean
 	default y
 
-#config ADK_TOOLCHAIN_GCC_JAVA
-#	prompt "Enable building of GCJ (Java language support in GCC)"
-#	boolean
-#	default n
-#
+config ADK_TOOLCHAIN_GCC_JAVA
+	prompt "Enable building of GCJ (Java language support in GCC)"
+	boolean
+	select ADK_PACKAGE_LIBGCJ
+	default n
+
 #config ADK_TOOLCHAIN_GCC_OBJC
 #	prompt "Enable building of Objective C compiler"
 #	boolean
-- 
cgit v1.2.3


From e5780c9b777243a5c7e36eb442c6e51631813ef8 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 24 Mar 2011 18:22:10 +0100
Subject: update TODO, remove duplicate wrong files

---
 package/libgcj/files/libpthread.so.x86    | 5 -----
 package/libgcj/files/libpthread.so.x86_64 | 5 -----
 2 files changed, 10 deletions(-)
 delete mode 100644 package/libgcj/files/libpthread.so.x86
 delete mode 100644 package/libgcj/files/libpthread.so.x86_64

diff --git a/package/libgcj/files/libpthread.so.x86 b/package/libgcj/files/libpthread.so.x86
deleted file mode 100644
index e7555c820..000000000
--- a/package/libgcj/files/libpthread.so.x86
+++ /dev/null
@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-   the static library, so try that secondarily.  */
-OUTPUT_FORMAT(elf32-i386)
-GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a )
diff --git a/package/libgcj/files/libpthread.so.x86_64 b/package/libgcj/files/libpthread.so.x86_64
deleted file mode 100644
index b0e31f904..000000000
--- a/package/libgcj/files/libpthread.so.x86_64
+++ /dev/null
@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-   the static library, so try that secondarily.  */
-OUTPUT_FORMAT(elf64-x86-64)
-GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a )
-- 
cgit v1.2.3


From d4747cb6cfb250931f0d299730e0e405e4a31dd1 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 24 Mar 2011 18:22:18 +0100
Subject: update TODO, remove duplicate wrong files

---
 TODO | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/TODO b/TODO
index e0163c47e..6850df315 100644
--- a/TODO
+++ b/TODO
@@ -1,17 +1,14 @@
-- rpath cleanup
-- mark c++ packages
+- enable and test gcj
+- port cacao 
+- port LXDE
+- port openjdk
 - add and test brcm 2.6 wireless support
 - man pages in ipkg/tgz packages (automatic)
 - automate /etc handling via conffiles
 - distcc evaluation
-- LTO GCC evaluation
 - fix qemu package
 - openssl ocf support check
 - new package minidlna
-- wget/curl/ftp download support
-- busybox update and SuSv3 removal
-- check rtc support on foxg20
-- adkinstall with NTP and hwclock support
 - PKG_CONFLICTS for python/python2, is this possible with Kconfig?
 - mirror only option, for no internet access
 - help text for config/ needs adoption
-- 
cgit v1.2.3


From 2897de8a5ed2276157957b315c8a7d9b92aabd80 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 28 Mar 2011 00:26:39 +0200
Subject: update template

---
 package/.template/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/.template/Makefile b/package/.template/Makefile
index b9b1c125e..12e618f34 100644
--- a/package/.template/Makefile
+++ b/package/.template/Makefile
@@ -41,7 +41,7 @@ PKG_SITES:=		add download url without package name
 #PKGFB_WITH_SSL:=	openssl
 
 # define your choices for your package here, f.e. different SSL implementations
-#PKG_CHOICES:=		WITH_OPENSSL WITH_GNUTLS
+#PKG_CHOICES_PKGNAME:=	WITH_OPENSSL WITH_GNUTLS
 # package description for each choice
 #PKGCD_WITH_OPENSSL:=	SSL support via OpenSSL library
 #PKGCD_WITH_GNUTLS:=	SSL support via GNUTLS library
@@ -57,7 +57,7 @@ PKG_SITES:=		add download url without package name
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,@UPKG@,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 #CONFIG_STYLE:=		manual
 # use following to add ./configure options
@@ -68,7 +68,7 @@ $(eval $(call PKG_template,@UPKG@,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PK
 #INSTALL_STYLE:=	manual
 
 # please install all files and directories to the package dir
-post-install:
+@PKG@-install:
 	$(INSTALL_DIR) $(IDIR_@UPKG@)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ \
 		$(IDIR_@UPKG@)/usr/bin
-- 
cgit v1.2.3


From 1659a23722eee992fa79eaf6886f0b50dd6d9267 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 28 Mar 2011 00:27:34 +0200
Subject: add build dependency

---
 package/glib/Makefile      | 2 +-
 package/xcb-proto/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/glib/Makefile b/package/glib/Makefile
index 37816d5cb..e0b0d1dc6 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -11,7 +11,7 @@ PKG_MD5SUM:=		9f6e85e1e38490c3956f4415bcd33e6e
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libintl libiconv libpthread
-PKG_BUILDDEP:=		gettext libiconv
+PKG_BUILDDEP:=		gettext libiconv dbus
 PKG_URL:=		http://www.gtk.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/
 
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile
index 1d24840d8..893287ee1 100644
--- a/package/xcb-proto/Makefile
+++ b/package/xcb-proto/Makefile
@@ -24,7 +24,7 @@ include $(TOPDIR)/mk/python.mk
 CONFIGURE_ENV+=		PYTHON=$(PYTHON)
 
 xcb-proto-install:
-	${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/share/
+	${INSTALL_DIR} ${IDIR_XCB_PROTO}/usr/share
 	${CP} ${WRKINST}/usr/share/xcb ${IDIR_XCB_PROTO}/usr/share
 	${INSTALL_DIR} ${STAGING_DIR}/usr/share/xcb
 	${CP} ${WRKINST}/usr/share/xcb/* ${STAGING_DIR}/usr/share/xcb
-- 
cgit v1.2.3


From bc70557e8384f24c5a8af02f0a592b016591c097 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 28 Mar 2011 02:36:11 +0200
Subject: add first step to get java running

add cacaovm and classpath packages. Add some dependency packages
(gconf, orbit2). Add a non-working icedtea6/openjdk, need to work
on a Linux host for further experimenting.
---
 toolchain/gcc/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 6e5fd7b49..20f2929b5 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -76,6 +76,7 @@ LANGUAGES:=${LANGUAGES},c++
 endif
 ifeq ($(ADK_TOOLCHAIN_GCC_JAVA),y)
 LANGUAGES:=${LANGUAGES},java
+GCC_CONFOPTS+=		--enable-java-home
 endif
 ifeq ($(ADK_TOOLCHAIN_GCC_ADA),y)
 LANGUAGES:=${LANGUAGES},ada
-- 
cgit v1.2.3


From 6692b15f8bd7ffc742cce5b67b963b458f87f8b6 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 28 Mar 2011 03:14:11 +0200
Subject: avoid warnings on fresh checkout

---
 mk/build.mk      | 4 ++--
 scripts/reloc.sh | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mk/build.mk b/mk/build.mk
index ba0301159..62c9245cf 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -248,7 +248,7 @@ distclean:
 	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
 	@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
 	@rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
-	@rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
+	@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
 	    .menu ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.*
 
 else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
@@ -477,7 +477,7 @@ distclean:
 	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
 	@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(TOOLS_BUILD_DIR)
 	@rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
-	@rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
+	@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
 	    .menu .rebuild.* ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG
 
 
diff --git a/scripts/reloc.sh b/scripts/reloc.sh
index f7a0a1e3b..59323612f 100755
--- a/scripts/reloc.sh
+++ b/scripts/reloc.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
 # execute this after relocation of adk directory
 
-olddir=$(grep "^TOPDIR" prereq.mk |cut -d '=' -f 2)
+olddir=$(grep "^TOPDIR" prereq.mk 2>/dev/null |cut -d '=' -f 2)
 newdir=$(pwd)
 
-if [ "$olddir" != "$newdir" ];then
+if [ ! -z $olddir ];then
+  if [ "$olddir" != "$newdir" ];then
 	echo "adk directory relocated!"
 	echo "old directory: $olddir"
 	echo "new directory: $newdir"
@@ -13,4 +14,5 @@ if [ "$olddir" != "$newdir" ];then
 	sed -i -e "s#$olddir#$newdir#g" $(find target_*/scripts -type f|xargs)
 	sed -i -e "s#$olddir#$newdir#" target_*/etc/ipkg.conf
 	sed -i -e "s#$olddir#$newdir#" prereq.mk
+  fi
 fi
-- 
cgit v1.2.3


From 0c9fca670b86871f111e1cda82ac8f70605992be Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 28 Mar 2011 03:06:55 +0200
Subject: add first step to get java working

---
 package/cacaovm/Makefile                           |  50 +++
 package/cacaovm/patches/patch-src_cacaoh_headers_c |  14 +
 .../patches/patch-src_threads_posix_thread-posix_h |  14 +
 package/classpath/Makefile                         |  37 ++
 package/gconf/Makefile                             |  29 ++
 package/glib/patches/patch-gmodule-2_0_pc_in       |  10 +
 .../glib/patches/patch-gmodule-export-2_0_pc_in    |  10 +
 package/icedtea6/Makefile                          |  54 +++
 package/icedtea6/patches/patch-Makefile_in         |  20 +
 package/icedtea6/patches/patch-configure           | 479 +++++++++++++++++++++
 package/orbit2/Makefile                            |  45 ++
 package/orbit2/patches/patch-ORBit-2_0_pc_in       |  11 +
 package/orbit2/patches/patch-configure             |  11 +
 .../patches/patch-src_idl-compiler_Makefile_in     |  54 +++
 scripts/sha256sum                                  |   7 +
 15 files changed, 845 insertions(+)
 create mode 100644 package/cacaovm/Makefile
 create mode 100644 package/cacaovm/patches/patch-src_cacaoh_headers_c
 create mode 100644 package/cacaovm/patches/patch-src_threads_posix_thread-posix_h
 create mode 100644 package/classpath/Makefile
 create mode 100644 package/gconf/Makefile
 create mode 100644 package/glib/patches/patch-gmodule-2_0_pc_in
 create mode 100644 package/glib/patches/patch-gmodule-export-2_0_pc_in
 create mode 100644 package/icedtea6/Makefile
 create mode 100644 package/icedtea6/patches/patch-Makefile_in
 create mode 100644 package/icedtea6/patches/patch-configure
 create mode 100644 package/orbit2/Makefile
 create mode 100644 package/orbit2/patches/patch-ORBit-2_0_pc_in
 create mode 100644 package/orbit2/patches/patch-configure
 create mode 100644 package/orbit2/patches/patch-src_idl-compiler_Makefile_in
 create mode 100755 scripts/sha256sum

diff --git a/package/cacaovm/Makefile b/package/cacaovm/Makefile
new file mode 100644
index 000000000..1d85a420a
--- /dev/null
+++ b/package/cacaovm/Makefile
@@ -0,0 +1,50 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		cacaovm
+PKG_VERSION:=		0.99.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
+PKG_DESCR:=		Java VM
+PKG_SECTION:=		lang
+PKG_BUILDDEP:=		classpath zlib
+PKG_DEPENDS:=		classpath zlib
+PKG_URL:=		http://www.cacaovm.org/
+PKG_SITES:=		http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/
+
+WRKDIST=		${WRKDIR}/cacao-${PKG_VERSION}
+DISTFILES:=             cacao-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,CACAOVM,cacaovm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+=	--with-jni_md_h=${STAGING_TARGET_DIR}/usr/include \
+			--with-java-runtime-library-prefix=${STAGING_TARGET_DIR}/usr \
+			--with-cacaoh=${STAGING_TARGET_DIR}/bin/cacaoh
+
+post-patch:
+	(cd ${WRKBUILD}; ./configure \
+		--enable-jit \
+		--with-java-runtime-library-prefix=/opt/local \
+		--enable-gc=none \
+	);
+	$(MAKE) -C ${WRKBUILD}/src/vmcore
+	$(MAKE) -C ${WRKBUILD}/src/toolbox
+	$(MAKE) -C ${WRKBUILD}/src/cacaoh
+	$(CP) $(WRKBUILD)/src/cacaoh/cacaoh $(STAGING_TARGET_DIR)/bin
+	$(MAKE) -C ${WRKBUILD} clean
+
+cacaovm-install:
+	$(INSTALL_DIR) $(IDIR_CACAOVM)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libjvm.so $(IDIR_CACAOVM)/usr/lib
+	$(INSTALL_DIR) $(IDIR_CACAOVM)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/cacao $(IDIR_CACAOVM)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/java $(IDIR_CACAOVM)/usr/bin
+	$(INSTALL_DIR) $(IDIR_CACAOVM)/usr/share/cacao
+	$(CP) $(WRKINST)/usr/share/cacao/vm.zip \
+		$(IDIR_CACAOVM)/usr/share/cacao
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cacaovm/patches/patch-src_cacaoh_headers_c b/package/cacaovm/patches/patch-src_cacaoh_headers_c
new file mode 100644
index 000000000..0e1ca0923
--- /dev/null
+++ b/package/cacaovm/patches/patch-src_cacaoh_headers_c
@@ -0,0 +1,14 @@
+--- cacao-0.99.4.orig/src/cacaoh/headers.c	2008-08-04 18:51:28.000000000 +0200
++++ cacao-0.99.4/src/cacaoh/headers.c	2011-03-26 20:11:11.000000000 +0100
+@@ -35,8 +35,10 @@
+ #if defined(ENABLE_THREADS)
+ # if defined(__DARWIN__)
+ #  include <signal.h>
++#  include <sys/ucontext.h>
++# else
++#  include <ucontext.h>
+ # endif
+-# include <ucontext.h>
+ #endif
+ 
+ #include "mm/gc-common.h"
diff --git a/package/cacaovm/patches/patch-src_threads_posix_thread-posix_h b/package/cacaovm/patches/patch-src_threads_posix_thread-posix_h
new file mode 100644
index 000000000..fc43526fb
--- /dev/null
+++ b/package/cacaovm/patches/patch-src_threads_posix_thread-posix_h
@@ -0,0 +1,14 @@
+--- cacao-0.99.4.orig/src/threads/posix/thread-posix.h	2008-08-04 18:51:28.000000000 +0200
++++ cacao-0.99.4/src/threads/posix/thread-posix.h	2011-03-26 20:12:13.000000000 +0100
+@@ -34,7 +34,11 @@ typedef struct threadobject threadobject
+ #include "config.h"
+ 
+ #include <pthread.h>
++#if defined(__DARWIN__)
++#include <sys/ucontext.h>
++#else
+ #include <ucontext.h>
++#endif
+ 
+ #include "vm/types.h"
+ 
diff --git a/package/classpath/Makefile b/package/classpath/Makefile
new file mode 100644
index 000000000..3292232c1
--- /dev/null
+++ b/package/classpath/Makefile
@@ -0,0 +1,37 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		classpath
+PKG_VERSION:=		0.98
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		90c6571b8b0309e372faa0f9f6255ea9
+PKG_DESCR:=		GNU Classpath
+PKG_SECTION:=		lang
+PKG_BUILDDEP:=		gtk+ gdk-pixbuf orbit2 gconf
+PKG_DEPENDS:=		libgtk gdk-pixbuf orbit2 gconf
+PKG_URL:=		http://www.gnu.org/software/classpath/home.html
+PKG_SITES:=		${MASTER_SITE_GNU:=classpath/}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+=	--disable-plugin \
+			--disable-tools \
+			--disable-examples
+
+classpath-install:
+	$(INSTALL_DIR) $(IDIR_CLASSPATH)/usr/share/classpath
+	$(CP) $(WRKINST)/usr/share/classpath/glibj.zip \
+		$(IDIR_CLASSPATH)/usr/share/classpath
+	$(INSTALL_DIR) $(IDIR_CLASSPATH)/usr/lib/classpath
+	$(CP) $(WRKINST)/usr/lib/classpath/lib*so.* \
+		$(IDIR_CLASSPATH)/usr/lib/classpath
+	# install to staging directory
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/share/classpath
+	$(CP) $(WRKINST)/usr/share/classpath/glibj.zip \
+		$(STAGING_DIR)/usr/share/classpath
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gconf/Makefile b/package/gconf/Makefile
new file mode 100644
index 000000000..dd47682c2
--- /dev/null
+++ b/package/gconf/Makefile
@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		GConf
+PKG_VERSION:=		2.32.1
+PKG_EXTRAVER:=		2.32
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		de83e70453910ac62f9ee2a86444bdab
+PKG_DESCR:=		a system for storing application preferences
+PKG_SECTION:=		libs
+PKG_BUILDDEP:=		dbus dbus-glib
+PKG_DEPENDS:=		dbus dbus-glib
+PKG_URL:=		http://projects.gnome.org/gconf/
+PKG_SITES:=		ftp://ftp.gnome.org//pub/GNOME/sources/GConf/${PKG_EXTRAVER}/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GCONF,gconf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+gconf-install:
+	$(INSTALL_DIR) $(IDIR_GCONF)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/* $(IDIR_GCONF)/usr/bin
+	$(INSTALL_DIR) $(IDIR_GCONF)/usr/lib
+	$(INSTALL_BIN) $(WRKINST)/usr/lib/libgconf*.so* \
+		$(IDIR_GCONF)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/glib/patches/patch-gmodule-2_0_pc_in b/package/glib/patches/patch-gmodule-2_0_pc_in
new file mode 100644
index 000000000..db8446fed
--- /dev/null
+++ b/package/glib/patches/patch-gmodule-2_0_pc_in
@@ -0,0 +1,10 @@
+--- glib-2.28.1.orig/gmodule-2.0.pc.in	2010-04-13 15:33:16.000000000 +0200
++++ glib-2.28.1/gmodule-2.0.pc.in	2011-03-25 19:49:39.000000000 +0100
+@@ -9,6 +9,6 @@ Name: GModule
+ Description: Dynamic module loader for GLib
+ Requires: glib-2.0
+ Version: @VERSION@
+-Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_THREAD_LIBS@
++Libs: -L${libdir} -lgmodule-2.0 @G_THREAD_LIBS@
+ Libs.private: @G_MODULE_LIBS@
+ Cflags: @G_THREAD_CFLAGS@
diff --git a/package/glib/patches/patch-gmodule-export-2_0_pc_in b/package/glib/patches/patch-gmodule-export-2_0_pc_in
new file mode 100644
index 000000000..bf61551fd
--- /dev/null
+++ b/package/glib/patches/patch-gmodule-export-2_0_pc_in
@@ -0,0 +1,10 @@
+--- glib-2.28.1.orig/gmodule-export-2.0.pc.in	2010-04-13 15:33:16.000000000 +0200
++++ glib-2.28.1/gmodule-export-2.0.pc.in	2011-03-25 19:49:59.000000000 +0100
+@@ -9,6 +9,6 @@ Name: GModule
+ Description: Dynamic module loader for GLib
+ Requires: glib-2.0
+ Version: @VERSION@
+-Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_THREAD_LIBS@
++Libs: -L${libdir} -lgmodule-2.0 @G_THREAD_LIBS@
+ Libs.private: @G_MODULE_LIBS@
+ Cflags: @G_THREAD_CFLAGS@
diff --git a/package/icedtea6/Makefile b/package/icedtea6/Makefile
new file mode 100644
index 000000000..39bdea2b9
--- /dev/null
+++ b/package/icedtea6/Makefile
@@ -0,0 +1,54 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		icedtea6
+PKG_VERSION:=		1.10
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		fd3f35e8a8a2ef9a64c035ed66cea06d 2d2bbbb0f9b81f1fec41ec730da8a933
+PKG_DESCR:=		OpenJDK Java VM
+PKG_SECTION:=		lang
+PKG_URL:=		http://icedtea.classpath.org/
+PKG_SITES:=		http://icedtea.classpath.org/download/source/ \
+			http://download.java.net/openjdk/jdk6/promoted/b22/
+
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz openjdk-6-src-b22-28_feb_2011.tar.gz
+
+PKG_SUBPKGS:=		OPENJDK
+
+PKG_CHOICES_OPENJDK:=	ZERO SHARK CACAO JAMVM
+PKGCD_ZERO:=		zero-assembly backend
+PKGCD_SHARK:=		JIT backend
+PKGCD_CACAO:=		Cacao JIT backend
+PKGCD_JAMVM:=		JamVM backend
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+ifeq ($(ADK_PACKAGE_OPENJDK_ZERO),y)
+CONFIGURE_ARGS+=	--enable-zero
+endif
+ifeq ($(ADK_PACKAGE_OPENJDK_SHARK),y)
+CONFIGURE_ARGS+=	--enable-shark 
+endif
+
+
+CONFIGURE_ARGS+=	--disable-docs \
+			--enable-bootstrap \
+			--with-jdk-home=$(STAGING_HOST_DIR)/lib/jvm \
+			--with-xalan2-jar=/opt/local/share/java/xalan.jar \
+			--with-xalan2-serializer-jar=/opt/local/share/java/serializer.jar \
+			--with-xerces2-jar=/opt/local/share/java/xercesImpl.jar \
+			--with-openjdk-src-zip=$(TOPDIR)/dl/openjdk-6-src-b22-28_feb_2011.tar.gz \
+			--with-ecj-jar=$(TOPDIR)/dl/ecj.jar \
+			--with-gcj \
+			--without-rhino \
+			--disable-xrender \
+			--disable-nss
+
+openjdk-install:
+	$(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/icedtea6/patches/patch-Makefile_in b/package/icedtea6/patches/patch-Makefile_in
new file mode 100644
index 000000000..652a4bc8e
--- /dev/null
+++ b/package/icedtea6/patches/patch-Makefile_in
@@ -0,0 +1,20 @@
+--- icedtea6-1.10.orig/Makefile.in	2011-03-02 20:48:45.000000000 +0100
++++ icedtea6-1.10/Makefile.in	2011-03-27 23:52:31.000000000 +0200
+@@ -1329,7 +1317,7 @@ stamps/extract-openjdk.stamp: stamps/dow
+ @OPENJDK_SRC_DIR_FOUND_TRUE@	  cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk ; \
+ @OPENJDK_SRC_DIR_FOUND_TRUE@	fi
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@	if ! test -d openjdk ; then \
+-@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@	  cp -pPRl openjdk.hg openjdk ; \
++@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@	  cp -pPR openjdk.hg openjdk ; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@	fi
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@	set -e ; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@	if ! test -d openjdk ; \
+@@ -1576,7 +1564,7 @@ clean-overlay:
+ # FIXME (missing): Rename to clone-ecj.
+ stamps/extract-ecj.stamp: $(OPENJDK_TREE)
+ 	if ! test -d openjdk-ecj ; then \
+-	    cp -pPRl openjdk openjdk-ecj ; \
++	    cp -pPR openjdk openjdk-ecj ; \
+ 	fi
+ 	mkdir -p stamps
+ 	touch stamps/extract-ecj.stamp
diff --git a/package/icedtea6/patches/patch-configure b/package/icedtea6/patches/patch-configure
new file mode 100644
index 000000000..28ad4a0dc
--- /dev/null
+++ b/package/icedtea6/patches/patch-configure
@@ -0,0 +1,479 @@
+--- icedtea6-1.10.orig/configure	2011-03-02 20:48:44.000000000 +0100
++++ icedtea6-1.10/configure	2011-03-27 22:27:06.000000000 +0200
+@@ -10805,22 +10805,6 @@ fi
+ 
+ 
+ 
+-for ac_header in cups/cups.h cups/ppd.h
+-do :
+-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-
+-else
+-  as_fn_error $? "\"CUPS headers were not found -
+-	try installing cups-devel.\"" "$LINENO" 5
+-fi
+-
+-done
+ 
+ for ac_header in X11/X.h
+ do :
+@@ -10879,46 +10863,6 @@ else
+   as_fn_error $? "\"libjpeg not found - try installing libjpeg-devel\"" "$LINENO" 5
+ fi
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5
+-$as_echo_n "checking for main in -lgif... " >&6; }
+-if ${ac_cv_lib_gif_main+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgif  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-
+-int
+-main ()
+-{
+-return main ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_gif_main=yes
+-else
+-  ac_cv_lib_gif_main=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5
+-$as_echo "$ac_cv_lib_gif_main" >&6; }
+-if test "x$ac_cv_lib_gif_main" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBGIF 1
+-_ACEOF
+-
+-  LIBS="-lgif $LIBS"
+-
+-else
+-  as_fn_error $? "\"giflib not found - try installing giflib-devel\"" "$LINENO" 5
+-fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lz" >&5
+ $as_echo_n "checking for main in -lz... " >&6; }
+@@ -11040,156 +10984,9 @@ fi
+ 
+ 
+ 
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XT" >&5
+-$as_echo_n "checking for XT... " >&6; }
+-
+-if test -n "$XT_CFLAGS"; then
+-    pkg_cv_XT_CFLAGS="$XT_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xt") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XT_CFLAGS=`$PKG_CONFIG --cflags "xt" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$XT_LIBS"; then
+-    pkg_cv_XT_LIBS="$XT_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xt") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XT_LIBS=`$PKG_CONFIG --libs "xt" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xt" 2>&1`
+-        else
+-	        XT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xt" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$XT_PKG_ERRORS" >&5
+-
+-	XT_FOUND=no
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	XT_FOUND=no
+-else
+-	XT_CFLAGS=$pkg_cv_XT_CFLAGS
+-	XT_LIBS=$pkg_cv_XT_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	XT_FOUND=yes
+-fi
+-if test "x${XT_FOUND}" = xno
+-then
+-  as_fn_error $? "Could not find Xt - \
+-  Try installing libXt-devel." "$LINENO" 5
+-fi
+-
+-
+-
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XP" >&5
+-$as_echo_n "checking for XP... " >&6; }
+-
+-if test -n "$XP_CFLAGS"; then
+-    pkg_cv_XP_CFLAGS="$XP_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xp") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XP_CFLAGS=`$PKG_CONFIG --cflags "xp" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$XP_LIBS"; then
+-    pkg_cv_XP_LIBS="$XP_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xp") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XP_LIBS=`$PKG_CONFIG --libs "xp" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+ 
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+ 
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xp" 2>&1`
+-        else
+-	        XP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xp" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$XP_PKG_ERRORS" >&5
+ 
+-	XP_FOUND=no
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	XP_FOUND=no
+-else
+-	XP_CFLAGS=$pkg_cv_XP_CFLAGS
+-	XP_LIBS=$pkg_cv_XP_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	XP_FOUND=yes
+-fi
+-if test "x${XP_FOUND}" = xno
+-then
+-  as_fn_error $? "Could not find Xp - \
+-  Try installing libXp-devel." "$LINENO" 5
+-fi
+ 
+ 
+ 
+@@ -11271,83 +11068,6 @@ fi
+ 
+ 
+ 
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XINERAMA" >&5
+-$as_echo_n "checking for XINERAMA... " >&6; }
+-
+-if test -n "$XINERAMA_CFLAGS"; then
+-    pkg_cv_XINERAMA_CFLAGS="$XINERAMA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XINERAMA_CFLAGS=`$PKG_CONFIG --cflags "xinerama" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$XINERAMA_LIBS"; then
+-    pkg_cv_XINERAMA_LIBS="$XINERAMA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XINERAMA_LIBS=`$PKG_CONFIG --libs "xinerama" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xinerama" 2>&1`
+-        else
+-	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --print-errors "xinerama" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$XINERAMA_PKG_ERRORS" >&5
+-
+-	XINERAMA_FOUND=no
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	XINERAMA_FOUND=no
+-else
+-	XINERAMA_CFLAGS=$pkg_cv_XINERAMA_CFLAGS
+-	XINERAMA_LIBS=$pkg_cv_XINERAMA_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	XINERAMA_FOUND=yes
+-
+-fi
+-if test "x${XINERAMA_FOUND}" = xno
+-then
+-  as_fn_error $? "Could not find Xinerama - \
+-  Try installing libXinerama-devel." "$LINENO" 5
+-fi
+-
+-
+-
+ if test "x${ENABLE_XRENDER}" = "xyes"
+ then
+ 
+@@ -11610,79 +11330,6 @@ fi
+ 
+ 
+ 
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTST" >&5
+-$as_echo_n "checking for XTST... " >&6; }
+-
+-if test -n "$XTST_CFLAGS"; then
+-    pkg_cv_XTST_CFLAGS="$XTST_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xtst") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XTST_CFLAGS=`$PKG_CONFIG --cflags "xtst" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$XTST_LIBS"; then
+-    pkg_cv_XTST_LIBS="$XTST_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xtst") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XTST_LIBS=`$PKG_CONFIG --libs "xtst" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        XTST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xtst" 2>&1`
+-        else
+-	        XTST_PKG_ERRORS=`$PKG_CONFIG --print-errors "xtst" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$XTST_PKG_ERRORS" >&5
+-
+-	XTST_FOUND=no
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	XTST_FOUND=no
+-else
+-	XTST_CFLAGS=$pkg_cv_XTST_CFLAGS
+-	XTST_LIBS=$pkg_cv_XTST_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	XTST_FOUND=yes
+-fi
+-if test "x${XTST_FOUND}" = xno
+-then
+-  as_fn_error $? "Could not find Xtst - \
+-  Try installing libXtst-devel." "$LINENO" 5
+-fi
+ 
+ 
+ 
+@@ -11764,85 +11411,6 @@ fi
+ 
+ 
+ 
+-if test "x${BUILD_OS_DIR}" = "xlinux"
+-then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
+-$as_echo_n "checking for ALSA... " >&6; }
+-
+-if test -n "$ALSA_CFLAGS"; then
+-    pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "alsa") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$ALSA_LIBS"; then
+-    pkg_cv_ALSA_LIBS="$ALSA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "alsa") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "alsa" 2>&1`
+-        else
+-	        ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "alsa" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$ALSA_PKG_ERRORS" >&5
+-
+-	ALSA_FOUND=no
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	ALSA_FOUND=no
+-else
+-	ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
+-	ALSA_LIBS=$pkg_cv_ALSA_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	ALSA_FOUND=yes
+-fi
+-  if test "x${ALSA_FOUND}" = xno
+-  then
+-    as_fn_error $? "Could not find alsa - \
+-    Try installing alsa-lib-devel." "$LINENO" 5
+-  fi
+-
+-
+-fi
+ 
+ if test "x${enable_pulse_java}" = "xyes"
+ then
diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile
new file mode 100644
index 000000000..db64efe10
--- /dev/null
+++ b/package/orbit2/Makefile
@@ -0,0 +1,45 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		ORBit2
+PKG_VERSION:=		2.14.19
+PKG_EXTRAVER:=		2.14
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		87c69c56c6d0bdafa4de5e18ae115cc9
+PKG_DESCR:=		a CORBA 2.4-compliant Object Request Broker
+PKG_SECTION:=		libs
+PKG_BUILDDEP:=		libIDL
+PKG_URL:=		http://projects.gnome.org/ORBit2/
+PKG_SITES:=		ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CFLAGS_FOR_BUILD+=	$(shell ${BUILD_LIBIDL_CONFIG} --cflags)
+LDFLAGS_FOR_BUILD+=	$(shell ${BUILD_LIBIDL_CONFIG} --libs)
+LDFLAGS_FOR_BUILD+=	-lgmodule-2.0
+CONFIGURE_ENV+=		ac_cv_alignof_CORBA_octet=1 \
+			ac_cv_alignof_CORBA_boolean=1 \
+			ac_cv_alignof_CORBA_char=1 \
+			ac_cv_alignof_CORBA_wchar=2 \
+			ac_cv_alignof_CORBA_short=2 \
+			ac_cv_alignof_CORBA_long=4 \
+			ac_cv_alignof_CORBA_long_long=4 \
+			ac_cv_alignof_CORBA_float=4 \
+			ac_cv_alignof_CORBA_double=4 \
+			ac_cv_alignof_CORBA_long_double=4 \
+			ac_cv_alignof_CORBA_struct=1 \
+			ac_cv_alignof_CORBA_pointer=4
+
+orbit2-install:
+	$(INSTALL_DIR) $(IDIR_ORBIT2)/usr/lib
+	$(INSTALL_BIN) $(WRKINST)/usr/lib/libORBit*.so* \
+		$(IDIR_ORBIT2)/usr/lib
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/bin
+	$(CP) $(WRKINST)/usr/bin/orbit-idl-2 \
+		$(STAGING_DIR)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/orbit2/patches/patch-ORBit-2_0_pc_in b/package/orbit2/patches/patch-ORBit-2_0_pc_in
new file mode 100644
index 000000000..394e62a0c
--- /dev/null
+++ b/package/orbit2/patches/patch-ORBit-2_0_pc_in
@@ -0,0 +1,11 @@
+--- ORBit2-2.14.19.orig/ORBit-2.0.pc.in	2010-02-09 13:05:35.000000000 +0100
++++ ORBit2-2.14.19/ORBit-2.0.pc.in	2011-03-25 21:11:02.000000000 +0100
+@@ -2,7 +2,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-orbit_idl=@bindir@/orbit-idl-2@EXEEXT@
++orbit_idl=${prefix}/../@bindir@/orbit-idl-2@EXEEXT@
+ 
+ 
+ Name: ORBit-2.0
diff --git a/package/orbit2/patches/patch-configure b/package/orbit2/patches/patch-configure
new file mode 100644
index 000000000..e2a4d02c9
--- /dev/null
+++ b/package/orbit2/patches/patch-configure
@@ -0,0 +1,11 @@
+--- ORBit2-2.14.19.orig/configure	2010-09-28 11:39:37.000000000 +0200
++++ ORBit2-2.14.19/configure	2011-03-25 19:39:53.000000000 +0100
+@@ -8373,7 +8373,7 @@ $as_echo_n "checking whether the $compil
+     # here allows them to be overridden if necessary.
+     runpath_var=LD_RUN_PATH
+     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-    export_dynamic_flag_spec='${wl}--export-dynamic'
++    #export_dynamic_flag_spec='${wl}--export-dynamic'
+     # ancient GNU ld didn't support --whole-archive et. al.
+     if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+       whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
diff --git a/package/orbit2/patches/patch-src_idl-compiler_Makefile_in b/package/orbit2/patches/patch-src_idl-compiler_Makefile_in
new file mode 100644
index 000000000..2053d9f29
--- /dev/null
+++ b/package/orbit2/patches/patch-src_idl-compiler_Makefile_in
@@ -0,0 +1,54 @@
+--- ORBit2-2.14.19.orig/src/idl-compiler/Makefile.in	2010-09-28 11:39:39.000000000 +0200
++++ ORBit2-2.14.19/src/idl-compiler/Makefile.in	2011-03-25 20:28:46.000000000 +0100
+@@ -66,15 +66,13 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+-	$(LDFLAGS) -o $@
++	--mode=compile $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
++CCLD = $(CC_FOR_BUILD)
++LINK = $(CCLD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
+ SOURCES = $(orbit_idl_2_SOURCES)
+ DIST_SOURCES = $(orbit_idl_2_SOURCES)
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+@@ -178,8 +176,8 @@ ORBIT_ALIGNOF_CORBA_SHORT = @ORBIT_ALIGN
+ ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@
+ ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@
+ ORBIT_CFLAGS = @ORBIT_CFLAGS@
+-ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@
+-ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@
++ORBIT_IDL_CFLAGS = 
++ORBIT_IDL_LIBS = 
+ ORBIT_LIBS = @ORBIT_LIBS@
+ ORBIT_MAJOR_VERSION = @ORBIT_MAJOR_VERSION@
+ ORBIT_MICRO_VERSION = @ORBIT_MICRO_VERSION@
+@@ -199,7 +197,7 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_LIBDIR = $(PKG_HOSTLIB_DIR)
+ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ RANLIB = @RANLIB@
+ SED = @SED@
+@@ -270,8 +268,7 @@ INCLUDES = \
+ 	-DVERSION=\"$(ORBIT_VERSION)\"				\
+ 	-DORBIT2_INTERNAL_API					\
+ 	$(WARN_CFLAGS)						\
+-	$(DISABLE_DEPRECATED_CFLAGS)				\
+-	$(ORBIT_IDL_CFLAGS)
++	$(DISABLE_DEPRECATED_CFLAGS)
+ 
+ orbit_idl_2_LDADD = \
+ 	$(ORBIT_IDL_LIBS)		\
diff --git a/scripts/sha256sum b/scripts/sha256sum
new file mode 100755
index 000000000..3c0a706c7
--- /dev/null
+++ b/scripts/sha256sum
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+tmp=$(mktemp -t yyy)
+cat - > $tmp
+shasum -a 256 "$@" $tmp
-- 
cgit v1.2.3


From af7079fd5fd0139bddad4529a03133a71b904eda Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 28 Mar 2011 14:52:32 +0200
Subject: update to latest stable upstream

---
 toolchain/glibc-ports/Makefile.inc       |  6 +++---
 toolchain/glibc/Makefile                 | 10 +++++-----
 toolchain/glibc/Makefile.inc             |  6 ++----
 toolchain/glibc/patches/ip_h-bug.patch   | 12 ------------
 toolchain/glibc/patches/make-mixed.patch | 15 ---------------
 5 files changed, 10 insertions(+), 39 deletions(-)
 delete mode 100644 toolchain/glibc/patches/ip_h-bug.patch
 delete mode 100644 toolchain/glibc/patches/make-mixed.patch

diff --git a/toolchain/glibc-ports/Makefile.inc b/toolchain/glibc-ports/Makefile.inc
index 64f1552f1..222728af3 100644
--- a/toolchain/glibc-ports/Makefile.inc
+++ b/toolchain/glibc-ports/Makefile.inc
@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		glibc-ports
-PKG_VERSION:=		2.12
+PKG_VERSION:=		2.13
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a6de5fd03fd89eb92ec77229d57e53d4
-PKG_SITES:=		${MASTER_SITE_OPENADK:=/}
+PKG_MD5SUM:=		094e3c9b57da605917a780ab24575187
+PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index f466021a7..f52d527db 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -31,7 +31,7 @@ GLIBC_BUILD_DIR_FINAL:=		${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-final
 $(WRKBUILD)/.headers_configure:
 	mkdir -p $(GLIBC_BUILD_DIR_INITIAL)
 	(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); \
-	ln -sf ../../w-glibc-ports-$(GLIBC_PORTS_VERSION)-1/glibc-ports-$(GLIBC_PORTS_VERSION)/ ports);
+	ln -sf ../../w-glibc-ports-$(PKG_VERSION)-1/glibc-ports-$(PKG_VERSION)/ ports);
 	(cd $(GLIBC_BUILD_DIR_INITIAL); \
 		${GLIBC_ENV} \
 		$(WRKBUILD)/configure \
@@ -70,10 +70,10 @@ $(WRKBUILD)/.installed:
 	${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL) \
 		install_root=$(STAGING_TARGET_DIR) install
 	mkdir -p ${STAGING_TARGET_DIR}/etc
-	${INSTALL_DATA} ${WRKBUILD}/posix/gai.conf ${STAGING_TARGET_DIR}/etc/
-	${INSTALL_DATA} ${WRKBUILD}/nscd/nscd.conf ${STAGING_TARGET_DIR}/etc/
-	${INSTALL_DATA} ${WRKBUILD}/nss/nsswitch.conf ${STAGING_TARGET_DIR}/etc/
+	${INSTALL_DATA} ${WRKBUILD}/posix/gai.conf ${STAGING_TARGET_DIR}/etc
+	${INSTALL_DATA} ${WRKBUILD}/nscd/nscd.conf ${STAGING_TARGET_DIR}/etc
+	${INSTALL_DATA} ${WRKBUILD}/nss/nsswitch.conf ${STAGING_TARGET_DIR}/etc
 	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
-	touch $(WRKBUILD)/.installed
+	touch $@
 
 include ${TOPDIR}/mk/toolchain.mk
diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index b7646e6a2..a9f838300 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -2,15 +2,13 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		glibc
-PKG_VERSION:=		2.12.1
+PKG_VERSION:=		2.13
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a8e77cd873125d9b46ca2e46ee1a13d0
+PKG_MD5SUM:=		fafabe01cb9748acb0a11a6879ebaa7e
 PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
-GLIBC_PORTS_VERSION:=	2.12
 GLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 			--host=$(REAL_GNU_TARGET_NAME) \
 			--with-headers=$(STAGING_TARGET_DIR)/usr/include \
-			--disable-nls \
 			--disable-sanity-checks \
 			--disable-nls \
 			--without-cvs \
diff --git a/toolchain/glibc/patches/ip_h-bug.patch b/toolchain/glibc/patches/ip_h-bug.patch
deleted file mode 100644
index 946c18fab..000000000
--- a/toolchain/glibc/patches/ip_h-bug.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur glibc-2.12.1.orig/sysdeps/generic/netinet/ip.h glibc-2.12.1/sysdeps/generic/netinet/ip.h
---- glibc-2.12.1.orig/sysdeps/generic/netinet/ip.h	2010-07-27 13:34:39.000000000 +0200
-+++ glibc-2.12.1/sysdeps/generic/netinet/ip.h	2010-10-13 15:00:56.000000000 +0200
-@@ -194,7 +194,7 @@
-  */
- 
- #define	IPTOS_CLASS_MASK		0xe0
--#define	IPTOS_CLASS(class)		((tos) & IPTOS_CLASS_MASK)
-+#define	IPTOS_CLASS(class)		((class) & IPTOS_CLASS_MASK)
- #define	IPTOS_CLASS_CS0			0x00
- #define	IPTOS_CLASS_CS1			0x20
- #define	IPTOS_CLASS_CS2			0x40
diff --git a/toolchain/glibc/patches/make-mixed.patch b/toolchain/glibc/patches/make-mixed.patch
deleted file mode 100644
index 7691eda95..000000000
--- a/toolchain/glibc/patches/make-mixed.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur glibc-2.12.1.orig/manual/Makefile glibc-2.12.1/manual/Makefile
---- glibc-2.12.1.orig/manual/Makefile	2010-07-27 13:34:39.000000000 +0200
-+++ glibc-2.12.1/manual/Makefile	2010-11-07 18:24:27.000000000 +0100
-@@ -232,7 +232,10 @@
- .PHONY: stubs
- stubs: $(objpfx)stubs
- endif
--$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
-+$(objpfx)stubs ../po/manual.pot:
-+	touch $@
-+
-+$(objpfx)stamp%:
- 	$(make-target-directory)
- 	touch $@
- 
-- 
cgit v1.2.3


From 0089f52549024a74c66dccd592e6774c18210ea6 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 28 Mar 2011 14:53:42 +0200
Subject: modify to work under Linux

---
 scripts/sha256sum | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/sha256sum b/scripts/sha256sum
index 3c0a706c7..da34d9113 100755
--- a/scripts/sha256sum
+++ b/scripts/sha256sum
@@ -2,6 +2,10 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-tmp=$(mktemp -t yyy)
-cat - > $tmp
-shasum -a 256 "$@" $tmp
+if [ -x /usr/bin/sha256sum ]; then
+	/usr/bin/sha256sum "$@"
+else
+	tmp=$(mktemp -t yyy)
+	cat - > $tmp
+	shasum -a 256 "$@" $tmp
+fi
-- 
cgit v1.2.3


From 125c380eef783c99f0877d60e966e37c295a2267 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 28 Mar 2011 20:31:26 +0200
Subject: rename package to openjdk

- fix bootstrap build
- optmize source extraction and layout
---
 package/icedtea6/Makefile                          |  54 ---
 package/icedtea6/patches/patch-Makefile_in         |  20 -
 package/icedtea6/patches/patch-configure           | 479 ---------------------
 package/openjdk/Makefile                           |  86 ++++
 .../patches/patch-icedtea6-1_10_Makefile_in        |  29 ++
 .../openjdk/patches/patch-icedtea6-1_10_configure  | 479 +++++++++++++++++++++
 package/openjdk/patches/patch-openjdk-6_Makefile   |  13 +
 7 files changed, 607 insertions(+), 553 deletions(-)
 delete mode 100644 package/icedtea6/Makefile
 delete mode 100644 package/icedtea6/patches/patch-Makefile_in
 delete mode 100644 package/icedtea6/patches/patch-configure
 create mode 100644 package/openjdk/Makefile
 create mode 100644 package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
 create mode 100644 package/openjdk/patches/patch-icedtea6-1_10_configure
 create mode 100644 package/openjdk/patches/patch-openjdk-6_Makefile

diff --git a/package/icedtea6/Makefile b/package/icedtea6/Makefile
deleted file mode 100644
index 39bdea2b9..000000000
--- a/package/icedtea6/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		icedtea6
-PKG_VERSION:=		1.10
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		fd3f35e8a8a2ef9a64c035ed66cea06d 2d2bbbb0f9b81f1fec41ec730da8a933
-PKG_DESCR:=		OpenJDK Java VM
-PKG_SECTION:=		lang
-PKG_URL:=		http://icedtea.classpath.org/
-PKG_SITES:=		http://icedtea.classpath.org/download/source/ \
-			http://download.java.net/openjdk/jdk6/promoted/b22/
-
-DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz openjdk-6-src-b22-28_feb_2011.tar.gz
-
-PKG_SUBPKGS:=		OPENJDK
-
-PKG_CHOICES_OPENJDK:=	ZERO SHARK CACAO JAMVM
-PKGCD_ZERO:=		zero-assembly backend
-PKGCD_SHARK:=		JIT backend
-PKGCD_CACAO:=		Cacao JIT backend
-PKGCD_JAMVM:=		JamVM backend
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-ifeq ($(ADK_PACKAGE_OPENJDK_ZERO),y)
-CONFIGURE_ARGS+=	--enable-zero
-endif
-ifeq ($(ADK_PACKAGE_OPENJDK_SHARK),y)
-CONFIGURE_ARGS+=	--enable-shark 
-endif
-
-
-CONFIGURE_ARGS+=	--disable-docs \
-			--enable-bootstrap \
-			--with-jdk-home=$(STAGING_HOST_DIR)/lib/jvm \
-			--with-xalan2-jar=/opt/local/share/java/xalan.jar \
-			--with-xalan2-serializer-jar=/opt/local/share/java/serializer.jar \
-			--with-xerces2-jar=/opt/local/share/java/xercesImpl.jar \
-			--with-openjdk-src-zip=$(TOPDIR)/dl/openjdk-6-src-b22-28_feb_2011.tar.gz \
-			--with-ecj-jar=$(TOPDIR)/dl/ecj.jar \
-			--with-gcj \
-			--without-rhino \
-			--disable-xrender \
-			--disable-nss
-
-openjdk-install:
-	$(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/icedtea6/patches/patch-Makefile_in b/package/icedtea6/patches/patch-Makefile_in
deleted file mode 100644
index 652a4bc8e..000000000
--- a/package/icedtea6/patches/patch-Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- icedtea6-1.10.orig/Makefile.in	2011-03-02 20:48:45.000000000 +0100
-+++ icedtea6-1.10/Makefile.in	2011-03-27 23:52:31.000000000 +0200
-@@ -1329,7 +1317,7 @@ stamps/extract-openjdk.stamp: stamps/dow
- @OPENJDK_SRC_DIR_FOUND_TRUE@	  cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk ; \
- @OPENJDK_SRC_DIR_FOUND_TRUE@	fi
- @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@	if ! test -d openjdk ; then \
--@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@	  cp -pPRl openjdk.hg openjdk ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@	  cp -pPR openjdk.hg openjdk ; \
- @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@	fi
- @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@	set -e ; \
- @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@	if ! test -d openjdk ; \
-@@ -1576,7 +1564,7 @@ clean-overlay:
- # FIXME (missing): Rename to clone-ecj.
- stamps/extract-ecj.stamp: $(OPENJDK_TREE)
- 	if ! test -d openjdk-ecj ; then \
--	    cp -pPRl openjdk openjdk-ecj ; \
-+	    cp -pPR openjdk openjdk-ecj ; \
- 	fi
- 	mkdir -p stamps
- 	touch stamps/extract-ecj.stamp
diff --git a/package/icedtea6/patches/patch-configure b/package/icedtea6/patches/patch-configure
deleted file mode 100644
index 28ad4a0dc..000000000
--- a/package/icedtea6/patches/patch-configure
+++ /dev/null
@@ -1,479 +0,0 @@
---- icedtea6-1.10.orig/configure	2011-03-02 20:48:44.000000000 +0100
-+++ icedtea6-1.10/configure	2011-03-27 22:27:06.000000000 +0200
-@@ -10805,22 +10805,6 @@ fi
- 
- 
- 
--for ac_header in cups/cups.h cups/ppd.h
--do :
--  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--
--else
--  as_fn_error $? "\"CUPS headers were not found -
--	try installing cups-devel.\"" "$LINENO" 5
--fi
--
--done
- 
- for ac_header in X11/X.h
- do :
-@@ -10879,46 +10863,6 @@ else
-   as_fn_error $? "\"libjpeg not found - try installing libjpeg-devel\"" "$LINENO" 5
- fi
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5
--$as_echo_n "checking for main in -lgif... " >&6; }
--if ${ac_cv_lib_gif_main+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgif  $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--
--int
--main ()
--{
--return main ();
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_gif_main=yes
--else
--  ac_cv_lib_gif_main=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5
--$as_echo "$ac_cv_lib_gif_main" >&6; }
--if test "x$ac_cv_lib_gif_main" = xyes; then :
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBGIF 1
--_ACEOF
--
--  LIBS="-lgif $LIBS"
--
--else
--  as_fn_error $? "\"giflib not found - try installing giflib-devel\"" "$LINENO" 5
--fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lz" >&5
- $as_echo_n "checking for main in -lz... " >&6; }
-@@ -11040,156 +10984,9 @@ fi
- 
- 
- 
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XT" >&5
--$as_echo_n "checking for XT... " >&6; }
--
--if test -n "$XT_CFLAGS"; then
--    pkg_cv_XT_CFLAGS="$XT_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xt") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XT_CFLAGS=`$PKG_CONFIG --cflags "xt" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--if test -n "$XT_LIBS"; then
--    pkg_cv_XT_LIBS="$XT_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xt") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XT_LIBS=`$PKG_CONFIG --libs "xt" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xt" 2>&1`
--        else
--	        XT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xt" 2>&1`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$XT_PKG_ERRORS" >&5
--
--	XT_FOUND=no
--elif test $pkg_failed = untried; then
--     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--	XT_FOUND=no
--else
--	XT_CFLAGS=$pkg_cv_XT_CFLAGS
--	XT_LIBS=$pkg_cv_XT_LIBS
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--	XT_FOUND=yes
--fi
--if test "x${XT_FOUND}" = xno
--then
--  as_fn_error $? "Could not find Xt - \
--  Try installing libXt-devel." "$LINENO" 5
--fi
--
--
--
--
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XP" >&5
--$as_echo_n "checking for XP... " >&6; }
--
--if test -n "$XP_CFLAGS"; then
--    pkg_cv_XP_CFLAGS="$XP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xp") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XP_CFLAGS=`$PKG_CONFIG --cflags "xp" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--if test -n "$XP_LIBS"; then
--    pkg_cv_XP_LIBS="$XP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xp") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XP_LIBS=`$PKG_CONFIG --libs "xp" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--
--
- 
--if test $pkg_failed = yes; then
--   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
- 
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xp" 2>&1`
--        else
--	        XP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xp" 2>&1`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$XP_PKG_ERRORS" >&5
- 
--	XP_FOUND=no
--elif test $pkg_failed = untried; then
--     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--	XP_FOUND=no
--else
--	XP_CFLAGS=$pkg_cv_XP_CFLAGS
--	XP_LIBS=$pkg_cv_XP_LIBS
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--	XP_FOUND=yes
--fi
--if test "x${XP_FOUND}" = xno
--then
--  as_fn_error $? "Could not find Xp - \
--  Try installing libXp-devel." "$LINENO" 5
--fi
- 
- 
- 
-@@ -11271,83 +11068,6 @@ fi
- 
- 
- 
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XINERAMA" >&5
--$as_echo_n "checking for XINERAMA... " >&6; }
--
--if test -n "$XINERAMA_CFLAGS"; then
--    pkg_cv_XINERAMA_CFLAGS="$XINERAMA_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XINERAMA_CFLAGS=`$PKG_CONFIG --cflags "xinerama" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--if test -n "$XINERAMA_LIBS"; then
--    pkg_cv_XINERAMA_LIBS="$XINERAMA_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XINERAMA_LIBS=`$PKG_CONFIG --libs "xinerama" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xinerama" 2>&1`
--        else
--	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --print-errors "xinerama" 2>&1`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$XINERAMA_PKG_ERRORS" >&5
--
--	XINERAMA_FOUND=no
--elif test $pkg_failed = untried; then
--     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--	XINERAMA_FOUND=no
--else
--	XINERAMA_CFLAGS=$pkg_cv_XINERAMA_CFLAGS
--	XINERAMA_LIBS=$pkg_cv_XINERAMA_LIBS
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--	XINERAMA_FOUND=yes
--
--fi
--if test "x${XINERAMA_FOUND}" = xno
--then
--  as_fn_error $? "Could not find Xinerama - \
--  Try installing libXinerama-devel." "$LINENO" 5
--fi
--
--
--
- if test "x${ENABLE_XRENDER}" = "xyes"
- then
- 
-@@ -11610,79 +11330,6 @@ fi
- 
- 
- 
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTST" >&5
--$as_echo_n "checking for XTST... " >&6; }
--
--if test -n "$XTST_CFLAGS"; then
--    pkg_cv_XTST_CFLAGS="$XTST_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xtst") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XTST_CFLAGS=`$PKG_CONFIG --cflags "xtst" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--if test -n "$XTST_LIBS"; then
--    pkg_cv_XTST_LIBS="$XTST_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xtst") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XTST_LIBS=`$PKG_CONFIG --libs "xtst" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        XTST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xtst" 2>&1`
--        else
--	        XTST_PKG_ERRORS=`$PKG_CONFIG --print-errors "xtst" 2>&1`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$XTST_PKG_ERRORS" >&5
--
--	XTST_FOUND=no
--elif test $pkg_failed = untried; then
--     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--	XTST_FOUND=no
--else
--	XTST_CFLAGS=$pkg_cv_XTST_CFLAGS
--	XTST_LIBS=$pkg_cv_XTST_LIBS
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--	XTST_FOUND=yes
--fi
--if test "x${XTST_FOUND}" = xno
--then
--  as_fn_error $? "Could not find Xtst - \
--  Try installing libXtst-devel." "$LINENO" 5
--fi
- 
- 
- 
-@@ -11764,85 +11411,6 @@ fi
- 
- 
- 
--if test "x${BUILD_OS_DIR}" = "xlinux"
--then
--
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
--$as_echo_n "checking for ALSA... " >&6; }
--
--if test -n "$ALSA_CFLAGS"; then
--    pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "alsa") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--if test -n "$ALSA_LIBS"; then
--    pkg_cv_ALSA_LIBS="$ALSA_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "alsa") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "alsa" 2>&1`
--        else
--	        ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "alsa" 2>&1`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$ALSA_PKG_ERRORS" >&5
--
--	ALSA_FOUND=no
--elif test $pkg_failed = untried; then
--     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--	ALSA_FOUND=no
--else
--	ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
--	ALSA_LIBS=$pkg_cv_ALSA_LIBS
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--	ALSA_FOUND=yes
--fi
--  if test "x${ALSA_FOUND}" = xno
--  then
--    as_fn_error $? "Could not find alsa - \
--    Try installing alsa-lib-devel." "$LINENO" 5
--  fi
--
--
--fi
- 
- if test "x${enable_pulse_java}" = "xyes"
- then
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
new file mode 100644
index 000000000..73812e426
--- /dev/null
+++ b/package/openjdk/Makefile
@@ -0,0 +1,86 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		openjdk
+PKG_VERSION:=		6
+PKG_EXTRAVER:=		b22-28_feb_2011
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		2d2bbbb0f9b81f1fec41ec730da8a933 fd3f35e8a8a2ef9a64c035ed66cea06d
+PKG_DESCR:=		OpenJDK Java VM
+PKG_SECTION:=		lang
+PKG_BUILDDEP:=		xproto jpeg zlib libX11 libpng freetype
+PKG_URL:=		http://openjdk.org/
+PKG_SITES:=		http://download.java.net/openjdk/jdk6/promoted/b22/ \
+			http://icedtea.classpath.org/download/source/
+
+# autotools infrastructure for OpenJDK
+ICEDTEA_NAME:=		icedtea6
+ICEDTEA_VERSION:=	1.10
+
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz $(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz
+NO_DISTFILES:=		1
+WRKDIST=		${WRKDIR}
+
+PKG_SUBPKGS:=		OPENJDK
+PKG_CFLINE_OPENJDK:=	select ADK_TOOLCHAIN_GCC_JAVA
+
+PKG_CHOICES_OPENJDK:=	ZERO SHARK CACAO JAMVM
+PKGCD_ZERO:=		zero-assembly backend
+PKGCD_SHARK:=		JIT backend
+PKGCD_CACAO:=		Cacao JIT backend
+PKGCD_JAMVM:=		JamVM backend
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+ifeq ($(ADK_PACKAGE_OPENJDK_ZERO),y)
+CONFIGURE_ARGS+=	--enable-zero
+endif
+ifeq ($(ADK_PACKAGE_OPENJDK_SHARK),y)
+CONFIGURE_ARGS+=	--enable-shark 
+endif
+
+CONFIGURE_ARGS+=	--disable-docs \
+			--enable-bootstrap \
+			--disable-openjdk-cross-compilation \
+			--with-jdk-home=$(STAGING_HOST_DIR)/lib/jvm \
+			--with-xalan2-jar=/usr/share/java/xalan.jar \
+			--with-xalan2-serializer-jar=/usr/share/java/serializer.jar \
+			--with-xerces2-jar=/usr/share/java/xercesImpl.jar \
+			--with-ecj-jar=$(TOPDIR)/dl/ecj.jar \
+			--with-gcj \
+			--without-rhino \
+			--disable-xrender \
+			--disable-nss
+
+do-extract:
+	(cd ${WRKBUILD}; mkdir $(PKG_NAME)-$(PKG_VERSION) ; tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C $(PKG_NAME)-$(PKG_VERSION))
+	(cd $(WRKBUILD); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz)
+
+pre-configure:
+	(cd ${WRKBUILD}/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION); rm -rf config.{cache,status} ; \
+		./configure \
+			--enable-bootstrap \
+			--enable-zero \
+			--disable-docs \
+			--disable-openjdk-cross-compilation \
+			--with-openjdk-src-dir=$(WRKBUILD)/$(PKG_NAME)-$(PKG_VERSION) \
+			--with-jdk-home=$(STAGING_HOST_DIR)/lib/jvm \
+			--with-xalan2-jar=/usr/share/java/xalan.jar \
+			--with-xalan2-serializer-jar=/usr/share/java/serializer.jar \
+			--with-xerces2-jar=/usr/share/java/xercesImpl.jar \
+			--with-ecj-jar=$(TOPDIR)/dl/ecj.jar \
+			--with-gcj \
+			--without-rhino \
+			--disable-xrender \
+			--disable-nss \
+	);
+	(cd $(WRKBUILD)/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION) ; ${MAKE} )
+
+openjdk-install:
+	$(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
new file mode 100644
index 000000000..7e19f5159
--- /dev/null
+++ b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
@@ -0,0 +1,29 @@
+--- w-openjdk-6-1.orig/icedtea6-1.10/Makefile.in	2011-03-02 20:48:45.161291458 +0100
++++ w-openjdk-6-1/icedtea6-1.10/Makefile.in	2011-03-28 17:00:03.591807998 +0200
+@@ -1329,7 +1329,7 @@ stamps/extract-openjdk.stamp: stamps/dow
+ @OPENJDK_SRC_DIR_FOUND_TRUE@	  cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk ; \
+ @OPENJDK_SRC_DIR_FOUND_TRUE@	fi
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@	if ! test -d openjdk ; then \
+-@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@	  cp -pPRl openjdk.hg openjdk ; \
++@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@	  cp -pPR openjdk.hg openjdk ; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@	fi
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@	set -e ; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@	if ! test -d openjdk ; \
+@@ -1576,7 +1576,7 @@ clean-overlay:
+ # FIXME (missing): Rename to clone-ecj.
+ stamps/extract-ecj.stamp: $(OPENJDK_TREE)
+ 	if ! test -d openjdk-ecj ; then \
+-	    cp -pPRl openjdk openjdk-ecj ; \
++	    cp -pPR openjdk openjdk-ecj ; \
+ 	fi
+ 	mkdir -p stamps
+ 	touch stamps/extract-ecj.stamp
+@@ -1644,7 +1644,7 @@ clean-patch-ecj:
+ stamps/native-ecj.stamp: 
+ 	mkdir -p stamps ; \
+ 	if test "x$(GCJ)" != "xno"; then \
+-	  $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
++	  $(GCJ) -static $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
+ 	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
+ 	fi ; \
+ 	touch stamps/native-ecj.stamp
diff --git a/package/openjdk/patches/patch-icedtea6-1_10_configure b/package/openjdk/patches/patch-icedtea6-1_10_configure
new file mode 100644
index 000000000..d9b96d1d4
--- /dev/null
+++ b/package/openjdk/patches/patch-icedtea6-1_10_configure
@@ -0,0 +1,479 @@
+--- w-openjdk-6-1.orig/icedtea6-1.10/configure	2011-03-02 20:48:44.321157333 +0100
++++ w-openjdk-6-1/icedtea6-1.10/configure	2011-03-28 15:30:08.791808629 +0200
+@@ -10805,22 +10805,6 @@ fi
+ 
+ 
+ 
+-for ac_header in cups/cups.h cups/ppd.h
+-do :
+-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-
+-else
+-  as_fn_error $? "\"CUPS headers were not found -
+-	try installing cups-devel.\"" "$LINENO" 5
+-fi
+-
+-done
+ 
+ for ac_header in X11/X.h
+ do :
+@@ -10879,46 +10863,6 @@ else
+   as_fn_error $? "\"libjpeg not found - try installing libjpeg-devel\"" "$LINENO" 5
+ fi
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5
+-$as_echo_n "checking for main in -lgif... " >&6; }
+-if ${ac_cv_lib_gif_main+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgif  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-
+-int
+-main ()
+-{
+-return main ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_gif_main=yes
+-else
+-  ac_cv_lib_gif_main=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5
+-$as_echo "$ac_cv_lib_gif_main" >&6; }
+-if test "x$ac_cv_lib_gif_main" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBGIF 1
+-_ACEOF
+-
+-  LIBS="-lgif $LIBS"
+-
+-else
+-  as_fn_error $? "\"giflib not found - try installing giflib-devel\"" "$LINENO" 5
+-fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lz" >&5
+ $as_echo_n "checking for main in -lz... " >&6; }
+@@ -11040,156 +10984,9 @@ fi
+ 
+ 
+ 
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XT" >&5
+-$as_echo_n "checking for XT... " >&6; }
+-
+-if test -n "$XT_CFLAGS"; then
+-    pkg_cv_XT_CFLAGS="$XT_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xt") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XT_CFLAGS=`$PKG_CONFIG --cflags "xt" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$XT_LIBS"; then
+-    pkg_cv_XT_LIBS="$XT_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xt") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XT_LIBS=`$PKG_CONFIG --libs "xt" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xt" 2>&1`
+-        else
+-	        XT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xt" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$XT_PKG_ERRORS" >&5
+-
+-	XT_FOUND=no
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	XT_FOUND=no
+-else
+-	XT_CFLAGS=$pkg_cv_XT_CFLAGS
+-	XT_LIBS=$pkg_cv_XT_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	XT_FOUND=yes
+-fi
+-if test "x${XT_FOUND}" = xno
+-then
+-  as_fn_error $? "Could not find Xt - \
+-  Try installing libXt-devel." "$LINENO" 5
+-fi
+-
+-
+-
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XP" >&5
+-$as_echo_n "checking for XP... " >&6; }
+-
+-if test -n "$XP_CFLAGS"; then
+-    pkg_cv_XP_CFLAGS="$XP_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xp") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XP_CFLAGS=`$PKG_CONFIG --cflags "xp" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$XP_LIBS"; then
+-    pkg_cv_XP_LIBS="$XP_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xp") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XP_LIBS=`$PKG_CONFIG --libs "xp" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+ 
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+ 
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xp" 2>&1`
+-        else
+-	        XP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xp" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$XP_PKG_ERRORS" >&5
+ 
+-	XP_FOUND=no
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	XP_FOUND=no
+-else
+-	XP_CFLAGS=$pkg_cv_XP_CFLAGS
+-	XP_LIBS=$pkg_cv_XP_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	XP_FOUND=yes
+-fi
+-if test "x${XP_FOUND}" = xno
+-then
+-  as_fn_error $? "Could not find Xp - \
+-  Try installing libXp-devel." "$LINENO" 5
+-fi
+ 
+ 
+ 
+@@ -11271,83 +11068,6 @@ fi
+ 
+ 
+ 
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XINERAMA" >&5
+-$as_echo_n "checking for XINERAMA... " >&6; }
+-
+-if test -n "$XINERAMA_CFLAGS"; then
+-    pkg_cv_XINERAMA_CFLAGS="$XINERAMA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XINERAMA_CFLAGS=`$PKG_CONFIG --cflags "xinerama" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$XINERAMA_LIBS"; then
+-    pkg_cv_XINERAMA_LIBS="$XINERAMA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XINERAMA_LIBS=`$PKG_CONFIG --libs "xinerama" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xinerama" 2>&1`
+-        else
+-	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --print-errors "xinerama" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$XINERAMA_PKG_ERRORS" >&5
+-
+-	XINERAMA_FOUND=no
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	XINERAMA_FOUND=no
+-else
+-	XINERAMA_CFLAGS=$pkg_cv_XINERAMA_CFLAGS
+-	XINERAMA_LIBS=$pkg_cv_XINERAMA_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	XINERAMA_FOUND=yes
+-
+-fi
+-if test "x${XINERAMA_FOUND}" = xno
+-then
+-  as_fn_error $? "Could not find Xinerama - \
+-  Try installing libXinerama-devel." "$LINENO" 5
+-fi
+-
+-
+-
+ if test "x${ENABLE_XRENDER}" = "xyes"
+ then
+ 
+@@ -11610,79 +11330,6 @@ fi
+ 
+ 
+ 
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTST" >&5
+-$as_echo_n "checking for XTST... " >&6; }
+-
+-if test -n "$XTST_CFLAGS"; then
+-    pkg_cv_XTST_CFLAGS="$XTST_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xtst") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XTST_CFLAGS=`$PKG_CONFIG --cflags "xtst" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$XTST_LIBS"; then
+-    pkg_cv_XTST_LIBS="$XTST_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xtst") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XTST_LIBS=`$PKG_CONFIG --libs "xtst" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        XTST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xtst" 2>&1`
+-        else
+-	        XTST_PKG_ERRORS=`$PKG_CONFIG --print-errors "xtst" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$XTST_PKG_ERRORS" >&5
+-
+-	XTST_FOUND=no
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	XTST_FOUND=no
+-else
+-	XTST_CFLAGS=$pkg_cv_XTST_CFLAGS
+-	XTST_LIBS=$pkg_cv_XTST_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	XTST_FOUND=yes
+-fi
+-if test "x${XTST_FOUND}" = xno
+-then
+-  as_fn_error $? "Could not find Xtst - \
+-  Try installing libXtst-devel." "$LINENO" 5
+-fi
+ 
+ 
+ 
+@@ -11764,85 +11411,6 @@ fi
+ 
+ 
+ 
+-if test "x${BUILD_OS_DIR}" = "xlinux"
+-then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
+-$as_echo_n "checking for ALSA... " >&6; }
+-
+-if test -n "$ALSA_CFLAGS"; then
+-    pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "alsa") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$ALSA_LIBS"; then
+-    pkg_cv_ALSA_LIBS="$ALSA_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "alsa") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "alsa" 2>&1`
+-        else
+-	        ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "alsa" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$ALSA_PKG_ERRORS" >&5
+-
+-	ALSA_FOUND=no
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	ALSA_FOUND=no
+-else
+-	ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
+-	ALSA_LIBS=$pkg_cv_ALSA_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	ALSA_FOUND=yes
+-fi
+-  if test "x${ALSA_FOUND}" = xno
+-  then
+-    as_fn_error $? "Could not find alsa - \
+-    Try installing alsa-lib-devel." "$LINENO" 5
+-  fi
+-
+-
+-fi
+ 
+ if test "x${enable_pulse_java}" = "xyes"
+ then
diff --git a/package/openjdk/patches/patch-openjdk-6_Makefile b/package/openjdk/patches/patch-openjdk-6_Makefile
new file mode 100644
index 000000000..2364d7ec0
--- /dev/null
+++ b/package/openjdk/patches/patch-openjdk-6_Makefile
@@ -0,0 +1,13 @@
+--- w-openjdk-6-1.orig/openjdk-6/Makefile	2011-02-28 17:02:07.000000000 +0100
++++ w-openjdk-6-1/openjdk-6/Makefile	2011-03-28 20:06:13.751809044 +0200
+@@ -25,9 +25,7 @@
+ 
+ BUILD_PARENT_DIRECTORY=.
+ 
+-ifndef TOPDIR
+-  TOPDIR:=.
+-endif
++TOPDIR:=.
+ 
+ ifndef JDK_TOPDIR
+   JDK_TOPDIR=$(TOPDIR)/jdk
-- 
cgit v1.2.3


From dd57c7c17b452f555fec0767f3a13e717c2a8cc1 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Mar 2011 18:05:16 +0200
Subject: allow lzma or newer xz-utils to be used

---
 scripts/scan-tools.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index 7d6d73e53..8834940c7 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -112,8 +112,8 @@ if ! which gzip >/dev/null 2>&1; then
 	out=1
 fi
 
-if ! which lzma >/dev/null 2>&1; then
-	echo You must install lzma to continue.
+if ! which lzma >/dev/null 2>&1 && ! which xz >/dev/null 2>&1; then
+	echo You must install lzma or xz-utils to continue.
 	echo
 	out=1
 fi
-- 
cgit v1.2.3


From 84b90159b05aaa4e914ce51d2b1319218c32d8a1 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Mar 2011 20:15:39 +0200
Subject: update to latest stable upstream version, refresh patch

---
 toolchain/gcc/Makefile.inc         |   4 +-
 toolchain/gcc/patches/cflags.patch | 179 +++++++++++++++++--------------------
 2 files changed, 85 insertions(+), 98 deletions(-)

diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc
index 585c0f85a..834d2fbb9 100644
--- a/toolchain/gcc/Makefile.inc
+++ b/toolchain/gcc/Makefile.inc
@@ -2,8 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		gcc
-PKG_VERSION:=		4.5.2
+PKG_VERSION:=		4.6.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d6559145853fbaaa0fd7556ed93bce9a
+PKG_MD5SUM:=		93d1c436bf991564524701259b6285a2
 PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/toolchain/gcc/patches/cflags.patch b/toolchain/gcc/patches/cflags.patch
index 0d5815a54..af4430fdc 100644
--- a/toolchain/gcc/patches/cflags.patch
+++ b/toolchain/gcc/patches/cflags.patch
@@ -1,36 +1,18 @@
-
-	This patch brings over a few features from MirBSD:
-	* -fhonour-copts
-	  If this option is not given, it's warned (depending
-	  on environment variables). This is to catch errors
-	  of misbuilt packages which override CFLAGS themselves.
-	* -Werror-maybe-reset
-	  Has the effect of -Wno-error if GCC_NO_WERROR is
-	  set and not '0', a no-operation otherwise. This is
-	  to be able to use -Werror in "make" but prevent
-	  GNU autoconf generated configure scripts from
-	  freaking out.
-	* Make -fno-strict-aliasing and -fno-delete-null-pointer-checks
-	  the default for -O2/-Os, because they trigger gcc bugs
-	  and can delete code with security implications.
-
-	This patch was authored by Thorsten Glaser <tg at mirbsd.de>
-	with copyright assignment to the FSF in effect.
-
---- a/gcc/c-opts.c
-+++ b/gcc/c-opts.c
-@@ -105,6 +105,9 @@
+diff -Nur gcc-4.6.0.orig/gcc/c-family/c-opts.c gcc-4.6.0/gcc/c-family/c-opts.c
+--- gcc-4.6.0.orig/gcc/c-family/c-opts.c	2011-01-26 07:48:04.000000000 +0100
++++ gcc-4.6.0/gcc/c-family/c-opts.c	2011-03-31 15:46:52.000000000 +0200
+@@ -103,6 +103,9 @@
  /* Number of deferred options scanned for -include.  */
  static size_t include_cursor;
  
 +/* Check if a port honours COPTS.  */
 +static int honour_copts = 0;
 +
- static void set_Wimplicit (int);
  static void handle_OPT_d (const char *);
  static void set_std_cxx98 (int);
-@@ -454,6 +457,9 @@
-       enable_warning_as_error ("implicit-function-declaration", value, CL_C | CL_ObjC); 
+ static void set_std_cxx0x (int);
+@@ -441,6 +444,9 @@
+       global_dc->warning_as_error_requested = value;
        break;
  
 +    case OPT_Werror_maybe_reset:
@@ -39,20 +21,19 @@
      case OPT_Wformat:
        set_Wformat (value);
        break;
-@@ -690,6 +701,12 @@
-       flag_exceptions = value;
+@@ -653,6 +659,11 @@
+       visibility_options.inlines_hidden = value;
        break;
  
 +    case OPT_fhonour_copts:
-+      if (c_language == clk_c) {
-+	honour_copts++;
-+      }
++      if (c_language == clk_c)
++		honour_copts++;
 +      break;
 +
-     case OPT_fimplement_inlines:
-       flag_implement_inlines = value;
+     case OPT_femit_struct_debug_baseonly:
+       set_struct_debug_option (&global_options, loc, "base");
        break;
-@@ -1209,6 +1226,47 @@
+@@ -1058,6 +1069,47 @@
        return false;
      }
  
@@ -100,10 +81,11 @@
    return true;
  }
  
---- a/gcc/c.opt
-+++ b/gcc/c.opt
-@@ -215,6 +215,10 @@
- C ObjC RejectNegative Warning
+diff -Nur gcc-4.6.0.orig/gcc/c-family/c.opt gcc-4.6.0/gcc/c-family/c.opt
+--- gcc-4.6.0.orig/gcc/c-family/c.opt	2011-02-17 22:34:10.000000000 +0100
++++ gcc-4.6.0/gcc/c-family/c.opt	2011-03-31 15:40:46.000000000 +0200
+@@ -363,6 +363,10 @@
+ C ObjC RejectNegative Warning Alias(Werror=, implicit-function-declaration)
  This switch is deprecated; use -Werror=implicit-function-declaration instead
  
 +Werror-maybe-reset
@@ -113,9 +95,9 @@
  Wfloat-equal
  C ObjC C++ ObjC++ Var(warn_float_equal) Warning
  Warn if testing floating point numbers for equality
-@@ -609,6 +613,9 @@
+@@ -790,6 +794,9 @@
  fhonor-std
- C++ ObjC++
+ C++ ObjC++ Ignore Warn(switch %qs is no longer supported)
  
 +fhonour-copts
 +C ObjC C++ ObjC++ RejectNegative
@@ -123,9 +105,10 @@
  fhosted
  C ObjC
  Assume normal C execution environment
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -102,6 +102,10 @@
+diff -Nur gcc-4.6.0.orig/gcc/common.opt gcc-4.6.0/gcc/common.opt
+--- gcc-4.6.0.orig/gcc/common.opt	2011-03-06 01:38:13.000000000 +0100
++++ gcc-4.6.0/gcc/common.opt	2011-03-31 15:40:46.000000000 +0200
+@@ -511,6 +511,10 @@
  Common Joined
  Treat specified warning as error
  
@@ -134,9 +117,9 @@
 +If environment variable GCC_NO_WERROR is set, act as -Wno-error
 +
  Wextra
- Common Warning
+ Common Var(extra_warnings) Warning
  Print extra (possibly unwanted) warnings
-@@ -573,6 +577,9 @@
+@@ -1147,6 +1151,9 @@
  Common Report Var(flag_guess_branch_prob) Optimization
  Enable guessing of branch probabilities
  
@@ -146,46 +129,9 @@
  ; Nonzero means ignore `#ident' directives.  0 means handle them.
  ; Generate position-independent code for executables if possible
  ; On SVR4 targets, it also controls whether or not to emit a
---- a/gcc/opts.c
-+++ b/gcc/opts.c
-@@ -896,8 +896,6 @@
-   flag_schedule_insns_after_reload = opt2;
- #endif
-   flag_regmove = opt2;
--  flag_strict_aliasing = opt2;
--  flag_strict_overflow = opt2;
-   flag_reorder_blocks = opt2;
-   flag_reorder_functions = opt2;
-   flag_tree_vrp = opt2;
-@@ -922,6 +919,8 @@
- 
-   /* -O3 optimizations.  */
-   opt3 = (optimize >= 3);
-+  flag_strict_aliasing = opt3;
-+  flag_strict_overflow = opt3;
-   flag_predictive_commoning = opt3;
-   flag_inline_functions = opt3;
-   flag_unswitch_loops = opt3;
-@@ -1601,6 +1601,17 @@
-       enable_warning_as_error (arg, value, lang_mask);
-       break;
- 
-+    case OPT_Werror_maybe_reset:
-+      {
-+	char *ev = getenv ("GCC_NO_WERROR");
-+	if ((ev != NULL) && (*ev != '0'))
-+	  warnings_are_errors = 0;
-+      }
-+      break;
-+
-+    case OPT_fhonour_copts:
-+      break;
-+
-     case OPT_Wlarger_than_:
-       /* This form corresponds to -Wlarger-than-. 
-          Kept for backward compatibility.
---- a/gcc/doc/cppopts.texi
-+++ b/gcc/doc/cppopts.texi
+diff -Nur gcc-4.6.0.orig/gcc/doc/cppopts.texi gcc-4.6.0/gcc/doc/cppopts.texi
+--- gcc-4.6.0.orig/gcc/doc/cppopts.texi	2010-12-20 08:26:12.000000000 +0100
++++ gcc-4.6.0/gcc/doc/cppopts.texi	2011-03-31 15:40:46.000000000 +0200
 @@ -164,6 +164,11 @@
  Make all warnings into hard errors.  Source code which triggers warnings
  will be rejected.
@@ -198,18 +144,19 @@
  @item -Wsystem-headers
  @opindex Wsystem-headers
  Issue warnings for code in system headers.  These are normally unhelpful
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -234,7 +234,7 @@
- -Wconversion  -Wcoverage-mismatch  -Wno-deprecated  @gol
+diff -Nur gcc-4.6.0.orig/gcc/doc/invoke.texi gcc-4.6.0/gcc/doc/invoke.texi
+--- gcc-4.6.0.orig/gcc/doc/invoke.texi	2011-03-18 15:34:52.000000000 +0100
++++ gcc-4.6.0/gcc/doc/invoke.texi	2011-03-31 15:41:41.000000000 +0200
+@@ -240,7 +240,7 @@
+ -Wconversion  -Wcoverage-mismatch  -Wcpp  -Wno-deprecated  @gol
  -Wno-deprecated-declarations -Wdisabled-optimization  @gol
- -Wno-div-by-zero -Wempty-body  -Wenum-compare -Wno-endif-labels @gol
---Werror  -Werror=* @gol
-+-Werror  -Werror=* -Werror-maybe-reset @gol
+ -Wno-div-by-zero -Wdouble-promotion -Wempty-body  -Wenum-compare @gol
+--Wno-endif-labels -Werror  -Werror=* @gol
++-Wno-endif-labels -Werror  -Werror=* -Werror-maybe-reset @gol
  -Wfatal-errors  -Wfloat-equal  -Wformat  -Wformat=2 @gol
  -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol
  -Wformat-security  -Wformat-y2k @gol
-@@ -4161,6 +4161,22 @@
+@@ -4488,6 +4488,22 @@
  @option{-Wall} and by @option{-pedantic}, which can be disabled with
  @option{-Wno-pointer-sign}.
  
@@ -232,7 +179,7 @@
  @item -Wstack-protector
  @opindex Wstack-protector
  @opindex Wno-stack-protector
-@@ -5699,7 +5715,7 @@
+@@ -6310,7 +6326,7 @@
  second branch or a point immediately following it, depending on whether
  the condition is known to be true or false.
  
@@ -241,9 +188,10 @@
  
  @item -fsplit-wide-types
  @opindex fsplit-wide-types
---- a/gcc/java/jvspec.c
-+++ b/gcc/java/jvspec.c
-@@ -670,6 +670,7 @@
+diff -Nur gcc-4.6.0.orig/gcc/java/jvspec.c gcc-4.6.0/gcc/java/jvspec.c
+--- gcc-4.6.0.orig/gcc/java/jvspec.c	2011-02-13 20:20:01.000000000 +0100
++++ gcc-4.6.0/gcc/java/jvspec.c	2011-03-31 15:40:46.000000000 +0200
+@@ -627,6 +627,7 @@
       class name.  Append dummy `.c' that can be stripped by set_input so %b
       is correct.  */ 
    set_input (concat (main_class_name, "main.c", NULL));
@@ -251,3 +199,42 @@
    err = do_spec (jvgenmain_spec);
    if (err == 0)
      {
+diff -Nur gcc-4.6.0.orig/gcc/opts.c gcc-4.6.0/gcc/opts.c
+--- gcc-4.6.0.orig/gcc/opts.c	2011-02-17 23:51:57.000000000 +0100
++++ gcc-4.6.0/gcc/opts.c	2011-03-31 15:43:52.000000000 +0200
+@@ -477,8 +477,6 @@
+     { OPT_LEVELS_2_PLUS, OPT_fschedule_insns2, NULL, 1 },
+ #endif
+     { OPT_LEVELS_2_PLUS, OPT_fregmove, NULL, 1 },
+-    { OPT_LEVELS_2_PLUS, OPT_fstrict_aliasing, NULL, 1 },
+-    { OPT_LEVELS_2_PLUS, OPT_fstrict_overflow, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_freorder_blocks, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_ftree_vrp, NULL, 1 },
+@@ -501,6 +499,8 @@
+     { OPT_LEVELS_3_PLUS_AND_SIZE, OPT_finline_functions, NULL, 1 },
+     { OPT_LEVELS_3_PLUS, OPT_funswitch_loops, NULL, 1 },
+     { OPT_LEVELS_3_PLUS, OPT_fgcse_after_reload, NULL, 1 },
++    { OPT_LEVELS_3_PLUS, OPT_fstrict_aliasing, NULL, 1 },
++    { OPT_LEVELS_3_PLUS, OPT_fstrict_overflow, NULL, 1 },
+     { OPT_LEVELS_3_PLUS, OPT_ftree_vectorize, NULL, 1 },
+     { OPT_LEVELS_3_PLUS, OPT_fipa_cp_clone, NULL, 1 },
+ 
+@@ -1399,6 +1399,17 @@
+ 			       opts, opts_set, loc, dc);
+       break;
+ 
++    case OPT_Werror_maybe_reset:
++      {
++	char *ev = getenv ("GCC_NO_WERROR");
++	if ((ev != NULL) && (*ev != '0'))
++	  warnings_are_errors = 0;
++      }
++      break;
++
++    case OPT_fhonour_copts:
++      break;
++
+     case OPT_Wlarger_than_:
+       opts->x_larger_than_size = value;
+       opts->x_warn_larger_than = value != -1;
-- 
cgit v1.2.3