From 7a10f4931bad2ef02fcf41e6d83d7b3e843f7ce2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 29 Apr 2014 10:59:10 +0200
Subject: add vfat to supported filesystems

---
 package/base-files/Makefile          | 2 +-
 package/base-files/src/etc/init.d/fs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index c9a343d59..b6e771d4a 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		82
+PKG_RELEASE:=		83
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
diff --git a/package/base-files/src/etc/init.d/fs b/package/base-files/src/etc/init.d/fs
index e995422ee..c524a089f 100644
--- a/package/base-files/src/etc/init.d/fs
+++ b/package/base-files/src/etc/init.d/fs
@@ -8,7 +8,7 @@
 # activate any logical volumes
 [ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay; }
 
-fstypes="ext2 ext3 ext4 xfs"
+fstypes="ext2 ext3 ext4 xfs vfat"
 
 # filesystem checks
 for fs in $fstypes; do
-- 
cgit v1.2.3


From 77826cce54a79049a8fb009c454518a849bd575d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 29 Apr 2014 11:40:18 +0200
Subject: finetune package

---
 package/samba/Makefile            | 4 +++-
 package/samba/files/smb.conf      | 6 +++---
 package/samba/files/swat.postinst | 6 ------
 3 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 package/samba/files/swat.postinst

diff --git a/package/samba/Makefile b/package/samba/Makefile
index 7279063b9..ab3334163 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		samba
 PKG_VERSION:=		3.6.23
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		2f7aee1dc5d31aefcb364600915b31dc
 PKG_DESCR:=		NetBIOS/SMB file and print server
 PKG_SECTION:=		net/fs
@@ -14,6 +14,8 @@ PKG_DEPENDS:=		samba-lib libuuid libpopt
 PKG_URL:=		http://www.samba.org/
 PKG_SITES:=		http://samba.org/samba/ftp/stable/
 
+PKG_CFLINE_SAMBA:=	select ADK_KERNEL_INOTIFY_USER
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		SAMBA SAMBA_CLIENT SAMBA_PASSWD SAMBA_LIB
diff --git a/package/samba/files/smb.conf b/package/samba/files/smb.conf
index 90ebf2bb4..8cae4dc2c 100644
--- a/package/samba/files/smb.conf
+++ b/package/samba/files/smb.conf
@@ -1,12 +1,12 @@
 [global]
- syslog = 3
+ syslog = 2
  syslog only = yes
- log level = 2
+ log level = 1
  workgroup = OpenADK
  server string = OpenADK Samba Server
  security = user
  encrypt passwords = yes
- guest account = root
+ guest account = nobody
  local master = yes
  name resolve order = hosts bcast
  pid directory = /var/run/samba
diff --git a/package/samba/files/swat.postinst b/package/samba/files/swat.postinst
deleted file mode 100644
index 85c2d226e..000000000
--- a/package/samba/files/swat.postinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_service swat 901/tcp
-grep -qe '^swat	' -e '^#swat	' $IPKG_INSTROOT/etc/inetd.conf 2>&- || \
-    echo '#swat	stream	tcp	nowait.400	root	/usr/bin/swat	swat' \
-    >>$IPKG_INSTROOT/etc/inetd.conf
-- 
cgit v1.2.3


From 30e7ab424389615d22867a9ac7d135da5f8bf20f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 29 Apr 2014 13:28:24 +0200
Subject: fix symlink

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

diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile
index b893cdb53..a0f3502de 100644
--- a/package/ntfs-3g/Makefile
+++ b/package/ntfs-3g/Makefile
@@ -5,9 +5,9 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ntfs-3g
 PKG_VERSION:=		2014.2.15
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		f11d563816249d730a00498983485f3a
-PKG_DESCR:=		ntfs filesystem driver
+PKG_DESCR:=		ntfs filesystem driver using fuse
 PKG_SECTION:=		fs
 PKG_DEPENDS:=		kmod-fuse-fs
 PKG_URL:=		http://tuxera.com
@@ -26,6 +26,6 @@ CONFIGURE_ARGS+=	--disable-ldconfig \
 ntfs-3g-install:
 	${INSTALL_DIR} ${IDIR_NTFS_3G}/bin
 	${INSTALL_BIN} ${WRKINST}/bin/ntfs-3g ${IDIR_NTFS_3G}/bin
-	cd ${WRKINST}/bin && ln -sf ntfs-3g mount.ntfs-3g
+	cd ${IDIR_NTFS_3G}/bin && ln -sf ntfs-3g mount.ntfs-3g
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From 31030399d3f01d6348b3fba4d1ff42e8b11ec0d3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 13 Apr 2014 17:23:54 +0200
Subject: remove unused

---
 target/sh/sys-available/toolchain-sh4   | 2 +-
 target/sh/sys-available/toolchain-sh4eb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/sh/sys-available/toolchain-sh4 b/target/sh/sys-available/toolchain-sh4
index 4d7fff826..91110cb0c 100644
--- a/target/sh/sys-available/toolchain-sh4
+++ b/target/sh/sys-available/toolchain-sh4
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4
 	bool "Toolchain only (little endian)"
 	select ADK_sh
 	select ADK_little
-	select ADK_toolchain_sh
+	select ADK_toolchain_sh4
 	select ADK_CPU_SH4
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
diff --git a/target/sh/sys-available/toolchain-sh4eb b/target/sh/sys-available/toolchain-sh4eb
index cccc163e1..70b99cb8e 100644
--- a/target/sh/sys-available/toolchain-sh4eb
+++ b/target/sh/sys-available/toolchain-sh4eb
@@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4EB
 	bool "Toolchain only (big endian)"
 	select ADK_sh
 	select ADK_big
-	select ADK_toolchain_sheb
+	select ADK_toolchain_sh4eb
 	select ADK_CPU_SH4
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
-- 
cgit v1.2.3


From f71879b1e9e706b6159dfcc62b64b62e63b6f6cb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 28 Apr 2014 08:50:21 +0200
Subject: fix description, do not select fpu

---
 target/arm/sys-available/toolchain-arm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm
index b9ba30aa5..876bcd84a 100644
--- a/target/arm/sys-available/toolchain-arm
+++ b/target/arm/sys-available/toolchain-arm
@@ -1,10 +1,9 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
-	bool "Toolchain only (little endian)"
+	bool "Toolchain only (soft float)"
 	select ADK_arm
 	select ADK_toolchain_arm
 	select ADK_little
 	select ADK_soft_float
-	select ADK_fpu_vfp
 	select ADK_eabi
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
-- 
cgit v1.2.3


From 0456a5ee2733ba01127043cc674aace662bd7c71 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 29 Apr 2014 21:59:55 +0200
Subject: exclude aarch64 from test-framework, set 3.13.11 as default kernel

---
 Config.in   | 1 +
 mk/build.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Config.in b/Config.in
index 3feae189d..3c3687555 100644
--- a/Config.in
+++ b/Config.in
@@ -106,6 +106,7 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_
 
 choice
 prompt "Kernel Version"
+default ADK_KERNEL_VERSION_3_13_11
 
 config ADK_KERNEL_VERSION_3_14_1
 	prompt "3.14.1"
diff --git a/mk/build.mk b/mk/build.mk
index 13e287d89..6d4f8a4e1 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -502,7 +502,7 @@ test-framework:
 	for libc in $$libc;do \
 		( \
 			mkdir -p $(TOPDIR)/firmware/; \
-			for arch in $$(grep -v m68k target/tarch.lst|xargs);do \
+			for arch in $$(grep -v "\(m68k\|aarch64\)" toolchain/$$libc/tarch.lst|xargs);do \
 				tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#" -e "s#hf##" -e "s#x86_64.*#x86_64#"); \
 				arch=$$(echo $$arch|sed -e 's#x86$$#i686#'); \
 				echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \
-- 
cgit v1.2.3


From 81d7f759d5c9bff2cfedfe121dbdff2f7842dcc2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 29 Apr 2014 22:11:09 +0200
Subject: fix mysql_config script

---
 package/mysql/Makefile                              |  5 ++++-
 package/mysql/patches/patch-scripts_mysql_config_sh | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 package/mysql/patches/patch-scripts_mysql_config_sh

diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index 759cab63c..293392a9c 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mysql
 PKG_VERSION:=		5.6.17
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		82114fa7c13fa3ca897b34666577d9f4
 PKG_DESCR:=		MySQL client library
 PKG_SECTION:=		db
@@ -36,6 +36,9 @@ host-build:
 	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
 		${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE)
 
+pre-configure:
+	$(SED) "s#@@STAGING_DIR@@#${STAGING_TARGET_DIR}#" ${WRKBUILD}/scripts/mysql_config.sh
+
 mysql-hostinstall:
 	$(INSTALL_BIN) ${WRKBUILD}/extra/comp_err \
 		$(STAGING_HOST_DIR)/usr/bin
diff --git a/package/mysql/patches/patch-scripts_mysql_config_sh b/package/mysql/patches/patch-scripts_mysql_config_sh
new file mode 100644
index 000000000..87ba2a833
--- /dev/null
+++ b/package/mysql/patches/patch-scripts_mysql_config_sh
@@ -0,0 +1,20 @@
+--- mysql-5.6.17.orig/scripts/mysql_config.sh	2014-03-14 20:07:28.000000000 +0100
++++ mysql-5.6.17/scripts/mysql_config.sh	2014-04-29 21:45:14.000000000 +0200
+@@ -83,7 +83,7 @@ execdir='@libexecdir@'
+ bindir='@bindir@'
+ 
+ # If installed, search for the compiled in directory first (might be "lib64")
+-pkglibdir='@pkglibdir@'
++pkglibdir='@@STAGING_DIR@@@pkglibdir@'
+ pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
+ fix_path pkglibdir $pkglibdir_rel lib/mysql lib
+ 
+@@ -91,7 +91,7 @@ plugindir='@pkgplugindir@'
+ plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
+ fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
+ 
+-pkgincludedir='@pkgincludedir@'
++pkgincludedir='@@STAGING_DIR@@@pkgincludedir@'
+ if [ -f "$basedir/include/mysql/mysql.h" ]; then
+   pkgincludedir="$basedir/include/mysql"
+ elif [ -f "$basedir/include/mysql.h" ]; then
-- 
cgit v1.2.3


From 96b68fb7047d2d355a6d3cc8409a0f1db95acec9 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 01:07:06 +0200
Subject: fix 32 bit userland with 64 bit kernel support

after onger discussion with Phil, I understood his old
patches and fixed support for x86 systems with 32 Bit userland
and 64 Bit kernel by using a biarch toolchain instead of
a multilib one.
---
 package/genext2fs/Makefile                      |  2 +
 target/config/Config.in                         |  2 +-
 target/x86/Makefile                             | 18 +++++++--
 target/x86/kernel/qemu-x86_64                   | 20 +++++++++
 target/x86/sys-available/qemu-x86_64-32         | 11 +++++
 target/x86_64/sys-available/toolchain-x86_64_32 | 12 ------
 toolchain/binutils/Makefile                     |  6 +--
 toolchain/gcc/Makefile                          | 13 ++++--
 toolchain/gcc/patches/4.8.2/abi32.patch         | 54 -------------------------
 9 files changed, 58 insertions(+), 80 deletions(-)
 create mode 100644 target/x86/kernel/qemu-x86_64
 create mode 100644 target/x86/sys-available/qemu-x86_64-32
 delete mode 100644 target/x86_64/sys-available/toolchain-x86_64_32
 delete mode 100644 toolchain/gcc/patches/4.8.2/abi32.patch

diff --git a/package/genext2fs/Makefile b/package/genext2fs/Makefile
index 4e8fea5bd..cf88ab095 100644
--- a/package/genext2fs/Makefile
+++ b/package/genext2fs/Makefile
@@ -11,6 +11,8 @@ PKG_DESCR:=		genext2fs utility
 PKG_SECTION:=		fs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=genext2fs/}
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+
 PKG_CFLINE_GENEXT2FS:=	depends on ADK_HOST_ONLY
 
 include $(TOPDIR)/mk/host.mk
diff --git a/target/config/Config.in b/target/config/Config.in
index 3d613bb1e..b1725b876 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -242,7 +242,7 @@ config ADK_TARGET_CUBOX_I1
 endchoice
 
 # global symbols
-config ADK_TARGET_KERNEL_MAY_64BIT
+config ADK_TARGET_KERNEL_64
 	boolean
 
 config ADK_TOOLCHAIN_ONLY
diff --git a/target/x86/Makefile b/target/x86/Makefile
index 736f1c359..89e59095a 100644
--- a/target/x86/Makefile
+++ b/target/x86/Makefile
@@ -8,6 +8,16 @@ include $(TOPDIR)/mk/kernel-build.mk
 include $(TOPDIR)/mk/image.mk
 
 KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
+
+QEMU_ARGS:=-M pc
+QEMU_ARGS+=${ADK_QEMU_ARGS}
+
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64_32),y)
+QEMU_ARCH:=x86_84
+else
+QEMU_ARCH:=i386
+endif
+
 ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y)
 ifeq ($(ADK_TARGET_QEMU_WITHOUT_GRAPHIC),y)
 CREATE:=./scripts/create.sh -g -t
@@ -43,9 +53,9 @@ ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "$(CREATE) qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following command line:"
 ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y)
-	@echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 qemu-${CPU_ARCH}.img'
+	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 qemu-${CPU_ARCH}.img'
 else
-	@echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
 endif
 endif
 ifeq ($(ADK_HARDWARE_VBOX),y)
@@ -72,7 +82,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
 ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -81,7 +91,7 @@ imageinstall: createinitramfs
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
 ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL)'
+	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
 endif
 ifeq (${ADK_TARGET_FS},iso)
diff --git a/target/x86/kernel/qemu-x86_64 b/target/x86/kernel/qemu-x86_64
new file mode 100644
index 000000000..7bf96c74c
--- /dev/null
+++ b/target/x86/kernel/qemu-x86_64
@@ -0,0 +1,20 @@
+CONFIG_X86=y
+CONFIG_64BIT=y
+CONFIG_X86_64=y
+CONFIG_GENERIC_CPU=y
+CONFIG_PROCESSOR_SELECT=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_MTRR=y
+CONFIG_X86_PAT=y
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+CONFIG_IA32_EMULATION=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E1000=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CONSOLE=y
diff --git a/target/x86/sys-available/qemu-x86_64-32 b/target/x86/sys-available/qemu-x86_64-32
new file mode 100644
index 000000000..f96e6ea35
--- /dev/null
+++ b/target/x86/sys-available/qemu-x86_64-32
@@ -0,0 +1,11 @@
+config ADK_TARGET_SYSTEM_QEMU_X86_64_32
+	bool "Qemu Emulator (x86_64) with 32Bit userland"
+	select ADK_x86
+	select ADK_qemu_x86_64_32
+	select ADK_CPU_I686
+	select ADK_HARDWARE_QEMU
+	select ADK_TARGET_KERNEL_BZIMAGE
+	select ADK_TARGET_KERNEL_64
+	help
+	 Support for Qemu Emulator (x86_64) with 32 Bit userland.
+
diff --git a/target/x86_64/sys-available/toolchain-x86_64_32 b/target/x86_64/sys-available/toolchain-x86_64_32
deleted file mode 100644
index 9e8297ea4..000000000
--- a/target/x86_64/sys-available/toolchain-x86_64_32
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64_32
-	bool "Toolchain only (32 ABI)"
-	select ADK_x86_64
-	select ADK_32
-	select ADK_toolchain_x86_64
-	select ADK_CPU_X86_64
-	select ADK_LINUX_64
-	select ADK_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  Build a x86_64 toolchain.
-
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 8947ee77e..0a41fc9f3 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -24,11 +24,7 @@ else
 CONFOPTS+=		--disable-gold
 endif
 
-ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
-CONFOPTS+=          	--with-arch=armv6
-endif
-
-ifneq ($(ADK_LINUX_64),)
+ifneq ($(ADK_LINUX_64)$(ADK_TARGET_KERNEL_64),)
 CONFOPTS+=		--enable-64-bit-bfd
 endif
 
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 63d0237c3..12ad4ebca 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -35,7 +35,7 @@ GCC_CONFOPTS:=		--prefix=$(TOOLCHAIN_DIR)/usr \
 			--disable-nls
 
 GCC_FINAL_CONFOPTS:=
-ifeq ($(ADK_LINUX_SH)$(ADK_LINUX_X86_64),)
+ifeq ($(ADK_LINUX_SH)$(ADK_LINUX_X86_64)$(ADK_LINUX_X86),)
 GCC_FINAL_CONFOPTS+=	--disable-biarch --disable-multilib
 endif
 
@@ -48,13 +48,18 @@ endif
 GCC_FINAL_CONFOPTS+=	--enable-multilib --with-multilib-list=m4,m4-nofpu
 endif
 
+ifeq ($(ADK_LINUX_X86),y)
+ifeq ($(ADK_TARGET_KERNEL_64),y)
+GCC_FINAL_CONFOPTS+=	--enable-biarch --enable-targets=all --disable-multilib
+else
+GCC_FINAL_CONFOPTS+=    --disable-biarch --disable-multilib
+endif
+endif
+
 ifeq ($(ADK_LINUX_X86_64),y)
 ifeq ($(ADK_x32),y)
 GCC_FINAL_CONFOPTS+=	--with-abi=x32
 endif
-ifeq ($(ADK_32),y)
-GCC_FINAL_CONFOPTS+=	--with-abi=32
-endif
 ifeq ($(ADK_64),y)
 GCC_FINAL_CONFOPTS+=	--disable-biarch --disable-multilib
 endif
diff --git a/toolchain/gcc/patches/4.8.2/abi32.patch b/toolchain/gcc/patches/4.8.2/abi32.patch
deleted file mode 100644
index 856d608bd..000000000
--- a/toolchain/gcc/patches/4.8.2/abi32.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Nur gcc-4.8.2.orig/gcc/config/i386/biarch32.h gcc-4.8.2/gcc/config/i386/biarch32.h
---- gcc-4.8.2.orig/gcc/config/i386/biarch32.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.8.2/gcc/config/i386/biarch32.h	2014-03-23 20:33:52.000000000 +0100
-@@ -0,0 +1,27 @@
-+/* Make configure files to produce biarch compiler defaulting to 32bit mode.
-+   This file must be included very first, while the OS specific file later
-+   to overwrite otherwise wrong defaults. 
-+   Copyright (C) 2001-2014 Free Software Foundation, Inc.
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 3, or (at your option)
-+any later version.
-+
-+GCC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+Under Section 7 of GPL version 3, you are granted additional
-+permissions described in the GCC Runtime Library Exception, version
-+3.1, as published by the Free Software Foundation.
-+
-+You should have received a copy of the GNU General Public License and
-+a copy of the GCC Runtime Library Exception along with this program;
-+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-+<http://www.gnu.org/licenses/>.  */
-+
-+#define TARGET_64BIT_DEFAULT 0
-diff -Nur gcc-4.8.2.orig/gcc/config.gcc gcc-4.8.2/gcc/config.gcc
---- gcc-4.8.2.orig/gcc/config.gcc	2013-10-03 02:47:24.000000000 +0200
-+++ gcc-4.8.2/gcc/config.gcc	2014-03-22 13:15:18.000000000 +0100
-@@ -522,6 +522,9 @@
- 	64 | m64)
- 		tm_file="i386/biarch64.h ${tm_file}"
- 		;;
-+	32 | m32)
-+		tm_file="i386/biarch32.h ${tm_file}"
-+		;;
- 	x32 | mx32)
- 		tm_file="i386/biarchx32.h ${tm_file}"
- 		;;
-@@ -1343,6 +1346,9 @@
- 		x32 | mx32)
- 			x86_multilibs="mx32"
- 			;;
-+		32 | m32)
-+			x86_multilibs="m32"
-+			;;
- 		*)
- 			x86_multilibs="m64,m32"
- 			;;
-- 
cgit v1.2.3


From 7bcadb06072bccdda7eebb8f9217e63745cf30b1 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 01:28:54 +0200
Subject: combine cubox-i kernel configs, make SMP, PREEMPT and HIGHMEM
 configurable

---
 target/arm/kernel/cubox-i            | 23 +++++++++++++++++++++++
 target/arm/kernel/cubox-i1           | 16 ----------------
 target/arm/kernel/cubox-i2           | 17 -----------------
 target/arm/kernel/cubox-i2ultra      | 24 ------------------------
 target/arm/kernel/cubox-i4pro        | 27 ---------------------------
 target/config/Config.in              | 10 ++--------
 target/linux/Config.in               |  1 +
 target/linux/config/Config.in.kernel | 33 ++++++++++++++++++++++++++-------
 8 files changed, 52 insertions(+), 99 deletions(-)
 create mode 100644 target/arm/kernel/cubox-i
 delete mode 100644 target/arm/kernel/cubox-i1
 delete mode 100644 target/arm/kernel/cubox-i2
 delete mode 100644 target/arm/kernel/cubox-i2ultra
 delete mode 100644 target/arm/kernel/cubox-i4pro

diff --git a/target/arm/kernel/cubox-i b/target/arm/kernel/cubox-i
new file mode 100644
index 000000000..0b56db7d7
--- /dev/null
+++ b/target/arm/kernel/cubox-i
@@ -0,0 +1,23 @@
+CONFIG_ARM=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_MXC=y
+CONFIG_ARCH_MX6=y
+CONFIG_SOC_IMX6Q=y
+CONFIG_SOC_IMX6SL=y
+CONFIG_LOCAL_TIMERS=y
+CONFIG_MXC_DEBUG_BOARD=y
+CONFIG_KUSER_HELPERS=y
+CONFIG_AEABI=y
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_NEON=y
+CONFIG_PCI_IMX6=y
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_FEC=y
+CONFIG_PHYLIB=y
+CONFIG_AT803X_PHY=y
+CONFIG_ATAGS=y
+CONFIG_CMDLINE_FORCE=y
diff --git a/target/arm/kernel/cubox-i1 b/target/arm/kernel/cubox-i1
deleted file mode 100644
index 82934afc0..000000000
--- a/target/arm/kernel/cubox-i1
+++ /dev/null
@@ -1,16 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX6=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_AEABI=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_DTC=y
-CONFIG_OF=y
-CONFIG_PCI_IMX6=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
diff --git a/target/arm/kernel/cubox-i2 b/target/arm/kernel/cubox-i2
deleted file mode 100644
index 3a6fecdf5..000000000
--- a/target/arm/kernel/cubox-i2
+++ /dev/null
@@ -1,17 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_SMP=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX6=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_AEABI=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_DTC=y
-CONFIG_OF=y
-CONFIG_PCI_IMX6=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
diff --git a/target/arm/kernel/cubox-i2ultra b/target/arm/kernel/cubox-i2ultra
deleted file mode 100644
index 47bc235c5..000000000
--- a/target/arm/kernel/cubox-i2ultra
+++ /dev/null
@@ -1,24 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_SMP=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX6=y
-CONFIG_SOC_IMX6Q=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_LOCAL_TIMERS=y
-CONFIG_MXC_DEBUG_BOARD=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_AEABI=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_PCI_IMX6=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_NET_VENDOR_FREESCALE=y
-CONFIG_FEC=y
-CONFIG_PHYLIB=y
-CONFIG_AT803X_PHY=y
-CONFIG_ATAGS=y
-CONFIG_CMDLINE_FORCE=y
diff --git a/target/arm/kernel/cubox-i4pro b/target/arm/kernel/cubox-i4pro
deleted file mode 100644
index 9d99b12a3..000000000
--- a/target/arm/kernel/cubox-i4pro
+++ /dev/null
@@ -1,27 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_SMP=y
-CONFIG_HIGHMEM=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX6=y
-CONFIG_SOC_IMX6Q=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_LOCAL_TIMERS=y
-CONFIG_MXC_DEBUG_BOARD=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_AEABI=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_DTC=y
-CONFIG_OF=y
-CONFIG_PCI_IMX6=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_NET_VENDOR_FREESCALE=y
-CONFIG_FEC=y
-CONFIG_PHYLIB=y
-CONFIG_AT803X_PHY=y
-CONFIG_ATAGS=y
-CONFIG_CMDLINE_FORCE=y
diff --git a/target/config/Config.in b/target/config/Config.in
index b1725b876..b5cd6121c 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -214,10 +214,7 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86_64_32 || ADK_TARGET_SYSTEM_QEMU_X86_64_X32
 	default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40
-	default "cubox-i4pro" if ADK_TARGET_CUBOX_I4PRO
-	default "cubox-i2ultra" if ADK_TARGET_CUBOX_I2ULTRA
-	default "cubox-i2" if ADK_TARGET_CUBOX_I2
-	default "cubox-i1" if ADK_TARGET_CUBOX_I1
+	default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I
 	default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
@@ -483,8 +480,6 @@ config ADK_TARGET_LIBC
 	default "glibc"  if ADK_glibc
 	default "musl"  if ADK_musl
 
-source "target/linux/config/Config.in.kernel"
-
 choice 
 prompt "Target C library"
 depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH
@@ -606,8 +601,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 		ADK_LINUX_PPC || \
 		ADK_LINUX_SPARC || \
 		ADK_LINUX_X86 || \
-		ADK_LINUX_X86_64 || \
-		ADK_LINUX_NATIVE
+		ADK_LINUX_X86_64
 	depends on !ADK_HARDWARE_VBOX
 	select ADK_KERNEL_EXT2_FS
 	help
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 778f4aa7c..03c4f079e 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -1,3 +1,4 @@
+source target/linux/config/Config.in.kernel
 source target/linux/config/Config.in.cpu
 source target/linux/config/Config.in.block
 source target/linux/config/Config.in.flash
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index aed028f79..e6dc6d6e9 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -106,12 +106,6 @@ config ADK_KERNEL_CPU_MIPS64_R1
 config ADK_KERNEL_CPU_MIPS64_R2
 	boolean
 
-config ADK_KERNEL_PREEMPT
-	boolean
-
-config ADK_KERNEL_THUMB2_KERNEL
-	boolean
-
 # page size
 config ADK_KERNEL_PAGE_SIZE_4KB
 	boolean
@@ -119,10 +113,13 @@ config ADK_KERNEL_PAGE_SIZE_4KB
 config ADK_KERNEL_PAGE_SIZE_16KB
 	boolean
 
-# ABI
+# ARM specific
 config ADK_KERNEL_AEABI
 	boolean
 
+config ADK_KERNEL_THUMB2_KERNEL
+	boolean
+
 # endianess
 config ADK_KERNEL_CPU_BIG_ENDIAN
 	default y if ADK_big
@@ -131,3 +128,25 @@ config ADK_KERNEL_CPU_BIG_ENDIAN
 config ADK_KERNEL_CPU_LITTLE_ENDIAN
 	default y if ADK_little
 	boolean
+
+menu "Kernel options"
+
+config ADK_KERNEL_SMP
+	prompt "Enable symmetric multi processing"
+	boolean
+	default y if ADK_TARGET_CUBOX_I4PRO
+	default y if ADK_TARGET_CUBOX_I2ULTRA
+	default n
+
+config ADK_KERNEL_HIGHMEM
+	prompt "Enable high memory"
+	boolean
+	default y if ADK_TARGET_CUBOX_I4PRO
+	default n
+
+config ADK_KERNEL_PREEMPT
+	prompt "Enable preemptive kernel"
+	boolean
+	default n
+
+endmenu
-- 
cgit v1.2.3


From 999c0d4d60937174ad592d3992e608415ff91a20 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 01:37:52 +0200
Subject: rework thumb2 support

do not change gcc defaults, discussed with phil, make
the resulting toolchains more conform.
---
 target/config/Config.in | 13 -------------
 toolchain/Config.in     | 15 ++++-----------
 toolchain/gcc/Makefile  |  1 -
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/target/config/Config.in b/target/config/Config.in
index b5cd6121c..8cc77b06c 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -50,12 +50,6 @@ config ADK_fpu_neon
 config ADK_fpu_vfp
 	boolean
 
-config ADK_mode_arm
-	boolean
-
-config ADK_mode_thumb
-	boolean
-
 config ADK_TARGET_FLOAT
 	string
 	default "hard" if ADK_hard_float
@@ -66,13 +60,6 @@ config ADK_TARGET_FPU
 	default "vfp" if ADK_fpu_vfp
 	default "neon" if ADK_fpu_neon
 
-config ADK_TARGET_ARM_MODE
-	depends on ADK_LINUX_ARM
-	string
-	default "arm" if ADK_mode_arm
-	default "thumb" if ADK_mode_thumb
-	default "arm"
-
 config ADK_TARGET_ENDIAN
 	string
 	default "little" if ADK_little
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 6a41140b8..f80c44841 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -44,18 +44,11 @@ config ADK_TOOLCHAIN_USE_GOLD
 	depends on ADK_TOOLCHAIN_GOLD
 	default n
 
-choice
-prompt "Use ARM thumb mode"
-depends on ADK_CPU_CORTEX_A9
-
-config ADK_LINUX_ARM_WITHOUT_THUMB
-	boolean "disabled"
-	select ADK_mode_arm
-
 config ADK_LINUX_ARM_WITH_THUMB
-	boolean "enabled"
-	select ADK_mode_thumb
+	prompt "Use THUMB2 ARM mode"
+	boolean
+	depends on ADK_CPU_CORTEX_A9 && ADK_TARGET_LIB_GLIBC
 	select ADK_KERNEL_THUMB2_KERNEL
+	default n
 
-endchoice
 endmenu
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 12ad4ebca..7616f2ab3 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -89,7 +89,6 @@ endif
 
 ifeq ($(ARCH),arm)
 GCC_CONFOPTS+=		--with-float=$(ADK_TARGET_FLOAT)
-GCC_CONFOPTS+=		--with-mode=$(ADK_TARGET_ARM_MODE)
 ifneq ($(ADK_TARGET_FPU),)
 GCC_CONFOPTS+=		--with-fpu=$(ADK_TARGET_FPU)
 endif
-- 
cgit v1.2.3


From d0dcbe4630cc167a473dfe2f896f4f72023f07c2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 01:59:17 +0200
Subject: fix leds kernel module packaging

---
 mk/modules.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mk/modules.mk b/mk/modules.mk
index 8f282498b..59f609cc8 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1482,15 +1482,15 @@ $(eval $(call KMOD_template,LEDS_ALIX2,leds-alix2,\
 ,10))
 
 $(eval $(call KMOD_template,LEDS_TRIGGER_TIMER,leds-trigger-timer,\
-	$(MODULES_DIR)/kernel/drivers/leds/ledtrig-timer \
+	$(MODULES_DIR)/kernel/drivers/leds/trigger/ledtrig-timer \
 ,20))
 
 $(eval $(call KMOD_template,LEDS_TRIGGER_HEARTBEAT,leds-trigger-heartbeat,\
-	$(MODULES_DIR)/kernel/drivers/leds/ledtrig-heartbeat \
+	$(MODULES_DIR)/kernel/drivers/leds/trigger/ledtrig-heartbeat \
 ,20))
 
 $(eval $(call KMOD_template,LEDS_TRIGGER_DEFAULT_ON,leds-trigger-default-on,\
-	$(MODULES_DIR)/kernel/drivers/leds/ledtrig-default-on \
+	$(MODULES_DIR)/kernel/drivers/leds/trigger/ledtrig-default-on \
 ,20))
 
 $(eval $(call KMOD_template,NETFILTER_XT_TARGET_LED,netfilter-xt-target-led,\
-- 
cgit v1.2.3


From 7f5413cc5602a961b5d3bbdcc8b9f98de33419af Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 13:04:05 +0200
Subject: set -mthumb when thum is choosen

---
 mk/vars.mk | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/mk/vars.mk b/mk/vars.mk
index 947aacbed..96a42592d 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -86,15 +86,6 @@ TARGET_CC+=		$(ADK_TARGET_ABI_CFLAGS)
 TARGET_CXX+=		$(ADK_TARGET_ABI_CFLAGS)
 endif
 
-MODE_FLAGS:=
-ifeq ($(ADK_LINUX_ARM),y)
-ifeq ($(ADK_LINUX_ARM_WITH_THUMB),y)
-MODE_FLAGS:=		-mthumb
-else
-MODE_FLAGS:=		-marm
-endif
-endif
-
 TARGET_CPPFLAGS:=	
 TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
 TARGET_CXXFLAGS:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident
@@ -149,9 +140,14 @@ TARGET_CFLAGS+=		-fno-unwind-tables -fno-asynchronous-unwind-tables
 TARGET_CFLAGS+=		-g3
 endif
 
-ifneq ($(MODE_FLAGS),)
-TARGET_CFLAGS+=		$(MODE_CFLAGS)
-TARGET_CXXFLAGS+=	$(MODE_CFLAGS)
+ifeq ($(ADK_LINUX_ARM),y)
+ifeq ($(ADK_LINUX_ARM_WITH_THUMB),y)
+TARGET_CFLAGS+=		-mthumb
+TARGET_CXXFLAGS+=	-mthumb
+else
+TARGET_CFLAGS+=		-marm
+TARGET_CXXFLAGS+=	-marm
+endif
 endif
 
 # A nifty macro to make testing gcc features easier (from uClibc project)
-- 
cgit v1.2.3


From 5a56253cede7a561a3256808f6e93ae26a750654 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 13:19:35 +0200
Subject: update

---
 BUGS |  3 ---
 TODO | 35 +++++++++++++++++++++++++----------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/BUGS b/BUGS
index 38c61307f..4ae9b352b 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,2 @@
-- qemu-sparc: startup kernel with gcc 4.8.2 broken
-- qemu-sh4: usb keyboard is broken
-- qemu-arm: thumb mode with glibc does not boot
 - qemu-sparc64: ide driver not working, only virtio (but unstable)
 - qemu-microblaze: ml605 early printk and network card emulation fails, little endian works
diff --git a/TODO b/TODO
index 7446514d5..0491af170 100644
--- a/TODO
+++ b/TODO
@@ -1,24 +1,39 @@
+global:
+- projects dir idea
+
+toolchain stuff:
 - hash-style=gnu for non-mips and non-musl
-- fix libiberty.a mess
 - check gold for mozilla compile
-- add stunnel
-- check for gcc and SSP again
+- check for gcc and SSP
 - config.site/config.cache usage for speedup?
   http://lists.gnu.org/archive/html/autoconf/2014-03/msg00031.html
-- add daemon() function to functions.sh
-- add printing of OK/FAIL (optional verbose bootup)
 - fixup rework libgcc --export-symbols
 - libgcc static?
 - static toolchain support
-- try Preset Loops per Jiffy for faster bootup via lpj=
-- port uuterm
+
+base system:
+- automount ntfs/ntfs-3g
+- add daemon() function to functions.sh
 - add fb full screen logo
-- port opkg with gpg signing
+- add printing of OK/FAIL (optional verbose bootup)
+- try Preset Loops per Jiffy for faster bootup via lpj=
 - restart network (kill wpa_supplicant)
 - essid with spaces
+
+new or update packages:
+- xbmc gotham
+- add rsyslog
+- add btrfs-utils
+- add stunnel
+- port uuterm
+- port opkg with gpg signing
 - add grsec kernel patch
-- microblaze: add cfgfs partition to dts, add partition to spartan dts
-- evaluate libguestfs for image creation
 - port msmtp
 - rutorrent porting
 - lms perl 
+
+system target specific:
+- fix ibm x40 bootup
+- reenable rb532
+- qemu superh more ram
+- microblaze: add cfgfs partition to dts, add partition to spartan dts
-- 
cgit v1.2.3


From c543dd2fde53678661dc25bfb52578cbe17168cc Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 13:20:09 +0200
Subject: update collections

---
 target/packages/pkg-available/console     | 2 +-
 target/packages/pkg-available/development | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/target/packages/pkg-available/console b/target/packages/pkg-available/console
index 68ff1f0b5..ff7654834 100644
--- a/target/packages/pkg-available/console
+++ b/target/packages/pkg-available/console
@@ -3,13 +3,13 @@ config ADK_PKG_CONSOLE
 	default n
 	select ADK_PACKAGE_ALSA_UTILS
 	select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER
-	select ADK_PACKAGE_DROPBEAR
 	select ADK_PACKAGE_SCREEN
 	select ADK_PACKAGE_SUDO
 	select ADK_PACKAGE_LINKS
 	select ADK_PACKAGE_ELINKS
 	select ADK_PACKAGE_LYNX
 	select ADK_PACKAGE_KEYCHAIN
+	select ADK_PACKAGE_OPENSSH
 	select ADK_PACKAGE_OPENSSH_CLIENT
 	select ADK_PACKAGE_OPENSSH_CLIENT_UTILS
 	select ADK_PACKAGE_OPENSSH_SERVER
diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development
index 6a883ebf2..9ea11f7f6 100644
--- a/target/packages/pkg-available/development
+++ b/target/packages/pkg-available/development
@@ -4,7 +4,6 @@ config ADK_PKG_DEVELOPMENT
 	select ADK_PACKAGE_BASH
 	select ADK_PACKAGE_BINUTILS
 	select ADK_PACKAGE_DIFFUTILS
-	select ADK_PACKAGE_FILE
 	select ADK_PACKAGE_GAWK
 	select ADK_PACKAGE_GCC
 	select ADK_PACKAGE_GXX
@@ -16,10 +15,8 @@ config ADK_PKG_DEVELOPMENT
 	select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
 	select ADK_PACKAGE_LIBNCURSES
 	select ADK_PACKAGE_LIBNCURSES_DEV
-	select ADK_PACKAGE_M4
 	select ADK_PACKAGE_MAKE
 	select ADK_PACKAGE_MKFONTDIR
-	select ADK_PACKAGE_PATCH
 	select ADK_PACKAGE_PERL
 	select BUSYBOX_STAT
 	select BUSYBOX_FEATURE_STAT_FORMAT
-- 
cgit v1.2.3


From fdfc7843aa85f23a3211afeb289042ec89738ace Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 13:20:51 +0200
Subject: more work need to be done, Xorg still broken

---
 package/xorg-server/Makefile                       |  6 ++-
 .../patches/patch-hw_kdrive_linux_linux_c          | 13 +++++
 .../patches/patch-hw_xfree86_common_compiler_h     | 58 +++++++++++++++++++++-
 .../patch-hw_xfree86_common_xf86VGAarbiter_h       | 18 +++++++
 .../xorg-server/patches/patch-hw_xfree86_dri_dri_c | 18 +++++++
 .../patches/patch-hw_xfree86_dri_sarea_h           | 11 ++++
 .../patch-hw_xfree86_os-support_linux_lnx_init_c   | 13 +++++
 .../patch-hw_xfree86_os-support_linux_lnx_video_c  | 23 +++++++++
 8 files changed, 158 insertions(+), 2 deletions(-)
 create mode 100644 package/xorg-server/patches/patch-hw_kdrive_linux_linux_c
 create mode 100644 package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_h
 create mode 100644 package/xorg-server/patches/patch-hw_xfree86_dri_dri_c
 create mode 100644 package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
 create mode 100644 package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c
 create mode 100644 package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c

diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index a8217311a..486bcec2e 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -31,7 +31,7 @@ PKG_ARCH_DEPENDS:=	!m68k
 
 PKG_FLAVOURS_XORG_SERVER:=	WITH_DRI WITH_KDRIVE
 PKGFS_WITH_DRI:=		mesalib
-PKGFD_WITH_DRI:=		enable DRI/DRI2 support
+PKGFD_WITH_DRI:=		enable DRI support
 PKGFB_WITH_DRI:=		xf86driproto glproto MesaLib
 PKGFD_WITH_KDRIVE:=		Build Kdrive Xfbdev server
 
@@ -78,6 +78,8 @@ CONFIGURE_ARGS+=	--enable-dga \
 			--disable-xcsecurity \
 			--disable-xvfb \
 			--disable-xvmc \
+			--disable-selective-werror \
+			--disable-strict-compilation \
 			--with-xkb-output=/tmp \
 			--with-os-vendor=OpenADK \
 			--with-vendor-web="http://openadk.org"
@@ -109,8 +111,10 @@ xorg-server-install:
 	${CP} ${WRKINST}/usr/bin/* $(IDIR_XORG_SERVER)/usr/bin
 	${CP} ${WRKINST}/usr/lib/xorg/modules/*.so \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules
+ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
 	${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*.so \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
+endif
 	${CP} ${WRKINST}/usr/lib/xorg/modules/multimedia/*.so \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia
 ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
diff --git a/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c b/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c
new file mode 100644
index 000000000..a7ad990e1
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c
@@ -0,0 +1,13 @@
+--- xorg-server-1.15.0.orig/hw/kdrive/linux/linux.c	2013-12-27 18:38:52.000000000 +0100
++++ xorg-server-1.15.0/hw/kdrive/linux/linux.c	2014-03-21 12:51:06.774068258 +0100
+@@ -66,8 +66,8 @@ static void
+ LinuxCheckChown(const char *file)
+ {
+     struct stat st;
+-    __uid_t u;
+-    __gid_t g;
++    uid_t u;
++    gid_t g;
+ 
+     if (stat(file, &st) < 0)
+         return;
diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
index 3a0eb0dbb..07737fafe 100644
--- a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
+++ b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
@@ -1,7 +1,63 @@
 from alpinelinux
 
 --- xorg-server-1.15.0.orig/hw/xfree86/common/compiler.h	2013-12-15 08:48:09.000000000 +0100
-+++ xorg-server-1.15.0/hw/xfree86/common/compiler.h	2014-03-14 23:25:52.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/common/compiler.h	2014-03-21 12:53:48.834417415 +0100
+@@ -727,26 +727,26 @@ xf86WriteMmio32LeNB(__volatile__ void *b
+ #define PORT_SIZE short
+ #endif
+ 
+-_X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
++_X_EXPORT volatile unsigned char *ioBase;  /* Memory mapped I/O port area */
+ 
+ static __inline__ void
+ outb(unsigned PORT_SIZE port, unsigned char val)
+ {
+-    *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
++    *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + ioBase) =
+         val;
+ }
+ 
+ static __inline__ void
+ outw(unsigned PORT_SIZE port, unsigned short val)
+ {
+-    *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
++    *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + ioBase) =
+         val;
+ }
+ 
+ static __inline__ void
+ outl(unsigned PORT_SIZE port, unsigned int val)
+ {
+-    *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
++    *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + ioBase) =
+         val;
+ }
+ 
+@@ -754,21 +754,21 @@ static __inline__ unsigned int
+ inb(unsigned PORT_SIZE port)
+ {
+     return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) +
+-                                        IOPortBase);
++                                        ioBase);
+ }
+ 
+ static __inline__ unsigned int
+ inw(unsigned PORT_SIZE port)
+ {
+     return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) +
+-                                         IOPortBase);
++                                         ioBase);
+ }
+ 
+ static __inline__ unsigned int
+ inl(unsigned PORT_SIZE port)
+ {
+     return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) +
+-                                       IOPortBase);
++                                       ioBase);
+ }
+ 
+ #if defined(__mips__)
 @@ -995,7 +995,7 @@ inl(unsigned short port)
      return xf86ReadMmio32Le((void *) ioBase, port);
  }
diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_h b/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_h
new file mode 100644
index 000000000..599c558d0
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_h
@@ -0,0 +1,18 @@
+--- xorg-server-1.15.0.orig/hw/xfree86/common/xf86VGAarbiter.h	2013-12-15 08:48:09.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/common/xf86VGAarbiter.h	2014-03-21 17:00:39.953676328 +0100
+@@ -30,6 +30,7 @@
+ #include "misc.h"
+ #include "xf86.h"
+ 
++#ifdef XSERVER_LIBPCIACCESS
+ /* Functions */
+ extern void xf86VGAarbiterInit(void);
+ extern void xf86VGAarbiterFini(void);
+@@ -41,6 +42,7 @@ extern void xf86VGAarbiterUnlock(ScrnInf
+ /* allow a driver to remove itself from arbiter - really should be
+  * done in the kernel though */
+ extern _X_EXPORT void xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn, int rsrc);
++#endif
+ 
+ /* DRI and arbiter are really not possible together,
+  * you really want to remove the card from arbitration if you can */
diff --git a/package/xorg-server/patches/patch-hw_xfree86_dri_dri_c b/package/xorg-server/patches/patch-hw_xfree86_dri_dri_c
new file mode 100644
index 000000000..6f0f10aec
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_dri_dri_c
@@ -0,0 +1,18 @@
+--- xorg-server-1.15.0.orig/hw/xfree86/dri/dri.c	2013-12-27 18:38:52.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/dri/dri.c	2014-03-21 16:18:51.934149666 +0100
+@@ -37,6 +37,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #include <xorg-config.h>
+ #endif
+ 
++#include "xf86VGAarbiter.h"
+ #include "xf86.h"
+ #include <sys/time.h>
+ #include <unistd.h>
+@@ -68,7 +69,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #include "mipointer.h"
+ #include "xf86_OSproc.h"
+ #include "inputstr.h"
+-#include "xf86VGAarbiter.h"
+ #include "xf86Extensions.h"
+ 
+ static int DRIEntPrivIndex = -1;
diff --git a/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h b/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
new file mode 100644
index 000000000..12f64f718
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
@@ -0,0 +1,11 @@
+--- xorg-server-1.15.0.orig/hw/xfree86/dri/sarea.h	2013-12-15 08:48:09.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/dri/sarea.h	2014-03-21 12:54:54.486559308 +0100
+@@ -43,6 +43,8 @@
+ #define SAREA_MAX 			0x2000
+ #elif defined(__ia64__)
+ #define SAREA_MAX			0x10000 /* 64kB */
++#elif defined(__mips__)
++#define SAREA_MAX			0x4000
+ #else
+ /* Intel 830M driver needs at least 8k SAREA */
+ #define SAREA_MAX			0x2000
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c
new file mode 100644
index 000000000..d170fa424
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c
@@ -0,0 +1,13 @@
+--- xorg-server-1.15.0.orig/hw/xfree86/os-support/linux/lnx_init.c	2013-12-27 18:38:52.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/os-support/linux/lnx_init.c	2014-03-21 12:56:02.898707432 +0100
+@@ -83,8 +83,8 @@ xf86OpenConsole(void)
+     struct vt_mode VT;
+     struct vt_stat vts;
+     MessageType from = X_PROBED;
+-    char *tty0[] = { "/dev/tty0", "/dev/vc/0", NULL };
+-    char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL };
++    char *tty0[] = { "/dev/tty0", NULL };
++    char *vcs[] = { "/dev/tty%d", NULL };
+ 
+     if (serverGeneration == 1) {
+ 
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
new file mode 100644
index 000000000..843cc145b
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
@@ -0,0 +1,23 @@
+--- xorg-server-1.15.0.orig/hw/xfree86/os-support/linux/lnx_video.c	2013-12-27 18:38:52.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/os-support/linux/lnx_video.c	2014-03-21 13:14:06.821293270 +0100
+@@ -473,7 +473,7 @@ unmapVidMem(int ScreenNum, pointer Base,
+ /* I/O Permissions section                                                 */
+ /***************************************************************************/
+ 
+-#if defined(__powerpc__)
++#if defined(__powerpc__) || defined(__mips__)
+ volatile unsigned char *ioBase = NULL;
+ 
+ #ifndef __NR_pciconfig_iobase
+@@ -484,7 +484,11 @@ static Bool
+ hwEnableIO(void)
+ {
+     int fd;
++#ifdef __powerpc__
+     unsigned int ioBase_phys = syscall(__NR_pciconfig_iobase, 2, 0, 0);
++#else
++    unsigned int ioBase_phys = 0x1fd00000;
++#endif
+ 
+     fd = open("/dev/mem", O_RDWR);
+     if (ioBase == NULL) {
-- 
cgit v1.2.3


From 30d6f21d2fb3ca89a86346994a70a436afbb2e14 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 13:24:21 +0200
Subject: update openswan

---
 package/openswan/Makefile                           |  4 ++--
 package/openswan/patches/patch-Makefile_inc         | 21 +++++++++++++++++----
 package/openswan/patches/patch-Makefile_top         | 11 -----------
 .../patches/patch-lib_libopenswan_alg_info_c        | 12 ------------
 4 files changed, 19 insertions(+), 29 deletions(-)
 delete mode 100644 package/openswan/patches/patch-Makefile_top
 delete mode 100644 package/openswan/patches/patch-lib_libopenswan_alg_info_c

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 5dc4245b6..1c981f30b 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openswan
-PKG_VERSION:=		2.6.38
+PKG_VERSION:=		2.6.41
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		13073eb5314b83a31be88e4117e8bbcd
+PKG_MD5SUM:=		da2e8b02ecc30a408cc5766767fef84f
 PKG_DESCR:=		IPsec software
 PKG_SECTION:=		net/security
 PKG_DEPENDS:=		ip libgmp libpthread kmod-net-key kmod-xfrm-user
diff --git a/package/openswan/patches/patch-Makefile_inc b/package/openswan/patches/patch-Makefile_inc
index 2a2040949..9c73c7ce0 100644
--- a/package/openswan/patches/patch-Makefile_inc
+++ b/package/openswan/patches/patch-Makefile_inc
@@ -1,5 +1,5 @@
---- openswan-2.6.37.orig/Makefile.inc	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/Makefile.inc	2011-12-01 17:30:31.000000000 +0100
+--- openswan-2.6.41.orig/Makefile.inc	2014-02-21 21:46:57.000000000 +0100
++++ openswan-2.6.41/Makefile.inc	2014-03-12 18:39:50.906115397 +0100
 @@ -169,7 +169,7 @@ INSTALL=install
  # how backup names are composed.
  # Note that the install procedures will never overwrite an existing config
@@ -9,7 +9,20 @@
  INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
  INSTMANFLAGS=
  INSTCONFFLAGS=
-@@ -279,12 +279,12 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F
+@@ -191,10 +191,10 @@ BISONOSFLAGS=
+ #Example for a cross compile:
+ #USERCOMPILE?=-g ${PORTDEFINE} -I/usr/local/arm_tools/arm-elf/inc -L/usr/local/arm_tools/lib/gcc-lib
+ GCC_LINT ?= -DGCC_LINT
+-USERCOMPILE?=-g -O3 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT)
++USERCOMPILE?=-g -O3 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT)
+ # on fedora/rhel
+ #USERCOMPILE?=-g -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4  -m64 -mtune=generic -fPIE -pie -DSUPPORT_BROKEN_ANDROID_ICS
+-KLIPSCOMPILE=-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM
++KLIPSCOMPILE=-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM
+ # Additional debugging for developers (warning: can crash openswan!)
+ #USERCOMPILE?=-g -DLEAK_DETECTIVE -lefence
+ # You can also run this before starting openswan on glibc systems:
+@@ -283,12 +283,12 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F
  # Note you need a locally running bind9 nameserver with lwres{} enabled
  # to use this, or have the "lwres" package installed and running.
  # This only affects conns that use DNS for keys in lookups.
@@ -23,4 +36,4 @@
 +USE_DYNAMICDNS?=false
  
  # Do we want all the configuration files like ipsec.conf and ipsec.secrets
- # and any certificates to be in a single directory defined by 
+ # and any certificates to be in a single directory defined by
diff --git a/package/openswan/patches/patch-Makefile_top b/package/openswan/patches/patch-Makefile_top
deleted file mode 100644
index 410670312..000000000
--- a/package/openswan/patches/patch-Makefile_top
+++ /dev/null
@@ -1,11 +0,0 @@
---- openswan-2.6.38.orig/Makefile.top	2012-03-23 22:33:43.000000000 +0100
-+++ openswan-2.6.38/Makefile.top	2012-07-25 18:17:21.000000000 +0200
-@@ -26,7 +26,7 @@ ERRCHECK=${MAKEUTILS}/errcheck
- KVUTIL=${MAKEUTILS}/kernelversion
- KVSHORTUTIL=${MAKEUTILS}/kernelversion-short
- 
--SUBDIRS?=lib programs testing
-+SUBDIRS?=lib programs
- 
- clean::
- 	-(cd ${OPENSWANSRCDIR} && $(MAKE) modclean && $(MAKE) mod26clean)
diff --git a/package/openswan/patches/patch-lib_libopenswan_alg_info_c b/package/openswan/patches/patch-lib_libopenswan_alg_info_c
deleted file mode 100644
index 3ac8e824b..000000000
--- a/package/openswan/patches/patch-lib_libopenswan_alg_info_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openswan-2.6.38.orig/lib/libopenswan/alg_info.c	2012-03-23 22:33:43.000000000 +0100
-+++ openswan-2.6.38/lib/libopenswan/alg_info.c	2012-07-25 18:17:21.000000000 +0200
-@@ -778,7 +778,7 @@ alg_info_discover_pfsgroup_hack(struct a
-     static char err_buf[256];
-     int ret;
-     
--    pfs_name=index(esp_buf, ';');
-+    pfs_name=strchr(esp_buf, ';');
-     
-     if(pfs_name) {
- 	*pfs_name='\0';
-- 
cgit v1.2.3


From 5a43da1af12df3a39cd30b724bf9144850bd2764 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 13:26:35 +0200
Subject: experimental midori support

---
 package/geoclue/Makefile                           |  29 +
 package/harfbuzz/Makefile                          |  10 +-
 package/icu4c/Makefile                             |  47 ++
 package/json-glib/Makefile                         |  27 +
 package/libcroco/Makefile                          |  32 +
 package/librsvg/Makefile                           |  34 +
 package/libsecret/Makefile                         |  31 +
 package/libsecret/patches/patch-Makefile_am        |  26 +
 package/libsecret/patches/patch-Makefile_am.orig   |  11 +
 package/libsecret/patches/patch-configure_ac       |  44 ++
 package/libsecret/patches/patch-configure_ac.orig  |  35 ++
 .../patch-docs_reference_libsecret_Makefile_am     |  20 +
 ...patch-docs_reference_libsecret_Makefile_am.orig |  11 +
 .../libsecret/patches/patch-libsecret_Makefile_am  |  95 +++
 .../patches/patch-libsecret_tests_Makefile_am      | 113 ++++
 .../patches/patch-libsecret_tests_Makefile_am.orig |  72 +++
 package/libsoup/Makefile                           |  31 +
 package/libsoup/patches/patch-Makefile_am          |  20 +
 .../libsoup/patches/patch-build-aux_config_guess   | 447 ++++++++++++++
 package/libsoup/patches/patch-build-aux_config_sub | 183 ++++++
 package/libsoup/patches/patch-build-aux_depcomp    | 682 +++++++++++++++++++++
 package/libsoup/patches/patch-build-aux_missing    | 440 +++++++++++++
 package/libsoup/patches/patch-configure_ac         |  10 +
 package/libwebp/Makefile                           |  25 +
 package/ltrace/Makefile                            |  26 +
 package/ltrace/patches/patch-breakpoints_c         |  14 +
 package/ltrace/patches/patch-breakpoints_c.orig    |  14 +
 package/ltrace/patches/patch-handle_event_c        |  19 +
 package/ltrace/patches/patch-proc_c                |  32 +
 package/midori/Makefile                            |  40 ++
 package/vala/Makefile                              |  33 +
 package/webkitgtk/Makefile                         |  43 ++
 32 files changed, 2693 insertions(+), 3 deletions(-)
 create mode 100644 package/geoclue/Makefile
 create mode 100644 package/icu4c/Makefile
 create mode 100644 package/json-glib/Makefile
 create mode 100644 package/libcroco/Makefile
 create mode 100644 package/librsvg/Makefile
 create mode 100644 package/libsecret/Makefile
 create mode 100644 package/libsecret/patches/patch-Makefile_am
 create mode 100644 package/libsecret/patches/patch-Makefile_am.orig
 create mode 100644 package/libsecret/patches/patch-configure_ac
 create mode 100644 package/libsecret/patches/patch-configure_ac.orig
 create mode 100644 package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am
 create mode 100644 package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am.orig
 create mode 100644 package/libsecret/patches/patch-libsecret_Makefile_am
 create mode 100644 package/libsecret/patches/patch-libsecret_tests_Makefile_am
 create mode 100644 package/libsecret/patches/patch-libsecret_tests_Makefile_am.orig
 create mode 100644 package/libsoup/Makefile
 create mode 100644 package/libsoup/patches/patch-Makefile_am
 create mode 100644 package/libsoup/patches/patch-build-aux_config_guess
 create mode 100644 package/libsoup/patches/patch-build-aux_config_sub
 create mode 100644 package/libsoup/patches/patch-build-aux_depcomp
 create mode 100644 package/libsoup/patches/patch-build-aux_missing
 create mode 100644 package/libsoup/patches/patch-configure_ac
 create mode 100644 package/libwebp/Makefile
 create mode 100644 package/ltrace/Makefile
 create mode 100644 package/ltrace/patches/patch-breakpoints_c
 create mode 100644 package/ltrace/patches/patch-breakpoints_c.orig
 create mode 100644 package/ltrace/patches/patch-handle_event_c
 create mode 100644 package/ltrace/patches/patch-proc_c
 create mode 100644 package/midori/Makefile
 create mode 100644 package/vala/Makefile
 create mode 100644 package/webkitgtk/Makefile

diff --git a/package/geoclue/Makefile b/package/geoclue/Makefile
new file mode 100644
index 000000000..113d400eb
--- /dev/null
+++ b/package/geoclue/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:=		geoclue
+PKG_VERSION:=		1.99.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		514efbecd69c78b3e0a3d86012b7d88c
+PKG_DESCR:=		D-Bus service that provides location information
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		json-glib
+PKG_BUILDDEP:=		json-glib
+PKG_URL:=		http://www.freedesktop.org/wiki/Software/GeoClue/
+PKG_SITES:=		http://www.freedesktop.org/software/geoclue/releases/1.99/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GEOCLUE,geoclue,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+geoclue-install:
+	$(INSTALL_DIR) $(IDIR_GEOCLUE)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/geoclue*.so* \
+		$(IDIR_GEOCLUE)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile
index d2530b5a1..07a84a5b4 100644
--- a/package/harfbuzz/Makefile
+++ b/package/harfbuzz/Makefile
@@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		harfbuzz
 PKG_VERSION:=		0.9.9
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		e901ffe556d706b7d43b272f83be7f09
 PKG_DESCR:=		OpenType text shaping engine
 PKG_SECTION:=		libs
 PKG_SITES:=		http://www.freedesktop.org/software/harfbuzz/release/
-PKG_DEPENDS:=		libstdcxx cairo
-PKG_BUILDDEP:=		libstdcxx cairo
+PKG_DEPENDS:=		libstdcxx cairo icu4c
+PKG_BUILDDEP:=		libstdcxx cairo icu4c
 PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	!m68k
@@ -22,6 +22,10 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+pre-install:
+	$(INSTALL_DIR) $(WRKINST)/usr/include/harfbuzz
+	$(CP) $(WRKBUILD)/src/hb-icu.h $(WRKINST)/usr/include/harfbuzz
+
 harfbuzz-install:
 	$(INSTALL_DIR) $(IDIR_HARFBUZZ)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libharfbuzz*.so* \
diff --git a/package/icu4c/Makefile b/package/icu4c/Makefile
new file mode 100644
index 000000000..772e147b5
--- /dev/null
+++ b/package/icu4c/Makefile
@@ -0,0 +1,47 @@
+# 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:=		icu4c
+PKG_VERSION:=		52.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		9e96ed4c1d99c0d14ac03c140f9f346c
+PKG_DESCR:=		unicode and globalization library
+PKG_SECTION:=		libs
+PKG_BUILDDEP:=		icu4c-host
+PKG_URL:=		http://icu-project.org
+PKG_SITES:=		http://download.icu-project.org/files/icu4c/52.1/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-52_1-src.tgz
+
+WRKDIST=		${WRKDIR}/icu/source
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,ICU4C,icu4c,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,ICU4C,icu4c,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+HOST_STYLE:=		auto
+HOST_CONFIGURE_ARGS+=	--enable-extras=no \
+			--enable-samples=no \
+			--enable-tests=no \
+			--enable-shared=no \
+			--enable-dyload=no \
+			--enable-static
+CONFIGURE_ARGS+=	--with-cross-build=${HOST_BUILD_DIR}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host/icu/source \
+			--enable-extras=no \
+			--enable-samples=no \
+			--enable-tests=no \
+
+icu4c-hostinstall:
+
+icu4c-install:
+	$(INSTALL_DIR) $(IDIR_ICU4C)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libicuuc.so* \
+		$(IDIR_ICU4C)/usr/lib
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/json-glib/Makefile b/package/json-glib/Makefile
new file mode 100644
index 000000000..f293c8384
--- /dev/null
+++ b/package/json-glib/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
+
+PKG_NAME:=		json-glib
+PKG_VERSION:=		0.14.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		2a22832c4654156a35b38ee027f6f065
+PKG_DESCR:=		a library providing serialization and deserialization support for the JavaScript Object Notation (JSON) format 
+PKG_SECTION:=		libs
+PKG_URL:=		https://wiki.gnome.org/JsonGlib/
+PKG_SITES:=		http://ftp.gnome.org/pub/GNOME/sources/json-glib/0.14/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,JSON_GLIB,json-glib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+json-glib-install:
+	$(INSTALL_DIR) $(IDIR_JSON_GLIB)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libjson-glib*.so* \
+		$(IDIR_JSON_GLIB)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libcroco/Makefile b/package/libcroco/Makefile
new file mode 100644
index 000000000..8e6775354
--- /dev/null
+++ b/package/libcroco/Makefile
@@ -0,0 +1,32 @@
+# 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:=		libcroco
+PKG_VERSION:=		0.6.8
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		767e73c4174f75b99695d4530fd9bb80
+PKG_DESCR:=		CSS2 parsing and manipulation library
+PKG_SECTION:=		libs
+PKG_URL:=		https://github.com/GNOME/libcroco
+PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,LIBCROCO,libcroco,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBCROCO,libcroco,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+HOST_STYLE:=		auto
+
+libcroco-install:
+	$(INSTALL_DIR) $(IDIR_LIBCROCO)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libcroco*.so* \
+		$(IDIR_LIBCROCO)/usr/lib
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/librsvg/Makefile b/package/librsvg/Makefile
new file mode 100644
index 000000000..39eeaab5d
--- /dev/null
+++ b/package/librsvg/Makefile
@@ -0,0 +1,34 @@
+# 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:=		librsvg
+PKG_VERSION:=		2.40.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		acdecdb9f08f3bf662a68bf7dafb8b82
+PKG_DESCR:=		SVG library
+PKG_BUILDDEP:=		libcroco
+HOST_BUILDDEP:=		libcroco-host
+PKG_SECTION:=		libs
+PKG_URL:=		https://wiki.gnome.org/action/show/Projects/LibRsvg?action=show&redirect=LibRsvg
+PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/librsvg/2.40/
+
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,LIBRSVG,librsvg,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBRSVG,librsvg,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+HOST_STYLE:=		auto
+CONFIGURE_ARGS+=	--enable-introspection=no
+
+librsvg-install:
+	$(INSTALL_DIR) $(IDIR_LIBRSVG)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/librsvg*.so* \
+		$(IDIR_LIBRSVG)/usr/lib
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libsecret/Makefile b/package/libsecret/Makefile
new file mode 100644
index 000000000..6659cbc67
--- /dev/null
+++ b/package/libsecret/Makefile
@@ -0,0 +1,31 @@
+# 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:=		libsecret
+PKG_VERSION:=		0.16
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		ab0edcd5887a6fe78c948e36b6341858
+PKG_DESCR:=		library for storing and retrieving passwords
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		libgcrypt
+PKG_BUILDDEP:=		autotool libgcrypt
+PKG_URL:=		https://wiki.gnome.org/Libsecret
+PKG_SITES:=		https://git.gnome.org/browse/libsecret/snapshot/
+PKG_OPTS:=		dev
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSECRET,libsecret,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+AUTOTOOL_STYLE:=	autoreconf
+CONFIGURE_ARGS+=	--enable-vala=no \
+			--enable-gcrypt
+
+libsecret-install:
+	$(INSTALL_DIR) $(IDIR_LIBSECRET)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libsecret*.so* \
+		$(IDIR_LIBSECRET)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libsecret/patches/patch-Makefile_am b/package/libsecret/patches/patch-Makefile_am
new file mode 100644
index 000000000..50af269ea
--- /dev/null
+++ b/package/libsecret/patches/patch-Makefile_am
@@ -0,0 +1,26 @@
+--- libsecret-0.16.orig/Makefile.am	2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/Makefile.am	2013-11-22 14:38:52.000000000 +0100
+@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
+ 
+ ACLOCAL_AMFLAGS = -I build/m4 ${ACLOCAL_FLAGS}
+ 
+-SUBDIRS = build egg libsecret tool po docs .
++SUBDIRS = build egg libsecret tool .
+ 
+ DISTCHECK_CONFIGURE_FLAGS = \
+ 	--enable-debug=yes \
+@@ -42,14 +42,9 @@ upload-release: $(DIST_ARCHIVES)
+ upload-docs:
+ 	rsync -Hvax docs/reference/libsecret/html/./ master.gnome.org:public_html/libsecret-docs/
+ 
+-if HAVE_VALAC
+-dist-check-valac:
+-
+-else
+ dist-check-valac:
+ 	@echo "*** valac must be installed and enabled in order to make dist"
+ 	@false
+-endif
+ 
+ dist-hook: dist-check-valac
+ 
diff --git a/package/libsecret/patches/patch-Makefile_am.orig b/package/libsecret/patches/patch-Makefile_am.orig
new file mode 100644
index 000000000..8273c753c
--- /dev/null
+++ b/package/libsecret/patches/patch-Makefile_am.orig
@@ -0,0 +1,11 @@
+--- libsecret-0.16.orig/Makefile.am	2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/Makefile.am	2013-11-21 12:03:12.000000000 +0100
+@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
+ 
+ ACLOCAL_AMFLAGS = -I build/m4 ${ACLOCAL_FLAGS}
+ 
+-SUBDIRS = build egg libsecret tool po docs .
++SUBDIRS = build egg libsecret tool .
+ 
+ DISTCHECK_CONFIGURE_FLAGS = \
+ 	--enable-debug=yes \
diff --git a/package/libsecret/patches/patch-configure_ac b/package/libsecret/patches/patch-configure_ac
new file mode 100644
index 000000000..e9de60534
--- /dev/null
+++ b/package/libsecret/patches/patch-configure_ac
@@ -0,0 +1,44 @@
+--- libsecret-0.16.orig/configure.ac	2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/configure.ac	2013-11-22 18:00:42.000000000 +0100
+@@ -43,7 +43,6 @@ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AM_PROG_LIBTOOL
+-IT_PROG_INTLTOOL([0.35.0])
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ 
+ GETTEXT_PACKAGE=libsecret
+@@ -66,9 +65,6 @@ PKG_CHECK_MODULES(GLIB,
+ LIBS="$LIBS $GLIB_LIBS"
+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
+ 
+-GTK_DOC_CHECK(1.9)
+-
+-GOBJECT_INTROSPECTION_CHECK([1.29])
+ AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
+ 
+ # --------------------------------------------------------------------
+@@ -88,14 +84,6 @@ AM_CONDITIONAL(WITH_MANPAGES, test x$ena
+ # --------------------------------------------------------------------
+ # Vala
+ 
+-VALA_REQUIRED=0.17.2.12
+-
+-VAPIGEN_CHECK($VALA_REQUIRED)
+-
+-if test "$enable_vala" != "no"; then
+-	AC_PATH_PROG([VALAC], [valac], [])
+-fi
+-AM_CONDITIONAL(HAVE_VALAC, test "x$VALAC" != "x")
+ 
+ # --------------------------------------------------------------------
+ # libgcrypt
+@@ -267,8 +255,6 @@ AC_CONFIG_FILES([
+ 	docs/reference/libsecret/version-major.xml
+ 	egg/Makefile
+ 	egg/tests/Makefile
+-	po/Makefile.in
+-	po/Makefile
+ 	libsecret/Makefile
+ 	libsecret/libsecret.pc
+ 	libsecret/libsecret-unstable.pc
diff --git a/package/libsecret/patches/patch-configure_ac.orig b/package/libsecret/patches/patch-configure_ac.orig
new file mode 100644
index 000000000..a26aab5cb
--- /dev/null
+++ b/package/libsecret/patches/patch-configure_ac.orig
@@ -0,0 +1,35 @@
+--- libsecret-0.16.orig/configure.ac	2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/configure.ac	2013-11-21 15:23:11.000000000 +0100
+@@ -43,7 +43,6 @@ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AM_PROG_LIBTOOL
+-IT_PROG_INTLTOOL([0.35.0])
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ 
+ GETTEXT_PACKAGE=libsecret
+@@ -66,9 +65,6 @@ PKG_CHECK_MODULES(GLIB,
+ LIBS="$LIBS $GLIB_LIBS"
+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
+ 
+-GTK_DOC_CHECK(1.9)
+-
+-GOBJECT_INTROSPECTION_CHECK([1.29])
+ AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
+ 
+ # --------------------------------------------------------------------
+@@ -88,14 +84,6 @@ AM_CONDITIONAL(WITH_MANPAGES, test x$ena
+ # --------------------------------------------------------------------
+ # Vala
+ 
+-VALA_REQUIRED=0.17.2.12
+-
+-VAPIGEN_CHECK($VALA_REQUIRED)
+-
+-if test "$enable_vala" != "no"; then
+-	AC_PATH_PROG([VALAC], [valac], [])
+-fi
+-AM_CONDITIONAL(HAVE_VALAC, test "x$VALAC" != "x")
+ 
+ # --------------------------------------------------------------------
+ # libgcrypt
diff --git a/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am b/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am
new file mode 100644
index 000000000..1a749c19e
--- /dev/null
+++ b/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am
@@ -0,0 +1,20 @@
+--- libsecret-0.16.orig/docs/reference/libsecret/Makefile.am	2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/docs/reference/libsecret/Makefile.am	2013-11-21 12:01:48.000000000 +0100
+@@ -92,13 +92,13 @@ GTKDOC_LIBS= $(GLIB_LIBS) $(GOBJECT_LIBS
+ 	$(top_builddir)/libsecret/libsecret-@SECRET_MAJOR@.la
+ 
+ # This includes the standard gtk-doc make rules, copied by gtkdocize.
+-include $(top_srcdir)/gtk-doc.make
++#include $(top_srcdir)/gtk-doc.make
+ 
+ # Other files to distribute
+ # e.g. EXTRA_DIST += version.xml.in
+-EXTRA_DIST += \
+-	version.xml.in \
+-	version-major.xml.in
++#EXTRA_DIST += \
++#	version.xml.in \
++#	version-major.xml.in
+ 
+ # Files not to distribute
+ # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
diff --git a/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am.orig b/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am.orig
new file mode 100644
index 000000000..02e2351a3
--- /dev/null
+++ b/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am.orig
@@ -0,0 +1,11 @@
+--- libsecret-0.16.orig/docs/reference/libsecret/Makefile.am	2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/docs/reference/libsecret/Makefile.am	2013-11-21 11:59:27.000000000 +0100
+@@ -92,7 +92,7 @@ GTKDOC_LIBS= $(GLIB_LIBS) $(GOBJECT_LIBS
+ 	$(top_builddir)/libsecret/libsecret-@SECRET_MAJOR@.la
+ 
+ # This includes the standard gtk-doc make rules, copied by gtkdocize.
+-include $(top_srcdir)/gtk-doc.make
++#include $(top_srcdir)/gtk-doc.make
+ 
+ # Other files to distribute
+ # e.g. EXTRA_DIST += version.xml.in
diff --git a/package/libsecret/patches/patch-libsecret_Makefile_am b/package/libsecret/patches/patch-libsecret_Makefile_am
new file mode 100644
index 000000000..88e9ef5fb
--- /dev/null
+++ b/package/libsecret/patches/patch-libsecret_Makefile_am
@@ -0,0 +1,95 @@
+--- libsecret-0.16.orig/libsecret/Makefile.am	2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/libsecret/Makefile.am	2013-11-21 12:06:37.000000000 +0100
+@@ -1,6 +1,6 @@
+ include $(top_srcdir)/Makefile.decl
+ 
+-SUBDIRS = . tests
++SUBDIRS = .
+ 
+ AM_CPPFLAGS = \
+ 	-I$(top_srcdir) \
+@@ -107,84 +107,6 @@ secret-enum-types.c: secret-enum-types.c
+ 
+ CLEANFILES =
+ 
+-# ------------------------------------------------------------------
+-# INTROSPECTION
+-
+-if HAVE_INTROSPECTION
+-
+-include $(INTROSPECTION_MAKEFILE)
+-
+-INTROSPECTION_GIRS = Secret-@SECRET_MAJOR@.gir SecretUnstable-0.gir
+-INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --warn-all --add-include-path=$(srcdir) --add-include-path=.
+-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=.
+-
+-Secret-@SECRET_MAJOR@.gir: libsecret-@SECRET_MAJOR@.la
+-
+-Secret_@SECRET_MAJOR@_gir_NAMESPACE = Secret
+-Secret_@SECRET_MAJOR@_gir_EXPORT_PACKAGES = libsecret-@SECRET_MAJOR@
+-Secret_@SECRET_MAJOR@_gir_INCLUDES = GObject-2.0 Gio-2.0
+-Secret_@SECRET_MAJOR@_gir_LIBS = libsecret-@SECRET_MAJOR@.la
+-Secret_@SECRET_MAJOR@_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -DSECRET_COMPILATION
+-Secret_@SECRET_MAJOR@_gir_FILES = $(STABLE_FILES)
+-Secret_@SECRET_MAJOR@_gir_SCANNERFLAGS = --c-include "libsecret/secret.h"
+-
+-SecretUnstable-0.gir: Secret-@SECRET_MAJOR@.gir
+-
+-SecretUnstable_0_gir_NAMESPACE = SecretUnstable
+-SecretUnstable_0_gir_EXPORT_PACKAGES = libsecret-unstable
+-SecretUnstable_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+-SecretUnstable_0_gir_LIBS = libsecret-@SECRET_MAJOR@.la
+-SecretUnstable_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -DSECRET_COMPILATION -DSECRET_API_SUBJECT_TO_CHANGE
+-SecretUnstable_0_gir_FILES = $(UNSTABLE_FILES)
+-SecretUnstable_0_gir_SCANNERFLAGS = --c-include "libsecret/secret.h" --identifier-prefix=Secret --symbol-prefix=secret --include-uninstalled=$(builddir)/Secret-@SECRET_MAJOR@.gir
+-
+-girdir = $(datadir)/gir-1.0
+-gir_DATA = $(INTROSPECTION_GIRS)
+-
+-typelibsdir = $(libdir)/girepository-1.0
+-typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+-
+-if ENABLE_VAPIGEN
+-include $(VAPIGEN_MAKEFILE)
+-
+-libsecret-@SECRET_MAJOR@.vapi: Secret-@SECRET_MAJOR@.gir Secret-@SECRET_MAJOR@.metadata libsecret-@SECRET_MAJOR@.deps
+-
+-libsecret-unstable.vapi: SecretUnstable-0.gir SecretUnstable-0.metadata libsecret-unstable.deps
+-
+-VAPIGEN_VAPIS = \
+-	libsecret-@SECRET_MAJOR@.vapi \
+-	libsecret-unstable.vapi
+-
+-libsecret_@SECRET_MAJOR@_vapi_DEPS = glib-2.0 gio-2.0
+-libsecret_@SECRET_MAJOR@_vapi_METADATADIRS = $(srcdir)
+-libsecret_@SECRET_MAJOR@_vapi_FILES = Secret-@SECRET_MAJOR@.gir
+-
+-libsecret_unstable_vapi_DEPS = gio-2.0 libsecret-@SECRET_MAJOR@
+-libsecret_unstable_vapi_METADATADIRS = $(srcdir)
+-libsecret_unstable_vapi_VAPIDIRS = $(builddir)
+-libsecret_unstable_vapi_GIRDIRS = $(builddir)
+-# ... because _GIRDIRS above is broken, yes, this is ugly
+-libsecret_unstable_vapi_FILES = --girdir=$(builddir)
+-libsecret_unstable_vapi_FILES += SecretUnstable-0.gir
+-
+-VAPI_DEPS = $(VAPIGEN_VAPIS:.vapi=.deps)
+-
+-libsecret-$(SECRET_MAJOR).deps: Makefile.am
+-	$(AM_V_GEN) echo $(libsecret_@SECRET_MAJOR@_vapi_DEPS) | tr ' ' '\n' > $@
+-libsecret-unstable.deps: Makefile.am
+-	$(AM_V_GEN) echo $(libsecret_unstable_vapi_DEPS) | tr ' ' '\n' > $@
+-
+-vapidir = $(datadir)/vala/vapi
+-vapi_DATA = \
+-	$(VAPIGEN_VAPIS) \
+-	$(VAPI_DEPS)
+-
+-CLEANFILES += \
+-	$(VAPIGEN_VAPIS) \
+-	$(VAPI_DEPS)
+-
+-endif # ENABLE_VAPIGEN
+-endif # HAVE_INTROSPECTION
+ 
+ # ------------------------------------------------------------------
+ # PKG CONFIG
diff --git a/package/libsecret/patches/patch-libsecret_tests_Makefile_am b/package/libsecret/patches/patch-libsecret_tests_Makefile_am
new file mode 100644
index 000000000..d168c022e
--- /dev/null
+++ b/package/libsecret/patches/patch-libsecret_tests_Makefile_am
@@ -0,0 +1,113 @@
+--- libsecret-0.16.orig/libsecret/tests/Makefile.am	2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/libsecret/tests/Makefile.am	2013-11-21 15:35:42.000000000 +0100
+@@ -73,59 +73,6 @@ PY_TESTS = \
+ 
+ PY_ENV = $(JS_ENV)
+ 
+-# ------------------------------------------------------------------
+-# VALA
+-
+-VALA_V = $(VALA_V_$(V))
+-VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
+-VALA_V_0 = @echo "  VALAC " $^;
+-
+-VALA_TESTS = \
+-	test-vala-lang \
+-	test-vala-unstable \
+-	$(NULL)
+-
+-VALA_FLAGS = \
+-	--vapidir=$(builddir)/.. \
+-	--pkg gio-2.0
+-
+-VALA_TESTS_VAPIS = \
+-	$(builddir)/../libsecret-unstable.vapi \
+-	$(builddir)/../libsecret-@SECRET_MAJOR@.vapi \
+-	$(builddir)/mock-service-0.vapi
+-
+-VALA_SRCS = $(VALA_TESTS:=.vala)
+-VALA_C_SRCS = $(VALA_SRCS:.vala=.c)
+-
+-if HAVE_VALAC
+-$(VALA_C_SRCS): %.c: %.vala $(VALA_TESTS_VAPIS)
+-	$(VALA_V)$(VALAC) $(VALA_FLAGS) $(VALA_TESTS_VAPIS) -C $<
+-endif
+-
+-test_vala_lang_CFLAGS = -w
+-test_vala_unstable_CFLAGS = -DSECRET_WITH_UNSTABLE -w
+-
+-nodist_test_vala_lang_SOURCES = test-vala-lang.c
+-nodist_test_vala_unstable_SOURCES = test-vala-unstable.c
+-
+-DISTCLEANFILES = $(VALA_C_SRCS)
+-
+-test-vala: $(VALA_TESTS)
+-	@gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(VALA_TESTS)
+-
+-VALA_TEST_TARGET =
+-
+-if HAVE_INTROSPECTION
+-if ENABLE_VAPIGEN
+-if HAVE_VALAC
+-
+-VALA_TEST_TARGET += test-vala
+-
+-TEST_PROGS += $(VALA_TESTS)
+-
+-endif # HAVE_VALAC
+-endif # ENABLE_VAPIGEN
+-endif # HAVE_INTROSPECTION
+ 
+ test-c: $(C_TESTS)
+ 	@gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(C_TESTS)
+@@ -138,50 +85,6 @@ test-py:
+ 
+ test: test-c test-py test-js $(VALA_TEST_TARGET)
+ 
+-# ------------------------------------------------------------------
+-# INTROSPECTION
+-
+-if HAVE_INTROSPECTION
+-
+-include $(INTROSPECTION_MAKEFILE)
+-
+-INTROSPECTION_GIRS = MockService-0.gir
+-INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --warn-all --add-include-path=$(srcdir) --add-include-path=.
+-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=.
+-
+-MockService-0.gir: libmock_service.la
+-
+-MockService_0_gir_PACKAGES = gobject-2.0 gio-2.0
+-MockService_0_gir_EXPORT_PACKAGES = mock-service-0
+-MockService_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+-MockService_0_gir_LIBS = libmock_service.la
+-MockService_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(srcdir)
+-MockService_0_gir_FILES = $(libmock_service_la_SOURCES)
+-MockService_0_gir_SCANNERFLAGS = --c-include "mock-service.h"
+-
+-noinst_DATA = \
+-	$(INTROSPECTION_GIRS) \
+-	$(INTROSPECTION_GIRS:.gir=.typelib)
+-
+-if ENABLE_VAPIGEN
+-include $(VAPIGEN_MAKEFILE)
+-
+-mock-service-0.vapi: MockService-0.gir $(builddir)/../libsecret-@SECRET_MAJOR@.vapi
+-
+-VAPIGEN_VAPIS = mock-service-0.vapi
+-
+-mock_service_0_vapi_DEPS = gio-2.0 libsecret-@SECRET_MAJOR@
+-mock_service_0_vapi_METADATADIRS = $(builddir)
+-mock_service_0_vapi_VAPIDIRS = $(builddir) $(builddir)/..
+-mock_service_0_vapi_FILES = MockService-0.gir
+-
+-vapidir = $(datadir)/vala/vapi
+-vapi_DATA = mock-service-0.vapi
+-
+-noinst_DATA += $(VAPIGEN_VAPIS)
+-
+-endif # ENABLE_VAPIGEN
+-endif # HAVE_INTROSPECTION
+ 
+ #--------------------------------------------------------------------
+ 
diff --git a/package/libsecret/patches/patch-libsecret_tests_Makefile_am.orig b/package/libsecret/patches/patch-libsecret_tests_Makefile_am.orig
new file mode 100644
index 000000000..efe20a44f
--- /dev/null
+++ b/package/libsecret/patches/patch-libsecret_tests_Makefile_am.orig
@@ -0,0 +1,72 @@
+--- libsecret-0.16.orig/libsecret/tests/Makefile.am	2013-08-26 17:42:16.000000000 +0200
++++ libsecret-0.16/libsecret/tests/Makefile.am	2013-11-21 12:15:40.000000000 +0100
+@@ -115,18 +115,6 @@ test-vala: $(VALA_TESTS)
+ 
+ VALA_TEST_TARGET =
+ 
+-if HAVE_INTROSPECTION
+-if ENABLE_VAPIGEN
+-if HAVE_VALAC
+-
+-VALA_TEST_TARGET += test-vala
+-
+-TEST_PROGS += $(VALA_TESTS)
+-
+-endif # HAVE_VALAC
+-endif # ENABLE_VAPIGEN
+-endif # HAVE_INTROSPECTION
+-
+ test-c: $(C_TESTS)
+ 	@gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(C_TESTS)
+ 
+@@ -138,50 +126,6 @@ test-py:
+ 
+ test: test-c test-py test-js $(VALA_TEST_TARGET)
+ 
+-# ------------------------------------------------------------------
+-# INTROSPECTION
+-
+-if HAVE_INTROSPECTION
+-
+-include $(INTROSPECTION_MAKEFILE)
+-
+-INTROSPECTION_GIRS = MockService-0.gir
+-INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --warn-all --add-include-path=$(srcdir) --add-include-path=.
+-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=.
+-
+-MockService-0.gir: libmock_service.la
+-
+-MockService_0_gir_PACKAGES = gobject-2.0 gio-2.0
+-MockService_0_gir_EXPORT_PACKAGES = mock-service-0
+-MockService_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+-MockService_0_gir_LIBS = libmock_service.la
+-MockService_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(srcdir)
+-MockService_0_gir_FILES = $(libmock_service_la_SOURCES)
+-MockService_0_gir_SCANNERFLAGS = --c-include "mock-service.h"
+-
+-noinst_DATA = \
+-	$(INTROSPECTION_GIRS) \
+-	$(INTROSPECTION_GIRS:.gir=.typelib)
+-
+-if ENABLE_VAPIGEN
+-include $(VAPIGEN_MAKEFILE)
+-
+-mock-service-0.vapi: MockService-0.gir $(builddir)/../libsecret-@SECRET_MAJOR@.vapi
+-
+-VAPIGEN_VAPIS = mock-service-0.vapi
+-
+-mock_service_0_vapi_DEPS = gio-2.0 libsecret-@SECRET_MAJOR@
+-mock_service_0_vapi_METADATADIRS = $(builddir)
+-mock_service_0_vapi_VAPIDIRS = $(builddir) $(builddir)/..
+-mock_service_0_vapi_FILES = MockService-0.gir
+-
+-vapidir = $(datadir)/vala/vapi
+-vapi_DATA = mock-service-0.vapi
+-
+-noinst_DATA += $(VAPIGEN_VAPIS)
+-
+-endif # ENABLE_VAPIGEN
+-endif # HAVE_INTROSPECTION
+ 
+ #--------------------------------------------------------------------
+ 
diff --git a/package/libsoup/Makefile b/package/libsoup/Makefile
new file mode 100644
index 000000000..967f375bb
--- /dev/null
+++ b/package/libsoup/Makefile
@@ -0,0 +1,31 @@
+# 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:=		libsoup
+PKG_VERSION:=		2.44.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		92aa3667357157e8f3489bcca287f2fa
+PKG_DESCR:=		HTTP client/server library
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		libsqlite
+PKG_BUILDDEP:=		autotool sqlite
+PKG_URL:=		https://wiki.gnome.org/LibSoup
+PKG_SITES:=		http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.44/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSOUP,libsoup,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+AUTOTOOL_STYLE:=	autoreconf
+
+libsoup-install:
+	$(INSTALL_DIR) $(IDIR_LIBSOUP)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libsoup*.so* \
+		$(IDIR_LIBSOUP)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libsoup/patches/patch-Makefile_am b/package/libsoup/patches/patch-Makefile_am
new file mode 100644
index 000000000..50a47de27
--- /dev/null
+++ b/package/libsoup/patches/patch-Makefile_am
@@ -0,0 +1,20 @@
+--- libsoup-2.44.2.orig/Makefile.am	2013-11-11 16:02:00.000000000 +0100
++++ libsoup-2.44.2/Makefile.am	2014-04-14 17:24:56.713849496 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+-SUBDIRS = libsoup po tests examples docs
++SUBDIRS = libsoup
+ 
+ EXTRA_DIST =				\
+ 	data/effective_tld_names.dat	\
+@@ -12,8 +12,6 @@ EXTRA_DIST =				\
+ 	m4/introspection.m4		\
+ 	Makefile.glib
+ 
+-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
+-
+ pkgconfigdir = $(libdir)/pkgconfig
+ 
+ pkgconfig_DATA = libsoup-2.4.pc
diff --git a/package/libsoup/patches/patch-build-aux_config_guess b/package/libsoup/patches/patch-build-aux_config_guess
new file mode 100644
index 000000000..a3a438b4f
--- /dev/null
+++ b/package/libsoup/patches/patch-build-aux_config_guess
@@ -0,0 +1,447 @@
+--- libsoup-2.44.2.orig/build-aux/config.guess	2013-10-18 00:01:48.000000000 +0200
++++ libsoup-2.44.2/build-aux/config.guess	2014-04-14 17:21:42.176934834 +0200
+@@ -1,10 +1,8 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+-#   2011, 2012, 2013 Free Software Foundation, Inc.
++#   Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+-timestamp='2012-12-29'
++timestamp='2014-01-25'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -26,7 +24,7 @@ timestamp='2012-12-29'
+ # program.  This Exception is an additional permission under section 7
+ # of the GNU General Public License, version 3 ("GPLv3").
+ #
+-# Originally written by Per Bothner. 
++# Originally written by Per Bothner.
+ #
+ # You can get the latest version of this script from:
+ # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+@@ -52,9 +50,7 @@ version="\
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+-2012, 2013 Free Software Foundation, Inc.
++Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -136,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
++case "${UNAME_SYSTEM}" in
++Linux|GNU|GNU/*)
++	# If the system lacks a compiler, then just pick glibc.
++	# We could probably try harder.
++	LIBC=gnu
++
++	eval $set_cc_for_build
++	cat <<-EOF > $dummy.c
++	#include <features.h>
++	#if defined(__UCLIBC__)
++	LIBC=uclibc
++	#elif defined(__dietlibc__)
++	LIBC=dietlibc
++	#else
++	LIBC=gnu
++	#endif
++	EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	;;
++esac
++
+ # Note: order is significant - the case branches are not exclusive.
+ 
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -857,21 +874,21 @@ EOF
+ 	exit ;;
+     *:GNU:*:*)
+ 	# the GNU system
+-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	exit ;;
+     *:GNU/*:*:*)
+ 	# other systems with GNU libc and userland
+-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ 	exit ;;
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
+     aarch64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     aarch64_be:Linux:*:*)
+ 	UNAME_MACHINE=aarch64_be
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -884,59 +901,54 @@ EOF
+ 	  EV68*) UNAME_MACHINE=alphaev68 ;;
+ 	esac
+ 	objdump --private-headers /bin/sh | grep -q ld.so.1
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    arc:Linux:*:* | arceb:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     arm*:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ 	    | grep -q __ARM_EABI__
+ 	then
+-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
++	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	else
+ 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ 		| grep -q __ARM_PCS_VFP
+ 	    then
+-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ 	    else
+-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ 	    fi
+ 	fi
+ 	exit ;;
+     avr32*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     cris:Linux:*:*)
+-	echo ${UNAME_MACHINE}-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ 	exit ;;
+     crisv32:Linux:*:*)
+-	echo ${UNAME_MACHINE}-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ 	exit ;;
+     frv:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     hexagon:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     i*86:Linux:*:*)
+-	LIBC=gnu
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ 	exit ;;
+     ia64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     m32r*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     m68*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     mips:Linux:*:* | mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+@@ -955,54 +967,63 @@ EOF
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ 	;;
++    or1k:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
+     or32:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     padre:Linux:*:*)
+-	echo sparc-unknown-linux-gnu
++	echo sparc-unknown-linux-${LIBC}
+ 	exit ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
++	echo hppa64-unknown-linux-${LIBC}
+ 	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+-	  *)    echo hppa-unknown-linux-gnu ;;
++	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
++	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
++	  *)    echo hppa-unknown-linux-${LIBC} ;;
+ 	esac
+ 	exit ;;
+     ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
++	echo powerpc64-unknown-linux-${LIBC}
+ 	exit ;;
+     ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
++	echo powerpc-unknown-linux-${LIBC}
++	exit ;;
++    ppc64le:Linux:*:*)
++	echo powerpc64le-unknown-linux-${LIBC}
++	exit ;;
++    ppcle:Linux:*:*)
++	echo powerpcle-unknown-linux-${LIBC}
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+-	echo ${UNAME_MACHINE}-ibm-linux
++	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ 	exit ;;
+     sh64*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     sh*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     tile*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     vax:Linux:*:*)
+-	echo ${UNAME_MACHINE}-dec-linux-gnu
++	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ 	exit ;;
+     x86_64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     xtensa*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+@@ -1235,19 +1256,31 @@ EOF
+ 	exit ;;
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+-	case $UNAME_PROCESSOR in
+-	    i386)
+-		eval $set_cc_for_build
+-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+-		      grep IS_64BIT_ARCH >/dev/null
+-		  then
+-		      UNAME_PROCESSOR="x86_64"
+-		  fi
+-		fi ;;
+-	    unknown) UNAME_PROCESSOR=powerpc ;;
+-	esac
++	eval $set_cc_for_build
++	if test "$UNAME_PROCESSOR" = unknown ; then
++	    UNAME_PROCESSOR=powerpc
++	fi
++	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
++	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		    grep IS_64BIT_ARCH >/dev/null
++		then
++		    case $UNAME_PROCESSOR in
++			i386) UNAME_PROCESSOR=x86_64 ;;
++			powerpc) UNAME_PROCESSOR=powerpc64 ;;
++		    esac
++		fi
++	    fi
++	elif test "$UNAME_PROCESSOR" = i386 ; then
++	    # Avoid executing cc on OS X 10.9, as it ships with a stub
++	    # that puts up a graphical alert prompting to install
++	    # developer tools.  Any system running Mac OS X 10.7 or
++	    # later (Darwin 11 and later) is required to have a 64-bit
++	    # processor. This is not true of the ARM version of Darwin
++	    # that Apple uses in portable devices.
++	    UNAME_PROCESSOR=x86_64
++	fi
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ 	exit ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+@@ -1338,154 +1371,6 @@ EOF
+ 	exit ;;
+ esac
+ 
+-eval $set_cc_for_build
+-cat >$dummy.c <<EOF
+-#ifdef _SEQUENT_
+-# include <sys/types.h>
+-# include <sys/utsname.h>
+-#endif
+-main ()
+-{
+-#if defined (sony)
+-#if defined (MIPSEB)
+-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+-     I don't know....  */
+-  printf ("mips-sony-bsd\n"); exit (0);
+-#else
+-#include <sys/param.h>
+-  printf ("m68k-sony-newsos%s\n",
+-#ifdef NEWSOS4
+-	"4"
+-#else
+-	""
+-#endif
+-	); exit (0);
+-#endif
+-#endif
+-
+-#if defined (__arm) && defined (__acorn) && defined (__unix)
+-  printf ("arm-acorn-riscix\n"); exit (0);
+-#endif
+-
+-#if defined (hp300) && !defined (hpux)
+-  printf ("m68k-hp-bsd\n"); exit (0);
+-#endif
+-
+-#if defined (NeXT)
+-#if !defined (__ARCHITECTURE__)
+-#define __ARCHITECTURE__ "m68k"
+-#endif
+-  int version;
+-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+-  if (version < 4)
+-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+-  else
+-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+-  exit (0);
+-#endif
+-
+-#if defined (MULTIMAX) || defined (n16)
+-#if defined (UMAXV)
+-  printf ("ns32k-encore-sysv\n"); exit (0);
+-#else
+-#if defined (CMU)
+-  printf ("ns32k-encore-mach\n"); exit (0);
+-#else
+-  printf ("ns32k-encore-bsd\n"); exit (0);
+-#endif
+-#endif
+-#endif
+-
+-#if defined (__386BSD__)
+-  printf ("i386-pc-bsd\n"); exit (0);
+-#endif
+-
+-#if defined (sequent)
+-#if defined (i386)
+-  printf ("i386-sequent-dynix\n"); exit (0);
+-#endif
+-#if defined (ns32000)
+-  printf ("ns32k-sequent-dynix\n"); exit (0);
+-#endif
+-#endif
+-
+-#if defined (_SEQUENT_)
+-    struct utsname un;
+-
+-    uname(&un);
+-
+-    if (strncmp(un.version, "V2", 2) == 0) {
+-	printf ("i386-sequent-ptx2\n"); exit (0);
+-    }
+-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+-	printf ("i386-sequent-ptx1\n"); exit (0);
+-    }
+-    printf ("i386-sequent-ptx\n"); exit (0);
+-
+-#endif
+-
+-#if defined (vax)
+-# if !defined (ultrix)
+-#  include <sys/param.h>
+-#  if defined (BSD)
+-#   if BSD == 43
+-      printf ("vax-dec-bsd4.3\n"); exit (0);
+-#   else
+-#    if BSD == 199006
+-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+-#    else
+-      printf ("vax-dec-bsd\n"); exit (0);
+-#    endif
+-#   endif
+-#  else
+-    printf ("vax-dec-bsd\n"); exit (0);
+-#  endif
+-# else
+-    printf ("vax-dec-ultrix\n"); exit (0);
+-# endif
+-#endif
+-
+-#if defined (alliant) && defined (i860)
+-  printf ("i860-alliant-bsd\n"); exit (0);
+-#endif
+-
+-  exit (1);
+-}
+-EOF
+-
+-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+-	{ echo "$SYSTEM_NAME"; exit; }
+-
+-# Apollos put the system type in the environment.
+-
+-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+-
+-# Convex versions that predate uname can use getsysinfo(1)
+-
+-if [ -x /usr/convex/getsysinfo ]
+-then
+-    case `getsysinfo -f cpu_type` in
+-    c1*)
+-	echo c1-convex-bsd
+-	exit ;;
+-    c2*)
+-	if getsysinfo -f scalar_acc
+-	then echo c32-convex-bsd
+-	else echo c2-convex-bsd
+-	fi
+-	exit ;;
+-    c34*)
+-	echo c34-convex-bsd
+-	exit ;;
+-    c38*)
+-	echo c38-convex-bsd
+-	exit ;;
+-    c4*)
+-	echo c4-convex-bsd
+-	exit ;;
+-    esac
+-fi
+-
+ cat >&2 <<EOF
+ $0: unable to guess system type
+ 
diff --git a/package/libsoup/patches/patch-build-aux_config_sub b/package/libsoup/patches/patch-build-aux_config_sub
new file mode 100644
index 000000000..623cd9420
--- /dev/null
+++ b/package/libsoup/patches/patch-build-aux_config_sub
@@ -0,0 +1,183 @@
+--- libsoup-2.44.2.orig/build-aux/config.sub	2013-10-18 00:01:48.000000000 +0200
++++ libsoup-2.44.2/build-aux/config.sub	2014-04-14 17:21:42.176934834 +0200
+@@ -1,10 +1,8 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+-#   2011, 2012, 2013 Free Software Foundation, Inc.
++#   Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+-timestamp='2012-12-29'
++timestamp='2014-01-01'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -70,9 +68,7 @@ Report bugs and patches to <config-patch
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+-2012, 2013 Free Software Foundation, Inc.
++Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -256,12 +252,12 @@ case $basic_machine in
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+-	| arc \
++	| arc | arceb \
+ 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ 	| avr | avr32 \
+ 	| be32 | be64 \
+ 	| bfin \
+-	| c4x | clipper \
++	| c4x | c8051 | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
+ 	| epiphany \
+ 	| fido | fr30 | frv \
+@@ -269,6 +265,7 @@ case $basic_machine in
+ 	| hexagon \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
++	| k1om \
+ 	| le32 | le64 \
+ 	| lm32 \
+ 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+@@ -290,16 +287,17 @@ case $basic_machine in
+ 	| mipsisa64r2 | mipsisa64r2el \
+ 	| mipsisa64sb1 | mipsisa64sb1el \
+ 	| mipsisa64sr71k | mipsisa64sr71kel \
++	| mipsr5900 | mipsr5900el \
+ 	| mipstx39 | mipstx39el \
+ 	| mn10200 | mn10300 \
+ 	| moxie \
+ 	| mt \
+ 	| msp430 \
+ 	| nds32 | nds32le | nds32be \
+-	| nios | nios2 \
++	| nios | nios2 | nios2eb | nios2el \
+ 	| ns16k | ns32k \
+ 	| open8 \
+-	| or32 \
++	| or1k | or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle \
+ 	| pyramid \
+@@ -327,7 +325,7 @@ case $basic_machine in
+ 	c6x)
+ 		basic_machine=tic6x-unknown
+ 		;;
+-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
++	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+ 		;;
+@@ -369,13 +367,13 @@ case $basic_machine in
+ 	| aarch64-* | aarch64_be-* \
+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
++	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+ 	| avr-* | avr32-* \
+ 	| be32-* | be64-* \
+ 	| bfin-* | bs2000-* \
+ 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+-	| clipper-* | craynv-* | cydra-* \
++	| c8051-* | clipper-* | craynv-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+ 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+@@ -384,6 +382,7 @@ case $basic_machine in
+ 	| hexagon-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
++	| k1om-* \
+ 	| le32-* | le64-* \
+ 	| lm32-* \
+ 	| m32c-* | m32r-* | m32rle-* \
+@@ -407,12 +406,13 @@ case $basic_machine in
+ 	| mipsisa64r2-* | mipsisa64r2el-* \
+ 	| mipsisa64sb1-* | mipsisa64sb1el-* \
+ 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
++	| mipsr5900-* | mipsr5900el-* \
+ 	| mipstx39-* | mipstx39el-* \
+ 	| mmix-* \
+ 	| mt-* \
+ 	| msp430-* \
+ 	| nds32-* | nds32le-* | nds32be-* \
+-	| nios-* | nios2-* \
++	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
+ 	| open8-* \
+ 	| orion-* \
+@@ -796,7 +796,7 @@ case $basic_machine in
+ 		os=-mingw64
+ 		;;
+ 	mingw32)
+-		basic_machine=i386-pc
++		basic_machine=i686-pc
+ 		os=-mingw32
+ 		;;
+ 	mingw32ce)
+@@ -832,7 +832,7 @@ case $basic_machine in
+ 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ 		;;
+ 	msys)
+-		basic_machine=i386-pc
++		basic_machine=i686-pc
+ 		os=-msys
+ 		;;
+ 	mvs)
+@@ -1008,7 +1008,7 @@ case $basic_machine in
+ 		;;
+ 	ppc64)	basic_machine=powerpc64-unknown
+ 		;;
+-	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ 		basic_machine=powerpc64le-unknown
+@@ -1354,7 +1354,7 @@ case $os in
+ 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+ 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+-	      | -sym* | -kopensolaris* \
++	      | -sym* | -kopensolaris* | -plan9* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ 	      | -aos* | -aros* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+@@ -1500,9 +1500,6 @@ case $os in
+ 	-aros*)
+ 		os=-aros
+ 		;;
+-	-kaos*)
+-		os=-kaos
+-		;;
+ 	-zvmoe)
+ 		os=-zvmoe
+ 		;;
+@@ -1551,6 +1548,9 @@ case $basic_machine in
+ 	c4x-* | tic4x-*)
+ 		os=-coff
+ 		;;
++	c8051-*)
++		os=-elf
++		;;
+ 	hexagon-*)
+ 		os=-elf
+ 		;;
+@@ -1594,6 +1594,9 @@ case $basic_machine in
+ 	mips*-*)
+ 		os=-elf
+ 		;;
++	or1k-*)
++		os=-elf
++		;;
+ 	or32-*)
+ 		os=-coff
+ 		;;
diff --git a/package/libsoup/patches/patch-build-aux_depcomp b/package/libsoup/patches/patch-build-aux_depcomp
new file mode 100644
index 000000000..730162b43
--- /dev/null
+++ b/package/libsoup/patches/patch-build-aux_depcomp
@@ -0,0 +1,682 @@
+--- libsoup-2.44.2.orig/build-aux/depcomp	2013-10-18 00:01:49.000000000 +0200
++++ libsoup-2.44.2/build-aux/depcomp	2014-04-14 17:21:42.708937363 +0200
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+ 
+-scriptversion=2013-05-30.07; # UTC
++scriptversion=2012-03-27.16; # UTC
+ 
+-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
++# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+ 
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -27,9 +27,9 @@ scriptversion=2013-05-30.07; # UTC
+ 
+ case $1 in
+   '')
+-    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+-    exit 1;
+-    ;;
++     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
++     exit 1;
++     ;;
+   -h | --h*)
+     cat <<\EOF
+ Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+@@ -56,65 +56,11 @@ EOF
+     ;;
+ esac
+ 
+-# Get the directory component of the given path, and save it in the
+-# global variables '$dir'.  Note that this directory component will
+-# be either empty or ending with a '/' character.  This is deliberate.
+-set_dir_from ()
+-{
+-  case $1 in
+-    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+-      *) dir=;;
+-  esac
+-}
+-
+-# Get the suffix-stripped basename of the given path, and save it the
+-# global variable '$base'.
+-set_base_from ()
+-{
+-  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+-}
+-
+-# If no dependency file was actually created by the compiler invocation,
+-# we still have to create a dummy depfile, to avoid errors with the
+-# Makefile "include basename.Plo" scheme.
+-make_dummy_depfile ()
+-{
+-  echo "#dummy" > "$depfile"
+-}
+-
+-# Factor out some common post-processing of the generated depfile.
+-# Requires the auxiliary global variable '$tmpdepfile' to be set.
+-aix_post_process_depfile ()
+-{
+-  # If the compiler actually managed to produce a dependency file,
+-  # post-process it.
+-  if test -f "$tmpdepfile"; then
+-    # Each line is of the form 'foo.o: dependency.h'.
+-    # Do two passes, one to just change these to
+-    #   $object: dependency.h
+-    # and one to simply output
+-    #   dependency.h:
+-    # which is needed to avoid the deleted-header problem.
+-    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+-      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+-    } > "$depfile"
+-    rm -f "$tmpdepfile"
+-  else
+-    make_dummy_depfile
+-  fi
+-}
+-
+ # A tabulation character.
+ tab='	'
+ # A newline character.
+ nl='
+ '
+-# Character ranges might be problematic outside the C locale.
+-# These definitions help.
+-upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+-lower=abcdefghijklmnopqrstuvwxyz
+-digits=0123456789
+-alpha=${upper}${lower}
+ 
+ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+   echo "depcomp: Variables source, object and depmode must be set" 1>&2
+@@ -128,9 +74,6 @@ tmpdepfile=${tmpdepfile-`echo "$depfile"
+ 
+ rm -f "$tmpdepfile"
+ 
+-# Avoid interferences from the environment.
+-gccflag= dashmflag=
+-
+ # Some modes work just like other modes, but use different flags.  We
+ # parameterize here, but still list the modes in the big case below,
+ # to make depend.m4 easier to write.  Note that we *cannot* use a case
+@@ -142,32 +85,32 @@ if test "$depmode" = hp; then
+ fi
+ 
+ if test "$depmode" = dashXmstdout; then
+-  # This is just like dashmstdout with a different argument.
+-  dashmflag=-xM
+-  depmode=dashmstdout
++   # This is just like dashmstdout with a different argument.
++   dashmflag=-xM
++   depmode=dashmstdout
+ fi
+ 
+ cygpath_u="cygpath -u -f -"
+ if test "$depmode" = msvcmsys; then
+-  # This is just like msvisualcpp but w/o cygpath translation.
+-  # Just convert the backslash-escaped backslashes to single forward
+-  # slashes to satisfy depend.m4
+-  cygpath_u='sed s,\\\\,/,g'
+-  depmode=msvisualcpp
++   # This is just like msvisualcpp but w/o cygpath translation.
++   # Just convert the backslash-escaped backslashes to single forward
++   # slashes to satisfy depend.m4
++   cygpath_u='sed s,\\\\,/,g'
++   depmode=msvisualcpp
+ fi
+ 
+ if test "$depmode" = msvc7msys; then
+-  # This is just like msvc7 but w/o cygpath translation.
+-  # Just convert the backslash-escaped backslashes to single forward
+-  # slashes to satisfy depend.m4
+-  cygpath_u='sed s,\\\\,/,g'
+-  depmode=msvc7
++   # This is just like msvc7 but w/o cygpath translation.
++   # Just convert the backslash-escaped backslashes to single forward
++   # slashes to satisfy depend.m4
++   cygpath_u='sed s,\\\\,/,g'
++   depmode=msvc7
+ fi
+ 
+ if test "$depmode" = xlc; then
+-  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+-  gccflag=-qmakedep=gcc,-MF
+-  depmode=gcc
++   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
++   gccflag=-qmakedep=gcc,-MF
++   depmode=gcc
+ fi
+ 
+ case "$depmode" in
+@@ -190,7 +133,8 @@ gcc3)
+   done
+   "$@"
+   stat=$?
+-  if test $stat -ne 0; then
++  if test $stat -eq 0; then :
++  else
+     rm -f "$tmpdepfile"
+     exit $stat
+   fi
+@@ -198,17 +142,13 @@ gcc3)
+   ;;
+ 
+ gcc)
+-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+-## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+-## (see the conditional assignment to $gccflag above).
+ ## There are various ways to get dependency output from gcc.  Here's
+ ## why we pick this rather obscure method:
+ ## - Don't want to use -MD because we'd like the dependencies to end
+ ##   up in a subdir.  Having to rename by hand is ugly.
+ ##   (We might end up doing this anyway to support other compilers.)
+ ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+-##   -MM, not -M (despite what the docs say).  Also, it might not be
+-##   supported by the other compilers which use the 'gcc' depmode.
++##   -MM, not -M (despite what the docs say).
+ ## - Using -M directly means running the compiler twice (even worse
+ ##   than renaming).
+   if test -z "$gccflag"; then
+@@ -216,14 +156,15 @@ gcc)
+   fi
+   "$@" -Wp,"$gccflag$tmpdepfile"
+   stat=$?
+-  if test $stat -ne 0; then
++  if test $stat -eq 0; then :
++  else
+     rm -f "$tmpdepfile"
+     exit $stat
+   fi
+   rm -f "$depfile"
+   echo "$object : \\" > "$depfile"
+-  # The second -e expression handles DOS-style file names with drive
+-  # letters.
++  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
++## The second -e expression handles DOS-style file names with drive letters.
+   sed -e 's/^[^:]*: / /' \
+       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+ ## This next piece of magic avoids the "deleted header file" problem.
+@@ -232,15 +173,15 @@ gcc)
+ ## typically no way to rebuild the header).  We avoid this by adding
+ ## dummy dependencies for each header file.  Too bad gcc doesn't do
+ ## this for us directly.
++  tr ' ' "$nl" < "$tmpdepfile" |
+ ## Some versions of gcc put a space before the ':'.  On the theory
+ ## that the space means something, we add a space to the output as
+ ## well.  hp depmode also adds that space, but also prefixes the VPATH
+ ## to the object.  Take care to not repeat it in the output.
+ ## Some versions of the HPUX 10.20 sed can't process this invocation
+ ## correctly.  Breaking it into two sed invocations is a workaround.
+-  tr ' ' "$nl" < "$tmpdepfile" \
+-    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+-    | sed -e 's/$/ :/' >> "$depfile"
++    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
++      | sed -e 's/$/ :/' >> "$depfile"
+   rm -f "$tmpdepfile"
+   ;;
+ 
+@@ -258,7 +199,8 @@ sgi)
+     "$@" -MDupdate "$tmpdepfile"
+   fi
+   stat=$?
+-  if test $stat -ne 0; then
++  if test $stat -eq 0; then :
++  else
+     rm -f "$tmpdepfile"
+     exit $stat
+   fi
+@@ -266,6 +208,7 @@ sgi)
+ 
+   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+     echo "$object : \\" > "$depfile"
++
+     # Clip off the initial element (the dependent).  Don't try to be
+     # clever and replace this with sed code, as IRIX sed won't handle
+     # lines with more than a fixed number of characters (4096 in
+@@ -273,15 +216,19 @@ sgi)
+     # the IRIX cc adds comments like '#:fec' to the end of the
+     # dependency line.
+     tr ' ' "$nl" < "$tmpdepfile" \
+-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+-      | tr "$nl" ' ' >> "$depfile"
++    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
++    tr "$nl" ' ' >> "$depfile"
+     echo >> "$depfile"
++
+     # The second pass generates a dummy entry for each header file.
+     tr ' ' "$nl" < "$tmpdepfile" \
+-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+-      >> "$depfile"
++   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
++   >> "$depfile"
+   else
+-    make_dummy_depfile
++    # The sourcefile does not contain any dependencies, so just
++    # store a dummy comment line, to avoid errors with the Makefile
++    # "include basename.Plo" scheme.
++    echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+@@ -299,8 +246,9 @@ aix)
+   # current directory.  Also, the AIX compiler puts '$object:' at the
+   # start of each line; $object doesn't have directory information.
+   # Version 6 uses the directory in both cases.
+-  set_dir_from "$object"
+-  set_base_from "$object"
++  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++  test "x$dir" = "x$object" && dir=
++  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+   if test "$libtool" = yes; then
+     tmpdepfile1=$dir$base.u
+     tmpdepfile2=$base.u
+@@ -313,7 +261,9 @@ aix)
+     "$@" -M
+   fi
+   stat=$?
+-  if test $stat -ne 0; then
++
++  if test $stat -eq 0; then :
++  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+     exit $stat
+   fi
+@@ -322,113 +272,65 @@ aix)
+   do
+     test -f "$tmpdepfile" && break
+   done
+-  aix_post_process_depfile
+-  ;;
+-
+-tcc)
+-  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+-  # FIXME: That version still under development at the moment of writing.
+-  #        Make that this statement remains true also for stable, released
+-  #        versions.
+-  # It will wrap lines (doesn't matter whether long or short) with a
+-  # trailing '\', as in:
+-  #
+-  #   foo.o : \
+-  #    foo.c \
+-  #    foo.h \
+-  #
+-  # It will put a trailing '\' even on the last line, and will use leading
+-  # spaces rather than leading tabs (at least since its commit 0394caf7
+-  # "Emit spaces for -MD").
+-  "$@" -MD -MF "$tmpdepfile"
+-  stat=$?
+-  if test $stat -ne 0; then
+-    rm -f "$tmpdepfile"
+-    exit $stat
++  if test -f "$tmpdepfile"; then
++    # Each line is of the form 'foo.o: dependent.h'.
++    # Do two passes, one to just change these to
++    # '$object: dependent.h' and one to simply 'dependent.h:'.
++    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++  else
++    # The sourcefile does not contain any dependencies, so just
++    # store a dummy comment line, to avoid errors with the Makefile
++    # "include basename.Plo" scheme.
++    echo "#dummy" > "$depfile"
+   fi
+-  rm -f "$depfile"
+-  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+-  # We have to change lines of the first kind to '$object: \'.
+-  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+-  # And for each line of the second kind, we have to emit a 'dep.h:'
+-  # dummy dependency, to avoid the deleted-header problem.
+-  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+   rm -f "$tmpdepfile"
+   ;;
+ 
+-## The order of this option in the case statement is important, since the
+-## shell code in configure will try each of these formats in the order
+-## listed in this file.  A plain '-MD' option would be understood by many
+-## compilers, so we must ensure this comes after the gcc and icc options.
+-pgcc)
+-  # Portland's C compiler understands '-MD'.
+-  # Will always output deps to 'file.d' where file is the root name of the
+-  # source file under compilation, even if file resides in a subdirectory.
+-  # The object file name does not affect the name of the '.d' file.
+-  # pgcc 10.2 will output
++icc)
++  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
++  # However on
++  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
++  # ICC 7.0 will fill foo.d with something like
++  #    foo.o: sub/foo.c
++  #    foo.o: sub/foo.h
++  # which is wrong.  We want
++  #    sub/foo.o: sub/foo.c
++  #    sub/foo.o: sub/foo.h
++  #    sub/foo.c:
++  #    sub/foo.h:
++  # ICC 7.1 will output
+   #    foo.o: sub/foo.c sub/foo.h
+-  # and will wrap long lines using '\' :
++  # and will wrap long lines using '\':
+   #    foo.o: sub/foo.c ... \
+   #     sub/foo.h ... \
+   #     ...
+-  set_dir_from "$object"
+-  # Use the source, not the object, to determine the base name, since
+-  # that's sadly what pgcc will do too.
+-  set_base_from "$source"
+-  tmpdepfile=$base.d
+-
+-  # For projects that build the same source file twice into different object
+-  # files, the pgcc approach of using the *source* file root name can cause
+-  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+-  # the same $tmpdepfile.
+-  lockdir=$base.d-lock
+-  trap "
+-    echo '$0: caught signal, cleaning up...' >&2
+-    rmdir '$lockdir'
+-    exit 1
+-  " 1 2 13 15
+-  numtries=100
+-  i=$numtries
+-  while test $i -gt 0; do
+-    # mkdir is a portable test-and-set.
+-    if mkdir "$lockdir" 2>/dev/null; then
+-      # This process acquired the lock.
+-      "$@" -MD
+-      stat=$?
+-      # Release the lock.
+-      rmdir "$lockdir"
+-      break
+-    else
+-      # If the lock is being held by a different process, wait
+-      # until the winning process is done or we timeout.
+-      while test -d "$lockdir" && test $i -gt 0; do
+-        sleep 1
+-        i=`expr $i - 1`
+-      done
+-    fi
+-    i=`expr $i - 1`
+-  done
+-  trap - 1 2 13 15
+-  if test $i -le 0; then
+-    echo "$0: failed to acquire lock after $numtries attempts" >&2
+-    echo "$0: check lockdir '$lockdir'" >&2
+-    exit 1
+-  fi
+-
+-  if test $stat -ne 0; then
++  # tcc 0.9.26 (FIXME still under development at the moment of writing)
++  # will emit a similar output, but also prepend the continuation lines
++  # with horizontal tabulation characters.
++  "$@" -MD -MF "$tmpdepfile"
++  stat=$?
++  if test $stat -eq 0; then :
++  else
+     rm -f "$tmpdepfile"
+     exit $stat
+   fi
+   rm -f "$depfile"
+-  # Each line is of the form `foo.o: dependent.h',
+-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
++  # Each line is of the form 'foo.o: dependent.h',
++  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
+   # Do two passes, one to just change these to
+-  # `$object: dependent.h' and one to simply `dependent.h:'.
+-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+-  # Some versions of the HPUX 10.20 sed can't process this invocation
+-  # correctly.  Breaking it into two sed invocations is a workaround.
+-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+-    | sed -e 's/$/ :/' >> "$depfile"
++  # '$object: dependent.h' and one to simply 'dependent.h:'.
++  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
++    < "$tmpdepfile" > "$depfile"
++  sed '
++    s/[ '"$tab"'][ '"$tab"']*/ /g
++    s/^ *//
++    s/ *\\*$//
++    s/^[^:]*: *//
++    /^$/d
++    /:$/d
++    s/$/ :/
++  ' < "$tmpdepfile" >> "$depfile"
+   rm -f "$tmpdepfile"
+   ;;
+ 
+@@ -439,8 +341,9 @@ hp2)
+   # 'foo.d', which lands next to the object file, wherever that
+   # happens to be.
+   # Much of this is similar to the tru64 case; see comments there.
+-  set_dir_from  "$object"
+-  set_base_from "$object"
++  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++  test "x$dir" = "x$object" && dir=
++  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+   if test "$libtool" = yes; then
+     tmpdepfile1=$dir$base.d
+     tmpdepfile2=$dir.libs/$base.d
+@@ -451,7 +354,8 @@ hp2)
+     "$@" +Maked
+   fi
+   stat=$?
+-  if test $stat -ne 0; then
++  if test $stat -eq 0; then :
++  else
+      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      exit $stat
+   fi
+@@ -461,61 +365,76 @@ hp2)
+     test -f "$tmpdepfile" && break
+   done
+   if test -f "$tmpdepfile"; then
+-    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
++    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+     # Add 'dependent.h:' lines.
+     sed -ne '2,${
+-               s/^ *//
+-               s/ \\*$//
+-               s/$/:/
+-               p
+-             }' "$tmpdepfile" >> "$depfile"
++	       s/^ *//
++	       s/ \\*$//
++	       s/$/:/
++	       p
++	     }' "$tmpdepfile" >> "$depfile"
+   else
+-    make_dummy_depfile
++    echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile" "$tmpdepfile2"
+   ;;
+ 
+ tru64)
+-  # The Tru64 compiler uses -MD to generate dependencies as a side
+-  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+-  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+-  # dependencies in 'foo.d' instead, so we check for that too.
+-  # Subdirectories are respected.
+-  set_dir_from  "$object"
+-  set_base_from "$object"
++   # The Tru64 compiler uses -MD to generate dependencies as a side
++   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
++   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
++   # dependencies in 'foo.d' instead, so we check for that too.
++   # Subdirectories are respected.
++   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++   test "x$dir" = "x$object" && dir=
++   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ 
+-  if test "$libtool" = yes; then
+-    # Libtool generates 2 separate objects for the 2 libraries.  These
+-    # two compilations output dependencies in $dir.libs/$base.o.d and
+-    # in $dir$base.o.d.  We have to check for both files, because
+-    # one of the two compilations can be disabled.  We should prefer
+-    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+-    # automatically cleaned when .libs/ is deleted, while ignoring
+-    # the former would cause a distcleancheck panic.
+-    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+-    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+-    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+-    "$@" -Wc,-MD
+-  else
+-    tmpdepfile1=$dir$base.d
+-    tmpdepfile2=$dir$base.d
+-    tmpdepfile3=$dir$base.d
+-    "$@" -MD
+-  fi
++   if test "$libtool" = yes; then
++      # With Tru64 cc, shared objects can also be used to make a
++      # static library.  This mechanism is used in libtool 1.4 series to
++      # handle both shared and static libraries in a single compilation.
++      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
++      #
++      # With libtool 1.5 this exception was removed, and libtool now
++      # generates 2 separate objects for the 2 libraries.  These two
++      # compilations output dependencies in $dir.libs/$base.o.d and
++      # in $dir$base.o.d.  We have to check for both files, because
++      # one of the two compilations can be disabled.  We should prefer
++      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
++      # automatically cleaned when .libs/ is deleted, while ignoring
++      # the former would cause a distcleancheck panic.
++      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
++      tmpdepfile2=$dir$base.o.d          # libtool 1.5
++      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
++      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
++      "$@" -Wc,-MD
++   else
++      tmpdepfile1=$dir$base.o.d
++      tmpdepfile2=$dir$base.d
++      tmpdepfile3=$dir$base.d
++      tmpdepfile4=$dir$base.d
++      "$@" -MD
++   fi
+ 
+-  stat=$?
+-  if test $stat -ne 0; then
+-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+-    exit $stat
+-  fi
++   stat=$?
++   if test $stat -eq 0; then :
++   else
++      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
++      exit $stat
++   fi
+ 
+-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+-  do
+-    test -f "$tmpdepfile" && break
+-  done
+-  # Same post-processing that is required for AIX mode.
+-  aix_post_process_depfile
+-  ;;
++   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
++   do
++     test -f "$tmpdepfile" && break
++   done
++   if test -f "$tmpdepfile"; then
++      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++   else
++      echo "#dummy" > "$depfile"
++   fi
++   rm -f "$tmpdepfile"
++   ;;
+ 
+ msvc7)
+   if test "$libtool" = yes; then
+@@ -526,7 +445,8 @@ msvc7)
+   "$@" $showIncludes > "$tmpdepfile"
+   stat=$?
+   grep -v '^Note: including file: ' "$tmpdepfile"
+-  if test $stat -ne 0; then
++  if test "$stat" = 0; then :
++  else
+     rm -f "$tmpdepfile"
+     exit $stat
+   fi
+@@ -552,7 +472,6 @@ $ {
+   G
+   p
+ }' >> "$depfile"
+-  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+   rm -f "$tmpdepfile"
+   ;;
+ 
+@@ -604,14 +523,13 @@ dashmstdout)
+   # in the target name.  This is to cope with DOS-style filenames:
+   # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+   "$@" $dashmflag |
+-    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
++    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
+   rm -f "$depfile"
+   cat < "$tmpdepfile" > "$depfile"
+-  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+-  # correctly.  Breaking it into two sed invocations is a workaround.
+-  tr ' ' "$nl" < "$tmpdepfile" \
+-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+-    | sed -e 's/$/ :/' >> "$depfile"
++  tr ' ' "$nl" < "$tmpdepfile" | \
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly.  Breaking it into two sed invocations is a workaround.
++    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+   rm -f "$tmpdepfile"
+   ;;
+ 
+@@ -664,12 +582,10 @@ makedepend)
+   # makedepend may prepend the VPATH from the source file name to the object.
+   # No need to regex-escape $object, excess matching of '.' is harmless.
+   sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+-  # Some versions of the HPUX 10.20 sed can't process the last invocation
+-  # correctly.  Breaking it into two sed invocations is a workaround.
+-  sed '1,2d' "$tmpdepfile" \
+-    | tr ' ' "$nl" \
+-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+-    | sed -e 's/$/ :/' >> "$depfile"
++  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly.  Breaking it into two sed invocations is a workaround.
++    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+   rm -f "$tmpdepfile" "$tmpdepfile".bak
+   ;;
+ 
+@@ -705,10 +621,10 @@ cpp)
+     esac
+   done
+ 
+-  "$@" -E \
+-    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+-             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+-    | sed '$ s: \\$::' > "$tmpdepfile"
++  "$@" -E |
++    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
++       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++    sed '$ s: \\$::' > "$tmpdepfile"
+   rm -f "$depfile"
+   echo "$object : \\" > "$depfile"
+   cat < "$tmpdepfile" >> "$depfile"
+@@ -740,15 +656,15 @@ msvisualcpp)
+       shift
+       ;;
+     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+-        set fnord "$@"
+-        shift
+-        shift
+-        ;;
++	set fnord "$@"
++	shift
++	shift
++	;;
+     *)
+-        set fnord "$@" "$arg"
+-        shift
+-        shift
+-        ;;
++	set fnord "$@" "$arg"
++	shift
++	shift
++	;;
+     esac
+   done
+   "$@" -E 2>/dev/null |
diff --git a/package/libsoup/patches/patch-build-aux_missing b/package/libsoup/patches/patch-build-aux_missing
new file mode 100644
index 000000000..d51cb4f26
--- /dev/null
+++ b/package/libsoup/patches/patch-build-aux_missing
@@ -0,0 +1,440 @@
+--- libsoup-2.44.2.orig/build-aux/missing	2013-10-18 00:01:48.000000000 +0200
++++ libsoup-2.44.2/build-aux/missing	2014-04-14 17:21:42.180934853 +0200
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+-# Common wrapper for a few potentially missing GNU programs.
++# Common stub for a few missing GNU programs while installing.
+ 
+-scriptversion=2012-06-26.16; # UTC
++scriptversion=2012-01-06.18; # UTC
+ 
+-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+-# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
++# Copyright (C) 1996-2012 Free Software Foundation, Inc.
++# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+ 
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -29,33 +29,61 @@ if test $# -eq 0; then
+   exit 1
+ fi
+ 
+-case $1 in
++run=:
++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
++sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+ 
+-  --is-lightweight)
+-    # Used by our autoconf macros to check whether the available missing
+-    # script is modern enough.
+-    exit 0
+-    ;;
++# In the cases where this matters, 'missing' is being run in the
++# srcdir already.
++if test -f configure.ac; then
++  configure_ac=configure.ac
++else
++  configure_ac=configure.in
++fi
+ 
+-  --run)
+-    # Back-compat with the calling convention used by older automake.
+-    shift
+-    ;;
++msg="missing on your system"
++
++case $1 in
++--run)
++  # Try to run requested program, and just exit if it succeeds.
++  run=
++  shift
++  "$@" && exit 0
++  # Exit code 63 means version mismatch.  This often happens
++  # when the user try to use an ancient version of a tool on
++  # a file that requires a minimum version.  In this case we
++  # we should proceed has if the program had been absent, or
++  # if --run hadn't been passed.
++  if test $? = 63; then
++    run=:
++    msg="probably too old"
++  fi
++  ;;
+ 
+   -h|--h|--he|--hel|--help)
+     echo "\
+ $0 [OPTION]... PROGRAM [ARGUMENT]...
+ 
+-Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+-to PROGRAM being missing or too old.
++Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
++error status if there is no known handling for PROGRAM.
+ 
+ Options:
+   -h, --help      display this help and exit
+   -v, --version   output version information and exit
++  --run           try to run the given command, and emulate it if it fails
+ 
+ Supported PROGRAM values:
+-  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+-  bison     yacc      flex         lex       help2man
++  aclocal      touch file 'aclocal.m4'
++  autoconf     touch file 'configure'
++  autoheader   touch file 'config.h.in'
++  autom4te     touch the output file, or create a stub one
++  automake     touch all 'Makefile.in' files
++  bison        create 'y.tab.[ch]', if possible, from existing .[ch]
++  flex         create 'lex.yy.c', if possible, from existing .c
++  help2man     touch the output file
++  lex          create 'lex.yy.c', if possible, from existing .c
++  makeinfo     touch the output file
++  yacc         create 'y.tab.[ch]', if possible, from existing .[ch]
+ 
+ Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+ 'g' are ignored when checking the name.
+@@ -70,141 +98,228 @@ Send bug reports to <bug-automake@gnu.or
+     ;;
+ 
+   -*)
+-    echo 1>&2 "$0: unknown '$1' option"
++    echo 1>&2 "$0: Unknown '$1' option"
+     echo 1>&2 "Try '$0 --help' for more information"
+     exit 1
+     ;;
+ 
+ esac
+ 
+-# Run the given program, remember its exit status.
+-"$@"; st=$?
++# normalize program name to check for.
++program=`echo "$1" | sed '
++  s/^gnu-//; t
++  s/^gnu//; t
++  s/^g//; t'`
+ 
+-# If it succeeded, we are done.
+-test $st -eq 0 && exit 0
++# Now exit if we have it, but it failed.  Also exit now if we
++# don't have it and --version was passed (most likely to detect
++# the program).  This is about non-GNU programs, so use $1 not
++# $program.
++case $1 in
++  lex*|yacc*)
++    # Not GNU programs, they don't have --version.
++    ;;
+ 
+-# Also exit now if we it failed (or wasn't found), and '--version' was
+-# passed; such an option is passed most likely to detect whether the
+-# program is present and works.
+-case $2 in --version|--help) exit $st;; esac
++  *)
++    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
++       # We have it, but it failed.
++       exit 1
++    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++       # Could not run --version or --help.  This is probably someone
++       # running '$TOOL --version' or '$TOOL --help' to check whether
++       # $TOOL exists and not knowing $TOOL uses missing.
++       exit 1
++    fi
++    ;;
++esac
+ 
+-# Exit code 63 means version mismatch.  This often happens when the user
+-# tries to use an ancient version of a tool on a file that requires a
+-# minimum version.
+-if test $st -eq 63; then
+-  msg="probably too old"
+-elif test $st -eq 127; then
+-  # Program was missing.
+-  msg="missing on your system"
+-else
+-  # Program was found and executed, but failed.  Give up.
+-  exit $st
+-fi
++# If it does not exist, or fails to run (possibly an outdated version),
++# try to emulate it.
++case $program in
++  aclocal*)
++    echo 1>&2 "\
++WARNING: '$1' is $msg.  You should only need it if
++         you modified 'acinclude.m4' or '${configure_ac}'.  You might want
++         to install the Automake and Perl packages.  Grab them from
++         any GNU archive site."
++    touch aclocal.m4
++    ;;
+ 
+-perl_URL=http://www.perl.org/
+-flex_URL=http://flex.sourceforge.net/
+-gnu_software_URL=http://www.gnu.org/software
++  autoconf*)
++    echo 1>&2 "\
++WARNING: '$1' is $msg.  You should only need it if
++         you modified '${configure_ac}'.  You might want to install the
++         Autoconf and GNU m4 packages.  Grab them from any GNU
++         archive site."
++    touch configure
++    ;;
+ 
+-program_details ()
+-{
+-  case $1 in
+-    aclocal|automake)
+-      echo "The '$1' program is part of the GNU Automake package:"
+-      echo "<$gnu_software_URL/automake>"
+-      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+-      echo "<$gnu_software_URL/autoconf>"
+-      echo "<$gnu_software_URL/m4/>"
+-      echo "<$perl_URL>"
+-      ;;
+-    autoconf|autom4te|autoheader)
+-      echo "The '$1' program is part of the GNU Autoconf package:"
+-      echo "<$gnu_software_URL/autoconf/>"
+-      echo "It also requires GNU m4 and Perl in order to run:"
+-      echo "<$gnu_software_URL/m4/>"
+-      echo "<$perl_URL>"
+-      ;;
+-  esac
+-}
++  autoheader*)
++    echo 1>&2 "\
++WARNING: '$1' is $msg.  You should only need it if
++         you modified 'acconfig.h' or '${configure_ac}'.  You might want
++         to install the Autoconf and GNU m4 packages.  Grab them
++         from any GNU archive site."
++    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
++    test -z "$files" && files="config.h"
++    touch_files=
++    for f in $files; do
++      case $f in
++      *:*) touch_files="$touch_files "`echo "$f" |
++				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
++      *) touch_files="$touch_files $f.in";;
++      esac
++    done
++    touch $touch_files
++    ;;
+ 
+-give_advice ()
+-{
+-  # Normalize program name to check for.
+-  normalized_program=`echo "$1" | sed '
+-    s/^gnu-//; t
+-    s/^gnu//; t
+-    s/^g//; t'`
++  automake*)
++    echo 1>&2 "\
++WARNING: '$1' is $msg.  You should only need it if
++         you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
++         You might want to install the Automake and Perl packages.
++         Grab them from any GNU archive site."
++    find . -type f -name Makefile.am -print |
++	   sed 's/\.am$/.in/' |
++	   while read f; do touch "$f"; done
++    ;;
+ 
+-  printf '%s\n' "'$1' is $msg."
++  autom4te*)
++    echo 1>&2 "\
++WARNING: '$1' is needed, but is $msg.
++         You might have modified some files without having the
++         proper tools for further handling them.
++         You can get '$1' as part of Autoconf from any GNU
++         archive site."
+ 
+-  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+-  case $normalized_program in
+-    autoconf*)
+-      echo "You should only need it if you modified 'configure.ac',"
+-      echo "or m4 files included by it."
+-      program_details 'autoconf'
+-      ;;
+-    autoheader*)
+-      echo "You should only need it if you modified 'acconfig.h' or"
+-      echo "$configure_deps."
+-      program_details 'autoheader'
+-      ;;
+-    automake*)
+-      echo "You should only need it if you modified 'Makefile.am' or"
+-      echo "$configure_deps."
+-      program_details 'automake'
+-      ;;
+-    aclocal*)
+-      echo "You should only need it if you modified 'acinclude.m4' or"
+-      echo "$configure_deps."
+-      program_details 'aclocal'
+-      ;;
+-   autom4te*)
+-      echo "You might have modified some maintainer files that require"
+-      echo "the 'automa4te' program to be rebuilt."
+-      program_details 'autom4te'
+-      ;;
+-    bison*|yacc*)
+-      echo "You should only need it if you modified a '.y' file."
+-      echo "You may want to install the GNU Bison package:"
+-      echo "<$gnu_software_URL/bison/>"
+-      ;;
+-    lex*|flex*)
+-      echo "You should only need it if you modified a '.l' file."
+-      echo "You may want to install the Fast Lexical Analyzer package:"
+-      echo "<$flex_URL>"
+-      ;;
+-    help2man*)
+-      echo "You should only need it if you modified a dependency" \
+-           "of a man page."
+-      echo "You may want to install the GNU Help2man package:"
+-      echo "<$gnu_software_URL/help2man/>"
++    file=`echo "$*" | sed -n "$sed_output"`
++    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++    if test -f "$file"; then
++	touch $file
++    else
++	test -z "$file" || exec >$file
++	echo "#! /bin/sh"
++	echo "# Created by GNU Automake missing as a replacement of"
++	echo "#  $ $@"
++	echo "exit 0"
++	chmod +x $file
++	exit 1
++    fi
+     ;;
+-    makeinfo*)
+-      echo "You should only need it if you modified a '.texi' file, or"
+-      echo "any other file indirectly affecting the aspect of the manual."
+-      echo "You might want to install the Texinfo package:"
+-      echo "<$gnu_software_URL/texinfo/>"
+-      echo "The spurious makeinfo call might also be the consequence of"
+-      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+-      echo "want to install GNU make:"
+-      echo "<$gnu_software_URL/make/>"
+-      ;;
+-    *)
+-      echo "You might have modified some files without having the proper"
+-      echo "tools for further handling them.  Check the 'README' file, it"
+-      echo "often tells you about the needed prerequisites for installing"
+-      echo "this package.  You may also peek at any GNU archive site, in"
+-      echo "case some other package contains this missing '$1' program."
+-      ;;
+-  esac
+-}
+ 
+-give_advice "$1" | sed -e '1s/^/WARNING: /' \
+-                       -e '2,$s/^/         /' >&2
++  bison*|yacc*)
++    echo 1>&2 "\
++WARNING: '$1' $msg.  You should only need it if
++         you modified a '.y' file.  You may need the Bison package
++         in order for those modifications to take effect.  You can get
++         Bison from any GNU archive site."
++    rm -f y.tab.c y.tab.h
++    if test $# -ne 1; then
++        eval LASTARG=\${$#}
++	case $LASTARG in
++	*.y)
++	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
++	    if test -f "$SRCFILE"; then
++	         cp "$SRCFILE" y.tab.c
++	    fi
++	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
++	    if test -f "$SRCFILE"; then
++	         cp "$SRCFILE" y.tab.h
++	    fi
++	  ;;
++	esac
++    fi
++    if test ! -f y.tab.h; then
++	echo >y.tab.h
++    fi
++    if test ! -f y.tab.c; then
++	echo 'main() { return 0; }' >y.tab.c
++    fi
++    ;;
+ 
+-# Propagate the correct exit status (expected to be 127 for a program
+-# not found, 63 for a program that failed due to version mismatch).
+-exit $st
++  lex*|flex*)
++    echo 1>&2 "\
++WARNING: '$1' is $msg.  You should only need it if
++         you modified a '.l' file.  You may need the Flex package
++         in order for those modifications to take effect.  You can get
++         Flex from any GNU archive site."
++    rm -f lex.yy.c
++    if test $# -ne 1; then
++        eval LASTARG=\${$#}
++	case $LASTARG in
++	*.l)
++	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
++	    if test -f "$SRCFILE"; then
++	         cp "$SRCFILE" lex.yy.c
++	    fi
++	  ;;
++	esac
++    fi
++    if test ! -f lex.yy.c; then
++	echo 'main() { return 0; }' >lex.yy.c
++    fi
++    ;;
++
++  help2man*)
++    echo 1>&2 "\
++WARNING: '$1' is $msg.  You should only need it if
++	 you modified a dependency of a manual page.  You may need the
++	 Help2man package in order for those modifications to take
++	 effect.  You can get Help2man from any GNU archive site."
++
++    file=`echo "$*" | sed -n "$sed_output"`
++    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++    if test -f "$file"; then
++	touch $file
++    else
++	test -z "$file" || exec >$file
++	echo ".ab help2man is required to generate this page"
++	exit $?
++    fi
++    ;;
++
++  makeinfo*)
++    echo 1>&2 "\
++WARNING: '$1' is $msg.  You should only need it if
++         you modified a '.texi' or '.texinfo' file, or any other file
++         indirectly affecting the aspect of the manual.  The spurious
++         call might also be the consequence of using a buggy 'make' (AIX,
++         DU, IRIX).  You might want to install the Texinfo package or
++         the GNU make package.  Grab either from any GNU archive site."
++    # The file to touch is that specified with -o ...
++    file=`echo "$*" | sed -n "$sed_output"`
++    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++    if test -z "$file"; then
++      # ... or it is the one specified with @setfilename ...
++      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
++      file=`sed -n '
++	/^@setfilename/{
++	  s/.* \([^ ]*\) *$/\1/
++	  p
++	  q
++	}' $infile`
++      # ... or it is derived from the source name (dir/f.texi becomes f.info)
++      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
++    fi
++    # If the file does not exist, the user really needs makeinfo;
++    # let's fail without touching anything.
++    test -f $file || exit 1
++    touch $file
++    ;;
++
++  *)
++    echo 1>&2 "\
++WARNING: '$1' is needed, and is $msg.
++         You might have modified some files without having the
++         proper tools for further handling them.  Check the 'README' file,
++         it often tells you about the needed prerequisites for installing
++         this package.  You may also peek at any GNU archive site, in case
++         some other package would contain this missing '$1' program."
++    exit 1
++    ;;
++esac
++
++exit 0
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/package/libsoup/patches/patch-configure_ac b/package/libsoup/patches/patch-configure_ac
new file mode 100644
index 000000000..099b01b2a
--- /dev/null
+++ b/package/libsoup/patches/patch-configure_ac
@@ -0,0 +1,10 @@
+--- libsoup-2.44.2.orig/configure.ac	2013-11-11 23:40:56.000000000 +0100
++++ libsoup-2.44.2/configure.ac	2014-04-14 17:20:43.656655730 +0200
+@@ -116,7 +116,6 @@ AM_CONDITIONAL(OS_WIN32, [test $os_win32
+ dnl ************************
+ dnl *** gettext/intltool ***
+ dnl ************************
+-IT_PROG_INTLTOOL([0.35.0])
+ GETTEXT_PACKAGE=libsoup
+ AC_SUBST([GETTEXT_PACKAGE])
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[The gettext domain name])
diff --git a/package/libwebp/Makefile b/package/libwebp/Makefile
new file mode 100644
index 000000000..8a22e3fa8
--- /dev/null
+++ b/package/libwebp/Makefile
@@ -0,0 +1,25 @@
+# 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:=		libwebp
+PKG_VERSION:=		0.3.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		dc862bb4006d819b7587767a9e83d31f
+PKG_DESCR:=		new image format for the web
+PKG_SECTION:=		libs
+PKG_URL:=		https://developers.google.com/speed/webp/
+PKG_SITES:=		https://webp.googlecode.com/files/
+PKG_OPTS:=		dev
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBWEBP,libwebp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+libwebp-install:
+	$(INSTALL_DIR) $(IDIR_LIBWEBP)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libwebp*.so* \
+		$(IDIR_LIBWEBP)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ltrace/Makefile b/package/ltrace/Makefile
new file mode 100644
index 000000000..a8464d55a
--- /dev/null
+++ b/package/ltrace/Makefile
@@ -0,0 +1,26 @@
+# 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:=		ltrace
+PKG_VERSION:=		0.7.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		2cb7660738b1e28fd84ce0dc06f6ea69
+PKG_DESCR:=		intercepts and records dynamic library calls 
+PKG_SECTION:=		debug
+PKG_DEPENDS:=		libelf
+PKG_BUILDDEP:=		libelf
+PKG_URL:=		http://ltrace.org/
+PKG_SITES:=		https://alioth.debian.org/frs/download.php/file/3948/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LTRACE,ltrace,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+ltrace-install:
+	$(INSTALL_DIR) $(IDIR_LTRACE)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/ltrace \
+		$(IDIR_LTRACE)/usr/sbin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ltrace/patches/patch-breakpoints_c b/package/ltrace/patches/patch-breakpoints_c
new file mode 100644
index 000000000..0c8d77c8b
--- /dev/null
+++ b/package/ltrace/patches/patch-breakpoints_c
@@ -0,0 +1,14 @@
+--- ltrace-0.7.3.orig/breakpoints.c	2013-09-09 11:46:54.000000000 +0200
++++ ltrace-0.7.3/breakpoints.c	2013-10-16 11:26:00.000000000 +0200
+@@ -159,9 +159,10 @@ int
+ breakpoint_clone(struct breakpoint *retp, struct Process *new_proc,
+ 		 struct breakpoint *bp, struct Process *old_proc)
+ {
++	__attribute__((unused))int rc;
+ 	struct library_symbol *libsym = NULL;
+ 	if (bp->libsym != NULL) {
+-		int rc = proc_find_symbol(new_proc, bp->libsym, NULL, &libsym);
++		rc = proc_find_symbol(new_proc, bp->libsym, NULL, &libsym);
+ 		assert(rc == 0);
+ 	}
+ 
diff --git a/package/ltrace/patches/patch-breakpoints_c.orig b/package/ltrace/patches/patch-breakpoints_c.orig
new file mode 100644
index 000000000..6c69f0d34
--- /dev/null
+++ b/package/ltrace/patches/patch-breakpoints_c.orig
@@ -0,0 +1,14 @@
+--- ltrace-0.7.3.orig/breakpoints.c	2013-09-09 11:46:54.000000000 +0200
++++ ltrace-0.7.3/breakpoints.c	2013-10-16 11:13:21.000000000 +0200
+@@ -159,9 +159,10 @@ int
+ breakpoint_clone(struct breakpoint *retp, struct Process *new_proc,
+ 		 struct breakpoint *bp, struct Process *old_proc)
+ {
++	int rc;
+ 	struct library_symbol *libsym = NULL;
+ 	if (bp->libsym != NULL) {
+-		int rc = proc_find_symbol(new_proc, bp->libsym, NULL, &libsym);
++		rc = proc_find_symbol(new_proc, bp->libsym, NULL, &libsym);
+ 		assert(rc == 0);
+ 	}
+ 
diff --git a/package/ltrace/patches/patch-handle_event_c b/package/ltrace/patches/patch-handle_event_c
new file mode 100644
index 000000000..c40853052
--- /dev/null
+++ b/package/ltrace/patches/patch-handle_event_c
@@ -0,0 +1,19 @@
+--- ltrace-0.7.3.orig/handle_event.c	2013-02-05 12:05:39.000000000 +0100
++++ ltrace-0.7.3/handle_event.c	2013-10-16 11:29:03.000000000 +0200
+@@ -533,6 +533,7 @@ calc_time_spent(Process *proc) {
+ 
+ static void
+ handle_sysret(Event *event) {
++	__attribute__((unused))unsigned d;
+ 	debug(DEBUG_FUNCTION, "handle_sysret(pid=%d, sysnum=%d)", event->proc->pid, event->e_un.sysnum);
+ 	if (event->proc->state != STATE_IGNORED) {
+ 		if (opt_T || options.summary) {
+@@ -544,7 +545,7 @@ handle_sysret(Event *event) {
+ 						     event->e_un.sysnum));
+ 
+ 		assert(event->proc->callstack_depth > 0);
+-		unsigned d = event->proc->callstack_depth - 1;
++		d = event->proc->callstack_depth - 1;
+ 		assert(event->proc->callstack[d].is_syscall);
+ 		callstack_pop(event->proc);
+ 	}
diff --git a/package/ltrace/patches/patch-proc_c b/package/ltrace/patches/patch-proc_c
new file mode 100644
index 000000000..5571a51c3
--- /dev/null
+++ b/package/ltrace/patches/patch-proc_c
@@ -0,0 +1,32 @@
+--- ltrace-0.7.3.orig/proc.c	2013-02-05 12:05:39.000000000 +0100
++++ ltrace-0.7.3/proc.c	2013-10-16 11:37:49.000000000 +0200
+@@ -329,6 +329,7 @@ clone_single_bp(void *key, void *value,
+ int
+ process_clone(struct Process *retp, struct Process *proc, pid_t pid)
+ {
++	__attribute__((unused))int rc;
+ 	if (process_bare_init(retp, proc->filename, pid, 0) < 0) {
+ 	fail1:
+ 		fprintf(stderr, "failed to clone process %d->%d : %s\n",
+@@ -432,7 +433,7 @@ process_clone(struct Process *retp, stru
+ 		 * library.  */
+ 		if (!elem->is_syscall && elem->c_un.libfunc != NULL) {
+ 			struct library_symbol *libfunc = elem->c_un.libfunc;
+-			int rc = proc_find_symbol(retp, libfunc,
++			rc = proc_find_symbol(retp, libfunc,
+ 						  NULL, &elem->c_un.libfunc);
+ 			assert(rc == 0);
+ 		}
+@@ -937,10 +938,11 @@ proc_add_breakpoint(struct Process *proc
+ void
+ proc_remove_breakpoint(struct Process *proc, struct breakpoint *bp)
+ {
++	__attribute__((unused))struct breakpoint *removed;
+ 	debug(DEBUG_FUNCTION, "proc_remove_breakpoint(pid=%d, %s@%p)",
+ 	      proc->pid, breakpoint_name(bp), bp->addr);
+ 	check_leader(proc);
+-	struct breakpoint *removed = dict_remove(proc->breakpoints, bp->addr);
++	removed = dict_remove(proc->breakpoints, bp->addr);
+ 	assert(removed == bp);
+ }
+ 
diff --git a/package/midori/Makefile b/package/midori/Makefile
new file mode 100644
index 000000000..13a916bc0
--- /dev/null
+++ b/package/midori/Makefile
@@ -0,0 +1,40 @@
+# 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:=		midori
+PKG_VERSION:=		0.5.8
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		5815eac39f4d9511ce2c71a81567647f
+PKG_DESCR:=		web browser
+PKG_SECTION:=		x11/apps
+PKG_DEPENDS:=		libnotify webkitgtk
+PKG_BUILDDEP:=		autotool cmake-host vala-host libnotify webkitgtk
+PKG_BUILDDEP+=		librsvg-host librsvg
+PKG_URL:=		http://www.midori-browser.org
+PKG_SITES:=		http://www.midori-browser.org/downloads/
+
+WRKBUILD=               ${WRKDIR}/${PKG_NAME}-obj
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,MIDORI,midori,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=          manual
+
+do-configure:
+	(cd $(WRKBUILD) && PATH='${HOST_PATH}' \
+		cmake -DCMAKE_SYSTEM_NAME=Linux \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DENABLE_NLS=0 \
+		-DUSE_ZEITGEIST=0 \
+		$(WRKSRC)/)
+
+midori-install:
+	$(INSTALL_DIR) $(IDIR_MIDORI)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/midori \
+		$(IDIR_MIDORI)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/vala/Makefile b/package/vala/Makefile
new file mode 100644
index 000000000..5a84b76a4
--- /dev/null
+++ b/package/vala/Makefile
@@ -0,0 +1,33 @@
+# 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:=		vala
+PKG_VERSION:=		0.24.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		beddeff9c06d3c278988b237da0e7401
+PKG_DESCR:=		compiler for the GObject type system
+PKG_SECTION:=		lang
+PKG_BUILDDEP:=		glib
+HOST_BUILDDEP:=		glib-host
+PKG_URL:=		https://wiki.gnome.org/Vala
+PKG_SITES:=		http://download.gnome.org/sources/vala/0.24/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,VALA,vala,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,VALA,vala,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+HOST_STYLE:=		auto
+
+vala-install:
+	$(INSTALL_DIR) $(IDIR_VALA)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/valac \
+		$(IDIR_VALA)/usr/bin
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile
new file mode 100644
index 000000000..b98149666
--- /dev/null
+++ b/package/webkitgtk/Makefile
@@ -0,0 +1,43 @@
+# 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:=		webkitgtk
+PKG_VERSION:=		2.4.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c759bf11fe4cadd1268630f16a97f7b9
+PKG_DESCR:=		web browser engine
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		glib icu4c zlib libwebp libgtk libsoup
+PKG_DEPENDS+=		libsecret libxt
+PKG_DEPENDS+=		gst-plugins-base gstreamer
+PKG_BUILDDEP:=		glib icu4c zlib libwebp gtk+
+PKG_BUILDDEP+=		libsoup libsecret libXt
+PKG_BUILDDEP+=		gst-plugins-base gstreamer
+PKG_URL:=		http://www.webkitgtk.org/
+PKG_SITES:=		http://webkitgtk.org/releases/
+PKG_OPTS:=		dev
+
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,WEBKITGTK,webkitgtk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+MAKE_FILE:=		GNUmakefile
+CONFIGURE_ENV+=		AR_FLAGS="cr"
+CONFIGURE_ARGS+=	--with-gtk=2.0 \
+			--disable-webkit2 \
+			--disable-geolocation
+
+pre-build:
+	mkdir -p $(WRKBUILD)/DerivedSources/{webkit,webkitdom,InjectedBundle,Platform}
+	mkdir -p $(WRKBUILD)/DerivedSources/WebKit2/webkit2gtk/webkit2
+
+webkitgtk-install:
+	$(INSTALL_DIR) $(IDIR_WEBKITGTK)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/webkitgtk*.so* \
+		$(IDIR_WEBKITGTK)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From 5266a0a75cb98dc2dec0ced894fbff70d36b26ab Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 12:06:29 +0200
Subject: use CLIB instead of LIBC to avoid clashes with uClibc buildsystem

---
 mk/build.mk        | 28 ++++++++++++++--------------
 toolchain/Makefile | 28 ++++++++++++++--------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/mk/build.mk b/mk/build.mk
index 6d4f8a4e1..bc1ce477b 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -361,9 +361,9 @@ endif
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/.defconfig; \
 	fi
-	@if [ ! -z "$(LIBC)" ];then \
+	@if [ ! -z "$(CLIB)" ];then \
 		grep "^config" target/config/Config.in \
-			|grep -i "$(LIBC)" \
+			|grep -i "$(CLIB)" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/.defconfig; \
 	fi
@@ -419,9 +419,9 @@ endif
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/all.config; \
 	fi
-	@if [ ! -z "$(LIBC)" ];then \
+	@if [ ! -z "$(CLIB)" ];then \
 		grep "^config" target/config/Config.in \
-			|grep -i "$(LIBC)" \
+			|grep -i "$(CLIB)" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/all.config; \
 	fi
@@ -466,10 +466,10 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 
 # build all target architecture and libc combinations (toolchain only)
 bulktoolchain:
-	@if [ -z "$(LIBC)" ];then \
+	@if [ -z "$(CLIB)" ];then \
 		libc="glibc uclibc musl"; \
 	else \
-		libc="$(LIBC)"; \
+		libc="$(CLIB)"; \
 	fi; \
 	for libc in $$libc;do \
 		while read arch; do \
@@ -478,7 +478,7 @@ bulktoolchain:
 			tarch=$$(echo $$arch|sed -e "s#sh4.*#sh#" -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#hf##" -e "s#x86_64.*#x86_64#" ); \
 			carch=$$(echo $$arch|sed -e "s#hf##" -e "s#mips64n.*#mips64#" -e "s#mips64el.*#mips64el#" -e 's#x86$$#i686#' -e "s#x86_64.*#x86_64#" ); \
 			echo === building $$tarch $$libc toolchain-$$arch on $$(date); \
-				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
+				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch CLIB=$$libc defconfig; \
 				tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
 				if [ $$arch = "armhf" ];then arch=arm; else arch=$$arch;fi; \
 				if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \
@@ -494,10 +494,10 @@ bulktoolchain:
 	done
 
 test-framework:
-	@if [ -z "$(LIBC)" ];then \
+	@if [ -z "$(CLIB)" ];then \
 		libc="glibc uclibc musl"; \
 	else \
-		libc="$(LIBC)"; \
+		libc="$(CLIB)"; \
 	fi; \
 	for libc in $$libc;do \
 		( \
@@ -506,7 +506,7 @@ test-framework:
 				tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#" -e "s#hf##" -e "s#x86_64.*#x86_64#"); \
 				arch=$$(echo $$arch|sed -e 's#x86$$#i686#'); \
 				echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \
-				$(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=initramfsarchive COLLECTION=test defconfig; \
+				$(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch CLIB=$$libc FS=initramfsarchive COLLECTION=test defconfig; \
 				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 				tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
 				if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \
@@ -529,7 +529,7 @@ release:
 		( \
 			echo === building $$libc on $$(date); \
 			$(GMAKE) prereq && \
-			$(GMAKE) ARCH=$(ARCH) SYSTEM=$(SYSTEM) LIBC=$$libc FS=archive allmodconfig; \
+			$(GMAKE) ARCH=$(ARCH) SYSTEM=$(SYSTEM) CLIB=$$libc FS=archive allmodconfig; \
 			$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 			rm .config; \
 		) 2>&1 | tee $(TOPDIR)/firmware/release-build.log; \
@@ -547,7 +547,7 @@ bulk:
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
-		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive defconfig; \
+		$(GMAKE) ARCH=$$arch SYSTEM=$$system CLIB=$$libc FS=archive defconfig; \
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 		rm .config; \
             ) 2>&1 | tee $(TOPDIR)/firmware/bulkbuild.log; \
@@ -567,7 +567,7 @@ bulkall:
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
-		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allconfig; \
+		$(GMAKE) ARCH=$$arch SYSTEM=$$system CLIB=$$libc FS=archive allconfig; \
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 		rm .config; \
             ) 2>&1 | tee $(TOPDIR)/firmware/bulkallbuild.log; \
@@ -587,7 +587,7 @@ bulkallmod:
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
-		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allmodconfig; \
+		$(GMAKE) ARCH=$$arch SYSTEM=$$system CLIB=$$libc FS=archive allmodconfig; \
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system-$$libc >.exit; exit 1;fi; \
 		$(GMAKE) clean; \
 		rm .config; \
diff --git a/toolchain/Makefile b/toolchain/Makefile
index d37117272..d0922507f 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -18,15 +18,15 @@ include $(TOPDIR)/rules.mk
 TARGETS:=binutils gmp mpfr mpc libelf gcc
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 TARGETS+=glibc
-LIBC:=glibc
+CLIB:=glibc
 endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 TARGETS+=uclibc
-LIBC:=uclibc
+CLIB:=uclibc
 endif
 ifeq ($(ADK_TARGET_LIB_MUSL),y)
 TARGETS+=musl
-LIBC:=musl
+CLIB:=musl
 endif
 ifeq ($(ADK_TOOLCHAIN_GDB),y)
 TARGETS+=gdb
@@ -34,7 +34,7 @@ endif
 
 DOWNLOAD:=kernel-headers-download $(patsubst %,%-download,$(TARGETS))
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
-FIXUP:=$(patsubst %,%-fixup,$(LIBC))
+FIXUP:=$(patsubst %,%-fixup,$(CLIB))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
 
 install: $(TARGETS_INSTALL)
@@ -43,14 +43,14 @@ download: $(DOWNLOAD)
 fixup: $(FIXUP)
 
 gcc-prepare: binutils-install gmp-install mpfr-install mpc-install libelf-install
-$(LIBC)-prepare: gcc-prepare kernel-headers-prepare
-gcc-configure: $(LIBC)-prepare
-$(LIBC)-compile: gcc-configure
-gcc-compile: $(LIBC)-install
+$(CLIB)-prepare: gcc-prepare kernel-headers-prepare
+gcc-configure: $(CLIB)-prepare
+$(CLIB)-compile: gcc-configure
+gcc-compile: $(CLIB)-install
 ifeq ($(ADK_TOOLCHAIN_GDB),y)
-$(LIBC)-fixup: gcc-install gdb-install
+$(CLIB)-fixup: gcc-install gdb-install
 else
-$(LIBC)-fixup: gcc-install
+$(CLIB)-fixup: gcc-install
 endif
 
 %-download:
@@ -59,7 +59,7 @@ endif
 
 %-prepare:
 	$(TRACE) toolchain/$(patsubst %-prepare,%,$@)/prepare
-	@if test x"$(patsubst %-prepare,%,$@)" = x"$(LIBC)"; then \
+	@if test x"$(patsubst %-prepare,%,$@)" = x"$(CLIB)"; then \
 		$(MAKE) -C $(patsubst %-prepare,%,$@) prepare \
 		    $(MAKE_TRACE); \
 	else \
@@ -70,7 +70,7 @@ endif
 
 %-configure: %-prepare
 	$(TRACE) toolchain/$(patsubst %-configure,%,$@)/configure
-	@if test x"$(patsubst %-configure,%,$@)" = x"$(LIBC)"; then \
+	@if test x"$(patsubst %-configure,%,$@)" = x"$(CLIB)"; then \
 		$(MAKE) -C $(patsubst %-configure,%,$@) configure \
 		    $(MAKE_TRACE); \
 	else \
@@ -81,7 +81,7 @@ endif
 
 %-compile: %-configure
 	$(TRACE) toolchain/$(patsubst %-compile,%,$@)/compile
-	@if test x"$(patsubst %-compile,%,$@)" = x"$(LIBC)"; then \
+	@if test x"$(patsubst %-compile,%,$@)" = x"$(CLIB)"; then \
 		$(MAKE) -C $(patsubst %-compile,%,$@) compile \
 		    $(MAKE_TRACE); \
 	else \
@@ -92,7 +92,7 @@ endif
 
 %-install: %-compile
 	$(TRACE) toolchain/$(patsubst %-install,%,$@)/install
-	@if test x"$(patsubst %-install,%,$@)" = x"$(LIBC)"; then \
+	@if test x"$(patsubst %-install,%,$@)" = x"$(CLIB)"; then \
 		$(MAKE) -C $(patsubst %-install,%,$@) install \
 		    $(MAKE_TRACE); \
 	else \
-- 
cgit v1.2.3


From f1a694baf28042b4cfad7f6c4da01483e13ce114 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 30 Mar 2014 21:59:10 +0200
Subject: fix mplayer for x86 build

---
 package/mplayer/Makefile                           | 17 ++++++++--
 .../patches/patch-ffmpeg_libavcodec_h264_cabac_c   | 39 ++++++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 package/mplayer/patches/patch-ffmpeg_libavcodec_h264_cabac_c

diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 0a98de806..51ecceea4 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mplayer
 PKG_VERSION:=		1.1.1
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		39dd55f30eb5403f219a606e79a6648a
 PKG_DESCR:=		popular video player
 PKG_SECTION:=		multimedia
@@ -19,6 +19,8 @@ PKG_BUILDDEP+=		xvidcore libvpx gettext-tiny
 PKG_URL:=		http://www.mplayerhq.hu/
 PKG_SITES:=		http://www.mplayerhq.hu/MPlayer/releases/
 
+PKG_BUILDDEP_IBM_X40:=	yasm-host
+
 DISTFILES:=		MPlayer-$(PKG_VERSION).tar.xz
 WRKDIST=		${WRKDIR}/MPlayer-${PKG_VERSION}
 
@@ -89,6 +91,12 @@ else
 CONFIGURE_DIRECTFB=	--disable-directfb
 endif
 
+ifeq ($(ADK_TARGET_SYSTEM_IBM_X40),y)
+			--yasm=${STAGING_HOST_DIR}/usr/bin/yasm
+else
+			--yasm=''
+endif
+
 CONFIGURE_ARGS:=	--prefix=/usr \
 			--enable-x11 \
 			--confdir=/etc \
@@ -96,8 +104,6 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--target=${ARCH}-linux \
 			--cc='$(TARGET_CC)' \
 			--host-cc=$(CC_FOR_BUILD) \
-			--yasm='' \
-			--disable-mencoder \
 			--enable-fbdev \
 			--enable-alsa \
 			--enable-tv \
@@ -109,7 +115,11 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--enable-faac \
 			--enable-theora \
 			--enable-xvid \
+			--enable-x264 \
+			--enable-x264-lavc \
+			--disable-mencoder \
 			--disable-ossaudio \
+			--disable-caca \
 			--disable-vm \
 			--disable-iconv \
 			--disable-lirc \
@@ -141,6 +151,7 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--disable-xinerama \
 			--disable-vidix \
 			--disable-gl \
+			--disable-ssse3 \
 			--extra-cflags="${EXTRA_CFLAGS}" \
 			${CONFIGURE_CPU_OPTS} \
 			${CONFIGURE_DEBUG} \
diff --git a/package/mplayer/patches/patch-ffmpeg_libavcodec_h264_cabac_c b/package/mplayer/patches/patch-ffmpeg_libavcodec_h264_cabac_c
new file mode 100644
index 000000000..9b12513f2
--- /dev/null
+++ b/package/mplayer/patches/patch-ffmpeg_libavcodec_h264_cabac_c
@@ -0,0 +1,39 @@
+--- MPlayer-1.1.1.orig/ffmpeg/libavcodec/h264_cabac.c	2013-05-05 20:11:42.000000000 +0200
++++ MPlayer-1.1.1/ffmpeg/libavcodec/h264_cabac.c	2014-03-27 12:24:39.544699747 +0100
+@@ -39,10 +39,6 @@
+ #include "h264_mvpred.h"
+ #include "golomb.h"
+ 
+-#if ARCH_X86
+-#include "x86/h264_i386.h"
+-#endif
+-
+ //#undef NDEBUG
+ #include <assert.h>
+ 
+@@ -1652,17 +1648,6 @@ decode_cabac_residual_internal(H264Conte
+             index[coeff_count++] = last;\
+         }
+         const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
+-#if ARCH_X86 && HAVE_7REGS
+-        coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index,
+-                                                 last_coeff_ctx_base, sig_off);
+-    } else {
+-        if (is_dc && chroma422) { // dc 422
+-            DECODE_SIGNIFICANCE(7, sig_coeff_offset_dc[last], sig_coeff_offset_dc[last]);
+-        } else {
+-            coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index,
+-                                                 last_coeff_ctx_base-significant_coeff_ctx_base);
+-        }
+-#else
+         DECODE_SIGNIFICANCE( 63, sig_off[last], ff_h264_last_coeff_flag_offset_8x8[last] );
+     } else {
+         if (is_dc && chroma422) { // dc 422
+@@ -1670,7 +1655,6 @@ decode_cabac_residual_internal(H264Conte
+         } else {
+             DECODE_SIGNIFICANCE(max_coeff - 1, last, last);
+         }
+-#endif
+     }
+     assert(coeff_count > 0);
+ 
-- 
cgit v1.2.3


From 050b471cb5e78e5d97a1a033d2a16cf34a245fb4 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 15:11:34 +0200
Subject: fix disfile name

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

diff --git a/package/libcec/Makefile b/package/libcec/Makefile
index e4380c197..48b9143b4 100644
--- a/package/libcec/Makefile
+++ b/package/libcec/Makefile
@@ -14,6 +14,8 @@ PKG_URL:=		http://libcec.pulse-eight.com/
 PKG_SITES:=		http://packages.pulse-eight.net/pulse/sources/libcec/
 PKG_OPTS:=		dev
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+
 PKG_DEPENDS_RASPBERRY_PI:=	bcm2835-vc
 PKG_BUILDDEP_RASPBERRY_PI:=	bcm2835-vc
 PKG_SYSTEM_DEPENDS:=    raspberry-pi ibm-x40
-- 
cgit v1.2.3


From f3f363240d49eed73964dfffdc04a81f667429c2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 15:28:17 +0200
Subject: fix download urls

---
 package/libwebp/Makefile | 2 ++
 package/midori/Makefile  | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/libwebp/Makefile b/package/libwebp/Makefile
index 8a22e3fa8..7fc652425 100644
--- a/package/libwebp/Makefile
+++ b/package/libwebp/Makefile
@@ -13,6 +13,8 @@ PKG_URL:=		https://developers.google.com/speed/webp/
 PKG_SITES:=		https://webp.googlecode.com/files/
 PKG_OPTS:=		dev
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBWEBP,libwebp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/midori/Makefile b/package/midori/Makefile
index 13a916bc0..2c1013603 100644
--- a/package/midori/Makefile
+++ b/package/midori/Makefile
@@ -13,10 +13,9 @@ PKG_DEPENDS:=		libnotify webkitgtk
 PKG_BUILDDEP:=		autotool cmake-host vala-host libnotify webkitgtk
 PKG_BUILDDEP+=		librsvg-host librsvg
 PKG_URL:=		http://www.midori-browser.org
-PKG_SITES:=		http://www.midori-browser.org/downloads/
+PKG_SITES:=		http://www.openadk.org/distfiles/
 
 WRKBUILD=               ${WRKDIR}/${PKG_NAME}-obj
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 include $(TOPDIR)/mk/package.mk
 
-- 
cgit v1.2.3


From 4ea678cd0d3aa6b3376eb2e75655161aa6dea1b1 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Apr 2014 15:39:15 +0200
Subject: needs pcre

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

diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index 92161fbfc..3f61502cd 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		freeradius-server
 PKG_VERSION:=		3.0.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		3532b6439270f9da0ebfc03d3623f962
 PKG_DESCR:=		flexible RADIUS server
 PKG_SECTION:=		ppp
-PKG_DEPENDS:=		libltdl libopenssl libpthread
-PKG_BUILDDEP:=		autotool libtool openssl samba
+PKG_DEPENDS:=		libltdl libopenssl libpthread libpcre
+PKG_BUILDDEP:=		autotool libtool openssl samba pcre
 PKG_URL:=		http://www.freeradius.org/
 PKG_SITES:=		ftp://ftp.freeradius.org/pub/radius/
 PKG_MULTI:=		1
-- 
cgit v1.2.3


From 1a8e55ce789fd089311838c09e4a418c90178c38 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 2 May 2014 07:47:06 +0200
Subject: update to latest, use OpenWrt patches

---
 package/screen/Makefile                |   6 +-
 package/screen/patches/patch-configure | 573 ++-------------------------------
 package/screen/patches/patch-process_c |  15 -
 package/screen/patches/patch-pty_c     |  17 +-
 package/screen/patches/patch-sched_h   |  10 +-
 package/screen/patches/patch-screen_c  |  13 -
 package/screen/patches/patch-tty_sh    |  13 -
 7 files changed, 36 insertions(+), 611 deletions(-)
 delete mode 100644 package/screen/patches/patch-process_c
 delete mode 100644 package/screen/patches/patch-screen_c
 delete mode 100644 package/screen/patches/patch-tty_sh

diff --git a/package/screen/Makefile b/package/screen/Makefile
index 62d1c86e9..871323966 100644
--- a/package/screen/Makefile
+++ b/package/screen/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		screen
-PKG_VERSION:=		4.0.3
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		8506fd205028a96c741e4037de6e3c42
+PKG_VERSION:=		4.2.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		419a0594e2b25039239af8b90eda7d92
 PKG_DESCR:=		window manager for the terminal session
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libncurses libelf
diff --git a/package/screen/patches/patch-configure b/package/screen/patches/patch-configure
index 884ebef58..9d5400329 100644
--- a/package/screen/patches/patch-configure
+++ b/package/screen/patches/patch-configure
@@ -1,564 +1,29 @@
---- screen-4.0.3.orig/configure	2003-12-05 14:46:53.000000000 +0100
-+++ screen-4.0.3/configure	2014-02-19 08:18:45.000000000 +0100
-@@ -124,7 +124,7 @@ done
+--- screen-4.2.1.orig/configure	2014-04-26 12:58:46.000000000 +0200
++++ screen-4.2.1/configure	2014-05-01 13:04:48.000000000 +0200
+@@ -414,7 +414,7 @@ as_fn_error ()
+     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
    fi
-   if test ! -f "$as_myself"; then
-     { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
--   { (exit 1); exit 1; }; }
-+    }
-   fi
-   case $CONFIG_SHELL in
-   '')
-@@ -174,7 +174,7 @@ done
-     ' >$as_me.lineno &&
-   chmod +x $as_me.lineno ||
-     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
--   { (exit 1); exit 1; }; }
-+    }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
-@@ -397,7 +397,7 @@ do
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-     eval "enable_$ac_feature=no" ;;
- 
-@@ -406,7 +406,7 @@ do
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-     case $ac_option in
-       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-@@ -588,7 +588,7 @@ do
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ac_package=`echo $ac_package| sed 's/-/_/g'`
-     case $ac_option in
-       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-@@ -601,7 +601,7 @@ do
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ac_package=`echo $ac_package | sed 's/-/_/g'`
-     eval "with_$ac_package=no" ;;
- 
-@@ -625,7 +625,7 @@ do
- 
-   -*) { echo "$as_me: error: unrecognized option: $ac_option
- Try \`$0 --help' for more information." >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ;;
- 
-   *=*)
-@@ -633,7 +633,7 @@ Try \`$0 --help' for more information."
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-     eval "$ac_envvar='$ac_optarg'"
-     export $ac_envvar ;;
-@@ -652,7 +652,7 @@ done
- if test -n "$ac_prev"; then
-   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-   { echo "$as_me: error: missing argument to $ac_option" >&2
--   { (exit 1); exit 1; }; }
-+    }
- fi
- 
- # Be sure to have absolute paths.
-@@ -662,7 +662,7 @@ do
-   case $ac_val in
-     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-     *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
-+    };;
-   esac
- done
- 
-@@ -674,7 +674,7 @@ do
-   case $ac_val in
-     [\\/$]* | ?:[\\/]* ) ;;
-     *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
-+    };;
-   esac
- done
- 
-@@ -728,15 +728,15 @@ fi
- if test ! -r $srcdir/$ac_unique_file; then
-   if test "$ac_srcdir_defaulted" = yes; then
-     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
--   { (exit 1); exit 1; }; }
-+    }
-   else
-     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
--   { (exit 1); exit 1; }; }
-+    }
-   fi
- fi
- (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-   { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
--   { (exit 1); exit 1; }; }
-+    }
- srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
- ac_env_build_alias_set=${build_alias+set}
- ac_env_build_alias_value=$build_alias
-@@ -1243,7 +1243,7 @@ if $ac_cache_corrupted; then
- echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-   { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
- echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
+   $as_echo "$as_me: error: $2" >&2
+-  as_fn_exit $as_status
++  # as_fn_exit $as_status
+ } # as_fn_error
  
- ac_ext=c
-@@ -1734,7 +1734,7 @@ test -z "$CC" && { { echo "$as_me:$LINEN
- See \`config.log' for more details." >&5
- echo "$as_me: error: no acceptable C compiler found in \$PATH
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- 
- # Provide some information about the compiler.
- echo "$as_me:$LINENO:" \
-@@ -1856,7 +1856,7 @@ See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
-     fi
-   fi
- fi
-@@ -1898,7 +1898,7 @@ else
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- 
- rm -f conftest$ac_cv_exeext
-@@ -1950,7 +1950,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
-@@ -2514,7 +2514,7 @@ else
- See \`config.log' for more details." >&5
- echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- 
- ac_ext=c
-@@ -2704,7 +2704,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -2753,7 +2753,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -2790,7 +2790,7 @@ echo "$ac_compile" 1>&6
- 
- { { echo "$as_me:$LINENO: error: Can't run the compiler - sorry" >&5
- echo "$as_me: error: Can't run the compiler - sorry" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-@@ -2800,7 +2800,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -2830,7 +2830,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   (exit $ac_status); }; }; then
-   { { echo "$as_me:$LINENO: error: Your compiler does not set the exit status - sorry" >&5
- echo "$as_me: error: Your compiler does not set the exit status - sorry" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
-@@ -2900,7 +2900,7 @@ done
- if test -z "$ac_aux_dir"; then
-   { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
- echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- ac_config_guess="$SHELL $ac_aux_dir/config.guess"
- ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-@@ -3335,6 +3335,11 @@ _ACEOF
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+@@ -5941,8 +5941,6 @@ else
  fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
-+# always SYSV
-+cat >>confdefs.h <<\_ACEOF
-+#define SYSV 1
-+_ACEOF
-+
- { echo "$as_me:$LINENO: checking for sequent/ptx..." >&5
- echo "$as_me: checking for sequent/ptx..." >&6;}
- cat >conftest.$ac_ext <<_ACEOF
-@@ -4149,7 +4154,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- { { echo "$as_me:$LINENO: error: !!! no select - no screen" >&5
- echo "$as_me: error: !!! no select - no screen" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
-@@ -4163,7 +4168,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -4272,7 +4277,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -4365,7 +4370,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -4460,7 +4465,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -4562,7 +4567,7 @@ elif test -n "$sock"; then
- else
-   { { echo "$as_me:$LINENO: error: you have neither usable sockets nor usable pipes -> no screen" >&5
- echo "$as_me: error: you have neither usable sockets nor usable pipes -> no screen" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- 
- 
-@@ -4573,7 +4578,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -4898,7 +4903,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- { { echo "$as_me:$LINENO: error: !!! no tgetent - no screen" >&5
- echo "$as_me: error: !!! no tgetent - no screen" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-@@ -4915,7 +4920,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -5008,50 +5013,6 @@ _ACEOF
- 
- fi
- 
--{ echo "$as_me:$LINENO: checking for SVR4 ptys..." >&5
--echo "$as_me: checking for SVR4 ptys..." >&6;}
--sysvr4ptys=
--if test -c /dev/ptmx ; then
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--ptsname(0);grantpt(0);unlockpt(0);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  cat >>confdefs.h <<\_ACEOF
--#define HAVE_SVR4_PTYS 1
--_ACEOF
--
--sysvr4ptys=1
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--fi
- 
- 
- for ac_func in getpt
-@@ -5359,7 +5320,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -6206,7 +6167,7 @@ echo "$as_me: checking for avenrun symbo
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -6482,7 +6443,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -6598,8 +6559,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
- LIBS="$oldlibs"
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
 -test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec"
 -test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow"
  oldlibs="$LIBS"
  LIBS="$LIBS -lsun"
- { echo "$as_me:$LINENO: checking IRIX sun library..." >&5
-@@ -7004,7 +6963,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -7056,7 +7015,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -7110,7 +7069,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -7158,6 +7117,11 @@ fi
- rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
-+# always use memcpy
-+cat >>confdefs.h <<\_ACEOF
-+#define USEMEMCPY 1
-+_ACEOF
-+
- echo "$as_me:$LINENO: checking long file names" >&5
- echo $ECHO_N "checking long file names... $ECHO_C" >&6
- (echo 1 > /tmp/conftest9012345) 2>/dev/null
-@@ -7951,7 +7915,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -7982,7 +7946,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- ( exit $ac_status )
- { { echo "$as_me:$LINENO: error: Can't run the compiler - internal error. Sorry." >&5
- echo "$as_me: error: Can't run the compiler - internal error. Sorry." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-@@ -8251,7 +8215,7 @@ done
-   if test ! -f "$as_myself"; then
-     { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
- echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking IRIX sun library..." >&5
+@@ -7023,7 +7021,7 @@ as_fn_error ()
+     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
    fi
-   case $CONFIG_SHELL in
-   '')
-@@ -8302,7 +8266,7 @@ done
-   chmod +x $as_me.lineno ||
-     { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
- echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
-@@ -8494,7 +8458,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
--   { (exit 1); exit 1; }; };;
-+    };;
-   --help | --hel | -h )
-     echo "$ac_cs_usage"; exit 0 ;;
-   --debug | --d* | -d )
-@@ -8516,7 +8480,7 @@ Try \`$0 --help' for more information."
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
--   { (exit 1); exit 1; }; } ;;
-+    } ;;
- 
-   *) ac_config_targets="$ac_config_targets $1" ;;
- 
-@@ -8555,7 +8519,7 @@ do
-   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
--   { (exit 1); exit 1; }; };;
-+    };;
-   esac
- done
- 
-@@ -8750,7 +8714,7 @@ echo X"$as_dir" |
-     test ! -n "$as_dirs" || mkdir $as_dirs
-   fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
- echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }; }
-+    }; }
- 
-   ac_builddir=.
+   $as_echo "$as_me: error: $2" >&2
+-  as_fn_exit $as_status
++  # as_fn_exit $as_status
+ } # as_fn_error
  
-@@ -8816,7 +8780,7 @@ echo "$as_me: creating $ac_file" >&6;}
-          # Absolute (can't be DOS-style, as IFS=:)
-          test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
-          echo $f;;
-       *) # Relative
-          if test -f "$f"; then
-@@ -8829,7 +8793,7 @@ echo "$as_me: error: cannot find input f
-            # /dev/null tree
-            { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
-          fi;;
-       esac
-     done` || { (exit 1); exit 1; }
-@@ -8907,7 +8871,7 @@ echo "$as_me: creating $ac_file" >&6;}
-          # Absolute (can't be DOS-style, as IFS=:)
-          test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
-          echo $f;;
-       *) # Relative
-          if test -f "$f"; then
-@@ -8920,7 +8884,7 @@ echo "$as_me: error: cannot find input f
-            # /dev/null tree
-            { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
-          fi;;
-       esac
-     done` || { (exit 1); exit 1; }
-@@ -9073,7 +9037,7 @@ echo X"$as_dir" |
-     test ! -n "$as_dirs" || mkdir $as_dirs
-   fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
- echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }; }
-+    }; }
  
-       rm -f $ac_file
-       mv $tmp/config.h $ac_file
diff --git a/package/screen/patches/patch-process_c b/package/screen/patches/patch-process_c
deleted file mode 100644
index d41cee752..000000000
--- a/package/screen/patches/patch-process_c
+++ /dev/null
@@ -1,15 +0,0 @@
---- screen-4.0.3.orig/process.c	2003-09-18 14:53:54.000000000 +0200
-+++ screen-4.0.3/process.c	2014-02-19 08:27:28.000000000 +0100
-@@ -35,12 +35,6 @@
- 
- 
- #include "config.h"
--
--/* for solaris 2.1, Unixware (SVR4.2) and possibly others: */
--#ifdef SVR4
--# include <sys/stropts.h>
--#endif
--
- #include "screen.h"
- #include "extern.h"
- #include "logfile.h"
diff --git a/package/screen/patches/patch-pty_c b/package/screen/patches/patch-pty_c
index e62923e01..90d5636b4 100644
--- a/package/screen/patches/patch-pty_c
+++ b/package/screen/patches/patch-pty_c
@@ -1,14 +1,15 @@
---- screen-4.0.3.orig/pty.c	2003-09-08 16:26:18.000000000 +0200
-+++ screen-4.0.3/pty.c	2014-02-19 08:26:17.000000000 +0100
-@@ -33,11 +33,6 @@
- # include <sys/ioctl.h>
+--- screen-4.2.1.orig/pty.c	2014-04-26 12:58:35.000000000 +0200
++++ screen-4.2.1/pty.c	2014-05-01 13:04:48.000000000 +0200
+@@ -39,9 +39,9 @@
  #endif
  
--/* for solaris 2.1, Unixware (SVR4.2) and possibly others */
--#ifdef HAVE_SVR4_PTYS
+ /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
+-#ifdef HAVE_STROPTS_H
 -# include <sys/stropts.h>
 -#endif
--
++//#ifdef HAVE_STROPTS_H
++//# include <sys/stropts.h>
++//#endif
+ 
  #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL)
  # include <sys/ttold.h>
- #endif
diff --git a/package/screen/patches/patch-sched_h b/package/screen/patches/patch-sched_h
index 17e9cf010..56508f1cd 100644
--- a/package/screen/patches/patch-sched_h
+++ b/package/screen/patches/patch-sched_h
@@ -1,7 +1,7 @@
---- screen-4.0.3.orig/sched.h	2002-01-08 16:42:43.000000000 +0100
-+++ screen-4.0.3/sched.h	2008-10-08 13:33:43.000000000 +0200
-@@ -22,6 +22,11 @@
-  * $Id: sched.h,v 1.1.1.1 1993/06/16 23:51:13 jnweiger Exp $ FAU
+--- screen-4.2.1.orig/sched.h	2014-04-26 12:58:35.000000000 +0200
++++ screen-4.2.1/sched.h	2014-05-01 13:04:48.000000000 +0200
+@@ -27,6 +27,11 @@
+  * $Id$ GNU
   */
  
 +#ifndef __SCHED_H
@@ -12,7 +12,7 @@
  struct event
  {
    struct event *next;
-@@ -41,3 +46,5 @@ struct event
+@@ -46,3 +51,5 @@ struct event
  #define EV_READ		1
  #define EV_WRITE	2
  #define EV_ALWAYS	3
diff --git a/package/screen/patches/patch-screen_c b/package/screen/patches/patch-screen_c
deleted file mode 100644
index 441dd6255..000000000
--- a/package/screen/patches/patch-screen_c
+++ /dev/null
@@ -1,13 +0,0 @@
---- screen-4.0.3.orig/screen.c	2003-09-08 16:26:41.000000000 +0200
-+++ screen-4.0.3/screen.c	2014-02-19 08:27:10.000000000 +0100
-@@ -50,10 +50,6 @@
- 
- #include "config.h"
- 
--#ifdef SVR4
--# include <sys/stropts.h>
--#endif
--
- #if defined(SYSV) && !defined(ISC)
- # include <sys/utsname.h>
- #endif
diff --git a/package/screen/patches/patch-tty_sh b/package/screen/patches/patch-tty_sh
deleted file mode 100644
index 218a3f9e8..000000000
--- a/package/screen/patches/patch-tty_sh
+++ /dev/null
@@ -1,13 +0,0 @@
---- screen-4.0.3.orig/tty.sh	2003-09-08 16:24:25.000000000 +0200
-+++ screen-4.0.3/tty.sh	2014-02-19 08:40:44.000000000 +0100
-@@ -76,10 +76,6 @@ exit 0
- #endif
- 
- #include "config.h"
--#ifdef SVR4
--#include <sys/stropts.h>	/* for I_POP */
--#endif
--
- #include "screen.h"
- #include "extern.h"
- 
-- 
cgit v1.2.3


From 4b6074c2463d43cace54ce688eebd6a6228a49fd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 2 May 2014 07:47:18 +0200
Subject: fix libsecret build

---
 package/libsecret/Makefile                         |  11 +-
 package/libsecret/patches/patch-Makefile_am        |  26 -----
 package/libsecret/patches/patch-Makefile_am.orig   |  11 --
 package/libsecret/patches/patch-configure_ac       |  44 --------
 package/libsecret/patches/patch-configure_ac.orig  |  35 -------
 .../patch-docs_reference_libsecret_Makefile_am     |  20 ----
 ...patch-docs_reference_libsecret_Makefile_am.orig |  11 --
 .../libsecret/patches/patch-libsecret_Makefile_am  |  95 -----------------
 .../patches/patch-libsecret_tests_Makefile_am      | 113 ---------------------
 .../patches/patch-libsecret_tests_Makefile_am.orig |  72 -------------
 10 files changed, 5 insertions(+), 433 deletions(-)
 delete mode 100644 package/libsecret/patches/patch-Makefile_am
 delete mode 100644 package/libsecret/patches/patch-Makefile_am.orig
 delete mode 100644 package/libsecret/patches/patch-configure_ac
 delete mode 100644 package/libsecret/patches/patch-configure_ac.orig
 delete mode 100644 package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am
 delete mode 100644 package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am.orig
 delete mode 100644 package/libsecret/patches/patch-libsecret_Makefile_am
 delete mode 100644 package/libsecret/patches/patch-libsecret_tests_Makefile_am
 delete mode 100644 package/libsecret/patches/patch-libsecret_tests_Makefile_am.orig

diff --git a/package/libsecret/Makefile b/package/libsecret/Makefile
index 6659cbc67..04fc40e6e 100644
--- a/package/libsecret/Makefile
+++ b/package/libsecret/Makefile
@@ -4,22 +4,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libsecret
-PKG_VERSION:=		0.16
+PKG_VERSION:=		0.18
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ab0edcd5887a6fe78c948e36b6341858
+PKG_MD5SUM:=		279d723cd005e80d1d304f74a3488acc
 PKG_DESCR:=		library for storing and retrieving passwords
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libgcrypt
-PKG_BUILDDEP:=		autotool libgcrypt
+PKG_DEPENDS:=		libgcrypt glib
+PKG_BUILDDEP:=		intltool-host gettext-tiny libgcrypt glib
 PKG_URL:=		https://wiki.gnome.org/Libsecret
-PKG_SITES:=		https://git.gnome.org/browse/libsecret/snapshot/
+PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/libsecret/${PKG_VERSION}/
 PKG_OPTS:=		dev
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBSECRET,libsecret,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--enable-vala=no \
 			--enable-gcrypt
 
diff --git a/package/libsecret/patches/patch-Makefile_am b/package/libsecret/patches/patch-Makefile_am
deleted file mode 100644
index 50af269ea..000000000
--- a/package/libsecret/patches/patch-Makefile_am
+++ /dev/null
@@ -1,26 +0,0 @@
---- libsecret-0.16.orig/Makefile.am	2013-08-26 17:42:16.000000000 +0200
-+++ libsecret-0.16/Makefile.am	2013-11-22 14:38:52.000000000 +0100
-@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
- 
- ACLOCAL_AMFLAGS = -I build/m4 ${ACLOCAL_FLAGS}
- 
--SUBDIRS = build egg libsecret tool po docs .
-+SUBDIRS = build egg libsecret tool .
- 
- DISTCHECK_CONFIGURE_FLAGS = \
- 	--enable-debug=yes \
-@@ -42,14 +42,9 @@ upload-release: $(DIST_ARCHIVES)
- upload-docs:
- 	rsync -Hvax docs/reference/libsecret/html/./ master.gnome.org:public_html/libsecret-docs/
- 
--if HAVE_VALAC
--dist-check-valac:
--
--else
- dist-check-valac:
- 	@echo "*** valac must be installed and enabled in order to make dist"
- 	@false
--endif
- 
- dist-hook: dist-check-valac
- 
diff --git a/package/libsecret/patches/patch-Makefile_am.orig b/package/libsecret/patches/patch-Makefile_am.orig
deleted file mode 100644
index 8273c753c..000000000
--- a/package/libsecret/patches/patch-Makefile_am.orig
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsecret-0.16.orig/Makefile.am	2013-08-26 17:42:16.000000000 +0200
-+++ libsecret-0.16/Makefile.am	2013-11-21 12:03:12.000000000 +0100
-@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
- 
- ACLOCAL_AMFLAGS = -I build/m4 ${ACLOCAL_FLAGS}
- 
--SUBDIRS = build egg libsecret tool po docs .
-+SUBDIRS = build egg libsecret tool .
- 
- DISTCHECK_CONFIGURE_FLAGS = \
- 	--enable-debug=yes \
diff --git a/package/libsecret/patches/patch-configure_ac b/package/libsecret/patches/patch-configure_ac
deleted file mode 100644
index e9de60534..000000000
--- a/package/libsecret/patches/patch-configure_ac
+++ /dev/null
@@ -1,44 +0,0 @@
---- libsecret-0.16.orig/configure.ac	2013-08-26 17:42:16.000000000 +0200
-+++ libsecret-0.16/configure.ac	2013-11-22 18:00:42.000000000 +0100
-@@ -43,7 +43,6 @@ AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
- AM_PROG_LIBTOOL
--IT_PROG_INTLTOOL([0.35.0])
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- 
- GETTEXT_PACKAGE=libsecret
-@@ -66,9 +65,6 @@ PKG_CHECK_MODULES(GLIB,
- LIBS="$LIBS $GLIB_LIBS"
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
- 
--GTK_DOC_CHECK(1.9)
--
--GOBJECT_INTROSPECTION_CHECK([1.29])
- AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
- 
- # --------------------------------------------------------------------
-@@ -88,14 +84,6 @@ AM_CONDITIONAL(WITH_MANPAGES, test x$ena
- # --------------------------------------------------------------------
- # Vala
- 
--VALA_REQUIRED=0.17.2.12
--
--VAPIGEN_CHECK($VALA_REQUIRED)
--
--if test "$enable_vala" != "no"; then
--	AC_PATH_PROG([VALAC], [valac], [])
--fi
--AM_CONDITIONAL(HAVE_VALAC, test "x$VALAC" != "x")
- 
- # --------------------------------------------------------------------
- # libgcrypt
-@@ -267,8 +255,6 @@ AC_CONFIG_FILES([
- 	docs/reference/libsecret/version-major.xml
- 	egg/Makefile
- 	egg/tests/Makefile
--	po/Makefile.in
--	po/Makefile
- 	libsecret/Makefile
- 	libsecret/libsecret.pc
- 	libsecret/libsecret-unstable.pc
diff --git a/package/libsecret/patches/patch-configure_ac.orig b/package/libsecret/patches/patch-configure_ac.orig
deleted file mode 100644
index a26aab5cb..000000000
--- a/package/libsecret/patches/patch-configure_ac.orig
+++ /dev/null
@@ -1,35 +0,0 @@
---- libsecret-0.16.orig/configure.ac	2013-08-26 17:42:16.000000000 +0200
-+++ libsecret-0.16/configure.ac	2013-11-21 15:23:11.000000000 +0100
-@@ -43,7 +43,6 @@ AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
- AM_PROG_LIBTOOL
--IT_PROG_INTLTOOL([0.35.0])
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- 
- GETTEXT_PACKAGE=libsecret
-@@ -66,9 +65,6 @@ PKG_CHECK_MODULES(GLIB,
- LIBS="$LIBS $GLIB_LIBS"
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
- 
--GTK_DOC_CHECK(1.9)
--
--GOBJECT_INTROSPECTION_CHECK([1.29])
- AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
- 
- # --------------------------------------------------------------------
-@@ -88,14 +84,6 @@ AM_CONDITIONAL(WITH_MANPAGES, test x$ena
- # --------------------------------------------------------------------
- # Vala
- 
--VALA_REQUIRED=0.17.2.12
--
--VAPIGEN_CHECK($VALA_REQUIRED)
--
--if test "$enable_vala" != "no"; then
--	AC_PATH_PROG([VALAC], [valac], [])
--fi
--AM_CONDITIONAL(HAVE_VALAC, test "x$VALAC" != "x")
- 
- # --------------------------------------------------------------------
- # libgcrypt
diff --git a/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am b/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am
deleted file mode 100644
index 1a749c19e..000000000
--- a/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am
+++ /dev/null
@@ -1,20 +0,0 @@
---- libsecret-0.16.orig/docs/reference/libsecret/Makefile.am	2013-08-26 17:42:16.000000000 +0200
-+++ libsecret-0.16/docs/reference/libsecret/Makefile.am	2013-11-21 12:01:48.000000000 +0100
-@@ -92,13 +92,13 @@ GTKDOC_LIBS= $(GLIB_LIBS) $(GOBJECT_LIBS
- 	$(top_builddir)/libsecret/libsecret-@SECRET_MAJOR@.la
- 
- # This includes the standard gtk-doc make rules, copied by gtkdocize.
--include $(top_srcdir)/gtk-doc.make
-+#include $(top_srcdir)/gtk-doc.make
- 
- # Other files to distribute
- # e.g. EXTRA_DIST += version.xml.in
--EXTRA_DIST += \
--	version.xml.in \
--	version-major.xml.in
-+#EXTRA_DIST += \
-+#	version.xml.in \
-+#	version-major.xml.in
- 
- # Files not to distribute
- # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
diff --git a/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am.orig b/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am.orig
deleted file mode 100644
index 02e2351a3..000000000
--- a/package/libsecret/patches/patch-docs_reference_libsecret_Makefile_am.orig
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsecret-0.16.orig/docs/reference/libsecret/Makefile.am	2013-08-26 17:42:16.000000000 +0200
-+++ libsecret-0.16/docs/reference/libsecret/Makefile.am	2013-11-21 11:59:27.000000000 +0100
-@@ -92,7 +92,7 @@ GTKDOC_LIBS= $(GLIB_LIBS) $(GOBJECT_LIBS
- 	$(top_builddir)/libsecret/libsecret-@SECRET_MAJOR@.la
- 
- # This includes the standard gtk-doc make rules, copied by gtkdocize.
--include $(top_srcdir)/gtk-doc.make
-+#include $(top_srcdir)/gtk-doc.make
- 
- # Other files to distribute
- # e.g. EXTRA_DIST += version.xml.in
diff --git a/package/libsecret/patches/patch-libsecret_Makefile_am b/package/libsecret/patches/patch-libsecret_Makefile_am
deleted file mode 100644
index 88e9ef5fb..000000000
--- a/package/libsecret/patches/patch-libsecret_Makefile_am
+++ /dev/null
@@ -1,95 +0,0 @@
---- libsecret-0.16.orig/libsecret/Makefile.am	2013-08-26 17:42:16.000000000 +0200
-+++ libsecret-0.16/libsecret/Makefile.am	2013-11-21 12:06:37.000000000 +0100
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/Makefile.decl
- 
--SUBDIRS = . tests
-+SUBDIRS = .
- 
- AM_CPPFLAGS = \
- 	-I$(top_srcdir) \
-@@ -107,84 +107,6 @@ secret-enum-types.c: secret-enum-types.c
- 
- CLEANFILES =
- 
--# ------------------------------------------------------------------
--# INTROSPECTION
--
--if HAVE_INTROSPECTION
--
--include $(INTROSPECTION_MAKEFILE)
--
--INTROSPECTION_GIRS = Secret-@SECRET_MAJOR@.gir SecretUnstable-0.gir
--INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --warn-all --add-include-path=$(srcdir) --add-include-path=.
--INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=.
--
--Secret-@SECRET_MAJOR@.gir: libsecret-@SECRET_MAJOR@.la
--
--Secret_@SECRET_MAJOR@_gir_NAMESPACE = Secret
--Secret_@SECRET_MAJOR@_gir_EXPORT_PACKAGES = libsecret-@SECRET_MAJOR@
--Secret_@SECRET_MAJOR@_gir_INCLUDES = GObject-2.0 Gio-2.0
--Secret_@SECRET_MAJOR@_gir_LIBS = libsecret-@SECRET_MAJOR@.la
--Secret_@SECRET_MAJOR@_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -DSECRET_COMPILATION
--Secret_@SECRET_MAJOR@_gir_FILES = $(STABLE_FILES)
--Secret_@SECRET_MAJOR@_gir_SCANNERFLAGS = --c-include "libsecret/secret.h"
--
--SecretUnstable-0.gir: Secret-@SECRET_MAJOR@.gir
--
--SecretUnstable_0_gir_NAMESPACE = SecretUnstable
--SecretUnstable_0_gir_EXPORT_PACKAGES = libsecret-unstable
--SecretUnstable_0_gir_INCLUDES = GObject-2.0 Gio-2.0
--SecretUnstable_0_gir_LIBS = libsecret-@SECRET_MAJOR@.la
--SecretUnstable_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -DSECRET_COMPILATION -DSECRET_API_SUBJECT_TO_CHANGE
--SecretUnstable_0_gir_FILES = $(UNSTABLE_FILES)
--SecretUnstable_0_gir_SCANNERFLAGS = --c-include "libsecret/secret.h" --identifier-prefix=Secret --symbol-prefix=secret --include-uninstalled=$(builddir)/Secret-@SECRET_MAJOR@.gir
--
--girdir = $(datadir)/gir-1.0
--gir_DATA = $(INTROSPECTION_GIRS)
--
--typelibsdir = $(libdir)/girepository-1.0
--typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
--
--if ENABLE_VAPIGEN
--include $(VAPIGEN_MAKEFILE)
--
--libsecret-@SECRET_MAJOR@.vapi: Secret-@SECRET_MAJOR@.gir Secret-@SECRET_MAJOR@.metadata libsecret-@SECRET_MAJOR@.deps
--
--libsecret-unstable.vapi: SecretUnstable-0.gir SecretUnstable-0.metadata libsecret-unstable.deps
--
--VAPIGEN_VAPIS = \
--	libsecret-@SECRET_MAJOR@.vapi \
--	libsecret-unstable.vapi
--
--libsecret_@SECRET_MAJOR@_vapi_DEPS = glib-2.0 gio-2.0
--libsecret_@SECRET_MAJOR@_vapi_METADATADIRS = $(srcdir)
--libsecret_@SECRET_MAJOR@_vapi_FILES = Secret-@SECRET_MAJOR@.gir
--
--libsecret_unstable_vapi_DEPS = gio-2.0 libsecret-@SECRET_MAJOR@
--libsecret_unstable_vapi_METADATADIRS = $(srcdir)
--libsecret_unstable_vapi_VAPIDIRS = $(builddir)
--libsecret_unstable_vapi_GIRDIRS = $(builddir)
--# ... because _GIRDIRS above is broken, yes, this is ugly
--libsecret_unstable_vapi_FILES = --girdir=$(builddir)
--libsecret_unstable_vapi_FILES += SecretUnstable-0.gir
--
--VAPI_DEPS = $(VAPIGEN_VAPIS:.vapi=.deps)
--
--libsecret-$(SECRET_MAJOR).deps: Makefile.am
--	$(AM_V_GEN) echo $(libsecret_@SECRET_MAJOR@_vapi_DEPS) | tr ' ' '\n' > $@
--libsecret-unstable.deps: Makefile.am
--	$(AM_V_GEN) echo $(libsecret_unstable_vapi_DEPS) | tr ' ' '\n' > $@
--
--vapidir = $(datadir)/vala/vapi
--vapi_DATA = \
--	$(VAPIGEN_VAPIS) \
--	$(VAPI_DEPS)
--
--CLEANFILES += \
--	$(VAPIGEN_VAPIS) \
--	$(VAPI_DEPS)
--
--endif # ENABLE_VAPIGEN
--endif # HAVE_INTROSPECTION
- 
- # ------------------------------------------------------------------
- # PKG CONFIG
diff --git a/package/libsecret/patches/patch-libsecret_tests_Makefile_am b/package/libsecret/patches/patch-libsecret_tests_Makefile_am
deleted file mode 100644
index d168c022e..000000000
--- a/package/libsecret/patches/patch-libsecret_tests_Makefile_am
+++ /dev/null
@@ -1,113 +0,0 @@
---- libsecret-0.16.orig/libsecret/tests/Makefile.am	2013-08-26 17:42:16.000000000 +0200
-+++ libsecret-0.16/libsecret/tests/Makefile.am	2013-11-21 15:35:42.000000000 +0100
-@@ -73,59 +73,6 @@ PY_TESTS = \
- 
- PY_ENV = $(JS_ENV)
- 
--# ------------------------------------------------------------------
--# VALA
--
--VALA_V = $(VALA_V_$(V))
--VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
--VALA_V_0 = @echo "  VALAC " $^;
--
--VALA_TESTS = \
--	test-vala-lang \
--	test-vala-unstable \
--	$(NULL)
--
--VALA_FLAGS = \
--	--vapidir=$(builddir)/.. \
--	--pkg gio-2.0
--
--VALA_TESTS_VAPIS = \
--	$(builddir)/../libsecret-unstable.vapi \
--	$(builddir)/../libsecret-@SECRET_MAJOR@.vapi \
--	$(builddir)/mock-service-0.vapi
--
--VALA_SRCS = $(VALA_TESTS:=.vala)
--VALA_C_SRCS = $(VALA_SRCS:.vala=.c)
--
--if HAVE_VALAC
--$(VALA_C_SRCS): %.c: %.vala $(VALA_TESTS_VAPIS)
--	$(VALA_V)$(VALAC) $(VALA_FLAGS) $(VALA_TESTS_VAPIS) -C $<
--endif
--
--test_vala_lang_CFLAGS = -w
--test_vala_unstable_CFLAGS = -DSECRET_WITH_UNSTABLE -w
--
--nodist_test_vala_lang_SOURCES = test-vala-lang.c
--nodist_test_vala_unstable_SOURCES = test-vala-unstable.c
--
--DISTCLEANFILES = $(VALA_C_SRCS)
--
--test-vala: $(VALA_TESTS)
--	@gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(VALA_TESTS)
--
--VALA_TEST_TARGET =
--
--if HAVE_INTROSPECTION
--if ENABLE_VAPIGEN
--if HAVE_VALAC
--
--VALA_TEST_TARGET += test-vala
--
--TEST_PROGS += $(VALA_TESTS)
--
--endif # HAVE_VALAC
--endif # ENABLE_VAPIGEN
--endif # HAVE_INTROSPECTION
- 
- test-c: $(C_TESTS)
- 	@gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(C_TESTS)
-@@ -138,50 +85,6 @@ test-py:
- 
- test: test-c test-py test-js $(VALA_TEST_TARGET)
- 
--# ------------------------------------------------------------------
--# INTROSPECTION
--
--if HAVE_INTROSPECTION
--
--include $(INTROSPECTION_MAKEFILE)
--
--INTROSPECTION_GIRS = MockService-0.gir
--INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --warn-all --add-include-path=$(srcdir) --add-include-path=.
--INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=.
--
--MockService-0.gir: libmock_service.la
--
--MockService_0_gir_PACKAGES = gobject-2.0 gio-2.0
--MockService_0_gir_EXPORT_PACKAGES = mock-service-0
--MockService_0_gir_INCLUDES = GObject-2.0 Gio-2.0
--MockService_0_gir_LIBS = libmock_service.la
--MockService_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(srcdir)
--MockService_0_gir_FILES = $(libmock_service_la_SOURCES)
--MockService_0_gir_SCANNERFLAGS = --c-include "mock-service.h"
--
--noinst_DATA = \
--	$(INTROSPECTION_GIRS) \
--	$(INTROSPECTION_GIRS:.gir=.typelib)
--
--if ENABLE_VAPIGEN
--include $(VAPIGEN_MAKEFILE)
--
--mock-service-0.vapi: MockService-0.gir $(builddir)/../libsecret-@SECRET_MAJOR@.vapi
--
--VAPIGEN_VAPIS = mock-service-0.vapi
--
--mock_service_0_vapi_DEPS = gio-2.0 libsecret-@SECRET_MAJOR@
--mock_service_0_vapi_METADATADIRS = $(builddir)
--mock_service_0_vapi_VAPIDIRS = $(builddir) $(builddir)/..
--mock_service_0_vapi_FILES = MockService-0.gir
--
--vapidir = $(datadir)/vala/vapi
--vapi_DATA = mock-service-0.vapi
--
--noinst_DATA += $(VAPIGEN_VAPIS)
--
--endif # ENABLE_VAPIGEN
--endif # HAVE_INTROSPECTION
- 
- #--------------------------------------------------------------------
- 
diff --git a/package/libsecret/patches/patch-libsecret_tests_Makefile_am.orig b/package/libsecret/patches/patch-libsecret_tests_Makefile_am.orig
deleted file mode 100644
index efe20a44f..000000000
--- a/package/libsecret/patches/patch-libsecret_tests_Makefile_am.orig
+++ /dev/null
@@ -1,72 +0,0 @@
---- libsecret-0.16.orig/libsecret/tests/Makefile.am	2013-08-26 17:42:16.000000000 +0200
-+++ libsecret-0.16/libsecret/tests/Makefile.am	2013-11-21 12:15:40.000000000 +0100
-@@ -115,18 +115,6 @@ test-vala: $(VALA_TESTS)
- 
- VALA_TEST_TARGET =
- 
--if HAVE_INTROSPECTION
--if ENABLE_VAPIGEN
--if HAVE_VALAC
--
--VALA_TEST_TARGET += test-vala
--
--TEST_PROGS += $(VALA_TESTS)
--
--endif # HAVE_VALAC
--endif # ENABLE_VAPIGEN
--endif # HAVE_INTROSPECTION
--
- test-c: $(C_TESTS)
- 	@gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(C_TESTS)
- 
-@@ -138,50 +126,6 @@ test-py:
- 
- test: test-c test-py test-js $(VALA_TEST_TARGET)
- 
--# ------------------------------------------------------------------
--# INTROSPECTION
--
--if HAVE_INTROSPECTION
--
--include $(INTROSPECTION_MAKEFILE)
--
--INTROSPECTION_GIRS = MockService-0.gir
--INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --warn-all --add-include-path=$(srcdir) --add-include-path=.
--INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=.
--
--MockService-0.gir: libmock_service.la
--
--MockService_0_gir_PACKAGES = gobject-2.0 gio-2.0
--MockService_0_gir_EXPORT_PACKAGES = mock-service-0
--MockService_0_gir_INCLUDES = GObject-2.0 Gio-2.0
--MockService_0_gir_LIBS = libmock_service.la
--MockService_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(srcdir)
--MockService_0_gir_FILES = $(libmock_service_la_SOURCES)
--MockService_0_gir_SCANNERFLAGS = --c-include "mock-service.h"
--
--noinst_DATA = \
--	$(INTROSPECTION_GIRS) \
--	$(INTROSPECTION_GIRS:.gir=.typelib)
--
--if ENABLE_VAPIGEN
--include $(VAPIGEN_MAKEFILE)
--
--mock-service-0.vapi: MockService-0.gir $(builddir)/../libsecret-@SECRET_MAJOR@.vapi
--
--VAPIGEN_VAPIS = mock-service-0.vapi
--
--mock_service_0_vapi_DEPS = gio-2.0 libsecret-@SECRET_MAJOR@
--mock_service_0_vapi_METADATADIRS = $(builddir)
--mock_service_0_vapi_VAPIDIRS = $(builddir) $(builddir)/..
--mock_service_0_vapi_FILES = MockService-0.gir
--
--vapidir = $(datadir)/vala/vapi
--vapi_DATA = mock-service-0.vapi
--
--noinst_DATA += $(VAPIGEN_VAPIS)
--
--endif # ENABLE_VAPIGEN
--endif # HAVE_INTROSPECTION
- 
- #--------------------------------------------------------------------
- 
-- 
cgit v1.2.3


From a4e07b8ba93799e1e67a636e7f5212c35706e2d1 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 2 May 2014 07:47:35 +0200
Subject: add intltool to host

---
 package/intltool/Makefile | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package/intltool/Makefile

diff --git a/package/intltool/Makefile b/package/intltool/Makefile
new file mode 100644
index 000000000..3aaaa7673
--- /dev/null
+++ b/package/intltool/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
+
+PKG_NAME:=		intltool
+PKG_VERSION:=		0.50.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		23fbd879118253cb99aeac067da5f591
+PKG_DESCR:=		internationalization utility to create po files
+PKG_SECTION:=		misc
+PKG_URL:=		http://freedesktop.org/wiki/Software/intltool/
+PKG_SITES:=		https://launchpad.net/intltool/trunk/0.50.2/+download/
+
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+
+PKG_ARCH_DEPENDS:=	native
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,INTLTOOL,intltool,$(PKG_VERSION)-${PKG_RELEASE}))
+
+HOST_STYLE:=		auto
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From 29949a05b6be852c6ad2835b50087dac35b27023 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 2 May 2014 07:47:49 +0200
Subject: minor fixes

---
 mk/vars.mk              | 2 +-
 package/libICE/Makefile | 4 ++--
 package/libSM/Makefile  | 2 +-
 package/vala/Makefile   | 2 --
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mk/vars.mk b/mk/vars.mk
index 96a42592d..19c43dbf3 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -53,7 +53,7 @@ PACKAGE_DIR:=		$(FW_DIR)/packages
 SCRIPT_TARGET_DIR:=	${STAGING_TARGET_DIR}/scripts
 
 # PATH variables
-TARGET_PATH=		${SCRIPT_DIR}:${STAGING_TARGET_DIR}/scripts:${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
+TARGET_PATH=		${SCRIPT_DIR}:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${TOOLCHAIN_DIR}/usr/bin:${_PATH}
 HOST_PATH=		${SCRIPT_DIR}:${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
 AUTOTOOL_PATH=		${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH}
 
diff --git a/package/libICE/Makefile b/package/libICE/Makefile
index b25a951ea..1c28200a8 100644
--- a/package/libICE/Makefile
+++ b/package/libICE/Makefile
@@ -9,7 +9,8 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		4b8dae73fce37e994c3a6fa05d6db7ca
 PKG_DESCR:=		Inter-Client Exchange library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xtrans-host xtrans xproto-host xproto libICE-host
+PKG_BUILDDEP:=		xtrans xproto
+HOST_BUILDDEP:=		xtrans-host xproto-host
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libice
 PKG_OPTS:=		dev
@@ -23,7 +24,6 @@ $(eval $(call HOST_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 HOST_STYLE:=		auto
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 
 libice-install:
 	${INSTALL_DIR} ${IDIR_LIBICE}/usr/lib
diff --git a/package/libSM/Makefile b/package/libSM/Makefile
index f17c209fc..aa77da957 100644
--- a/package/libSM/Makefile
+++ b/package/libSM/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		1d507651e9fa50aab7ef11be9e0e2f20
 PKG_DESCR:=		X11 Session Management library
 PKG_SECTION:=		x11/libs
 PKG_DEPENDS:=		libuuid
-PKG_BUILDDEP:=		libSM-host libICE util-linux
+PKG_BUILDDEP:=		libICE util-linux
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libsm
 PKG_OPTS:=		dev
diff --git a/package/vala/Makefile b/package/vala/Makefile
index 5a84b76a4..b65810f84 100644
--- a/package/vala/Makefile
+++ b/package/vala/Makefile
@@ -14,8 +14,6 @@ HOST_BUILDDEP:=		glib-host
 PKG_URL:=		https://wiki.gnome.org/Vala
 PKG_SITES:=		http://download.gnome.org/sources/vala/0.24/
 
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
-
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
-- 
cgit v1.2.3


From f0066beb4d617c93d69d2a5308a2a19dffa13b3c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 2 May 2014 08:17:45 +0200
Subject: create core package section, cleanup old installer stuff

---
 adk/tools/pkgmaker.c                               |   2 +-
 package/adkinstall/Makefile                        |  48 ------
 package/adkinstall/src/adkinstall                  | 167 ---------------------
 package/adkinstall/src/adkinstall.foxg20           |  54 -------
 package/adkinstall/src/adkinstall.rb4xx            |  35 -----
 package/adkinstall/src/adkinstall.rb532            |  88 -----------
 package/adkinstall/src/adkinstall.yeelong          |  59 --------
 package/base-files/src/sbin/adkupdate              | 112 --------------
 package/busybox/Makefile                           |   2 +-
 package/coreutils/Makefile                         |  18 +--
 package/findutils/Makefile                         |  12 +-
 package/installer/Makefile                         |  26 ----
 package/installer/src/installer                    | 145 ------------------
 package/section.lst                                |   3 +-
 package/uclibc/Config.in.manual                    |   2 +-
 package/util-linux/Makefile                        |  53 ++++---
 package/util-linux/patches/patch-fdisks_cfdisk_c   |  13 --
 .../patches/patch-fdisks_fdisksunlabel_c           |  30 ----
 .../util-linux/patches/patch-include_ttyutils_h    |  12 --
 package/util-linux/patches/patch-lib_fileutils_c   |  14 --
 .../util-linux/patches/patch-libblkid_blkid_pc_in  |  12 --
 .../util-linux/patches/patch-libblkid_src_save_c   |  14 --
 .../util-linux/patches/patch-libmount_src_utils_c  |  14 --
 .../util-linux/patches/patch-libuuid_uuid_pc_in    |  13 --
 .../util-linux/patches/patch-term-utils_setterm_c  |  13 --
 .../util-linux/patches/patch-term-utils_ttymsg_c   |  12 --
 .../util-linux/patches/patch-text-utils_hexdump_h  |  12 --
 package/util-linux/patches/patch-text-utils_pg_c   |  13 --
 package/uvd/Makefile                               |   2 +-
 29 files changed, 52 insertions(+), 948 deletions(-)
 delete mode 100644 package/adkinstall/Makefile
 delete mode 100644 package/adkinstall/src/adkinstall
 delete mode 100644 package/adkinstall/src/adkinstall.foxg20
 delete mode 100644 package/adkinstall/src/adkinstall.rb4xx
 delete mode 100644 package/adkinstall/src/adkinstall.rb532
 delete mode 100644 package/adkinstall/src/adkinstall.yeelong
 delete mode 100755 package/base-files/src/sbin/adkupdate
 delete mode 100644 package/installer/Makefile
 delete mode 100755 package/installer/src/installer
 delete mode 100644 package/util-linux/patches/patch-fdisks_cfdisk_c
 delete mode 100644 package/util-linux/patches/patch-fdisks_fdisksunlabel_c
 delete mode 100644 package/util-linux/patches/patch-include_ttyutils_h
 delete mode 100644 package/util-linux/patches/patch-lib_fileutils_c
 delete mode 100644 package/util-linux/patches/patch-libblkid_blkid_pc_in
 delete mode 100644 package/util-linux/patches/patch-libblkid_src_save_c
 delete mode 100644 package/util-linux/patches/patch-libmount_src_utils_c
 delete mode 100644 package/util-linux/patches/patch-libuuid_uuid_pc_in
 delete mode 100644 package/util-linux/patches/patch-term-utils_setterm_c
 delete mode 100644 package/util-linux/patches/patch-term-utils_ttymsg_c
 delete mode 100644 package/util-linux/patches/patch-text-utils_hexdump_h
 delete mode 100644 package/util-linux/patches/patch-text-utils_pg_c

diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c
index 6997f3def..ef10d1120 100644
--- a/adk/tools/pkgmaker.c
+++ b/adk/tools/pkgmaker.c
@@ -758,7 +758,7 @@ int main() {
 				fprintf(cfg, "\ttristate\n");
 				if (pkg_multi != NULL)
 					if (strncmp(pkg_multi, "1", 1) == 0)
-						if (strncmp(toupperstr(token), toupperstr(pkgdirp->d_name), strlen(token)) != 0)
+						if (strncmp(toupperstr(token), toupperstr(pkgdirp->d_name), strlen(pkgdirp->d_name)) != 0)
 							fprintf(cfg, "\tdepends on ADK_PACKAGE_%s\n", toupperstr(pkgdirp->d_name));
 
 				free(pseudo_name);
diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile
deleted file mode 100644
index 9d5d74cfd..000000000
--- a/package/adkinstall/Makefile
+++ /dev/null
@@ -1,48 +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:=		adkinstall
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		10
-PKG_DESCR:=		openadk installer
-PKG_SECTION:=		base
-PKG_DEPENDS:=		parted sfdisk mke2fs
-PKG_URL:=		http://openadk.org/
-
-PKG_ARCH_DEPENDS:=	!m68k
-
-WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
-NO_DISTFILES:=		1
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,ADKINSTALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-pre-configure:
-	mkdir -p ${WRKBUILD}
-
-do-install:
-	${INSTALL_DIR} $(IDIR_ADKINSTALL)/sbin
-ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y)
-	${INSTALL_BIN} ./src/adkinstall.rb532 \
-		$(IDIR_ADKINSTALL)/sbin/adkinstall
-else ifeq ($(ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20),y)
-	${INSTALL_BIN} ./src/adkinstall.foxg20 \
-		$(IDIR_ADKINSTALL)/sbin/adkinstall
-else ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
-	${INSTALL_BIN} ./src/adkinstall.yeelong \
-		$(IDIR_ADKINSTALL)/sbin/adkinstall
-else ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB4XX),y)
-	${INSTALL_BIN} ./src/adkinstall.rb4xx \
-		$(IDIR_ADKINSTALL)/sbin/adkinstall
-else
-	${INSTALL_BIN} ./src/adkinstall $(IDIR_ADKINSTALL)/sbin
-endif
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/adkinstall/src/adkinstall b/package/adkinstall/src/adkinstall
deleted file mode 100644
index 2f14d0b96..000000000
--- a/package/adkinstall/src/adkinstall
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto a Compact Flash disk
-
-check_exit() {
-        if [ $? -ne 0 ];then
-                echo "Installation failed."
-                exit 1
-        fi
-}
-
-rescue=0
-while getopts "r" option
-do
-	case $option in
-		r)
-			rescue=1
-			;;
-		*)
-			printf "Option not recognized\n"
-			exit 1
-			;;
-	esac
-done
-shift $(($OPTIND - 1))
-
-if [ -z $1 ];then
-        printf "Please give your root tar archive as parameter\n"
-        exit 1
-fi
-
-if [ $rescue -eq 1 ];then
-	if [ -z $2 ];then
-		printf "Please give your rescue kernel image as second parameter\n"
-		exit 2
-	fi
-	if [ ! -f $2 ];then
-		printf "$2 is not a file, Exiting.\n"
-		exit 1
-	fi
-fi
-
-printf "Creating partitions ...\n"
-parted -s /dev/sda mklabel msdos
-check_exit
-sleep 2
-maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
-rootsize=$(($maxsize-2))
-start=0
-rootp=1
-cfgfsp=2
-if [ $rescue -eq 1 ];then
-	rootp=3
-	cfgfsp=4
-	start=2
-	parted -s /dev/sda unit cyl mkpart primary ext2 0 1
-	check_exit
-	mke2fs -q /dev/sda1
-	check_exit
-	parted -s /dev/sda unit cyl mkpart primary ext2 1 2
-	check_exit
-	mke2fs -q /dev/sda2
-	check_exit
-fi
-parted -s /dev/sda unit cyl mkpart primary ext2 $start $rootsize
-check_exit
-mke2fs -q /dev/sda1
-check_exit
-parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
-check_exit
-parted -s /dev/sda set $rootp boot on
-check_exit
-sfdisk --change-id /dev/sda $cfgfsp 88 >/dev/null 2>&1
-check_exit
-# settle down
-sleep 2
-mount -t ext2 /dev/sda$rootp /mnt
-check_exit
-printf "Extracting install archive ...\n"
-tar -C /mnt -xzpf $1
-check_exit
-chmod 1777 /mnt/tmp
-chmod 4755 /mnt/bin/busybox
-if [ $rescue -eq 1 ];then
-	mkdir /mnt/boot/grub
-fi
-
-speed=$(awk -F \, '/console=ttyS0/ { print $2 }' /proc/cmdline|sed -e "s/ .*$//")
-
-if [ $rescue -eq 1 ];then
-	umount /mnt
-	mount /dev/sda2 /mnt
-	cp $2 /mnt/rescue
-fi
-printf "Installing bootloader ...\n"
-mkdir -p /mnt/boot/grub
-if [ $rescue -eq 1 ];then
-mount /dev/sda1 /mnt/boot/grub
-cat << EOF > /mnt/boot/grub/grub.cfg
-set timeout=1
-serial --unit=0 --speed=$speed
-terminal_output serial 
-terminal_input serial 
-
-if [ -s \$prefix/grubenv ]; then
-  load_env
-fi
-
-set default="\${saved_entry}"
-
-if [ \${prev_saved_entry} ]; then
-  set saved_entry=\${prev_saved_entry}
-  save_env saved_entry
-  set prev_saved_entry=
-  save_env prev_saved_entry
-  set boot_once=true
-fi
-
-function savedefault {
-  if [ -z \${boot_once} ]; then
-    saved_entry=\${chosen}
-    save_env saved_entry
-  fi
-}
-
-function recordfail {
-  set recordfail=1
-  if [ -n \${have_grubenv} ]; then if [ -z \${boot_once} ]; then save_env recordfail; fi; fi
-}
-
-menuentry "GNU/Linux (OpenADK)" {
-	recordfail
-        insmod ext2
-        set root=(hd0,3)
-        linux /boot/kernel root=/dev/sda$rootp ro init=/init panic=10
-}
-
-menuentry "GNU/Linux (OpenADK) Rescue Mode" {
-	recordfail
-        insmod ext2
-        set root=(hd0,2)
-        linux /rescue ro init=/init panic=10
-}
-EOF
-else
-cat << EOF > /mnt/boot/grub/grub.cfg
-set default=0
-set timeout=1
-serial --unit=0 --speed=$speed
-terminal_output serial 
-terminal_input serial 
-
-menuentry "GNU/Linux (OpenADK)" {
-        insmod ext2
-        set root=(hd0,1)
-        linux /boot/kernel root=/dev/sda$rootp ro init=/init panic=10
-}
-EOF
-fi
-grub-install --root-directory=/mnt /dev/sda 
-check_exit
-if [ $rescue -eq 1 ];then
-	grub-set-default --root-directory=/mnt 0
-	umount /mnt/boot/grub
-fi
-umount /mnt
-printf "Successfully installed. You can reboot now.\n"
-exit 0
diff --git a/package/adkinstall/src/adkinstall.foxg20 b/package/adkinstall/src/adkinstall.foxg20
deleted file mode 100644
index 99cd899f4..000000000
--- a/package/adkinstall/src/adkinstall.foxg20
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto a micro SD card
-# special script for foxboard netus aka foxg20
-
-if [ -z $1 ];then
-        printf "Please give your root tar archive as parameter\n"
-        exit 1
-fi
-
-if [ ! -f $1 ];then
-	printf "given root tar archive does not exist\n"
-	exit 1
-fi
-
-printf "Creating partition scheme\n"
-parted -s /dev/mmcblk0 mklabel msdos
-sleep 2
-maxsize=$(env LC_ALL=C parted /dev/mmcblk0 -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
-rootsize=$(($maxsize-2))
-parted -s /dev/mmcblk0 unit cyl mkpart primary fat32 0 5
-parted -s /dev/mmcblk0 unit cyl mkpart primary ext2 5 $rootsize
-parted -s /dev/mmcblk0 unit cyl mkpart primary fat32 $rootsize $maxsize
-parted -s /dev/mmcblk0 set 1 boot on
-sfdisk --change-id /dev/mmcblk0 3 88 >/dev/null 2>&1
-sleep 2
-sync
-printf "Creating vfat filesystem\n"
-mkfs.vfat /dev/mmcblk0p1 >/dev/null 2>&1
-printf "Creating ext2 filesystem\n"
-mke2fs /dev/mmcblk0p2 >/dev/null 2>&1
-tune2fs -c0 -i0 /dev/mmcblk0p2 >/dev/null 2>&1
-mount -t ext2 /dev/mmcblk0p2 /mnt
-mkdir /mnt/boot
-mount -t vfat /dev/mmcblk0p1 /mnt/boot
-
-printf "Extracting install archive\n"
-tar -C /mnt -xzpf $1
-if [ $? -ne 0 ];then
-	printf "Extracting of install archive failed"
-	exit 1
-fi
-
-chmod 1777 /mnt/tmp
-chmod 4755 /mnt/bin/busybox
-sync
-umount /mnt/boot
-umount /mnt
-if [ $? -ne 0 ];then
-	printf "Unmounting filesystem failed"
-	exit 1
-else
-	printf "Successfully installed.\n"
-	exit 0
-fi
diff --git a/package/adkinstall/src/adkinstall.rb4xx b/package/adkinstall/src/adkinstall.rb4xx
deleted file mode 100644
index afaea0c39..000000000
--- a/package/adkinstall/src/adkinstall.rb4xx
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto a NAND device
-# special script for routerboard rb4xx
-
-if [ -z $1 ];then
-        printf "Please give your root tar archive as parameter\n"
-        exit 1
-fi
-
-printf "Preparing mountpoints\n"
-mount -t yaffs2 /dev/mtdblock2 /mnt
-rm -rf /mnt/* >/dev/null 2>&1
-mkdir /mnt/boot
-mount -t yaffs2 /dev/mtdblock1 /mnt/boot
-
-printf "Extracting install archive\n"
-tar -C /mnt -xzpf $1
-if [ $? -ne 0 ];then
-	printf "Extracting of install archive failed"
-	exit 1
-fi
-
-chmod 1777 /mnt/tmp
-chmod 4755 /mnt/bin/busybox
-
-sync
-umount /mnt/boot
-umount /mnt
-if [ $? -ne 0 ];then
-	printf "Unmounting filesystem failed"
-	exit 1
-else
-	printf "Successfully installed.\n"
-	exit 0
-fi
diff --git a/package/adkinstall/src/adkinstall.rb532 b/package/adkinstall/src/adkinstall.rb532
deleted file mode 100644
index 9f1af0bb6..000000000
--- a/package/adkinstall/src/adkinstall.rb532
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto 
-# a Compact Flash disk or NAND device
-# special script for routerboard rb532
-
-nandinstall=0
-cfinstall=0
-
-if [ -z $1 ];then
-        printf "Please give your target device as first parameter [cf|nand]\n"
-        exit 1
-fi
-if [ -z $2 ];then
-        printf "Please give your root tar archive as second parameter\n"
-        exit 1
-fi
-case $1 in
-	nand)
-		nandinstall=1
-		;;
-	cf)
-		cfinstall=1
-		;;
-	*)
-		printf "Target device not known.\n"
-		exit 1
-		;;
-esac
-
-if [ $cfinstall -eq 1 ];then
-	if [ -z $3 ];then
-       	 printf "Please give your kernel as third parameter\n"
-       	 exit 1
-	fi
-fi
-
-if [ $cfinstall -eq 1 ];then
-	# create empty partition table
-	printf "Creating partition scheme\n"
-	parted -s /dev/sda mklabel msdos
-	sleep 2
-	maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
-	rootsize=$(($maxsize-2))
-	parted -s /dev/sda unit cyl mkpart primary ext2 0 1
-	parted -s /dev/sda unit cyl mkpart primary ext2 1 $rootsize
-	parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
-	parted -s /dev/sda set 1 boot on
-	sfdisk --change-id /dev/sda 1 27 >/dev/null 2>&1
-	sfdisk --change-id /dev/sda 3 88 >/dev/null 2>&1
-	sleep 2
-	mke2fs /dev/sda2
-	sync
-	printf "Installing kernel\n"
-	dd if=$3 of=/dev/sda1 bs=2048 >/dev/null 2>&1
-	sync
-	mount -t ext2 /dev/sda2 /mnt
-fi
-
-if [ $nandinstall -eq 1 ];then
-	printf "Preparing mountpoints\n"
-	mount -t yaffs2 /dev/mtdblock1 /mnt
-	rm -rf /mnt/* >/dev/null 2>&1
-	mkdir /mnt/boot
-	mount -t yaffs2 /dev/mtdblock0 /mnt/boot
-fi
-
-printf "Extracting install archive\n"
-tar -C /mnt -xzpf $2
-if [ $? -ne 0 ];then
-	printf "Extracting of install archive failed"
-	exit 1
-fi
-
-chmod 1777 /mnt/tmp
-chmod 4755 /mnt/bin/busybox
-sync
-
-if [ $nandinstall -eq 1 ];then
-	umount /mnt/boot
-fi
-umount /mnt
-if [ $? -ne 0 ];then
-	printf "Unmounting filesystem failed"
-	exit 1
-else
-	printf "Successfully installed.\n"
-	exit 0
-fi
diff --git a/package/adkinstall/src/adkinstall.yeelong b/package/adkinstall/src/adkinstall.yeelong
deleted file mode 100644
index b6735ec54..000000000
--- a/package/adkinstall/src/adkinstall.yeelong
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto a disk
-# lemote yeelong specific installer
-
-check_exit() {
-        if [ $? -ne 0 ];then
-                echo "Installation failed."
-                exit 1
-        fi
-}
-
-if [ -z $1 ];then
-        printf "Please give your root tar archive as parameter\n"
-        exit 1
-fi
-
-printf "Creating partitions ...\n"
-parted -s /dev/sda mklabel msdos
-check_exit
-sleep 2
-maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
-rootsize=$(($maxsize-2))
-start=0
-rootp=1
-cfgfsp=2
-
-parted -s /dev/sda unit cyl mkpart primary ext2 $start $rootsize
-check_exit
-mke2fs -q /dev/sda1
-check_exit
-parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
-check_exit
-parted -s /dev/sda set $rootp boot on
-check_exit
-sfdisk --change-id /dev/sda $cfgfsp 88 >/dev/null 2>&1
-check_exit
-# settle down
-sleep 2
-mount -t ext2 /dev/sda$rootp /mnt
-check_exit
-printf "Extracting install archive ...\n"
-tar -C /mnt -xzpf $1
-check_exit
-chmod 1777 /mnt/tmp
-chmod 4755 /mnt/bin/busybox
-
-cat << EOF > /mnt/boot/boot.cfg
-default 0
-timeout 3
-showmenu 1
-title OpenADK
-        kernel (wd0,0)/boot/kernel
-        args root=/dev/sda1 ro panic=10
-}
-EOF
-
-umount /mnt
-printf "Successfully installed. You can reboot now.\n"
-exit 0
diff --git a/package/base-files/src/sbin/adkupdate b/package/base-files/src/sbin/adkupdate
deleted file mode 100755
index b5477412f..000000000
--- a/package/base-files/src/sbin/adkupdate
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/sh
-
-who=$(id -u)
-if [ $who -ne 0 ]; then
-  echo 'Exit. System update must be run as root.'
-  exit 1
-fi
-
-system=$(awk '/system type/ { print $5 }' /proc/cpuinfo 2>/dev/null)
-
-if [ -x /sbin/mtd ];then
-	if [ "$system" == "AR7" ];then
-		updatecmd="dd bs=16 skip=3 | mtd -r write - linux"
-	else
-		updatecmd="mtd -r write - linux"
-	fi
-else
-	updatecmd="gunzip -c | tar -xf -"
-fi
-
-
-check_exit() {
-	if [ $? -ne 0 ];then
-		echo "Update failed."
-		exit 1
-	fi
-}
-
-prepare() {
-	cd /
-	if [ -x /sbin/cfgfs ];then
-		mount -o bind /tmp/.cfgfs/root /etc
-		check_exit
-		mount -o remount,rw /etc
-		check_exit
-	fi
-	mount -o remount,rw /
-	check_exit
-	if [ "$system" == "RB532" ];then
-		mount -t yaffs2 /dev/mtdblock0 /boot
-	elif [ "$system" == "AR7130" ];then
-		mount -t yaffs2 /dev/mtdblock1 /boot
-	elif [ "$system" == "FOXG20" ];then
-		mount -t vfat /dev/mmcblk0p1 /boot
-	fi
-}
-
-extract_from_file() {
-	prepare
-        cat $1 | eval $updatecmd
-	check_exit
-}
-
-extract_from_ssh() {
-	prepare
-        ssh $1 "cat $2" | eval $updatecmd
-	check_exit
-}
-
-extract_from_http() {
-	prepare
-        wget -O - $1 | eval $updatecmd
-	check_exit
-}
-                
-case $1 in
-        file://*|/*)
-                url=$(echo $1|sed -e "s#file://##")
-		echo "Updating system from $1"
-                extract_from_file $url
-                ;;
-        ssh://*)
-                host=$(echo $1|sed -e "s#ssh://\(.*\):.*#\1#")
-                file=$(echo $1|sed -e "s#ssh://.*:\(.*\)#\1#")
-		echo "Updating system from $1"
-                extract_from_ssh $host $file
-                ;;
-        http://*|ftp://*)
-		echo "Updating system from $1"
-                extract_from_http $1
-                ;;
-        *)
-                echo "No or wrong uri given. exit."
-		echo "Use one of the following uri:"
-		echo "http://myserver/myupdate.tar.gz"
-		echo "ssh://myuser@myserver:/my/path/myupdate.tar.gz"
-		echo "file:///mypath/myupdate.tar.gz"
-                exit 1
-                ;;
-esac
-
-# fix permissions
-if [ -f /usr/bin/sudo ];then
-	chmod 4755 /usr/bin/sudo
-fi
-if [ -f /usr/bin/Xorg ];then
-	chmod 4755 /usr/bin/Xorg
-fi
-
-sync
-if [ -x /sbin/cfgfs ];then
-	umount /etc
-fi
-if [ "$system" == "RB532" ];then
-	umount -f /boot
-elif [ "$system" == "AR7130" ];then
-	umount -f /boot
-elif [ "$system" == "FOXG20" ];then
-	umount -f /boot
-fi
-
-echo "Update sucessful. You should reboot now."
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 6b07623b0..e3b766558 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		1.21.1
 PKG_RELEASE:=		6
 PKG_MD5SUM:=		795394f83903b5eec6567d51eebb417e
 PKG_DESCR:=		core utilities for embedded systems
-PKG_SECTION:=		base
+PKG_SECTION:=		core
 PKG_BUILDDEP:=		bzip2-host
 PKG_URL:=		http://www.busybox.net/
 PKG_SITES:=		http://www.busybox.net/downloads/
diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile
index 5be1c57b2..621b95187 100644
--- a/package/coreutils/Makefile
+++ b/package/coreutils/Makefile
@@ -7,26 +7,24 @@ PKG_NAME:=		coreutils
 PKG_VERSION:=		8.22
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		8fb0ae2267aa6e728958adc38f8163a2
-PKG_DESCR:=		basic file, shell and text manipulation utilities
-PKG_SECTION:=		base
+PKG_DESCR:=		basic file, shell and text manipulation utilities (also provided by busybox)
+PKG_SECTION:=		core
 PKG_BUILDDEP:=		gmp autotool
 PKG_URL:=		http://www.gnu.org/software/coreutils/
 PKG_SITES:=		http://ftp.gnu.org/gnu/coreutils/
+PKG_MULTI:=		1
 
-PKG_SUBPKGS:=		TSORT SHA256SUM TOUCH
+PKG_SUBPKGS:=		COREUTILS TSORT SHA256SUM TOUCH
 PKGSD_TSORT:=		topological sort utility
-PKGSC_TSORT:=		misc
 PKGSD_SHA256SUM:=	SHA1 256 bit checksum utility
-PKGSC_SHA256SUM:=	misc
 PKGSD_TOUCH:=		touch utility
-PKGSC_TOUCH:=		misc
 
 include $(TOPDIR)/mk/package.mk
 
-#$(eval $(call PKG_template,COREUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,TSORT,tsort,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TSORT},${PKGSC_TSORT}))
-$(eval $(call PKG_template,TOUCH,touch,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TOUCH},${PKGSC_TOUCH}))
-$(eval $(call PKG_template,SHA256SUM,sha256sum,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SHA256SUM},${PKGSC_SHA256SUM}))
+$(eval $(call PKG_template,COREUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TSORT,tsort,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TSORT},${PKG_SECTION}))
+$(eval $(call PKG_template,TOUCH,touch,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TOUCH},${PKG_SECTION}))
+$(eval $(call PKG_template,SHA256SUM,sha256sum,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SHA256SUM},${PKG_SECTION}))
 
 AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--disable-rpath
diff --git a/package/findutils/Makefile b/package/findutils/Makefile
index 3b4fd3ffd..fa0dd0601 100644
--- a/package/findutils/Makefile
+++ b/package/findutils/Makefile
@@ -7,27 +7,29 @@ PKG_NAME:=		findutils
 PKG_VERSION:=		4.4.2
 PKG_RELEASE:=		5
 PKG_MD5SUM:=		351cc4adb07d54877fa15f75fb77d39f
-PKG_DESCR:=		utilities for finding files
-PKG_SECTION:=		utils
+PKG_DESCR:=		utilities for finding files (also provided by busybox)
+PKG_SECTION:=		core
 PKG_DEPENDS:=		libpthread
 PKG_BUILDDEP:=		autotool
 HOST_BUILDDEP:=		autotool
 PKG_URL:=		http://www.gnu.org/software/findutils/
 PKG_SITES:=		http://ftp.gnu.org/pub/gnu/findutils/
+PKG_MULTI:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_SUBPKGS:=		FIND XARGS LOCATE
+PKG_SUBPKGS:=		FINDUTILS XARGS LOCATE FIND
 PKGSD_LOCATE:=		locate utility
 PKGSD_XARGS:=		xargs utility
+PKGSD_FIND:=		find utility
 
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,FINDUTILS,findutils,$(PKG_VERSION)-${PKG_RELEASE}))
-$(eval $(call PKG_template,FIND,find,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,XARGS,xargs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XARGS},${PKG_SECTION}))
+$(eval $(call PKG_template,FIND,find,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FIND},${PKG_SECTION}))
 $(eval $(call PKG_template,LOCATE,locate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOCATE},${PKG_SECTION}))
+$(eval $(call PKG_template,XARGS,xargs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XARGS},${PKG_SECTION}))
 
 HOST_STYLE:=		auto
 AUTOTOOL_STYLE:=	autoreconf
diff --git a/package/installer/Makefile b/package/installer/Makefile
deleted file mode 100644
index ed850f057..000000000
--- a/package/installer/Makefile
+++ /dev/null
@@ -1,26 +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:=		installer
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		1
-PKG_DESCR:=		OpenADK disk installer
-PKG_SECTION:=		base
-
-WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
-NO_DISTFILES:=		1
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,INSTALLER,installer,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-do-install:
-	$(INSTALL_BIN) ./src/installer $(IDIR_INSTALLER)/
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/installer/src/installer b/package/installer/src/installer
deleted file mode 100755
index 3c24cb6a2..000000000
--- a/package/installer/src/installer
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-
-#set -x
-
-rootsize=1024
-usbrootsize=512
-cfgsize=16
-
-create_bootcfg() {
-	cat << FOO > /mnt/boot/boot.cfg
-default 0
-timeout 2
-showmenu 1
-title OpenADK
-	kernel (wd0,0)/boot/kernel
-	args root=/dev/sda1
-
-title USB
-	kernel (usb0,0)/boot/kernel-usb
-	args root=/dev/sdc1
-FOO
-
-}
-
-create_fstab() {
-	cat << FOO > /mnt/etc/fstab
-/dev/sda2 /home ext4 defaults 0 0
-/dev/sda3 none swap sw 0 0
-FOO
-
-}
-
-create_usb_fstab() {
-	cat << FOO > /mnt/etc/fstab
-/dev/sdc2 /home ext4 defaults 0 0
-FOO
-
-}
-
-create_home() { 
-	mkdir -p /mnt/home
-	mkdir -p /tmp/home/lemote
-	chown 1000:1000 /tmp/home/lemote
-	echo "lemote:x:1000:1000:Linux User,,,:/home/lemote:/bin/mksh" >> /mnt/etc/passwd
-	echo "lemote:.m3Jtyyc5L4W6:15426:0:99999:7:::" >> /mnt/etc/shadow
-	echo "setxkbmap -option terminate:ctrl_alt_bksp" >> /tmp/home/lemote/.xsession
-	echo fluxbox >> /tmp/home/lemote/.xsession
-}
-
-usb_install() {
-	size=$(parted -s /dev/sdc unit mb print|awk '/Disk/ {print $3}'|sed -e "s#MB##")
-	homesize=$(($size-$usbrootsize-$cfgsize))
-	mkdir /tmp/home
-	parted -s /dev/sdc mklabel msdos
-	parted -s /dev/sdc mkpart primary ext2 0 ${usbrootsize}M 2>&1 >/dev/null
-	parted -s /dev/sdc mkpart primary ext2 ${usbrootsize}M ${homesize}M
-	parted -s /dev/sdc -- mkpart primary ext2 ${homesize}M -0
-	sfdisk --change-id /dev/sdc 3 88 2>&1 >/dev/null
-	echo "Creating filesystem on /home"
-	mke2fs -q -j /dev/sdc2
-	mount -t ext4 /dev/sdc2 /tmp/home
-	echo "Copying system to disk" 
-	dd if=/dev/sdc of=/tmp/home/lemote.tar.gz bs=16384 skip=1024 count=8000 2>/dev/null
-	echo "Creating filesystem on /"
-	mke2fs -q -j /dev/sdc1
-	mount -t ext4 /dev/sdc1 /mnt
-	echo "Installing system to USB disk ..."
-	tar xzf /tmp/home/lemote.tar.gz -C /mnt
-	test -x /mnt/usr/bin/sudo && chmod u+s /mnt/usr/bin/sudo
-	test -x /mnt/usr/bin/Xorg && chmod u+s /mnt/usr/bin/Xorg
-	create_home
-	create_bootcfg
-	create_usb_fstab
-	umount /mnt
-	umount /tmp/home
-	
-}
-
-disk_install() {
-	size=$(parted -s /dev/sda unit mb print|awk '/Disk/ {print $3}'|sed -e "s#MB##")
-	swap=1024
-	homesize=$(($size-$rootsize-$cfgsize-$swap))
-	swapsize=$(($homesize+$swap))
-	mkdir /tmp/home
-	parted -s /dev/sda mklabel msdos
-	parted -s /dev/sda mkpart primary ext2 0 ${rootsize}M 2>&1 >/dev/null
-	parted -s /dev/sda mkpart primary ext2 ${rootsize}M ${homesize}M
-	parted -s /dev/sda mkpart primary ext2 ${homesize}M ${swapsize}M
-	parted -s /dev/sda -- mkpart primary ext2 ${swapsize}M -0
-	sfdisk --change-id /dev/sda 3 82 2>&1 >/dev/null
-	sfdisk --change-id /dev/sda 4 88 2>&1 >/dev/null
-	sleep 2
-	echo "Creating filesystem on /home"
-	mke2fs -q -j /dev/sda2
-	mkswap /dev/sda3
-	mount -t ext4 /dev/sda2 /tmp/home
-	echo "Copying system to disk" 
-	dd if=/dev/sdc of=/tmp/home/lemote.tar.gz bs=16384 skip=1024 count=8000 2>/dev/null
-	mke2fs -q -j /dev/sda1
-	mount -t ext4 /dev/sda1 /mnt
-	echo "Installing system to hard disk ..."
-	tar xzf /tmp/home/lemote.tar.gz -C /mnt
-	test -x /mnt/usr/bin/sudo && chmod u+s /mnt/usr/bin/sudo
-	test -x /mnt/usr/bin/Xorg && chmod u+s /mnt/usr/bin/Xorg
-	create_home
-	create_bootcfg
-	create_fstab
-	umount /mnt
-	umount /tmp/home
-	
-}
-
-. /etc/functions.sh
-echo 0 > /proc/sys/kernel/printk
-
-load_modules /etc/modules
-for f in /etc/modules.d/*; do
-	[[ -e $f ]] && load_modules /etc/modules.d/*
-	break
-done
-
-echo "  ___                      _    ____  _  __ "
-echo " / _ \ _ __   ___ _ __    / \  |  _ \| |/ / "
-echo "| | | | '_ \ / _ \ '_ \  / _ \ | | | | ' /  "
-echo "| |_| | |_) |  __/ | | |/ ___ \| |_| | . \  "
-echo " \___/| .__/ \___|_| |_/_/   \_\____/|_|\_\ "
-echo "      |_|                                   "
-echo ""
-# settle down, after module load
-sleep 2
-echo "Should I install OpenADK to disk (d) or usb disk (u) or do nothing (any key)"
-read answer
-if [ "$answer" = "d" ];then
-	disk_install
-fi
-if [ "$answer" = "u" ];then
-	usb_install
-fi
-echo "Should I reboot now (y/n)"
-read answer
-if [ "$answer" = "y" ];then
-	/bin/busybox reboot -f
-else
-	exit
-fi
diff --git a/package/section.lst b/package/section.lst
index 9476cb44d..7302a4a4f 100644
--- a/package/section.lst
+++ b/package/section.lst
@@ -1,5 +1,6 @@
-base	Base System
 boot	Boot Loaders
+base	Base System and Libraries
+core	Basic System commands
 browser	Browser / Editor / Pager
 editor	Browser / Editor / Pager
 pager	Browser / Editor / Pager
diff --git a/package/uclibc/Config.in.manual b/package/uclibc/Config.in.manual
index bf8021d6c..7cfe210f5 100644
--- a/package/uclibc/Config.in.manual
+++ b/package/uclibc/Config.in.manual
@@ -1,5 +1,5 @@
 config ADK_PACKAGE_UCLIBC
-	prompt "uClibc................. embedded C library"
+	prompt "uClibc............... embedded C library"
 	bool
 	default y if ADK_TARGET_LIB_UCLIBC && !ADK_TOOLCHAIN_ONLY
 	default n
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 636b43f48..4a2a48d30 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -4,47 +4,54 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		util-linux
-PKG_VERSION:=		2.23.2
-PKG_RELEASE:=		6
-PKG_MD5SUM:=		b39fde897334a4858bb2098edcce5b3f
-PKG_DESCR:=		Linux utilities (meta-package)
-PKG_SECTION:=		utils
-PKG_DEPENDS:=		mount fdisk sfdisk swap-utils losetup mount mcookie
+PKG_VERSION:=		2.24.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		3f191727a0d28f7204b755cf1b6ea0aa
+PKG_DESCR:=		basic Linux utilities (also provided by busybox)
+PKG_SECTION:=		core
 PKG_BUILDDEP:=		ncurses
-PKG_SITES:=		http://www.kernel.org/pub/linux/utils/util-linux/v2.23/
+PKG_SITES:=		http://www.kernel.org/pub/linux/utils/util-linux/v2.24/
 PKG_NOPARALLEL:=	1
 PKG_OPTS:=		dev
+PKG_MULTI:=		1
 
 PKG_ARCH_DEPENDS:=	!m68k
 
 PKG_SUBPKGS:=		UTIL_LINUX FDISK SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT
-PKG_SUBPKGS+=		LIBUUID LIBBLKID LIBMOUNT
-PKGSD_LIBUUID:=		UUID library
+PKG_SUBPKGS+=		LIBUUID LIBBLKID LIBMOUNT SU CFDISK
+PKGSD_LIBUUID:=		uuid library
 PKGSC_LIBUUID:=		libs
-PKGSD_LIBBLKID:=	BLKID library
+PKGSD_LIBBLKID:=	blkid library
 PKGSC_LIBBLKID:=	libs
-PKGSD_LIBMOUNT:=	Mount library
+PKGSD_LIBMOUNT:=	mount library
 PKGSC_LIBMOUNT:=	libs
-PKGSD_FDISK:=		Partition table manipulation utility
-PKGSC_FDISK:=		fs
-PKGSD_SFDISK:=		Scriptable Partition table manipulation utility
+PKGSD_FDISK:=		partition table manipulation utility
+PKGSC_FDISK:=		core
+PKGSD_SFDISK:=		scriptable partition table manipulation utility
 PKGSC_SFDISK:=		fs
-PKGSD_SWAP_UTILS:=	Swap space management utilities
+PKGSD_CFDISK:=		partition table manipulation utility
+PKGSC_CFDISK:=		fs
+PKGSD_SU:=		switch user utility
+PKGSB_SU:=		pam
+PKGSC_SU:=		core
+PKGSD_SWAP_UTILS:=	swap space management utilities
 PKGSS_SWAP_UTILS:=	libblkid
-PKGSC_SWAP_UTILS:=	fs
-PKGSD_LOSETUP:=		Loop devices management utilities
+PKGSC_SWAP_UTILS:=	core
+PKGSD_LOSETUP:=		loop devices management utilities
 PKGSS_LOSETUP:=		kmod-blk-dev-loop
 PKGSD_MOUNT:=		mount/umount utilities
 PKGSS_MOUNT:=		libblkid libmount libuuid
-PKGSC_MOUNT:=		fs
-PKGSD_MCOOKIE:=		Generate magic cookies for xauth
+PKGSC_MOUNT:=		core
+PKGSD_MCOOKIE:=		generate magic cookies for xauth
 PKGSC_MCOOKIE:=		x11/apps
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,UTIL_LINUX,util-linux,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FDISK},${PKGSC_FDISK}))
+$(eval $(call PKG_template,CFDISK,cfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CFDISK},${PKGSC_CFDISK}))
 $(eval $(call PKG_template,SFDISK,sfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SFDISK},${PKGSC_SFDISK}))
+$(eval $(call PKG_template,SU,su,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SU},${PKGSD_SU},${PKGSC_SU}))
 $(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SWAP_UTILS},${PKGSD_SWAP_UTILS},${PKGSC_SWAP_UTILS}))
 $(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LOSETUP},${PKGSD_LOSETUP},${PKG_SECTION}))
 $(eval $(call PKG_template,MOUNT,mount,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MOUNT},${PKGSD_MOUNT},${PKGSC_MOUNT}))
@@ -59,7 +66,7 @@ CONFIGURE_ARGS+=	--disable-use-tty-group \
 			--disable-schedutils \
 			--disable-cramfs \
 			--disable-login \
-			--disable-su \
+			--enable-su \
 			--enable-libuuid \
 			--enable-libblkid \
 			--enable-libmount \
@@ -69,12 +76,14 @@ CONFIGURE_ARGS+=	--disable-use-tty-group \
 FAKE_FLAGS+=		INSTALLSUID="install -m 4755"
 TARGET_CFLAGS+=		-DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK -ltinfo
 
-util-linux-install:
-
 fdisk-install:
 	${INSTALL_DIR} ${IDIR_FDISK}/usr/sbin
 	${CP} ${WRKINST}/sbin/fdisk ${IDIR_FDISK}/usr/sbin
 
+cfdisk-install:
+	${INSTALL_DIR} ${IDIR_CFDISK}/usr/sbin
+	${CP} ${WRKINST}/sbin/cfdisk ${IDIR_FDISK}/usr/sbin
+
 sfdisk-install:
 	${INSTALL_DIR} ${IDIR_SFDISK}/usr/sbin
 	${CP} ${WRKINST}/sbin/sfdisk ${IDIR_SFDISK}/usr/sbin
diff --git a/package/util-linux/patches/patch-fdisks_cfdisk_c b/package/util-linux/patches/patch-fdisks_cfdisk_c
deleted file mode 100644
index c7595e3cc..000000000
--- a/package/util-linux/patches/patch-fdisks_cfdisk_c
+++ /dev/null
@@ -1,13 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/fdisks/cfdisk.c	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/fdisks/cfdisk.c	2013-08-14 12:42:25.000000000 +0200
-@@ -325,7 +325,7 @@ int num_parts = 0;
- int logical = 0;
- long long logical_sectors[MAXIMUM_PARTS];
- 
--__sighandler_t old_SIGINT, old_SIGTERM;
-+sighandler_t old_SIGINT, old_SIGTERM;
- 
- int arrow_cursor = FALSE;
- int display_units = MEGABYTES;
diff --git a/package/util-linux/patches/patch-fdisks_fdisksunlabel_c b/package/util-linux/patches/patch-fdisks_fdisksunlabel_c
deleted file mode 100644
index 35851b9b6..000000000
--- a/package/util-linux/patches/patch-fdisks_fdisksunlabel_c
+++ /dev/null
@@ -1,30 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/fdisks/fdisksunlabel.c	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/fdisks/fdisksunlabel.c	2013-08-14 12:38:12.000000000 +0200
-@@ -383,9 +383,11 @@ static void fetch_sun(struct fdisk_conte
- 	}
- }
- 
--static int verify_sun_cmp(int *a, int *b, void *data)
-+static void* cmp_data;
-+static int verify_sun_cmp(const void *pa, const void *pb)
- {
--    unsigned int *verify_sun_starts = (unsigned int *) data;
-+    const int *a = pa, *b = pb;
-+    unsigned int *verify_sun_starts = (unsigned int *) cmp_data;	
- 
-     if (*a == -1)
- 	    return 1;
-@@ -449,9 +451,8 @@ static int sun_verify_disklabel(struct f
-         else
-             array[i] = -1;
-     }
--    qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]),
--	  (int (*)(const void *,const void *,void *)) verify_sun_cmp,
--	  verify_sun_starts);
-+    cmp_data = verify_sun_starts;
-+    qsort(array,ARRAY_SIZE(array),sizeof(array[0]), verify_sun_cmp);
- 
-     if (array[0] == -1) {
- 	fdisk_info(cxt, _("No partitions defined"));
diff --git a/package/util-linux/patches/patch-include_ttyutils_h b/package/util-linux/patches/patch-include_ttyutils_h
deleted file mode 100644
index 2fd1baed0..000000000
--- a/package/util-linux/patches/patch-include_ttyutils_h
+++ /dev/null
@@ -1,12 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/include/ttyutils.h	2013-07-15 10:25:46.000000000 +0200
-+++ util-linux-2.23.2/include/ttyutils.h	2013-08-14 12:31:25.000000000 +0200
-@@ -10,6 +10,7 @@
- #include <stdlib.h>
- #include <termios.h>
- #include <limits.h>
-+#include <sys/ttydefaults.h>
- #ifdef HAVE_SYS_IOCTL_H
- #include <sys/ioctl.h>
- #endif
diff --git a/package/util-linux/patches/patch-lib_fileutils_c b/package/util-linux/patches/patch-lib_fileutils_c
deleted file mode 100644
index d4edf1c6a..000000000
--- a/package/util-linux/patches/patch-lib_fileutils_c
+++ /dev/null
@@ -1,14 +0,0 @@
---- util-linux-2.23.2.orig/lib/fileutils.c	2013-06-13 09:46:10.000000000 +0200
-+++ util-linux-2.23.2/lib/fileutils.c	2013-08-14 11:58:47.000000000 +0200
-@@ -37,7 +37,11 @@ int xmkstemp(char **tmpname, char *dir)
- 		xasprintf(&localtmp, "%s/%s.XXXXXX", _PATH_TMP,
- 			  program_invocation_short_name);
- 	old_mode = umask(077);
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- 	fd = mkostemp(localtmp, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
-+#else
-+	fd = mkstemp(localtmp);
-+#endif
- 	umask(old_mode);
- 	if (fd == -1) {
- 		free(localtmp);
diff --git a/package/util-linux/patches/patch-libblkid_blkid_pc_in b/package/util-linux/patches/patch-libblkid_blkid_pc_in
deleted file mode 100644
index 475bc2f92..000000000
--- a/package/util-linux/patches/patch-libblkid_blkid_pc_in
+++ /dev/null
@@ -1,12 +0,0 @@
---- util-linux-2.23.2.orig/libblkid/blkid.pc.in	2013-02-27 17:46:29.000000000 +0100
-+++ util-linux-2.23.2/libblkid/blkid.pc.in	2013-10-28 12:08:14.000000000 +0100
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@usrlib_execdir@
--includedir=@includedir@
-+libdir=${prefix}/lib
-+includedir=${prefix}/include
- 
- Name: blkid
- Description: Block device id library
diff --git a/package/util-linux/patches/patch-libblkid_src_save_c b/package/util-linux/patches/patch-libblkid_src_save_c
deleted file mode 100644
index c25f42c10..000000000
--- a/package/util-linux/patches/patch-libblkid_src_save_c
+++ /dev/null
@@ -1,14 +0,0 @@
---- util-linux-2.23.2.orig/libblkid/src/save.c	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/libblkid/src/save.c	2013-08-14 11:59:06.000000000 +0200
-@@ -110,7 +110,11 @@ int blkid_flush_cache(blkid_cache cache)
- 		tmp = malloc(strlen(filename) + 8);
- 		if (tmp) {
- 			sprintf(tmp, "%s-XXXXXX", filename);
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- 			fd = mkostemp(tmp, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
-+#else
-+			fd = mkstemp(tmp);
-+#endif
- 			if (fd >= 0) {
- 				if (fchmod(fd, 0644) != 0)
- 					DBG(SAVE, blkid_debug("%s: fchmod failed", filename));
diff --git a/package/util-linux/patches/patch-libmount_src_utils_c b/package/util-linux/patches/patch-libmount_src_utils_c
deleted file mode 100644
index b0fcc2afa..000000000
--- a/package/util-linux/patches/patch-libmount_src_utils_c
+++ /dev/null
@@ -1,14 +0,0 @@
---- util-linux-2.23.2.orig/libmount/src/utils.c	2013-07-30 11:15:27.000000000 +0200
-+++ util-linux-2.23.2/libmount/src/utils.c	2013-08-14 11:58:25.000000000 +0200
-@@ -842,7 +842,11 @@ int mnt_open_uniq_filename(const char *f
- 	 */
- 	oldmode = umask(S_IRGRP|S_IWGRP|S_IXGRP|
- 			S_IROTH|S_IWOTH|S_IXOTH);
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- 	fd = mkostemp(n, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
-+#else
-+	fd = mkstemp(n);
-+#endif
- 	umask(oldmode);
- 
- 	if (fd >= 0 && name)
diff --git a/package/util-linux/patches/patch-libuuid_uuid_pc_in b/package/util-linux/patches/patch-libuuid_uuid_pc_in
deleted file mode 100644
index 059310086..000000000
--- a/package/util-linux/patches/patch-libuuid_uuid_pc_in
+++ /dev/null
@@ -1,13 +0,0 @@
---- util-linux-2.23.2.orig/libuuid/uuid.pc.in	2013-02-27 17:46:29.883020734 +0100
-+++ util-linux-2.23.2/libuuid/uuid.pc.in	2013-12-17 17:07:37.935403478 +0100
-@@ -1,7 +1,7 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@usrlib_execdir@
--includedir=@includedir@
-+exec_prefix=${prefix}
-+libdir=${prefix}/lib
-+includedir=${prefix}/include
- 
- Name: uuid
- Description: Universally unique id library
diff --git a/package/util-linux/patches/patch-term-utils_setterm_c b/package/util-linux/patches/patch-term-utils_setterm_c
deleted file mode 100644
index bd84e5bbb..000000000
--- a/package/util-linux/patches/patch-term-utils_setterm_c
+++ /dev/null
@@ -1,13 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/term-utils/setterm.c	2013-06-13 09:46:10.000000000 +0200
-+++ util-linux-2.23.2/term-utils/setterm.c	2013-08-14 12:47:43.000000000 +0200
-@@ -123,7 +123,7 @@
- #include "nls.h"
- #include "closestream.h"
- 
--#if __GNU_LIBRARY__ < 5
-+#if defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ < 5
- #ifndef __alpha__
- # include <linux/unistd.h>
- #define __NR_klogctl __NR_syslog
diff --git a/package/util-linux/patches/patch-term-utils_ttymsg_c b/package/util-linux/patches/patch-term-utils_ttymsg_c
deleted file mode 100644
index a93f16d4e..000000000
--- a/package/util-linux/patches/patch-term-utils_ttymsg_c
+++ /dev/null
@@ -1,12 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/term-utils/ttymsg.c	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/term-utils/ttymsg.c	2013-08-14 12:50:50.000000000 +0200
-@@ -41,6 +41,7 @@
-   */
- 
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <sys/uio.h>
- #include <signal.h>
- #include <fcntl.h>
diff --git a/package/util-linux/patches/patch-text-utils_hexdump_h b/package/util-linux/patches/patch-text-utils_hexdump_h
deleted file mode 100644
index 79e53a00d..000000000
--- a/package/util-linux/patches/patch-text-utils_hexdump_h
+++ /dev/null
@@ -1,12 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/text-utils/hexdump.h	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/text-utils/hexdump.h	2013-08-14 12:44:31.000000000 +0200
-@@ -33,6 +33,7 @@
-  *	@(#)hexdump.h	5.4 (Berkeley) 6/1/90
-  */
- 
-+#include <sys/types.h>
- typedef struct _pr {
- 	struct _pr *nextpr;		/* next print unit */
- #define	F_ADDRESS	0x001		/* print offset */
diff --git a/package/util-linux/patches/patch-text-utils_pg_c b/package/util-linux/patches/patch-text-utils_pg_c
deleted file mode 100644
index daa6adaee..000000000
--- a/package/util-linux/patches/patch-text-utils_pg_c
+++ /dev/null
@@ -1,13 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/text-utils/pg.c	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/text-utils/pg.c	2013-08-14 12:44:55.000000000 +0200
-@@ -37,7 +37,7 @@
- #ifndef	TIOCGWINSZ
- # include <sys/ioctl.h>
- #endif
--#include <sys/termios.h>
-+#include <termios.h>
- #include <fcntl.h>
- #include <regex.h>
- #include <stdio.h>
diff --git a/package/uvd/Makefile b/package/uvd/Makefile
index e782d9f2e..3e48de961 100644
--- a/package/uvd/Makefile
+++ b/package/uvd/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		uvd
 PKG_VERSION:=		0.1
 PKG_RELEASE:=		2
 PKG_DESCR:=		udp server for version information
-PKG_SECTION:=		base
+PKG_SECTION:=		misc
 PKG_URL:=		http://openadk.org/
 
 NO_DISTFILES:=		1
-- 
cgit v1.2.3


From 09989675149f4aa81d32812973bbb0ca48ed9ba9 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 1 May 2014 13:11:29 +0200
Subject: ecj.jar is in dl_dir

---
 package/ant/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/ant/Makefile b/package/ant/Makefile
index b5b7d86b9..fda2e54c9 100644
--- a/package/ant/Makefile
+++ b/package/ant/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		c474fa9d0c35a24037c23b6e476862c1
 PKG_DESCR:=		ant utility
 PKG_SECTION:=		lang
+HOST_BUILDDEP:=		gcj-host
 PKG_SITES:=		http://archive.apache.org/dist/ant/source/
 
 PKG_CFLINE_ANT:=	depends on ADK_HOST_ONLY
@@ -27,7 +28,7 @@ host-build:
 	if [ ! -f $(WRKBUILD)/lib/optional/junit-4.9b2.jar ];then \
 		cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar; \
 	fi
-	cp $(STAGING_HOST_DIR)/usr/share/java/ecj.jar $(WRKBUILD)/lib/optional
+	cp $(DL_DIR)/ecj.jar $(WRKBUILD)/lib/optional
 	cd ${WRKBUILD}; export BOOTJAVAC_OPTS="-bootclasspath $(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" \
 		LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 \
 		JAVA_HOME=$(STAGING_HOST_DIR)/usr/lib/jvm ; \
-- 
cgit v1.2.3


From d07065b1441e770433c371efb93f8c3a2ef58b0e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 2 May 2014 08:33:06 +0200
Subject: update to latest upstream

---
 package/openjdk7/Makefile               |   13 +-
 package/openjdk7/patches/mips64el.patch |   15 -
 package/openjdk7/patches/openadk.patch  | 3231 +------------------------------
 3 files changed, 27 insertions(+), 3232 deletions(-)
 delete mode 100644 package/openjdk7/patches/mips64el.patch

diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index 8376e715a..3101f53fa 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -4,26 +4,27 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		openjdk7
-PKG_VERSION:=		2.4.5
+PKG_VERSION:=		2.4.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		6dcc544657ade213d01017354a6f9858
+PKG_MD5SUM:=		f6b28633b9978fadc724247cfc264ff0
 PKG_DESCR:=		OpenJDK 7 Java VM
 PKG_SECTION:=		lang
 PKG_BUILDDEP:=		gettext-tiny-host glib-host flex-host bison-host qemu-host
 PKG_BUILDDEP+=		fastjar-host libICE-host libSM-host libX11-host util-macros-host libXt-host 
 PKG_BUILDDEP+=		xineramaproto-host libXinerama-host recordproto-host libXi-host libXtst-host freetype-host
 PKG_BUILDDEP+=		renderproto-host libXrender-host alsa-lib-host libffi-host gcj-host ecj-host jikes-host 
-PKG_BUILDDEP+=		classpath-host jamvm-host ant-host cups-host openjdk7-host nss
+PKG_BUILDDEP+=		classpath-host jamvm-host openjdk7-host nss
 PKG_BUILDDEP+=		alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups
 PKG_BUILDDEP+=		libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny
 PKG_BUILDDEP+=		libpng giflib gtk+ glib fontconfig
+HOST_BUILDDEP:=		ant-host cups-host
 PKG_DEPENDS:=		zlib libstdcxx libffi libpthread libxtst libxi libgcc cups
 PKG_DEPENDS+=		libfreetype libxrender libx11 libxext libpthread nss libjpeg-turbo
 PKG_DEPENDS+=		libpng giflib libgtk glib fontconfig
 PKG_URL:=		http://openjdk.org/
 PKG_SITES:=		http://icedtea.classpath.org/download/source/
 
-DISTFILES:=		icedtea-$(PKG_VERSION).tar.gz
+DISTFILES:=		icedtea-$(PKG_VERSION).tar.xz
 WRKDIST=		${WRKDIR}/icedtea-${PKG_VERSION}
 
 GCJ_VER:=		4.8.2
@@ -88,7 +89,7 @@ CONFIGURE_ARGS+=	$(CONFIGURE_COMMON)
 CONFIGURE_ARGS+=	--disable-bootstrap
 
 CONFIGURE_ENV+=		LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib
-MAKE_ENV+=		ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/bin \
+MAKE_ENV+=		ALT_COMPILER_PATH=$(TOOLCHAIN_DIR)/usr/$(GNU_TARGET_NAME)/bin \
 			ALT_OPENWIN_HOME=$(STAGING_TARGET_DIR)/usr/ \
 			ALT_CUPS_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \
 			ALT_FREETYPE_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \
@@ -122,7 +123,7 @@ HOST_CONFIGURE_ARGS+=\
 		--with-jdk-home=$(STAGING_HOST_DIR)/usr/lib/jvm \
 		--with-java=$(STAGING_HOST_DIR)/usr/bin/java \
 		--with-javac=$(STAGING_HOST_DIR)/usr/bin/ecj \
-		--with-ecj-jar=${STAGING_HOST_DIR}/usr/share/java/ecj.jar \
+		--with-ecj-jar=${DL_DIR}/ecj.jar \
 		--without-hotspot-build \
                 --disable-system-zlib \
                 --disable-system-jpeg \
diff --git a/package/openjdk7/patches/mips64el.patch b/package/openjdk7/patches/mips64el.patch
deleted file mode 100644
index 501167582..000000000
--- a/package/openjdk7/patches/mips64el.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur icedtea-2.3.9.orig/configure icedtea-2.3.9/configure
---- icedtea-2.3.9.orig/configure	2013-04-21 22:48:30.000000000 +0200
-+++ icedtea-2.3.9/configure	2013-05-13 12:43:02.000000000 +0200
-@@ -7159,6 +7159,11 @@
-       INSTALL_ARCH_DIR=mipsel
-       JRE_ARCH_DIR=mipsel
-        ;;
-+    mips64el)
-+      BUILD_ARCH_DIR=mipsel
-+      INSTALL_ARCH_DIR=mipsel
-+      JRE_ARCH_DIR=mipsel
-+       ;;
-     powerpc)
-       BUILD_ARCH_DIR=ppc
-       INSTALL_ARCH_DIR=ppc
diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch
index 2d7caa27b..2994a9f99 100644
--- a/package/openjdk7/patches/openadk.patch
+++ b/package/openjdk7/patches/openadk.patch
@@ -1,7 +1,7 @@
-diff -Nur icedtea-2.4.5.orig/Makefile.in icedtea-2.4.5/Makefile.in
---- icedtea-2.4.5.orig/Makefile.in	2014-01-29 09:28:28.000000000 +0100
-+++ icedtea-2.4.5/Makefile.in	2014-02-09 18:47:29.000000000 +0100
-@@ -704,7 +704,7 @@
+diff -Nur icedtea-2.4.7.orig/Makefile.in icedtea-2.4.7/Makefile.in
+--- icedtea-2.4.7.orig/Makefile.in	2014-04-16 06:20:44.689988653 +0200
++++ icedtea-2.4.7/Makefile.in	2014-05-01 13:34:58.421434811 +0200
+@@ -712,7 +712,7 @@
  	$(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES)
  
  # Bootstrapping patches
@@ -10,3200 +10,9 @@ diff -Nur icedtea-2.4.5.orig/Makefile.in icedtea-2.4.5/Makefile.in
  	patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \
  	patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \
  	patches/boot/demos.patch patches/boot/fphexconstants.patch \
-@@ -2120,7 +2120,7 @@
- # Optional native ecj
- stamps/native-ecj.stamp:
- 	mkdir -p stamps 
--@BUILD_NATIVE_ECJ_TRUE@	${GCJ} $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
-+@BUILD_NATIVE_ECJ_TRUE@	${GCJ} -lgcj -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
- @BUILD_NATIVE_ECJ_TRUE@	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR}
- 	touch $@
- 
-diff -Nur icedtea-2.4.5.orig/Makefile.in.orig icedtea-2.4.5/Makefile.in.orig
---- icedtea-2.4.5.orig/Makefile.in.orig	1970-01-01 01:00:00.000000000 +0100
-+++ icedtea-2.4.5/Makefile.in.orig	2014-01-29 09:28:28.000000000 +0100
-@@ -0,0 +1,3178 @@
-+# Makefile.in generated by automake 1.14 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-+
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+# Dependencies
-+VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-+am__make_running_with_option = \
-+  case $${target_option-} in \
-+      ?) ;; \
-+      *) echo "am__make_running_with_option: internal error: invalid" \
-+              "target option '$${target_option-}' specified" >&2; \
-+         exit 1;; \
-+  esac; \
-+  has_opt=no; \
-+  sane_makeflags=$$MAKEFLAGS; \
-+  if $(am__is_gnu_make); then \
-+    sane_makeflags=$$MFLAGS; \
-+  else \
-+    case $$MAKEFLAGS in \
-+      *\\[\ \	]*) \
-+        bs=\\; \
-+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-+    esac; \
-+  fi; \
-+  skip_next=no; \
-+  strip_trailopt () \
-+  { \
-+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-+  }; \
-+  for flg in $$sane_makeflags; do \
-+    test $$skip_next = yes && { skip_next=no; continue; }; \
-+    case $$flg in \
-+      *=*|--*) continue;; \
-+        -*I) strip_trailopt 'I'; skip_next=yes;; \
-+      -*I?*) strip_trailopt 'I';; \
-+        -*O) strip_trailopt 'O'; skip_next=yes;; \
-+      -*O?*) strip_trailopt 'O';; \
-+        -*l) strip_trailopt 'l'; skip_next=yes;; \
-+      -*l?*) strip_trailopt 'l';; \
-+      -[dEDm]) skip_next=yes;; \
-+      -[JT]) skip_next=yes;; \
-+    esac; \
-+    case $$flg in \
-+      *$$target_option*) has_opt=yes; break;; \
-+    esac; \
-+  done; \
-+  test $$has_opt = yes
-+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+
-+#PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement
-+@LACKS_JAVA_UTIL_REGEX_MATCHER_QUOTEREPLACEMENT_TRUE@am__append_1 = \
-+@LACKS_JAVA_UTIL_REGEX_MATCHER_QUOTEREPLACEMENT_TRUE@	$(SHARE)/java/util/regex/Matcher.java
-+
-+
-+#PR48033 - Missing javax.management.remote.JMXServiceURL
-+@LACKS_JAVAX_MANAGEMENT_REMOTE_JMXSERVICEURL_TRUE@am__append_2 = \
-+@LACKS_JAVAX_MANAGEMENT_REMOTE_JMXSERVICEURL_TRUE@	$(SHARE)/javax/management/remote/JMXServiceURL.java
-+
-+
-+#PR48034 - javax.management.modelmbean.ModelMBeanInfo
-+@LACKS_JAVAX_MANAGEMENT_MODELMBEAN_MODELMBEANINFO_TRUE@am__append_3 = \
-+@LACKS_JAVAX_MANAGEMENT_MODELMBEAN_MODELMBEANINFO_TRUE@	$(SHARE)/javax/management/modelmbean/ModelMBeanInfo.java
-+
-+
-+#PR42003 - Missing javax.swing.plaf.basic.BasicDirectoryModel methods cause OpenJDK build failure 
-+@LACKS_JAVAX_SWING_PLAF_BASIC_BASICDIRECTORYMODEL_ADDPROPERTYCHANGELISTENER_TRUE@am__append_4 = \
-+@LACKS_JAVAX_SWING_PLAF_BASIC_BASICDIRECTORYMODEL_ADDPROPERTYCHANGELISTENER_TRUE@	$(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java
-+
-+
-+#PR56553 - SSLParameters support missing
-+@LACKS_JAVAX_NET_SSL_SSLCONTEXT_GETDEFAULTSSLPARAMETERS_TRUE@am__append_5 = \
-+@LACKS_JAVAX_NET_SSL_SSLCONTEXT_GETDEFAULTSSLPARAMETERS_TRUE@	$(SHARE)/javax/net/ssl/SSLContext.java
-+
-+@LACKS_JAVAX_NET_SSL_SSLENGINE_SETSSLPARAMETERS_TRUE@am__append_6 = \
-+@LACKS_JAVAX_NET_SSL_SSLENGINE_SETSSLPARAMETERS_TRUE@	$(SHARE)/javax/net/ssl/SSLEngine.java
-+
-+
-+#PR57008 - Add missing SslRMIServerSocketFactory constructor from 7
-+@LACKS_JAVAX_RMI_SSL_SSLRMISERVERSOCKETFACTORY_7_TRUE@am__append_7 = \
-+@LACKS_JAVAX_RMI_SSL_SSLRMISERVERSOCKETFACTORY_7_TRUE@	$(SHARE)/javax/rmi/ssl/SslRMIServerSocketFactory.java
-+
-+
-+# Conditional patches
-+@WITH_RHINO_TRUE@am__append_8 = \
-+@WITH_RHINO_TRUE@	patches/rhino.patch
-+
-+@BUILD_CACAO_TRUE@am__append_9 = \
-+@BUILD_CACAO_TRUE@	patches/cacao/launcher.patch \
-+@BUILD_CACAO_TRUE@	patches/cacao/memory.patch
-+
-+@BUILD_CACAO_FALSE@@USING_CACAO_TRUE@am__append_10 = \
-+@BUILD_CACAO_FALSE@@USING_CACAO_TRUE@	patches/cacao/memory.patch
-+
-+@ENABLE_CACAO_TRUE@am__append_11 = \
-+@ENABLE_CACAO_TRUE@	patches/cacao/ignore-tests.patch
-+
-+@ENABLE_PULSE_JAVA_TRUE@am__append_12 = \
-+@ENABLE_PULSE_JAVA_TRUE@	patches/pulse-soundproperties.patch
-+
-+@ENABLE_SYSTEMTAP_TRUE@am__append_13 = \
-+@ENABLE_SYSTEMTAP_TRUE@	patches/systemtap_gc.patch
-+
-+@ENABLE_NSS_TRUE@am__append_14 = patches/nss-config.patch
-+@WITH_PAX_TRUE@am__append_15 = \
-+@WITH_PAX_TRUE@	patches/test_gamma.patch \
-+@WITH_PAX_TRUE@	patches/pax-mark-rmic-java.patch
-+
-+@DISABLE_BOOTSTRAP_TOOLS_TRUE@am__append_16 = patches/boot/openjdk6-prefer_source.patch
-+@DISABLE_BOOTSTRAP_TOOLS_FALSE@am__append_17 = patches/boot/bootstrap-tools.patch
-+@VM_SUPPORTS_XBOOTCLASSPATH_FALSE@am__append_18 = \
-+@VM_SUPPORTS_XBOOTCLASSPATH_FALSE@	patches/boot/xbootclasspath.patch
-+
-+@WITH_PAX_FALSE@am__append_19 = patches/boot/test_gamma.patch
-+@CP39408_JAVAH_TRUE@am__append_20 = patches/boot/pr39408.patch
-+@CP40188_JAVAH_TRUE@am__append_21 = patches/boot/pr40188.patch \
-+@CP40188_JAVAH_TRUE@	patches/boot/javah.patch
-+
-+@CP45526_JAVAH_TRUE@am__append_22 = patches/boot/explicit-inner-class-headers.patch
-+@CP40616_TRUE@am__append_23 = patches/boot/pr40616.patch
-+@LACKS_JAVA_UTIL_SCANNER_TRUE@am__append_24 = $(SCANNER_PATCHES)
-+@CP40630_TRUE@@LACKS_JAVA_UTIL_SCANNER_FALSE@am__append_25 = $(SCANNER_PATCHES)
-+@JAVAC_LACKS_DIAMOND_TRUE@am__append_26 = patches/boot/ecj-diamond.patch
-+@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_TRUE@am__append_27 = patches/boot/compile-for-7-cacao-mem.patch
-+@BUILD_CACAO_TRUE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_28 = patches/boot/compile-for-7-cacao-mem.patch
-+@BUILD_CACAO_FALSE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_29 = patches/boot/compile-for-7.patch
-+@DTDTYPE_QNAME_TRUE@am__append_30 = patches/boot/jaxws-getdtdtype.patch
-+@NO_BYTECODE7_TRUE@am__append_31 = patches/boot/use_target_6_for_bootstrap_classes.patch 
-+@ENABLE_CACAO_TRUE@am__append_32 = \
-+@ENABLE_CACAO_TRUE@	ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
-+
-+@ENABLE_JAMVM_TRUE@am__append_33 = \
-+@ENABLE_JAMVM_TRUE@	ALT_HOTSPOT_IMPORT_PATH="$(JAMVM_IMPORT_PATH)"
-+
-+@DISABLE_OPTIMIZATIONS_TRUE@am__append_34 = \
-+@DISABLE_OPTIMIZATIONS_TRUE@	NO_OPTIMIZATIONS="true" \
-+@DISABLE_OPTIMIZATIONS_TRUE@	CC_NO_OPT="-O0 -g"
-+
-+@ENABLE_DOCS_FALSE@am__append_35 = \
-+@ENABLE_DOCS_FALSE@	NO_DOCS="true"
-+
-+@USE_ALT_JAR_TRUE@am__append_36 = \
-+@USE_ALT_JAR_TRUE@	ALT_JAR_CMD="$(ALT_JAR_CMD)"
-+
-+@HAS_HOTSPOT_REVISION_TRUE@am__append_37 = \
-+@HAS_HOTSPOT_REVISION_TRUE@	HOTSPOT_BUILD_VERSION="$(HOTSPOT_REVISION)"
-+
-+@WITH_RHINO_TRUE@am__append_38 = \
-+@WITH_RHINO_TRUE@	RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
-+
-+@USE_SYSTEM_ZLIB_TRUE@am__append_39 = \
-+@USE_SYSTEM_ZLIB_TRUE@	SYSTEM_ZLIB="true" \
-+@USE_SYSTEM_ZLIB_TRUE@	ZLIB_LIBS="${ZLIB_LIBS}" \
-+@USE_SYSTEM_ZLIB_TRUE@	ZLIB_CFLAGS="${ZLIB_CFLAGS}"
-+
-+@USE_SYSTEM_LCMS_TRUE@am__append_40 = \
-+@USE_SYSTEM_LCMS_TRUE@	USE_SYSTEM_LCMS="true" \
-+@USE_SYSTEM_LCMS_TRUE@	LCMS_LIBS="${LCMS2_LIBS}" \
-+@USE_SYSTEM_LCMS_TRUE@	LCMS_CFLAGS="${LCMS2_CFLAGS}"
-+
-+@USE_SYSTEM_JPEG_TRUE@am__append_41 = \
-+@USE_SYSTEM_JPEG_TRUE@	USE_SYSTEM_JPEG="true" \
-+@USE_SYSTEM_JPEG_TRUE@	JPEG_LIBS="${JPEG_LIBS}" \
-+@USE_SYSTEM_JPEG_TRUE@	JPEG_CFLAGS="${JPEG_CFLAGS}"
-+
-+@USE_SYSTEM_PNG_TRUE@am__append_42 = \
-+@USE_SYSTEM_PNG_TRUE@	USE_SYSTEM_PNG="true" \
-+@USE_SYSTEM_PNG_TRUE@	PNG_LIBS="${PNG_LIBS}" \
-+@USE_SYSTEM_PNG_TRUE@	PNG_CFLAGS="${PNG_CFLAGS}"
-+
-+@USE_SYSTEM_GIF_TRUE@am__append_43 = \
-+@USE_SYSTEM_GIF_TRUE@	USE_SYSTEM_GIF="true" \
-+@USE_SYSTEM_GIF_TRUE@	GIF_LIBS="${GIF_LIBS}" \
-+@USE_SYSTEM_GIF_TRUE@	GIF_CFLAGS="${GIF_CFLAGS}"
-+
-+@USE_SYSTEM_GTK_TRUE@am__append_44 = \
-+@USE_SYSTEM_GTK_TRUE@	USE_SYSTEM_GTK="true" \
-+@USE_SYSTEM_GTK_TRUE@	GTK_LIBS="${GTK_LIBS}" \
-+@USE_SYSTEM_GTK_TRUE@	GTK_CFLAGS="${GTK_CFLAGS}"
-+
-+@USE_SYSTEM_GIO_TRUE@am__append_45 = \
-+@USE_SYSTEM_GIO_TRUE@	USE_SYSTEM_GIO="true" \
-+@USE_SYSTEM_GIO_TRUE@	GIO_LIBS="${GIO_LIBS}" \
-+@USE_SYSTEM_GIO_TRUE@	GIO_CFLAGS="${GIO_CFLAGS}"
-+
-+@USE_SYSTEM_FONTCONFIG_TRUE@am__append_46 = \
-+@USE_SYSTEM_FONTCONFIG_TRUE@	USE_SYSTEM_FONTCONFIG="true" \
-+@USE_SYSTEM_FONTCONFIG_TRUE@	FONTCONFIG_LIBS="${FONTCONFIG_LIBS}" \
-+@USE_SYSTEM_FONTCONFIG_TRUE@	FONTCONFIG_CFLAGS="${FONTCONFIG_CFLAGS}"
-+
-+@USE_SYSCALL_COMPILATION_TRUE@am__append_47 = \
-+@USE_SYSCALL_COMPILATION_TRUE@	COMPILE_AGAINST_SYSCALLS="true"
-+
-+@ENABLE_JAR_COMPRESSION_TRUE@am__append_48 = \
-+@ENABLE_JAR_COMPRESSION_TRUE@	COMPRESS_JARS="true"
-+
-+@USE_SYSTEM_KERBEROS_TRUE@am__append_49 = \
-+@USE_SYSTEM_KERBEROS_TRUE@	SYSTEM_KRB5="true" \
-+@USE_SYSTEM_KERBEROS_TRUE@	KRB5_LIBS="${KRB5_LIBS}" \
-+@USE_SYSTEM_KERBEROS_TRUE@	KRB5_CFLAGS="${KRB5_CFLAGS}"
-+
-+@ADD_SHARK_BUILD_TRUE@am__append_50 = \
-+@ADD_SHARK_BUILD_TRUE@	--enable-shark
-+
-+subdir = .
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+	$(top_srcdir)/configure $(am__configure_deps) \
-+	$(srcdir)/nss.cfg.in $(srcdir)/javac.in $(srcdir)/javap.in \
-+	$(srcdir)/javah.in $(srcdir)/tz.properties.in \
-+	$(srcdir)/pax-mark-vm.in \
-+	$(srcdir)/remove-intree-libraries.sh.in \
-+	$(top_srcdir)/tapset/hotspot.stp.in \
-+	$(top_srcdir)/tapset/hotspot_jni.stp.in \
-+	$(top_srcdir)/tapset/jstack.stp.in \
-+	$(top_srcdir)/tapset/hotspot_gc.stp.in AUTHORS COPYING \
-+	ChangeLog INSTALL NEWS README compile config.guess config.sub \
-+	install-sh missing
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno config.status.lineno
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_CLEAN_FILES = nss.cfg javac javap javah tz.properties \
-+	pax-mark-vm remove-intree-libraries.sh tapset/hotspot.stp \
-+	tapset/hotspot_jni.stp tapset/jstack.stp tapset/hotspot_gc.stp
-+CONFIG_CLEAN_VPATH_FILES =
-+AM_V_P = $(am__v_P_@AM_V@)
-+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-+am__v_P_0 = false
-+am__v_P_1 = :
-+AM_V_GEN = $(am__v_GEN_@AM_V@)
-+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-+am__v_GEN_0 = @echo "  GEN     " $@;
-+am__v_GEN_1 = 
-+AM_V_at = $(am__v_at_@AM_V@)
-+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-+am__v_at_0 = @
-+am__v_at_1 = 
-+SOURCES =
-+DIST_SOURCES =
-+am__can_run_installinfo = \
-+  case $$AM_UPDATE_INFO_DIR in \
-+    n|no|NO) false;; \
-+    *) (install-info --version) >/dev/null 2>&1;; \
-+  esac
-+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+  if test -d "$(distdir)"; then \
-+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-+      && rm -rf "$(distdir)" \
-+      || { sleep 5 && rm -rf "$(distdir)"; }; \
-+  else :; fi
-+am__post_remove_distdir = $(am__remove_distdir)
-+DIST_ARCHIVES = $(distdir).tar.gz
-+GZIP_ENV = --best
-+DIST_TARGETS = dist-gzip
-+distuninstallcheck_listfiles = find . -type f -print
-+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-+distcleancheck_listfiles = find . -type f -print
-+ABS_CLIENT_LIBJVM_SO = @ABS_CLIENT_LIBJVM_SO@
-+ABS_JAVA_HOME_DIR = @ABS_JAVA_HOME_DIR@
-+ABS_SERVER_LIBJVM_SO = @ABS_SERVER_LIBJVM_SO@
-+ACLOCAL = @ACLOCAL@
-+ALSA_CFLAGS = @ALSA_CFLAGS@
-+ALSA_LIBS = @ALSA_LIBS@
-+ALT_CACAO_SRC_DIR = @ALT_CACAO_SRC_DIR@
-+ALT_CACAO_SRC_ZIP = @ALT_CACAO_SRC_ZIP@
-+ALT_CORBA_SRC_ZIP = @ALT_CORBA_SRC_ZIP@
-+ALT_HOTSPOT_SRC_ZIP = @ALT_HOTSPOT_SRC_ZIP@
-+ALT_JAMVM_SRC_ZIP = @ALT_JAMVM_SRC_ZIP@
-+ALT_JAR_CMD = @ALT_JAR_CMD@
-+ALT_JAXP_SRC_ZIP = @ALT_JAXP_SRC_ZIP@
-+ALT_JAXWS_SRC_ZIP = @ALT_JAXWS_SRC_ZIP@
-+ALT_JDK_SRC_ZIP = @ALT_JDK_SRC_ZIP@
-+ALT_LANGTOOLS_SRC_ZIP = @ALT_LANGTOOLS_SRC_ZIP@
-+ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@
-+AMTAR = @AMTAR@
-+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-+ANT = @ANT@
-+ARCHFLAG = @ARCHFLAG@
-+ARCH_PREFIX = @ARCH_PREFIX@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+BUILD_ARCH_DIR = @BUILD_ARCH_DIR@
-+BUILD_OS_DIR = @BUILD_OS_DIR@
-+CACAO_IMPORT_PATH = @CACAO_IMPORT_PATH@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CHMOD = @CHMOD@
-+
-+# configure script arguments, quoted in single quotes
-+CONFIGURE_ARGS = @CONFIGURE_ARGS@
-+CPIO = @CPIO@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CUPS_LIBS = @CUPS_LIBS@
-+CXX = @CXX@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFAULT_LIBDIR = @DEFAULT_LIBDIR@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DIST_ID = @DIST_ID@
-+DIST_NAME = @DIST_NAME@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+ECJ = @ECJ@
-+ECJ_JAR = @ECJ_JAR@
-+EGREP = @EGREP@
-+ENABLE_CACAO = @ENABLE_CACAO@
-+ENABLE_JAMVM = @ENABLE_JAMVM@
-+ENABLE_SYSCALL_COMPILATION = @ENABLE_SYSCALL_COMPILATION@
-+ENABLE_SYSTEM_FONTCONFIG = @ENABLE_SYSTEM_FONTCONFIG@
-+ENABLE_SYSTEM_GIF = @ENABLE_SYSTEM_GIF@
-+ENABLE_SYSTEM_GIO = @ENABLE_SYSTEM_GIO@
-+ENABLE_SYSTEM_GTK = @ENABLE_SYSTEM_GTK@
-+ENABLE_SYSTEM_JPEG = @ENABLE_SYSTEM_JPEG@
-+ENABLE_SYSTEM_KERBEROS = @ENABLE_SYSTEM_KERBEROS@
-+ENABLE_SYSTEM_LCMS = @ENABLE_SYSTEM_LCMS@
-+ENABLE_SYSTEM_PNG = @ENABLE_SYSTEM_PNG@
-+ENABLE_SYSTEM_ZLIB = @ENABLE_SYSTEM_ZLIB@
-+ENABLE_WARNINGS = @ENABLE_WARNINGS@
-+EXEEXT = @EXEEXT@
-+FASTJAR = @FASTJAR@
-+FILE = @FILE@
-+FIND = @FIND@
-+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-+FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
-+FREETYPE2_LIBS = @FREETYPE2_LIBS@
-+GAWK = @GAWK@
-+GCJ = @GCJ@
-+GETCONF = @GETCONF@
-+GIF_LIBS = @GIF_LIBS@
-+GIO_CFLAGS = @GIO_CFLAGS@
-+GIO_LIBS = @GIO_LIBS@
-+GREP = @GREP@
-+GTK_CFLAGS = @GTK_CFLAGS@
-+GTK_LIBS = @GTK_LIBS@
-+GZIP = @GZIP@
-+HG = @HG@
-+HGREV = @HGREV@
-+HOTSPOT_REVISION = @HOTSPOT_REVISION@
-+HSBUILD = @HSBUILD@
-+ICEDTEA_REVISION = @ICEDTEA_REVISION@
-+INSTALL = @INSTALL@
-+INSTALL_ARCH_DIR = @INSTALL_ARCH_DIR@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAR_ACCEPTS_STDIN_LIST = @JAR_ACCEPTS_STDIN_LIST@
-+JAR_KNOWS_ATFILE = @JAR_KNOWS_ATFILE@
-+JAR_KNOWS_J_OPTIONS = @JAR_KNOWS_J_OPTIONS@
-+JAVA = @JAVA@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JDK_REVISION = @JDK_REVISION@
-+JPEG_LIBS = @JPEG_LIBS@
-+JRE_ARCH_DIR = @JRE_ARCH_DIR@
-+KRB5_LIBS = @KRB5_LIBS@
-+LCMS2_CFLAGS = @LCMS2_CFLAGS@
-+LCMS2_LIBS = @LCMS2_LIBS@
-+LDD = @LDD@
-+LDFLAGS = @LDFLAGS@
-+LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
-+LIBFFI_LIBS = @LIBFFI_LIBS@
-+LIBOBJS = @LIBOBJS@
-+LIBPULSE_CFLAGS = @LIBPULSE_CFLAGS@
-+LIBPULSE_LIBS = @LIBPULSE_LIBS@
-+LIBS = @LIBS@
-+LINUX32 = @LINUX32@
-+LLVM_CFLAGS = @LLVM_CFLAGS@
-+LLVM_CONFIG = @LLVM_CONFIG@
-+LLVM_LDFLAGS = @LLVM_LDFLAGS@
-+LLVM_LIBS = @LLVM_LIBS@
-+LSB_RELEASE = @LSB_RELEASE@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAKE = @MAKE@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NATIVE2ASCII = @NATIVE2ASCII@
-+NSS_CFLAGS = @NSS_CFLAGS@
-+NSS_LIBDIR = @NSS_LIBDIR@
-+NSS_LIBS = @NSS_LIBS@
-+OBJEXT = @OBJEXT@
-+OPENJDK_BUILD_DIR = @OPENJDK_BUILD_DIR@
-+OPENJDK_SRC_DIR = @OPENJDK_SRC_DIR@
-+OS_PATH = @OS_PATH@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PARALLEL_JOBS = @PARALLEL_JOBS@
-+PATCH = @PATCH@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PAX_COMMAND = @PAX_COMMAND@
-+PAX_COMMAND_ARGS = @PAX_COMMAND_ARGS@
-+PKGVERSION = @PKGVERSION@
-+PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-+PNG_CFLAGS = @PNG_CFLAGS@
-+PNG_LIBS = @PNG_LIBS@
-+PROJECT_NAME = @PROJECT_NAME@
-+RHINO_JAR = @RHINO_JAR@
-+RMIC = @RMIC@
-+SET_MAKE = @SET_MAKE@
-+SHA256SUM = @SHA256SUM@
-+SHELL = @SHELL@
-+STRIP = @STRIP@
-+SYSTEM_JDK_DIR = @SYSTEM_JDK_DIR@
-+TAR = @TAR@
-+TZDATA_DIR = @TZDATA_DIR@
-+UNZIP = @UNZIP@
-+USING_CACAO = @USING_CACAO@
-+USING_ECJ = @USING_ECJ@
-+VERSION = @VERSION@
-+VERSION_SUFFIX = @VERSION_SUFFIX@
-+WGET = @WGET@
-+X11_CFLAGS = @X11_CFLAGS@
-+X11_LIBS = @X11_LIBS@
-+XINERAMA_CFLAGS = @XINERAMA_CFLAGS@
-+XINERAMA_LIBS = @XINERAMA_LIBS@
-+XPROTO_CFLAGS = @XPROTO_CFLAGS@
-+XPROTO_LIBS = @XPROTO_LIBS@
-+XRENDER_CFLAGS = @XRENDER_CFLAGS@
-+XRENDER_LIBS = @XRENDER_LIBS@
-+XSLTPROC = @XSLTPROC@
-+XTST_CFLAGS = @XTST_CFLAGS@
-+XTST_LIBS = @XTST_LIBS@
-+XT_CFLAGS = @XT_CFLAGS@
-+XT_LIBS = @XT_LIBS@
-+XVFB_RUN_CMD = @XVFB_RUN_CMD@
-+ZERO_ARCHDEF = @ZERO_ARCHDEF@
-+ZERO_BITSPERWORD = @ZERO_BITSPERWORD@
-+ZERO_ENDIANNESS = @ZERO_ENDIANNESS@
-+ZERO_LIBARCH = @ZERO_LIBARCH@
-+ZIP = @ZIP@
-+ZLIB_CFLAGS = @ZLIB_CFLAGS@
-+ZLIB_LIBS = @ZLIB_LIBS@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_FASTJAR = @ac_ct_FASTJAR@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+enable_downloading = @enable_downloading@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+JDK_UPDATE_VERSION = 51
-+BUILD_VERSION = b31
-+COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-+CORBA_CHANGESET = 3594dbde270d
-+JAXP_CHANGESET = 8fe156ad49e2
-+JAXWS_CHANGESET = 32ea8b1ed91a
-+JDK_CHANGESET = 9db88c18e114
-+LANGTOOLS_CHANGESET = dabd37b7e295
-+OPENJDK_CHANGESET = 410eb7fef869
-+CORBA_SHA256SUM = d1f97e143fe94ae3a56b45bb5a90f8ab10ec2be4ff770a788f0a1ac677e27a7d
-+JAXP_SHA256SUM = 0a2a40186cedfbeb8f87b0bc86bea2830943943081d4289fc74f7a783b2e1af3
-+JAXWS_SHA256SUM = 08a169b6b02883759ec7a412aa91aa3e37480761cb50b95d092dbcdb2fc9a3d0
-+JDK_SHA256SUM = 285e5b8ccbb29f3f9f9ea9ea7856d1ed97465c57d091fbcd9b2e55a1ffbb543e
-+LANGTOOLS_SHA256SUM = 86cb370ce2084c4b699d8c002ebe6c026e86206ffa82a2f3d7906aadb94ed79f
-+OPENJDK_SHA256SUM = 2de151c7275d91ef082e63fcc0957c5f9290404ec6e20ecfa1e752e16bfab707
-+CACAO_VERSION = e215e36be9fc
-+CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
-+CACAO_BASE_URL = http://icedtea.classpath.org/download/drops/cacao
-+CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
-+CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
-+JAMVM_VERSION = ac22c9948434e528ece451642b4ebde40953ee7e
-+JAMVM_SHA256SUM = 4662da1fe3e0e11d8fa685c7f2fc748576b9f3d3e37dc56b798dd6a5bd6b61e7
-+JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm
-+JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
-+JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
-+ICEDTEA_PREFIX = icedtea7-forest-2.4
-+ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/release/$(ICEDTEA_PREFIX)
-+OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7
-+CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/
-+CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/
-+CACIOCAVALLO_HG_URL = http://hg.openjdk.java.net/caciocavallo/jdk7/
-+BSD_HG_URL = http://hg.openjdk.java.net/bsd-port/bsd-port
-+NIO2_HG_URL = http://hg.openjdk.java.net/nio/nio/
-+OPENJDK_URL = $(ICEDTEA_HG_URL)
-+CORBA_URL = $(ICEDTEA_HG_URL)/corba
-+JAXP_URL = $(ICEDTEA_HG_URL)/jaxp
-+JAXWS_URL = $(ICEDTEA_HG_URL)/jaxws
-+JDK_URL = $(ICEDTEA_HG_URL)/jdk
-+LANGTOOLS_URL = $(ICEDTEA_HG_URL)/langtools
-+HS_SHA256SUM = "`$(AWK) 'version==$$1 {print $$4}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
-+HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
-+HS_URL = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
-+
-+# Build directories
-+BUILD_DIR = @OPENJDK_BUILD_DIR@
-+BUILD_OUTPUT_DIR = $(abs_top_builddir)/$(BUILD_DIR)
-+DEBUG_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-debug
-+BOOT_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-boot
-+BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
-+RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar
-+CLS_DIR_BOOT = $(BOOT_BUILD_OUTPUT_DIR)/classes
-+SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server
-+BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-+BUILD_DEBUG_JRE_ARCH_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-+REWRITER_BUILD_DIR = $(abs_top_builddir)/rewriter.build
-+STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot
-+STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
-+JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot
-+CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/cryptocheck.build
-+STAGE1_BOOT_RUNTIME = $(STAGE1_BOOT_DIR)/jre/lib/rt.jar
-+STAGE2_BOOT_RUNTIME = $(STAGE2_BOOT_DIR)/jre/lib/rt.jar
-+
-+# Source directories
-+SHARE = openjdk-boot/jdk/src/share/classes
-+SOLARIS = openjdk-boot/jdk/src/solaris/classes
-+LANGTOOLS = openjdk-boot/langtools/src/share/classes
-+CORBA = openjdk-boot/corba/src/share/classes
-+JAXWS = openjdk-boot/jaxws/src/share/jaxws_classes:openjdk-boot/jaxws/src/share/jaf_classes
-+PULSE_JAVA_DIR = $(abs_top_srcdir)/pulseaudio
-+PULSE_JAVA_NATIVE_SRCDIR = $(PULSE_JAVA_DIR)/src/native
-+PULSE_JAVA_NATIVE_SRCS = $(wildcard $(PULSE_JAVA_NATIVE_SRCDIR)/*.c)
-+PULSE_JAVA_BUILDDIR = $(abs_top_builddir)/pulseaudio.build
-+PULSE_JAVA_NATIVE_BUILDDIR = $(PULSE_JAVA_BUILDDIR)/native
-+PULSE_JAVA_NATIVE_OBJECTS = \
-+	$(subst $(PULSE_JAVA_NATIVE_SRCDIR),$(PULSE_JAVA_NATIVE_BUILDDIR),$(patsubst %.c,%.o,$(PULSE_JAVA_NATIVE_SRCS)))
-+
-+PULSE_JAVA_JAVA_SRCDIR = $(PULSE_JAVA_DIR)/src/java
-+PULSE_JAVA_CLASS_DIR = $(PULSE_JAVA_BUILDDIR)/classes
-+OPENJDK_SOURCEPATH_DIRS = \
-+        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(CORBA):$(JAXWS)
-+
-+SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
-+
-+# Sources used from OpenJDK.
-+ICEDTEA_BOOTSTRAP_CLASSES = $(am__append_1) $(am__append_2) \
-+	$(am__append_3) $(am__append_4) $(am__append_5) \
-+	$(am__append_6) $(am__append_7)
-+@NO_BYTECODE7_FALSE@IT_LANGUAGE_SOURCE_VERSION = 7
-+
-+# Settings for javac
-+@NO_BYTECODE7_TRUE@IT_LANGUAGE_SOURCE_VERSION = 6
-+@NO_BYTECODE7_FALSE@IT_CLASS_TARGET_VERSION = 7
-+@NO_BYTECODE7_TRUE@IT_CLASS_TARGET_VERSION = 6
-+IT_JAVAC_SETTINGS = -g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
-+IT_JAVACFLAGS = $(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
-+
-+# Flags
-+IT_CFLAGS = $(CFLAGS) $(ARCHFLAG)
-+@USE_HG_FALSE@OPENJDK_SRC_ZIP = openjdk.tar.gz
-+
-+# Conditional defintions
-+@USE_HG_TRUE@OPENJDK_SRC_ZIP = 
-+@USE_HG_FALSE@CORBA_SRC_ZIP = corba.tar.gz
-+@USE_HG_TRUE@CORBA_SRC_ZIP = 
-+@USE_HG_FALSE@JAXP_SRC_ZIP = jaxp.tar.gz
-+@USE_HG_TRUE@JAXP_SRC_ZIP = 
-+@USE_HG_FALSE@JAXWS_SRC_ZIP = jaxws.tar.gz
-+@USE_HG_TRUE@JAXWS_SRC_ZIP = 
-+@USE_HG_FALSE@JDK_SRC_ZIP = jdk.tar.gz
-+@USE_HG_TRUE@JDK_SRC_ZIP = 
-+@USE_HG_FALSE@LANGTOOLS_SRC_ZIP = langtools.tar.gz
-+@USE_HG_TRUE@LANGTOOLS_SRC_ZIP = 
-+@USE_HG_FALSE@HOTSPOT_SRC_ZIP = hotspot.tar.gz
-+@USE_HG_TRUE@HOTSPOT_SRC_ZIP = 
-+@ENABLE_PULSE_JAVA_TRUE@PULSE_JAVA_TARGET = stamps/pulse-java.stamp
-+@BOOTSTRAPPING_FALSE@MEMORY_LIMIT = -J-Xmx1024m
-+
-+# This should not depend on bootstrapping
-+# but on whether MEMORY_LIMIT is accepted
-+# as an argument to javac
-+@BOOTSTRAPPING_TRUE@MEMORY_LIMIT = 
-+@BOOTSTRAPPING_FALSE@PREFER_SOURCE = -Xprefer:source
-+@BOOTSTRAPPING_TRUE@PREFER_SOURCE = 
-+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_TRUE@ICEDTEA_BUILD_TARGET = jdk_only
-+@ENABLE_CACAO_TRUE@ICEDTEA_BUILD_TARGET = jdk_only
-+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@ICEDTEA_DEBUG_BUILD_TARGET = debug_build
-+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_TRUE@ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only
-+@ENABLE_CACAO_TRUE@ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only
-+@BOOTSTRAPPING_FALSE@BOOTSTRAP_DIRECTORY_STAMP = 
-+@BOOTSTRAPPING_TRUE@BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory-stage2.stamp
-+@BOOTSTRAPPING_FALSE@ICEDTEA_HOME = $(SYSTEM_JDK_DIR)
-+@BOOTSTRAPPING_TRUE@ICEDTEA_HOME = $(STAGE2_BOOT_DIR)
-+@BOOTSTRAPPING_FALSE@INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-stage2.stamp
-+@BOOTSTRAPPING_TRUE@INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-stage1.stamp
-+@CP_SUPPORTS_REFLINK_TRUE@REFLINK = --reflink=auto
-+@OPENJDK_SRC_DIR_HARDLINKABLE_FALSE@OPENJDK_SRC_DIR_LINK = $(REFLINK)
-+@OPENJDK_SRC_DIR_HARDLINKABLE_TRUE@OPENJDK_SRC_DIR_LINK = -l
-+@SRC_DIR_HARDLINKABLE_FALSE@SRC_DIR_LINK = $(REFLINK)
-+@SRC_DIR_HARDLINKABLE_TRUE@SRC_DIR_LINK = -l
-+@DISABLE_HOTSPOT_TESTS_FALSE@HOTSPOT_TEST_SUITE = hotspot
-+@DISABLE_JDK_TESTS_FALSE@JDK_TEST_SUITE = jdk
-+@DISABLE_LANGTOOLS_TESTS_FALSE@LANGTOOLS_TEST_SUITE = langtools
-+@DISABLE_TESTS_FALSE@TEST_SUITES = $(HOTSPOT_TEST_SUITE) $(JDK_TEST_SUITE) $(LANGTOOLS_TEST_SUITE)
-+@DISABLE_TESTS_FALSE@TESTS_TO_RUN = jtreg $(addprefix check-,$(TEST_SUITES))
-+
-+# Target to ensure a patched OpenJDK tree containing Zero & Shark
-+# and any overlays is available in $(abs_top_builddir)/openjdk
-+OPENJDK_TREE = stamps/overlay.stamp stamps/add-nss.stamp
-+
-+# Target to ensure a patched OpenJDK bootstrap tree containing
-+# Zero & Shark, any other overlays and the bootstrapping patches
-+# is available in $(abs_top_builddir)/openjdk-boot
-+OPENJDK_BOOT_TREE = stamps/patch-boot.stamp
-+
-+# Sources list
-+REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
-+CRYPTO_CHECK_SRCS = $(top_srcdir)/TestCryptoLevel.java
-+
-+# Patch list
-+ICEDTEA_PATCHES = $(am__append_8) $(am__append_9) $(am__append_10) \
-+	$(am__append_11) $(am__append_12) $(am__append_13) \
-+	$(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES)
-+
-+# Bootstrapping patches
-+ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
-+	patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \
-+	patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \
-+	patches/boot/demos.patch patches/boot/fphexconstants.patch \
-+	patches/boot/fontconfig.patch \
-+	patches/boot/generated-comments.patch \
-+	patches/boot/icedteart.patch patches/boot/jar.patch \
-+	patches/boot/symbols.patch patches/boot/tobin.patch \
-+	patches/boot/tools.jar.patch patches/boot/jopt.patch \
-+	patches/boot/jaxp-dependency.patch \
-+	patches/boot/genstubs-nofork.patch \
-+	patches/boot/getannotation-cast.patch \
-+	patches/boot/break-processbuilder-dependency.patch \
-+	patches/boot/revert-6973616.patch \
-+	patches/boot/revert-6941137.patch \
-+	patches/boot/ecj-stringswitch.patch \
-+	patches/boot/langtools-force-old-jdk.patch \
-+	patches/boot/corba-dependencies.patch \
-+	patches/boot/jaxws-langtools-dependency.patch \
-+	patches/boot/jaxws-jdk-dependency.patch \
-+	patches/boot/hotspot/${HSBUILD}/jdk-dependency.patch \
-+	patches/boot/ecj-multicatch.patch \
-+	patches/boot/ecj-trywithresources.patch \
-+	patches/boot/ecj-autoboxing.patch patches/boot/xsltproc.patch \
-+	patches/boot/ecj-odd.patch $(am__append_16) $(am__append_17) \
-+	$(am__append_18) $(am__append_19) $(am__append_20) \
-+	$(am__append_21) $(am__append_22) $(am__append_23) \
-+	$(am__append_24) $(am__append_25) $(am__append_26) \
-+	$(am__append_27) $(am__append_28) $(am__append_29) \
-+	$(am__append_30) $(am__append_31) $(DISTRIBUTION_BOOT_PATCHES)
-+
-+# Patches for when java.util.Scanner is missing
-+# or has the bug #40630 (all these classes rely
-+# on Scanner#hasNextLine() looping behaviour)
-+SCANNER_PATCHES = patches/boot/scanner-spp.patch \
-+	patches/boot/scanner-sbcs.patch \
-+	patches/boot/scanner-dbcs.patch \
-+	patches/boot/scanner-charsets.patch
-+
-+
-+# OpenJDK build environment.
-+@ZERO_BUILD_TRUE@ICEDTEA_ZERO_BUILD = true
-+@SHARK_BUILD_TRUE@ICEDTEA_SHARK_BUILD = true
-+ICEDTEA_NAME = IcedTea
-+@HAS_ICEDTEA_REVISION_TRUE@ICEDTEA_REV = +${ICEDTEA_REVISION}
-+@HAS_PKGVERSION_TRUE@ICEDTEA_PKG = $(EMPTY) (${PKGVERSION})
-+@ENABLE_WERROR_FALSE@WERROR_STATUS = false
-+@ENABLE_WERROR_TRUE@WERROR_STATUS = true
-+ICEDTEA_ENV = ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" ANT="$(ANT)" \
-+	BUILD_NUMBER="$(BUILD_VERSION)" \
-+	JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \
-+	JRE_RELEASE_VERSION="1.7.0_$(COMBINED_VERSION)" \
-+	MILESTONE="fcs" LANG="C" \
-+	PATH="$(BOOT_DIR)/bin:$(OS_PATH):$$PATH" \
-+	ALT_BOOTDIR="$(BOOT_DIR)" BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \
-+	ICEDTEA_RT="$(RUNTIME)" CLASSPATH="" LD_LIBRARY_PATH="" \
-+	ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
-+	SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
-+	ZERO_LIBARCH="$(ZERO_LIBARCH)" \
-+	ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \
-+	ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
-+	ZERO_ARCHDEF="$(ZERO_ARCHDEF)" ZERO_ARCHFLAG="$(ARCHFLAG)" \
-+	LIBFFI_CFLAGS="$(LIBFFI_CFLAGS)" LIBFFI_LIBS="$(LIBFFI_LIBS)" \
-+	LLVM_CFLAGS="$(LLVM_CFLAGS)" LLVM_LDFLAGS="$(LLVM_LDFLAGS)" \
-+	LLVM_LIBS="$(LLVM_LIBS)" FT2_CFLAGS="$(FREETYPE2_CFLAGS)" \
-+	FT2_LIBS="$(FREETYPE2_LIBS)" \
-+	ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
-+	HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" JAVAC="" JAVA_HOME="" \
-+	JDK_HOME="" QUIETLY="" ANT_RESPECT_JAVA_HOME="TRUE" \
-+	DISTRIBUTION_ID="$(DIST_ID)" DERIVATIVE_ID="$(ICEDTEA_NAME) \
-+	$(PACKAGE_VERSION)$(ICEDTEA_REV)" \
-+	ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)" DEBUG_CLASSFILES="true" \
-+	DEBUG_BINARIES="true" DISABLE_INTREE_EC="true" \
-+	ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" VERBOSE="$(VERBOSE)" \
-+	STATIC_CXX="false" BUILD_GCC="$(CC)" BUILD_CXX="$(CXX)" \
-+	USE_SYSTEM_CUPS="true" CUPS_LIBS="${CUPS_LIBS}" \
-+	CUPS_CFLAGS="${CUPS_CFLAGS}" STRIP_POLICY=no_strip \
-+	JAVAC_WARNINGS_FATAL="$(WERROR_STATUS)" \
-+	COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" \
-+	UNLIMITED_CRYPTO="true" $(am__append_32) $(am__append_33) \
-+	$(am__append_34) $(am__append_35) $(am__append_36) \
-+	$(am__append_37) $(am__append_38) $(am__append_39) \
-+	$(am__append_40) $(am__append_41) $(am__append_42) \
-+	$(am__append_43) $(am__append_44) $(am__append_45) \
-+	$(am__append_46) $(am__append_47) $(am__append_48) \
-+	$(am__append_49)
-+
-+# OpenJDK boot build environment.
-+ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
-+	BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \
-+	BOOTCLASSPATH_CLS="-bootclasspath $(CLS_DIR_BOOT)" \
-+	BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(RUNTIME)" \
-+	GENSRCDIR="$(abs_top_builddir)/generated.build" \
-+	JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \
-+	JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \
-+	JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)" \
-+	DISABLE_NIMBUS="true" \
-+	NO_DOCS="true" \
-+	ALT_OUTPUTDIR="$(BOOT_BUILD_OUTPUT_DIR)" \
-+	XSLT="$(XSLTPROC)"
-+
-+
-+# Source files
-+GENERATED_FILES = $(top_srcdir)/generated/com/sun/java/swing/plaf/gtk/resources/gtk*.java \
-+	$(top_srcdir)/generated/com/sun/java/swing/plaf/motif/resources/motif*.java \
-+	$(top_srcdir)/generated/com/sun/java/swing/plaf/windows/resources/windows*.java \
-+	$(top_srcdir)/generated/com/sun/corba/se/spi/activation/*.java \
-+	$(top_srcdir)/generated/com/sun/corba/se/spi/activation/LocatorPackage/*.java \
-+	$(top_srcdir)/generated/com/sun/corba/se/spi/activation/InitialNameServicePackage/*.java \
-+	$(top_srcdir)/generated/com/sun/corba/se/spi/activation/RepositoryPackage/*.java \
-+	$(top_srcdir)/generated/com/sun/corba/se/impl/logging/*.resource \
-+	$(top_srcdir)/generated/com/sun/corba/se/impl/logging/*.java \
-+	$(top_srcdir)/generated/com/sun/corba/se/impl/logging/*.properties \
-+	$(top_srcdir)/generated/com/sun/corba/se/PortableActivationIDL/*.java \
-+	$(top_srcdir)/generated/com/sun/corba/se/PortableActivationIDL/LocatorPackage/*.java \
-+	$(top_srcdir)/generated/com/sun/corba/se/PortableActivationIDL/InitialNameServicePackage/*.java \
-+	$(top_srcdir)/generated/com/sun/corba/se/PortableActivationIDL/RepositoryPackage/*.java \
-+	$(top_srcdir)/generated/com/sun/swing/internal/plaf/basic/resources/basic*.java \
-+	$(top_srcdir)/generated/com/sun/swing/internal/plaf/metal/resources/metal*.java \
-+	$(top_srcdir)/generated/com/sun/swing/internal/plaf/synth/resources/synth*.java \
-+	$(top_srcdir)/generated/com/sun/tools/apt/resources/apt*.java \
-+	$(top_srcdir)/generated/com/sun/tools/jdi/*.java \
-+	$(top_srcdir)/generated/com/sun/tools/jdi/resources/jdi*.java \
-+	$(top_srcdir)/generated/com/sun/tools/javac/resources/*.java \
-+	$(top_srcdir)/generated/com/sun/tools/doclets/formats/html/resources/standard*.java \
-+	$(top_srcdir)/generated/com/sun/tools/doclets/internal/toolkit/resources/doclets*.java \
-+	$(top_srcdir)/generated/com/sun/tools/javadoc/resources/javadoc*.java \
-+	$(top_srcdir)/generated/com/sun/accessibility/internal/resources/accessibility*.java \
-+	$(top_srcdir)/generated/org/omg/IOP/*.java \
-+	$(top_srcdir)/generated/org/omg/IOP/CodecPackage/*.java \
-+	$(top_srcdir)/generated/org/omg/IOP/CodecFactoryPackage/*.java \
-+	$(top_srcdir)/generated/org/omg/CORBA/*.java \
-+	$(top_srcdir)/generated/org/omg/PortableInterceptor/*.java \
-+	$(top_srcdir)/generated/org/omg/PortableInterceptor/ORBInitInfoPackage/*.java \
-+	$(top_srcdir)/generated/org/omg/CosNaming/*.java \
-+	$(top_srcdir)/generated/org/omg/CosNaming/NamingContextPackage/*.java \
-+	$(top_srcdir)/generated/org/omg/CosNaming/NamingContextExtPackage/*.java \
-+	$(top_srcdir)/generated/org/omg/Messaging/*.java \
-+	$(top_srcdir)/generated/org/omg/Dynamic/*.java \
-+	$(top_srcdir)/generated/org/omg/DynamicAny/*.java \
-+	$(top_srcdir)/generated/org/omg/DynamicAny/DynAnyPackage/*.java \
-+	$(top_srcdir)/generated/org/omg/DynamicAny/DynAnyFactoryPackage/*.java \
-+	$(top_srcdir)/generated/org/omg/PortableServer/*.java \
-+	$(top_srcdir)/generated/org/omg/PortableServer/CurrentPackage/*.java \
-+	$(top_srcdir)/generated/org/omg/PortableServer/POAManagerPackage/*.java \
-+	$(top_srcdir)/generated/org/omg/PortableServer/POAPackage/*.java \
-+	$(top_srcdir)/generated/sun/awt/X11/*.java \
-+	$(top_srcdir)/generated/sun/awt/resources/awt*.java \
-+	$(top_srcdir)/generated/sun/nio/ch/*.java \
-+	$(top_srcdir)/generated/sun/nio/cs/*.java \
-+	$(top_srcdir)/generated/sun/nio/cs/ext/*.java \
-+	$(top_srcdir)/generated/sun/nio/fs/*.java \
-+	$(top_srcdir)/generated/sun/misc/*.java \
-+	$(top_srcdir)/generated/sun/util/*.java \
-+	$(top_srcdir)/generated/sun/util/logging/resources/logging*.java \
-+	$(top_srcdir)/generated/sun/util/resources/*.java \
-+	$(top_srcdir)/generated/sun/print/resources/serviceui*.java \
-+	$(top_srcdir)/generated/sun/tools/jar/resources/jar*.java \
-+	$(top_srcdir)/generated/sun/management/resources/agent*.java \
-+	$(top_srcdir)/generated/java/nio/*.java \
-+	$(top_srcdir)/generated/java/nio/channels/*.java \
-+	$(top_srcdir)/generated/java/lang/*.java \
-+	$(top_srcdir)/generated/java/util/*.java \
-+	$(top_srcdir)/generated/javax/management/remote/rmi/*.java \
-+	$(top_srcdir)/generated/fontconfig/fontconfig*.bfc
-+
-+JTREG_SRCS = $(top_srcdir)/test/jtreg/com/sun/javatest/cof/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/cof/COF2_0_2.xsd \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/cof/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/lib/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/diff/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/diff/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/exec/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/exec/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/exec/images/*.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/mrep/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/mrep/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/mrep/images/dotdotdot.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/mrep/images/Forward16.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/mrep/images/Back16.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/mrep/images/Home16.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/tool/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/tool/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/tool/images/*.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/tool/package.html \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/util/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/util/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/util/package.html \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/regtest/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/regtest/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/agent/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/agent/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/agent/jticon.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/agent/package.html \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/batch/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/batch/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/batch/package.html \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/audit/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/audit/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/audit/images/dotdotdot.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/audit/package.html \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/httpd/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/httpd/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/stylesheet.css \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/logging/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/logging/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/finder/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/finder/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/finder/package.html \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/report/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/report/package.html \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/report/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/interview/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/interview/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/interview/package.html \
-+	$(top_srcdir)/test/jtreg/com/sun/javatest/package.html \
-+	$(top_srcdir)/test/jtreg/com/sun/interview/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/interview/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/interview/wizard/*.java \
-+	$(top_srcdir)/test/jtreg/com/sun/interview/wizard/i18n.properties \
-+	$(top_srcdir)/test/jtreg/com/sun/interview/wizard/done.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/interview/wizard/blank.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/interview/wizard/history.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/interview/wizard/find.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/interview/wizard/check.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/interview/wizard/arrow.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/interview/wizard/back.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/interview/wizard/next.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/interview/wizard/info.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/interview/wizard/package.html \
-+	$(top_srcdir)/test/jtreg/com/sun/interview/wizard/cancel.gif \
-+	$(top_srcdir)/test/jtreg/com/sun/interview/package.html \
-+	$(top_srcdir)/test/jtreg/JavaTest.toolMgrs.lst \
-+	$(top_srcdir)/test/jtreg/legal/license.txt \
-+	$(top_srcdir)/test/jtreg/legal/copyright.txt \
-+	$(top_srcdir)/test/jtreg/README \
-+	$(top_srcdir)/test/jtreg/META-INF/MANIFEST.MF \
-+	$(top_srcdir)/test/jtreg/excludelist.jdk.jtx \
-+	$(top_srcdir)/test/jtreg/excludelist.jdk.cacao.jtx \
-+	$(top_srcdir)/test/jtreg/JavaTest.cmdMgrs.lst \
-+	$(top_srcdir)/test/jtreg/excludelist.langtools.jtx 
-+
-+PULSEAUDIO_SRCS = $(top_srcdir)/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/*.java \
-+	$(top_srcdir)/pulseaudio/src/java/META-INF/services/javax.sound.sampled.spi.MixerProvider \
-+	$(top_srcdir)/pulseaudio/src/native/*.h \
-+	$(top_srcdir)/pulseaudio/src/native/*.c \
-+	$(top_srcdir)/pulseaudio/TODO \
-+	$(top_srcdir)/pulseaudio/README \
-+	$(top_srcdir)/pulseaudio/testsounds/README \
-+	$(top_srcdir)/pulseaudio/testsounds/startup.wav \
-+	$(top_srcdir)/pulseaudio/testsounds/logout.wav \
-+	$(top_srcdir)/pulseaudio/testsounds/error.wav \
-+	$(top_srcdir)/pulseaudio/unittests/org/classpath/icedtea/pulseaudio/*.java \
-+	$(top_srcdir)/pulseaudio/COPYING
-+
-+EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \
-+	$(top_srcdir)/patches/boot/*.patch \
-+	$(top_srcdir)/patches/cacao/*.patch \
-+	$(top_srcdir)/patches/boot/hotspot/*/*.patch \
-+	tools-copy contrib overlays \
-+	javaws.png javaws.desktop \
-+	jconsole.desktop policytool.desktop \
-+	$(JTREG_SRCS) \
-+	HACKING $(PULSEAUDIO_SRCS) fsg.sh \
-+	hotspot.map autogen.sh \
-+	tapset/hotspot.stp.in \
-+	tapset/hotspot_jni.stp.in \
-+	tapset/jstack.stp.in \
-+	tapset/hotspot_gc.stp.in \
-+	scripts/jni_create_stap.c \
-+	scripts/jni_desc \
-+	rewriter/agpl-3.0.txt \
-+	$(REWRITER_SRCS) \
-+	test/tapset \
-+	$(CRYPTO_CHECK_SRCS)
-+
-+ADD_ZERO_CONFIGURE_ARGS =  \
-+	--with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \
-+	--disable-bootstrap --enable-zero $(am__append_50) \
-+	--disable-docs $(filter-out '--with-jdk-home=% '--with-ecj=% \
-+	'--with-java=% '--with-javah=% '--with-javac=% '--with-javac=% \
-+	'--with-rmic=% '--with-additional-vms=% '--disable-bootstrap% \
-+	'--enable-bootstrap% , $(CONFIGURE_ARGS)) $(foreach i, openjdk \
-+	hotspot corba jaxp jaxws jdk langtools, $(if $(findstring \
-+	--with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, \
-+	--with-$(i)-src-zip=$(abs_top_builddir)/$(i).tar.gz))
-+ADD_ZERO_EXTRA_BUILD_ENV = \
-+	BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(BUILD_OUTPUT_DIR)/langtools/dist \
-+	BUILD_JAXP=false      ALT_JAXP_DIST=$(BUILD_OUTPUT_DIR)/jaxp/dist \
-+	BUILD_JAXWS=false     ALT_JAXWS_DIST=$(BUILD_OUTPUT_DIR)/jaxws/dist \
-+	BUILD_CORBA=false     ALT_CORBA_DIST=$(BUILD_OUTPUT_DIR)/corba/dist \
-+	BUILD_JDK=false \
-+	DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(if $(findstring jamvm,$(p)),,$(p))))'
-+
-+
-+# FIXME: this might need some adjustment for other OS than Linux
-+jtreg_processes = ps x -ww -o pid,ppid,args \
-+	| awk '$$2 == 1 && $$3 ~ /^$(subst /,\/,/scratch)/' \
-+	| sed 's,$(CURDIR)/$(sdkimg),<sdkimg>,g;s,$(CURDIR),<pwd>,g'
-+
-+jtreg_pids = ps x --no-headers -ww -o pid,ppid,args \
-+	| awk '$$2 == 1 && $$3 ~ /^$(subst /,\/,$(CURDIR)/$(sdkimg))/ {print $$1}'
-+
-+all: all-am
-+
-+.SUFFIXES:
-+am--refresh: Makefile
-+	@:
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
-+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-+	$(am__cd) $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    echo ' $(SHELL) ./config.status'; \
-+	    $(SHELL) ./config.status;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	$(SHELL) ./config.status --recheck
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	$(am__cd) $(srcdir) && $(AUTOCONF)
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-+$(am__aclocal_m4_deps):
-+nss.cfg: $(top_builddir)/config.status $(srcdir)/nss.cfg.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+javac: $(top_builddir)/config.status $(srcdir)/javac.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+javap: $(top_builddir)/config.status $(srcdir)/javap.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+javah: $(top_builddir)/config.status $(srcdir)/javah.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+tz.properties: $(top_builddir)/config.status $(srcdir)/tz.properties.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+pax-mark-vm: $(top_builddir)/config.status $(srcdir)/pax-mark-vm.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+remove-intree-libraries.sh: $(top_builddir)/config.status $(srcdir)/remove-intree-libraries.sh.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+tapset/hotspot.stp: $(top_builddir)/config.status $(top_srcdir)/tapset/hotspot.stp.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+tapset/hotspot_jni.stp: $(top_builddir)/config.status $(top_srcdir)/tapset/hotspot_jni.stp.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+tapset/jstack.stp: $(top_builddir)/config.status $(top_srcdir)/tapset/jstack.stp.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+tapset/hotspot_gc.stp: $(top_builddir)/config.status $(top_srcdir)/tapset/hotspot_gc.stp.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+tags TAGS:
-+
-+ctags CTAGS:
-+
-+cscope cscopelist:
-+
-+
-+distdir: $(DISTFILES)
-+	$(am__remove_distdir)
-+	test -d "$(distdir)" || mkdir "$(distdir)"
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d "$(distdir)/$$file"; then \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	  else \
-+	    test -f "$(distdir)/$$file" \
-+	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	-test -n "$(am__skip_mode_fix)" \
-+	|| find "$(distdir)" -type d ! -perm -755 \
-+		-exec chmod u+rwx,go+rx {} \; -o \
-+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-+	|| chmod -R a+r "$(distdir)"
-+dist-gzip: distdir
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__post_remove_distdir)
-+
-+dist-bzip2: distdir
-+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-+	$(am__post_remove_distdir)
-+
-+dist-lzip: distdir
-+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-+	$(am__post_remove_distdir)
-+
-+dist-xz: distdir
-+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-+	$(am__post_remove_distdir)
-+
-+dist-tarZ: distdir
-+	@echo WARNING: "Support for shar distribution archives is" \
-+	               "deprecated." >&2
-+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-+	$(am__post_remove_distdir)
-+
-+dist-shar: distdir
-+	@echo WARNING: "Support for distribution archives compressed with" \
-+		       "legacy program 'compress' is deprecated." >&2
-+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+	$(am__post_remove_distdir)
-+
-+dist-zip: distdir
-+	-rm -f $(distdir).zip
-+	zip -rq $(distdir).zip $(distdir)
-+	$(am__post_remove_distdir)
-+
-+dist dist-all:
-+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-+	$(am__post_remove_distdir)
-+
-+# This target untars the dist file and tries a VPATH configuration.  Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+	case '$(DIST_ARCHIVES)' in \
-+	*.tar.gz*) \
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-+	*.tar.bz2*) \
-+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-+	*.tar.lz*) \
-+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
-+	*.tar.xz*) \
-+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-+	*.tar.Z*) \
-+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-+	*.shar.gz*) \
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-+	*.zip*) \
-+	  unzip $(distdir).zip ;;\
-+	esac
-+	chmod -R a-w $(distdir)
-+	chmod u+w $(distdir)
-+	mkdir $(distdir)/_build $(distdir)/_inst
-+	chmod a-w $(distdir)
-+	test -d $(distdir)/_build || exit 0; \
-+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-+	  && am__cwd=`pwd` \
-+	  && $(am__cd) $(distdir)/_build \
-+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
-+	    $(DISTCHECK_CONFIGURE_FLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+	  && $(MAKE) $(AM_MAKEFLAGS) check \
-+	  && $(MAKE) $(AM_MAKEFLAGS) install \
-+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-+	        distuninstallcheck \
-+	  && chmod -R a-w "$$dc_install_base" \
-+	  && ({ \
-+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-+	  && rm -rf "$$dc_destdir" \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-+	  && rm -rf $(DIST_ARCHIVES) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-+	  && cd "$$am__cwd" \
-+	  || exit 1
-+	$(am__post_remove_distdir)
-+	@(echo "$(distdir) archives ready for distribution: "; \
-+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-+distuninstallcheck:
-+	@test -n '$(distuninstallcheck_dir)' || { \
-+	  echo 'ERROR: trying to run $@ with an empty' \
-+	       '$$(distuninstallcheck_dir)' >&2; \
-+	  exit 1; \
-+	}; \
-+	$(am__cd) '$(distuninstallcheck_dir)' || { \
-+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-+	  exit 1; \
-+	}; \
-+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
-+	   || { echo "ERROR: files left after uninstall:" ; \
-+	        if test -n "$(DESTDIR)"; then \
-+	          echo "  (check DESTDIR support)"; \
-+	        fi ; \
-+	        $(distuninstallcheck_listfiles) ; \
-+	        exit 1; } >&2
-+distcleancheck: distclean
-+	@if test '$(srcdir)' = . ; then \
-+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-+	  exit 1 ; \
-+	fi
-+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-+	  || { echo "ERROR: files left in build directory after distclean:" ; \
-+	       $(distcleancheck_listfiles) ; \
-+	       exit 1; } >&2
-+check-am: all-am
-+	$(MAKE) $(AM_MAKEFLAGS) check-local
-+check: check-am
-+all-am: Makefile all-local
-+installdirs:
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	if test -z '$(STRIP)'; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	      install; \
-+	else \
-+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-+	fi
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic clean-local mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-local
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+html-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-dvi: install-dvi-am
-+
-+install-dvi-am:
-+
-+install-exec-am:
-+
-+install-html: install-html-am
-+
-+install-html-am:
-+
-+install-info: install-info-am
-+
-+install-info-am:
-+
-+install-man:
-+
-+install-pdf: install-pdf-am
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-am
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -rf $(top_srcdir)/autom4te.cache
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am:
-+
-+.MAKE: check-am install-am install-strip
-+
-+.PHONY: all all-am all-local am--refresh check check-am check-local \
-+	clean clean-generic clean-local cscopelist-am ctags-am dist \
-+	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
-+	dist-xz dist-zip distcheck distclean distclean-generic \
-+	distclean-local distcleancheck distdir distuninstallcheck dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-+	pdf-am ps ps-am tags-am uninstall uninstall-am
-+
-+
-+# Top-Level Targets
-+# =================
-+
-+all-local: icedtea-stage2
-+
-+check-local: jtregcheck check-tapset
-+
-+clean-tests: clean-jtreg clean-tapset-report clean-jtreg-reports
-+	if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
-+	  if [ -e test ] ; then \
-+	    rmdir test ; \
-+	  fi \
-+	fi
-+
-+clean-local: clean-tests clean-pulse-java \
-+ clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \
-+ clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
-+ clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
-+ clean-extract clean-generated clean-native-ecj clean-hgforest clean-icedtea-stage2 \
-+ clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \
-+ clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter \
-+ clean-add-systemtap clean-add-systemtap-debug clean-add-pulseaudio clean-add-pulseaudio-debug \
-+ clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug clean-cryptocheck
-+	if [ -e bootstrap ]; then \
-+	  rmdir bootstrap ; \
-+	fi
-+	if [ -e lib ]; then \
-+	  rmdir lib ; \
-+	fi
-+
-+distclean-local: clean-local clean-download
-+	if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
-+	  if [ -e tapset ] ; then \
-+	    rmdir tapset ; \
-+	  fi ; \
-+	fi
-+	if [ -e stamps ] ; then \
-+	  rmdir stamps ; \
-+	fi
-+
-+install:
-+
-+.PHONY: \
-+	env env-boot snapshot clean-clone clean-patch \
-+	clean-clone-boot clean-patch-boot clean-bootstrap-directory-stage2 \
-+	clean-bootstrap-directory-symlink-stage2 clean-bootstrap-directory-stage1 \
-+	clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \
-+	clean-icedtea icedtea-stage2 clean-icedtea-boot \
-+	clean-rt hotspot hotspot-helper clean-jtreg clean-jtreg-reports \
-+	jtregcheck clean-remove-intree-libraries \
-+	clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \
-+	clean-extract-hotspot clean-sanitise-openjdk \
-+	clean-tests clean-tapset-report clean-add-systemtap \
-+	clean-add-systemtap-debug clean-add-pulseaudio clean-add-pulseaudio-debug \
-+	clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug \
-+	clean-add-systemtap-boot clean-add-pulseaudio-boot clean-add-tzdata-support-boot \
-+	clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \
-+	clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck
-+
-+env:
-+	@echo 'unset JAVA_HOME'
-+	@echo 'export $(ICEDTEA_ENV)'
-+
-+env-boot:
-+	@echo 'unset JAVA_HOME'
-+	@echo 'export $(ICEDTEA_ENV_BOOT)'
-+
-+# Mercurial snapshot.
-+snapshot: dist
-+	mv $(DIST_ARCHIVES) $(distdir)-`$(HG) tip --template '{node}'`.tar.gz
-+
-+# Creates archive of openjdk.
-+dist-openjdk: stamps/extract-cacao.stamp
-+	find openjdk/ -name \\.hg* | xargs rm -rf	
-+	$(ZIP) -r openjdk-$(COMBINED_VERSION) openjdk/
-+
-+# Creates archive of openjdk that is compliant with Free Software guidelines.
-+dist-openjdk-fsg: stamps/patch-fsg.stamp
-+	$(ZIP) -r openjdk-fsg-$(COMBINED_VERSION) openjdk/
-+
-+dist-openjdk-fsg-xz: stamps/patch-fsg.stamp
-+	tardir=openjdk/ && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c \
-+	  >openjdk-fsg-$(COMBINED_VERSION).tar.xz
-+
-+# OpenJDK Source Preparation Targets
-+# ==================================
-+
-+# Check for forest support
-+
-+stamps/hgforest.stamp:
-+@USE_HG_TRUE@	if ! $(HG) fclone -h; \
-+@USE_HG_TRUE@          then \
-+@USE_HG_TRUE@          echo "No forest extension found. Please refer to" \
-+@USE_HG_TRUE@            "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
-+@USE_HG_TRUE@          exit 1; \
-+@USE_HG_TRUE@        fi;
-+	mkdir -p stamps 
-+	touch $@
-+
-+clean-hgforest:
-+	rm -f stamps/hgforest.stamp
-+
-+# Download OpenJDK sources.
-+
-+stamps/download.stamp: stamps/download-openjdk.stamp \
-+ stamps/download-cacao.stamp stamps/download-jamvm.stamp
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-download: clean-download-openjdk clean-download-cacao clean-download-jamvm
-+	rm -f stamps/download.stamp
-+
-+stamps/download-openjdk.stamp: stamps/hgforest.stamp
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_CLOSURES_TRUE@	$(HG) fclone $(CLOSURES_HG_URL) openjdk; 
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_TRUE@	$(HG) fclone $(CVMI_HG_URL) openjdk; 
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_CACIOCAVALLO_TRUE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@	$(HG) fclone $(CACIOCAVALLO_HG_URL) openjdk;
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_TRUE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@	$(HG) fclone $(BSD_HG_URL) openjdk;
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_NIO2_TRUE@	hg fclone $(NIO2_HG_URL) openjdk;
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_JDK7_TRUE@@USE_NIO2_FALSE@	hg fclone $(OPENJDK_HG_URL) openjdk;
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_TRUE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@@WITH_HGREV_TRUE@	$(HG) fclone -r $(HGREV) $(ICEDTEA_HG_URL) openjdk;
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_TRUE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@@WITH_HGREV_FALSE@	$(HG) fclone $(ICEDTEA_HG_URL) openjdk;
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_ALT_OPENJDK_SRC_ZIP_TRUE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	ln -sf $(ALT_OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP)
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	if ! echo "$(OPENJDK_SHA256SUM)  $(OPENJDK_SRC_ZIP)" \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  | $(SHA256SUM) --check ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  if test "x$(enable_downloading)" = "xyes"; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    if [ -e $(OPENJDK_SRC_ZIP) ] ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    $(WGET) $(OPENJDK_URL)/archive/$(OPENJDK_CHANGESET).tar.gz -O $(OPENJDK_SRC_ZIP); \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    if ! echo "$(OPENJDK_SHA256SUM)  $(OPENJDK_SRC_ZIP)" \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      | $(SHA256SUM) --check ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      echo "ERROR: Bad download of OpenJDK root zip"; false; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    fi; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  else \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    echo "ERROR: No up-to-date OpenJDK root zip available"; exit -1; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	fi ;
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_ALT_CORBA_SRC_ZIP_TRUE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	ln -sf $(ALT_CORBA_SRC_ZIP) $(CORBA_SRC_ZIP)
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	if ! echo "$(CORBA_SHA256SUM)  $(CORBA_SRC_ZIP)" \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  | $(SHA256SUM) --check ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  if test "x$(enable_downloading)" = "xyes"; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    if [ $(CORBA_SRC_ZIP) ] ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      mv $(CORBA_SRC_ZIP) $(CORBA_SRC_ZIP).old ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    $(WGET) $(CORBA_URL)/archive/$(CORBA_CHANGESET).tar.gz -O $(CORBA_SRC_ZIP); \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    if ! echo "$(CORBA_SHA256SUM)  $(CORBA_SRC_ZIP)" \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      | $(SHA256SUM) --check ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      echo "ERROR: Bad download of CORBA zip"; false; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    fi; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  else \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    echo "ERROR: No up-to-date OpenJDK CORBA zip available"; exit -1; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	fi ;
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_ALT_JAXP_SRC_ZIP_TRUE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	ln -sf $(ALT_JAXP_SRC_ZIP) $(JAXP_SRC_ZIP)
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	if ! echo "$(JAXP_SHA256SUM)  $(JAXP_SRC_ZIP)" \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  | $(SHA256SUM) --check ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  if test "x$(enable_downloading)" = "xyes"; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    if [ $(JAXP_SRC_ZIP) ] ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      mv $(JAXP_SRC_ZIP) $(JAXP_SRC_ZIP).old ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    $(WGET) $(JAXP_URL)/archive/$(JAXP_CHANGESET).tar.gz -O $(JAXP_SRC_ZIP); \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    if ! echo "$(JAXP_SHA256SUM)  $(JAXP_SRC_ZIP)" \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      | $(SHA256SUM) --check ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      echo "ERROR: Bad download of JAXP zip"; false; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    fi; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  else \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    echo "ERROR: No up-to-date JAXP root zip available"; exit -1; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	fi ;
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_ALT_JAXWS_SRC_ZIP_TRUE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	ln -sf $(ALT_JAXWS_SRC_ZIP) $(JAXWS_SRC_ZIP)
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	if ! echo "$(JAXWS_SHA256SUM)  $(JAXWS_SRC_ZIP)" \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  | $(SHA256SUM) --check ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  if test "x$(enable_downloading)" = "xyes"; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    if [ $(JAXWS_SRC_ZIP) ] ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      mv $(JAXWS_SRC_ZIP) $(JAXWS_SRC_ZIP).old ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    $(WGET) $(JAXWS_URL)/archive/$(JAXWS_CHANGESET).tar.gz -O $(JAXWS_SRC_ZIP); \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    if ! echo "$(JAXWS_SHA256SUM)  $(JAXWS_SRC_ZIP)" \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      | $(SHA256SUM) --check ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      echo "ERROR: Bad download of JAXWS zip"; false; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    fi; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  else \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    echo "ERROR: No up-to-date OpenJDK JAXWS zip available"; exit -1; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	fi ;
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_ALT_JDK_SRC_ZIP_TRUE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	ln -sf $(ALT_JDK_SRC_ZIP) $(JDK_SRC_ZIP)
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	if ! echo "$(JDK_SHA256SUM)  $(JDK_SRC_ZIP)" \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  | $(SHA256SUM) --check ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  if test "x$(enable_downloading)" = "xyes"; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    if [ $(JDK_SRC_ZIP) ] ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      mv $(JDK_SRC_ZIP) $(JDK_SRC_ZIP).old ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    $(WGET) $(JDK_URL)/archive/$(JDK_CHANGESET).tar.gz -O $(JDK_SRC_ZIP); \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    if ! echo "$(JDK_SHA256SUM)  $(JDK_SRC_ZIP)" \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      | $(SHA256SUM) --check ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      echo "ERROR: Bad download of JDK zip"; false; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    fi; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  else \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    echo "ERROR: No up-to-date OpenJDK JDK zip available"; exit -1; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	fi ;
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_ALT_LANGTOOLS_SRC_ZIP_TRUE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	ln -sf $(ALT_LANGTOOLS_SRC_ZIP) $(LANGTOOLS_SRC_ZIP)
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	if ! echo "$(LANGTOOLS_SHA256SUM)  $(LANGTOOLS_SRC_ZIP)" \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  | $(SHA256SUM) --check ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  if test "x$(enable_downloading)" = "xyes"; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    if [ $(LANGTOOLS_SRC_ZIP) ] ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      mv $(LANGTOOLS_SRC_ZIP) $(LANGTOOLS_SRC_ZIP).old ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    $(WGET) $(LANGTOOLS_URL)/archive/$(LANGTOOLS_CHANGESET).tar.gz -O $(LANGTOOLS_SRC_ZIP); \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    if ! echo "$(LANGTOOLS_SHA256SUM)  $(LANGTOOLS_SRC_ZIP)" \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      | $(SHA256SUM) --check ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      echo "ERROR: Bad download of langtools zip"; false; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    fi; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  else \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    echo "ERROR: No up-to-date OpenJDK langtools zip available"; exit -1; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	fi ;
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_ALT_HOTSPOT_SRC_ZIP_TRUE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	ln -sf $(ALT_HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP)
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	echo "Using HotSpot build: ${HSBUILD}"
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	if ! echo "$(HS_SHA256SUM)  $(HOTSPOT_SRC_ZIP)" \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  | $(SHA256SUM) --check ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  if test "x$(enable_downloading)" = "xyes"; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    if [ -e $(HOTSPOT_SRC_ZIP) ] ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    if ! echo "$(HS_SHA256SUM)  $(HOTSPOT_SRC_ZIP)" \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      | $(SHA256SUM) --check ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	      echo "ERROR: Bad download of HotSpot zip"; false; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    fi; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  else \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	    echo "ERROR: No up-to-date OpenJDK HotSpot zip available"; exit -1; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	  fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_BSD_FALSE@@USE_CACIOCAVALLO_FALSE@@USE_CLOSURES_FALSE@@USE_CVMI_FALSE@@USE_HG_FALSE@@USE_JDK7_FALSE@@USE_NIO2_FALSE@	fi
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-download-openjdk:
-+	if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
-+	  rm -f $(OPENJDK_SRC_ZIP) ; \
-+	fi
-+	if [ ! -z $(CORBA_SRC_ZIP) ] ; then \
-+	  rm -f $(CORBA_SRC_ZIP) ; \
-+	fi
-+	if [ ! -z $(JAXP_SRC_ZIP) ] ; then \
-+	  rm -f $(JAXP_SRC_ZIP) ; \
-+	fi
-+	if [ ! -z $(JAXWS_SRC_ZIP) ] ; then \
-+	  rm -f $(JAXWS_SRC_ZIP) ; \
-+	fi
-+	if [ ! -z $(JDK_SRC_ZIP) ] ; then \
-+	  rm -f $(JDK_SRC_ZIP) ; \
-+	fi
-+	if [ ! -z $(LANGTOOLS_SRC_ZIP) ] ; then \
-+	  rm -f $(LANGTOOLS_SRC_ZIP) ; \
-+	fi
-+	if [ ! -z $(HOTSPOT_SRC_ZIP) ] ; then \
-+	  rm -f $(HOTSPOT_SRC_ZIP) ; \
-+	fi
-+	rm -f stamps/download-openjdk.stamp
-+
-+stamps/download-cacao.stamp:
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_ALT_CACAO_SRC_ZIP_TRUE@@USE_SYSTEM_CACAO_FALSE@	ln -sf $(ALT_CACAO_SRC_ZIP) $(CACAO_SRC_ZIP)
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	if ! echo "$(CACAO_SHA256SUM)  $(CACAO_SRC_ZIP)" \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	 | $(SHA256SUM) --check ; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	then \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	 if test "x$(enable_downloading)" = "xyes"; then \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	   if [ -e $(CACAO_SRC_ZIP) ] ; then \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	     mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	   fi ; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	   $(WGET) $(CACAO_URL) -O $(CACAO_SRC_ZIP); \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	   if ! echo "$(CACAO_SHA256SUM)  $(CACAO_SRC_ZIP)" \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	     | $(SHA256SUM) --check ; then \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	     echo "ERROR: Bad download of CACAO zip"; false; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	   fi; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	 else \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	   echo "ERROR: No up-to-date CACAO zip available"; exit -1; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	 fi ; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	fi
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-download-cacao:
-+	rm -f $(CACAO_SRC_ZIP)
-+	rm -f stamps/download-cacao.stamp
-+
-+stamps/download-jamvm.stamp:
-+@BUILD_JAMVM_TRUE@@USE_ALT_JAMVM_SRC_ZIP_TRUE@	ln -sf $(ALT_JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP)
-+@BUILD_JAMVM_TRUE@	if ! echo "$(JAMVM_SHA256SUM)  $(JAMVM_SRC_ZIP)" \
-+@BUILD_JAMVM_TRUE@	 | $(SHA256SUM) --check ; \
-+@BUILD_JAMVM_TRUE@	then \
-+@BUILD_JAMVM_TRUE@	  if test "x$(enable_downloading)" = "xyes"; then \
-+@BUILD_JAMVM_TRUE@	    if [ -e $(JAMVM_SRC_ZIP) ] ; then \
-+@BUILD_JAMVM_TRUE@	      mv $(JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP).old ; \
-+@BUILD_JAMVM_TRUE@	    fi ; \
-+@BUILD_JAMVM_TRUE@	    $(WGET) $(JAMVM_URL) -O $(JAMVM_SRC_ZIP); \
-+@BUILD_JAMVM_TRUE@	    if ! echo "$(JAMVM_SHA256SUM)  $(JAMVM_SRC_ZIP)" \
-+@BUILD_JAMVM_TRUE@	      | $(SHA256SUM) --check ; then \
-+@BUILD_JAMVM_TRUE@	      echo "ERROR: Bad download of JamVM zip"; false; \
-+@BUILD_JAMVM_TRUE@	    fi; \
-+@BUILD_JAMVM_TRUE@	  else \
-+@BUILD_JAMVM_TRUE@	    echo "ERROR: No up-to-date JamVM zip available"; exit -1; \
-+@BUILD_JAMVM_TRUE@	  fi ; \
-+@BUILD_JAMVM_TRUE@	fi
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-download-jamvm:
-+	rm -f $(JAMVM_SRC_ZIP)
-+	rm -f stamps/download-jamvm.stamp
-+
-+stamps/extract.stamp: stamps/extract-openjdk.stamp \
-+ stamps/extract-cacao.stamp stamps/remove-intree-libraries.stamp \
-+ stamps/extract-jamvm.stamp stamps/extract-hotspot.stamp stamps/sanitise-openjdk.stamp
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-extract: clean-extract-openjdk clean-extract-cacao clean-extract-jamvm
-+	rm -f stamps/extract.stamp
-+
-+stamps/extract-openjdk.stamp: stamps/download-openjdk.stamp
-+@OPENJDK_SRC_DIR_FOUND_TRUE@	cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	set -e ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	if ! test -d openjdk ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    case "$(OPENJDK_SRC_ZIP)" in \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	      *.zip) $(UNZIP) -q $(OPENJDK_SRC_ZIP) ;; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	      *.tar.*) $(TAR) xf $(OPENJDK_SRC_ZIP) ;; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    esac; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    mv `echo $(ICEDTEA_PREFIX)|sed 's#\.#-#'`-$(OPENJDK_CHANGESET) openjdk ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  else \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    echo "ERROR: Couldn't extract OpenJDK"; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    false; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  fi; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	fi; 
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	set -e ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	if [ ! -z $(CORBA_SRC_ZIP) ] ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  if test -e ${CORBA_SRC_ZIP} ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    if ! test -d openjdk/corba ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	      case "$(CORBA_SRC_ZIP)" in \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	        *.zip) $(UNZIP) -q $(CORBA_SRC_ZIP) ;; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	        *.tar.*) $(TAR) xf $(CORBA_SRC_ZIP) ;; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	      esac; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	      mv corba-$(CORBA_CHANGESET) openjdk/corba ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	fi
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	set -e ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	if [ ! -z $(JAXP_SRC_ZIP) ] ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  if test -e ${JAXP_SRC_ZIP} ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    if ! test -d openjdk/jaxp ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	      case "$(JAXP_SRC_ZIP)" in \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	        *.zip) $(UNZIP) -q $(JAXP_SRC_ZIP) ;; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	        *.tar.*) $(TAR) xf $(JAXP_SRC_ZIP) ;; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	      esac; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	      mv jaxp-$(JAXP_CHANGESET) openjdk/jaxp ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	fi
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	set -e ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	if [ ! -z $(JAXWS_SRC_ZIP) ] ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  if test -e ${JAXWS_SRC_ZIP} ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    if ! test -d openjdk/jaxws ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	      case "$(JAXWS_SRC_ZIP)" in \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	        *.zip) $(UNZIP) -q $(JAXWS_SRC_ZIP) ;; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	        *.tar.*) $(TAR) xf $(JAXWS_SRC_ZIP) ;; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	      esac; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	      mv jaxws-$(JAXWS_CHANGESET) openjdk/jaxws ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	fi
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	set -e ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	if [ ! -z $(JDK_SRC_ZIP) ] ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  if test -e ${JDK_SRC_ZIP} ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    if ! test -d openjdk/jdk ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	      case "$(JDK_SRC_ZIP)" in \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	        *.zip) $(UNZIP) -q $(JDK_SRC_ZIP) ;; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	        *.tar.*) $(TAR) xf $(JDK_SRC_ZIP) ;; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	      esac; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	      mv jdk-$(JDK_CHANGESET) openjdk/jdk ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	fi
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	set -e ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	if [ ! -z $(LANGTOOLS_SRC_ZIP) ] ; then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  if test -e ${LANGTOOLS_SRC_ZIP} ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    if ! test -d openjdk/langtools ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    then \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	      case "$(LANGTOOLS_SRC_ZIP)" in \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	        *.zip) $(UNZIP) -q $(LANGTOOLS_SRC_ZIP) ;; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	        *.tar.*) $(TAR) xf $(LANGTOOLS_SRC_ZIP) ;; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	      esac; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	      mv langtools-$(LANGTOOLS_CHANGESET) openjdk/langtools ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	    fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	  fi ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@	fi
-+	touch stamps/extract-openjdk.stamp
-+
-+clean-extract-openjdk: clean-overlay clean-versioning \
-+ clean-patch-fsg clean-remove-intree-libraries \
-+ clean-sanitise-openjdk clean-extract-hotspot
-+	rm -rf openjdk
-+	rm -f stamps/extract-openjdk.stamp
-+
-+stamps/extract-hotspot.stamp: stamps/extract-openjdk.stamp
-+	set -e ; \
-+	if [ ! -z $(HOTSPOT_SRC_ZIP) ] ; then \
-+	  if test -e ${HOTSPOT_SRC_ZIP} ; \
-+	  then \
-+	    case "$(HOTSPOT_SRC_ZIP)" in \
-+	      *.zip) $(UNZIP) -q $(HOTSPOT_SRC_ZIP) ;; \
-+	      *.tar.*) $(TAR) xf $(HOTSPOT_SRC_ZIP) ;; \
-+	    esac; \
-+	    if test "x${HSBUILD}" != "xdefault"; then \
-+	      rm -rf openjdk/hotspot ; \
-+	    fi ; \
-+	    if ! test -d openjdk/hotspot ; \
-+	    then \
-+	      mv hotspot-$(HS_CHANGESET) openjdk/hotspot ; \
-+	    else \
-+	      rm -rf hotspot-$(HS_CHANGESET) ; \
-+	    fi ; \
-+	  fi ; \
-+	fi
-+	touch stamps/extract-hotspot.stamp
-+
-+clean-extract-hotspot:
-+	rm -rf openjdk/hotspot
-+	rm -f stamps/extract-hotspot.stamp
-+
-+stamps/sanitise-openjdk.stamp: stamps/extract-openjdk.stamp \
-+ stamps/extract-hotspot.stamp
-+	chmod -R ug+w openjdk 
-+	sh $(srcdir)/fsg.sh
-+	touch stamps/sanitise-openjdk.stamp
-+
-+clean-sanitise-openjdk:
-+	rm -f stamps/sanitise-openjdk.stamp
-+
-+stamps/extract-cacao.stamp: stamps/download-cacao.stamp
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_TRUE@@USE_SYSTEM_CACAO_FALSE@	if ! test -d cacao ; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_TRUE@@USE_SYSTEM_CACAO_FALSE@	then \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_TRUE@@USE_SYSTEM_CACAO_FALSE@	  mkdir -p cacao/cacao ; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_TRUE@@USE_SYSTEM_CACAO_FALSE@	  cp -r $(ALT_CACAO_SRC_DIR)/* cacao/cacao/ ; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_TRUE@@USE_SYSTEM_CACAO_FALSE@	fi
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	set -e ; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	if ! test -d cacao/cacao ; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	then \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	  mkdir cacao ; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	  $(TAR) xzf $(CACAO_SRC_ZIP) -C cacao ; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	  dir=$$(basename cacao/cacao-*) ; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	  ln -s $$dir cacao/cacao ; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	  cd cacao/cacao ; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	  cd .. ; \
-+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@	fi
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-extract-cacao: clean-cacao
-+	rm -f stamps/extract-cacao.stamp
-+
-+stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
-+@BUILD_JAMVM_TRUE@	set -e ; \
-+@BUILD_JAMVM_TRUE@	if ! test -d jamvm ; \
-+@BUILD_JAMVM_TRUE@	then \
-+@BUILD_JAMVM_TRUE@	  mkdir jamvm ; \
-+@BUILD_JAMVM_TRUE@	  $(TAR) xzf $(JAMVM_SRC_ZIP) -C jamvm ; \
-+@BUILD_JAMVM_TRUE@	  dir=$$(basename jamvm/jamvm-*) ; \
-+@BUILD_JAMVM_TRUE@	  ln -s $$dir jamvm/jamvm ; \
-+@BUILD_JAMVM_TRUE@	fi
-+	mkdir -p stamps
-+	touch stamps/extract-jamvm.stamp
-+
-+clean-extract-jamvm: clean-jamvm
-+	rm -f stamps/extract-jamvm.stamp
-+
-+stamps/remove-intree-libraries.stamp: stamps/sanitise-openjdk.stamp
-+	sh $(abs_top_builddir)/remove-intree-libraries.sh
-+	touch stamps/remove-intree-libraries.stamp
-+
-+clean-remove-intree-libraries:
-+	rm -f stamps/remove-intree-libraries.stamp
-+
-+stamps/generated.stamp:
-+	set -e ; \
-+	if [ ! -e $(abs_top_builddir)/generated.build ]; then \
-+	  cp -pPR $(abs_top_srcdir)/generated $(abs_top_builddir)/generated.build; \
-+	  chmod -R u+w $(abs_top_builddir)/generated.build ; \
-+	fi
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-generated:
-+	rm -rf $(abs_top_builddir)/generated.build
-+	rm -f stamps/generated.stamp
-+
-+stamps/patch-fsg.stamp: stamps/extract.stamp
-+	mkdir -p stamps ; \
-+	rm -f stamps/patch-fsg.stamp.tmp ; \
-+	touch stamps/patch-fsg.stamp.tmp ; \
-+	all_patches_ok=yes; \
-+	for p in $(ICEDTEA_FSG_PATCHES) ; \
-+	do \
-+	  if test x$${all_patches_ok} = "xyes" \
-+	    && echo Checking $$p \
-+	    && $(PATCH) -l -p0 --dry-run -s -t -f \
-+	      -F 0 < $(abs_top_srcdir)/$$p ; \
-+	  then \
-+	    echo Applying $$p ; \
-+	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
-+	    if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \
-+	      >> stamps/patch-fsg.stamp.tmp ; \
-+	    then \
-+	      echo "* $$(basename $$p): UNDOCUMENTED" \
-+	        >> stamps/patch-fsg.stamp.tmp ; \
-+	    fi ; \
-+	  else \
-+	    test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \
-+	  fi ; \
-+	done ; \
-+	mv stamps/patch-fsg.stamp.tmp stamps/patch-fsg.stamp ; \
-+	if ! test x$${all_patches_ok} = "xyes"; then \
-+	  echo ERROR patch $${all_patches_ok} FAILED! ; \
-+	  echo WARNING make clean-patch before retrying a fix ; \
-+	  exit 2; \
-+	fi ; 
-+
-+clean-patch-fsg: clean-patch
-+	if [ -e stamps/patch-fsg.stamp ] ; then \
-+	  all_patches_ok=yes; \
-+	  for p in $(ICEDTEA_FSG_PATCHES) ; \
-+	  do \
-+	    echo Checking $$p ; \
-+	    if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
-+	    then \
-+	      echo Reverting $$p ; \
-+	      $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
-+	    else \
-+	      all_patches_ok=no ; \
-+	    fi ; \
-+	  done ; \
-+	  if ! test x$${all_patches_ok} = "xyes" ; then \
-+	    echo "WARNING Not all patches reverted cleanly" ; \
-+	  fi ; \
-+	  rm -f stamps/patch-fsg.stamp ; \
-+	fi
-+
-+stamps/patch.stamp: stamps/patch-fsg.stamp
-+	mkdir -p stamps ; \
-+	rm -f stamps/patch.stamp.tmp ; \
-+	touch stamps/patch.stamp.tmp ; \
-+	all_patches_ok=yes; \
-+	cd $(abs_top_builddir)/openjdk/jdk; \
-+	for p in $(OPENJDK_PATCHES) ; \
-+	do \
-+	  if test x$${all_patches_ok} == "xyes" \
-+	     && echo Checking $$p \
-+	     && $(PATCH) -l -p1 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
-+	  then \
-+	    echo Applying $$p ; \
-+	    $(PATCH) -l -p1 < $(abs_top_srcdir)/$$p ; \
-+	  else \
-+	    test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
-+	  fi ; \
-+	done ; \
-+	cd $(abs_top_builddir) ; \
-+	for p in $(ICEDTEA_PATCHES) ; \
-+	do \
-+	  if test x$${all_patches_ok} = "xyes" \
-+	    && echo Checking $$p \
-+	    && $(PATCH) -l -p0 --dry-run -s -t -f \
-+	      -F 0 < $(abs_top_srcdir)/$$p ; \
-+	  then \
-+	    echo Applying $$p ; \
-+	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
-+	    if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \
-+	      >> stamps/patch.stamp.tmp ; \
-+	    then \
-+	      echo "* $$(basename $$p): UNDOCUMENTED" \
-+	        >> stamps/patch.stamp.tmp ; \
-+	    fi ; \
-+	  else \
-+	    test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \
-+	  fi ; \
-+	done ; \
-+	if ! test x$${all_patches_ok} = "xyes"; then \
-+	  echo ERROR patch $${all_patches_ok} FAILED! ; \
-+	  echo WARNING make clean-patch before retrying a fix ; \
-+	  exit 2; \
-+	fi ; \
-+	mv stamps/patch.stamp.tmp stamps/patch.stamp 
-+
-+clean-patch:
-+	if [ -e stamps/patch.stamp ] ; then \
-+	  all_patches_ok=yes; \
-+	  for p in $(ICEDTEA_PATCHES) ; \
-+	  do \
-+	    echo Checking $$p ; \
-+	    if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
-+	    then \
-+	      echo Reverting $$p ; \
-+	      $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
-+	    else \
-+	      all_patches_ok=no ; \
-+	    fi ; \
-+	  done ; \
-+	  cd $(abs_top_builddir)/openjdk/jdk; \
-+	  for p in $(OPENJDK_PATCHES) ; \
-+	  do \
-+	    echo Checking $$p ; \
-+	    if $(PATCH) -l -p1 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
-+	    then \
-+	      echo Reverting $$p ; \
-+	      $(PATCH) -l -p1 -R < $(abs_top_srcdir)/$$p ; \
-+	    else \
-+	      all_patches_ok=no ; \
-+	    fi ; \
-+	  done ; \
-+	  cd $(abs_top_builddir) ; \
-+	  if ! test x$${all_patches_ok} = "xyes" ; then \
-+	    echo "WARNING Not all patches reverted cleanly" ; \
-+	  fi ; \
-+	  rm -f stamps/patch.stamp ; \
-+	fi
-+
-+stamps/versioning.stamp: stamps/patch.stamp
-+	mv openjdk/jdk/make/common/shared/Defs.gmk Defs.gmk.bak
-+	cat Defs.gmk.bak > openjdk/jdk/make/common/shared/Defs.gmk
-+	icedtea_version="$(PACKAGE_VERSION)$(ICEDTEA_REV)" ; \
-+	if test "x$(ENABLE_CACAO)" = "xyes" || \
-+	   test "x$(ENABLE_JAMVM)" = "xyes"; then \
-+	  echo "JDK_DERIVATIVE_NAME=$${icedtea_version}" \
-+	    >>openjdk/jdk/make/common/shared/Defs.gmk ; \
-+	  echo "PRODUCT_NAME=$(ICEDTEA_NAME)" \
-+	    >>openjdk/jdk/make/common/shared/Defs.gmk ; \
-+	else \
-+	  echo "JDK_DERIVATIVE_NAME=$(ICEDTEA_NAME) $${icedtea_version}" \
-+	    >>openjdk/jdk/make/common/shared/Defs.gmk ; \
-+	fi ; 
-+
-+@HAS_JDK_REVISION_TRUE@	echo "JDK_REVID=$(JDK_REVISION)" >>openjdk/jdk/make/common/shared/Defs.gmk ;
-+
-+	echo "DISTRO_NAME=$(DIST_NAME)" >>openjdk/jdk/make/common/shared/Defs.gmk ;
-+@HAS_PKGVERSION_TRUE@	  echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
-+@HAS_PKGVERSION_TRUE@	    >>openjdk/jdk/make/common/shared/Defs.gmk ;
-+	if test x"$(PROJECT_NAME)" != "xjdk7" && test x"$(PROJECT_NAME)" != "xicedtea"; then \
-+	  proj_suffix="-$(PROJECT_NAME)"; \
-+	fi ; \
-+	if test x"$(VERSION_SUFFIX)" != "x"; then \
-+	  ver_suffix="-$(VERSION_SUFFIX)"; \
-+	fi ; \
-+	sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \
-+	  openjdk/jdk/make/common/shared/Defs.gmk;
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-versioning:
-+	if [ -e Defs.gmk.bak ] ; then \
-+	  mv Defs.gmk.bak openjdk/jdk/make/common/shared/Defs.gmk ; \
-+	fi
-+	rm -f stamps/versioning.stamp
-+
-+stamps/overlay.stamp: stamps/versioning.stamp
-+	cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/
-+	chmod -R ug+w openjdk
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-overlay:
-+	rm -f stamps/overlay.stamp
-+
-+# OpenJDK boot Source Preparation Targets
-+# ======================================
-+
-+# Copy over OpenJDK sources for bootstrap.
-+stamps/clone-boot.stamp: $(OPENJDK_TREE)
-+	if ! test -d openjdk-boot ; then \
-+	    cp -pPRl openjdk openjdk-boot ; \
-+	    if [ -e $(BUILD_OUTPUT_DIR) ] ; then \
-+	      cp -pPRl $(BUILD_OUTPUT_DIR) $(BOOT_BUILD_OUTPUT_DIR) ; \
-+	    fi ; \
-+	fi
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-clone-boot: 
-+	rm -rf openjdk-boot
-+	rm -f stamps/patch-boot.stamp
-+	rm -f stamps/clone-boot.stamp
-+
-+stamps/patch-boot.stamp: stamps/clone-boot.stamp
-+	mkdir -p stamps; \
-+	rm -f stamps/patch-boot.stamp.tmp ; \
-+	touch stamps/patch-boot.stamp.tmp ; \
-+	all_patches_ok=yes; \
-+	for p in $(ICEDTEA_BOOT_PATCHES) ; \
-+	do \
-+	  if test x$${all_patches_ok} = "xyes" \
-+	    && echo Checking $$p \
-+	    && $(PATCH) -l -p0 --dry-run -s -t -f \
-+	      -F 0 < $(abs_top_srcdir)/$$p ; \
-+	  then \
-+	    echo Applying $$p ; \
-+	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
-+	    if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \
-+	      >> stamps/patch-boot.stamp.tmp ; \
-+	    then \
-+	      echo "* $$(basename $$p): UNDOCUMENTED" \
-+	        >> stamps/patch-boot.stamp.tmp ; \
-+	    fi ; \
-+	  else \
-+	    test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \
-+	  fi ; \
-+	done ; \
-+	mv stamps/patch-boot.stamp.tmp stamps/patch-boot.stamp ; \
-+	if ! test x$${all_patches_ok} = "xyes"; then \
-+	  echo ERROR patch $${all_patches_ok} FAILED! ; \
-+	  echo WARNING make clean-patch before retrying a fix ; \
-+	  exit 2; \
-+	fi
-+
-+clean-patch-boot:
-+	if [ -e stamps/patch-boot.stamp ] ; then \
-+	  all_patches_ok=yes; \
-+	  for p in $(ICEDTEA_BOOT_PATCHES) ; \
-+	  do \
-+	    echo Checking $$p ; \
-+	    if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
-+	    then \
-+	      echo Reverting $$p ; \
-+	      $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
-+	    else \
-+	      all_patches_ok=no ; \
-+	    fi ; \
-+	  done ; \
-+	  if ! test x$${all_patches_ok} = "xyes" ; then \
-+	    echo "WARNING Not all patches reverted cleanly" ; \
-+	  fi ; \
-+	  rm -f stamps/patch-boot.stamp ; \
-+	fi
-+
-+# Bootstrap Directory Targets
-+# ===========================
-+
-+# Optional native ecj
-+stamps/native-ecj.stamp:
-+	mkdir -p stamps 
-+@BUILD_NATIVE_ECJ_TRUE@	${GCJ} $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
-+@BUILD_NATIVE_ECJ_TRUE@	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR}
-+	touch $@
-+
-+clean-native-ecj:
-+	rm -f native-ecj
-+	rm -rf stamps/native-ecj.stamp
-+
-+# bootstrap/stage1
-+stamps/bootstrap-directory-stage1.stamp: stamps/native-ecj.stamp
-+	mkdir -p $(STAGE1_BOOT_DIR)/bin stamps/
-+	ln -sf $(JAVA) $(STAGE1_BOOT_DIR)/bin/java
-+@JAVAH_SUPPORTS_X_OPTIONS_TRUE@	ln -sf $(JAVAH) $(STAGE1_BOOT_DIR)/bin/javah
-+@JAVAH_SUPPORTS_X_OPTIONS_FALSE@	ln -sf ../../../javah $(STAGE1_BOOT_DIR)/bin/javah
-+	ln -sf $(RMIC) $(STAGE1_BOOT_DIR)/bin/rmic
-+	ln -sf $(JAR) $(STAGE1_BOOT_DIR)/bin/jar
-+	ln -sf $(NATIVE2ASCII) $(STAGE1_BOOT_DIR)/bin/native2ascii
-+	ln -sf ../../../javac $(STAGE1_BOOT_DIR)/bin/javac
-+	ln -sf ../../../javap $(STAGE1_BOOT_DIR)/bin/javap
-+	mkdir -p $(STAGE1_BOOT_DIR)/lib/modules
-+	mkdir -p $(STAGE1_BOOT_DIR)/jre/lib && \
-+	cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_RUNTIME) && \
-+	chmod u+w $(STAGE1_BOOT_RUNTIME)
-+	mkdir -p $(STAGE1_BOOT_DIR)/lib && \
-+	if [ -e $(SYSTEM_JDK_DIR)/lib/tools.jar ] ; then \
-+	  ln -sf $(SYSTEM_JDK_DIR)/lib/tools.jar $(STAGE1_BOOT_DIR)/lib/tools.jar ; \
-+	else \
-+	  ln -sf $(STAGE1_BOOT_RUNTIME) $(STAGE1_BOOT_DIR)/lib/tools.jar ; \
-+	fi
-+	ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
-+	  $(STAGE1_BOOT_DIR)/jre/lib/ && \
-+	if ! test -d $(STAGE1_BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR); \
-+	  then \
-+	  ln -sf ./$(JRE_ARCH_DIR) \
-+	    $(STAGE1_BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR); \
-+	fi
-+	mkdir -p $(STAGE1_BOOT_DIR)/include && \
-+	for i in $(SYSTEM_JDK_DIR)/include/*; do \
-+	  test -r $$i | continue; \
-+	  i=`basename $$i`; \
-+	  rm -f $(STAGE1_BOOT_DIR)/include/$$i; \
-+	  ln -s $(SYSTEM_JDK_DIR)/include/$$i $(STAGE1_BOOT_DIR)/include/$$i; \
-+	done;
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-bootstrap-directory-stage1:
-+	rm -rf $(STAGE1_BOOT_DIR)
-+	rm -f stamps/bootstrap-directory-stage1.stamp
-+
-+# bootstrap/stage2.
-+stamps/bootstrap-directory-stage2.stamp: stamps/icedtea-stage1.stamp
-+	rm -rf $(STAGE2_BOOT_DIR)
-+	ln -s $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/ $(STAGE2_BOOT_DIR)
-+	if ! test -d $(STAGE2_BOOT_DIR)/include; then \
-+	  ln -sf $(BOOT_BUILD_OUTPUT_DIR)/include $(STAGE2_BOOT_DIR)/include; \
-+	fi
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-bootstrap-directory-stage2:
-+	rm -rf $(STAGE2_BOOT_DIR)
-+	rm -f stamps/bootstrap-directory-stage2.stamp
-+
-+# stage 1 symlink.
-+stamps/bootstrap-directory-symlink-stage1.stamp: stamps/bootstrap-directory-stage1.stamp
-+	rm -f $(BOOT_DIR)
-+	ln -sf $(STAGE1_BOOT_DIR) $(BOOT_DIR)
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-bootstrap-directory-symlink-stage1:
-+	rm -f $(BOOT_DIR)
-+	rm -f stamps/bootstrap-directory-symlink-stage1.stamp
-+
-+# stage 2 symlink.
-+stamps/bootstrap-directory-symlink-stage2.stamp: $(BOOTSTRAP_DIRECTORY_STAMP)
-+	mkdir -p bootstrap
-+	rm -f $(BOOT_DIR)
-+	ln -sf $(ICEDTEA_HOME) $(BOOT_DIR); \
-+	if ! $(BOOT_DIR)/bin/java -version ; \
-+         then \
-+           echo "$(BOOT_DIR)/bin/java" \
-+               "cannot be found or is corrupted." ; \
-+           exit 1; \
-+        fi
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-bootstrap-directory-symlink-stage2:
-+	rm -f $(BOOT_DIR)
-+	rm -f stamps/bootstrap-directory-symlink-stage2.stamp
-+
-+# OpenJDK Targets
-+# ===============
-+
-+# If you change anything here in the icedtea target, please make sure
-+# you change it in the icedtea-debug target as well.
-+stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
-+ stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
-+ stamps/cacao.stamp stamps/rewrite-rhino.stamp stamps/jamvm.stamp
-+	$(ARCH_PREFIX) $(MAKE) -j1 \
-+	  $(ICEDTEA_ENV) \
-+	  -C openjdk/ \
-+	  $(ICEDTEA_BUILD_TARGET)
-+	$(abs_top_builddir)/pax-mark-vm $(BUILD_OUTPUT_DIR)/j2sdk-image
-+	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-+	mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-+	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
-+	mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext 
-+@ZERO_BUILD_TRUE@	printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
-+@SHARK_BUILD_TRUE@	printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
-+@ENABLE_CACAO_TRUE@	printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
-+@ENABLE_JAMVM_TRUE@	printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
-+	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
-+	mkdir -p stamps
-+	touch $@
-+
-+stamps/add-systemtap.stamp: stamps/icedtea.stamp
-+@ENABLE_SYSTEMTAP_TRUE@	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
-+@ENABLE_SYSTEMTAP_TRUE@	grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
-+@ENABLE_SYSTEMTAP_TRUE@	if test $$? -eq 0; then \
-+@ENABLE_SYSTEMTAP_TRUE@	  sed -e '/\/client\/libjvm.so/d' \
-+@ENABLE_SYSTEMTAP_TRUE@	    < $(abs_top_builddir)/tapset/hotspot.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	  sed -e '/\/client\/libjvm.so/d' \
-+@ENABLE_SYSTEMTAP_TRUE@	    < $(abs_top_builddir)/tapset/hotspot_jni.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	  sed -e '/\/client\/libjvm.so/d' \
-+@ENABLE_SYSTEMTAP_TRUE@	    < $(abs_top_builddir)/tapset/hotspot_gc.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	else \
-+@ENABLE_SYSTEMTAP_TRUE@	  cp $(abs_top_builddir)/tapset/hotspot.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	  cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	  cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	fi; \
-+@ENABLE_SYSTEMTAP_TRUE@	cp $(abs_top_builddir)/tapset/jstack.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	  $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
-+	touch stamps/add-systemtap.stamp
-+
-+clean-add-systemtap:
-+	rm -rf $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset
-+	rm -f stamps/add-systemtap.stamp
-+
-+stamps/add-pulseaudio.stamp: stamps/icedtea.stamp $(PULSE_JAVA_TARGET)
-+@ENABLE_PULSE_JAVA_TRUE@	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
-+@ENABLE_PULSE_JAVA_TRUE@	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-+@ENABLE_PULSE_JAVA_TRUE@	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
-+@ENABLE_PULSE_JAVA_TRUE@	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-+@ENABLE_PULSE_JAVA_TRUE@	cp -pPRf pulse-java.jar \
-+@ENABLE_PULSE_JAVA_TRUE@	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
-+@ENABLE_PULSE_JAVA_TRUE@	cp -pPRf pulse-java.jar \
-+@ENABLE_PULSE_JAVA_TRUE@	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
-+@ENABLE_PULSE_JAVA_TRUE@	(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
-+@ENABLE_PULSE_JAVA_TRUE@	   $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
-+	touch stamps/add-pulseaudio.stamp
-+
-+# Note: for simplicity, we don't revert the update of src.zip
-+clean-add-pulseaudio:
-+	rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
-+	rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
-+	rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar
-+	rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar
-+	rm -f stamps/add-pulseaudio.stamp
-+
-+stamps/add-nss.stamp: stamps/extract-openjdk.stamp
-+	cp -v $(abs_top_builddir)/nss.cfg openjdk/jdk/src/share/lib/security;
-+	touch stamps/add-nss.stamp
-+
-+clean-add-nss:
-+	rm -f openjdk/jdk/src/share/lib/security/nss.cfg
-+	rm -f stamps/add-nss.stamp
-+
-+stamps/add-tzdata-support.stamp: stamps/icedtea.stamp
-+@WITH_TZDATA_DIR_TRUE@	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
-+@WITH_TZDATA_DIR_TRUE@	  cp -v $(abs_top_builddir)/tz.properties \
-+@WITH_TZDATA_DIR_TRUE@	    $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ; \
-+@WITH_TZDATA_DIR_TRUE@	fi
-+	touch stamps/add-tzdata-support.stamp
-+
-+clean-add-tzdata-support:
-+	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
-+	  rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
-+	fi
-+	rm -f stamps/add-tzdata-support.stamp
-+
-+stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp
-+	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
-+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
-+	fi
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-check-crypto:
-+	rm -f stamps/check-crypto.stamp
-+
-+stamps/add-archive.stamp: stamps/icedtea.stamp
-+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
-+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@	  $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
-+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@	fi
-+	touch stamps/add-archive.stamp
-+
-+clean-add-archive:
-+	rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
-+	rm -f stamps/add-archive.stamp
-+
-+stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
-+ stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
-+ stamps/cacao.stamp stamps/rewrite-rhino.stamp stamps/jamvm.stamp
-+	$(ARCH_PREFIX) $(MAKE) -j1 \
-+	  $(ICEDTEA_ENV) \
-+	  -C openjdk/ \
-+	  $(ICEDTEA_DEBUG_BUILD_TARGET)
-+	$(abs_top_builddir)/pax-mark-vm $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image
-+	mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-+	mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-+	mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
-+	mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext 
-+@ZERO_BUILD_TRUE@	printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
-+@SHARK_BUILD_TRUE@	printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
-+@ENABLE_CACAO_TRUE@	printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
-+@ENABLE_JAMVM_TRUE@	printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
-+	@echo "IcedTea (debug build) is served:" \
-+	  $(DEBUG_BUILD_OUTPUT_DIR)
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-icedtea: 
-+	rm -rf $(BUILD_OUTPUT_DIR)
-+	rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp
-+
-+stamps/add-systemtap-debug.stamp: stamps/icedtea-debug.stamp
-+@ENABLE_SYSTEMTAP_TRUE@	mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
-+@ENABLE_SYSTEMTAP_TRUE@	grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
-+@ENABLE_SYSTEMTAP_TRUE@	if test $$? -eq 0; then \
-+@ENABLE_SYSTEMTAP_TRUE@	  sed -e '/\/client\/libjvm.so/d' \
-+@ENABLE_SYSTEMTAP_TRUE@	    < $(abs_top_builddir)/tapset/hotspot.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	  sed -e '/\/client\/libjvm.so/d' \
-+@ENABLE_SYSTEMTAP_TRUE@	    < $(abs_top_builddir)/tapset/hotspot_jni.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	  sed -e '/\/client\/libjvm.so/d' \
-+@ENABLE_SYSTEMTAP_TRUE@	    < $(abs_top_builddir)/tapset/hotspot_gc.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	else \
-+@ENABLE_SYSTEMTAP_TRUE@	  cp $(abs_top_builddir)/tapset/hotspot.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	  cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	  cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	fi; \
-+@ENABLE_SYSTEMTAP_TRUE@	cp $(abs_top_builddir)/tapset/jstack.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
-+	touch stamps/add-systemtap-debug.stamp
-+
-+clean-add-systemtap-debug:
-+	rm -rf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
-+	rm -f stamps/add-systemtap-debug.stamp
-+
-+stamps/add-pulseaudio-debug.stamp: stamps/icedtea-debug.stamp $(PULSE_JAVA_TARGET)
-+@ENABLE_PULSE_JAVA_TRUE@	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
-+@ENABLE_PULSE_JAVA_TRUE@	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-+@ENABLE_PULSE_JAVA_TRUE@	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
-+@ENABLE_PULSE_JAVA_TRUE@	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-+@ENABLE_PULSE_JAVA_TRUE@	cp -pPRf pulse-java.jar \
-+@ENABLE_PULSE_JAVA_TRUE@	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
-+@ENABLE_PULSE_JAVA_TRUE@	cp -pPRf pulse-java.jar \
-+@ENABLE_PULSE_JAVA_TRUE@	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
-+@ENABLE_PULSE_JAVA_TRUE@	(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
-+@ENABLE_PULSE_JAVA_TRUE@	   $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
-+	touch stamps/add-pulseaudio-debug.stamp
-+
-+# Note: for simplicity, we don't revert the update of src.zip
-+clean-add-pulseaudio-debug:
-+	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
-+	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
-+	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar
-+	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar
-+	rm -f stamps/add-pulseaudio-debug.stamp
-+
-+stamps/add-tzdata-support-debug.stamp: stamps/icedtea-debug.stamp
-+@WITH_TZDATA_DIR_TRUE@	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
-+@WITH_TZDATA_DIR_TRUE@	  cp -v $(abs_top_builddir)/tz.properties \
-+@WITH_TZDATA_DIR_TRUE@	    $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; \
-+@WITH_TZDATA_DIR_TRUE@	fi
-+	touch stamps/add-tzdata-support-debug.stamp
-+
-+clean-add-tzdata-support-debug:
-+	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
-+	  rm -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
-+	fi
-+	rm -f stamps/add-tzdata-support-debug.stamp
-+
-+stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/icedtea-debug.stamp
-+	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
-+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
-+	fi
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-check-crypto-debug:
-+	rm -f stamps/check-crypto-debug.stamp
-+
-+stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp
-+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
-+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
-+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@	fi
-+	touch stamps/add-archive-debug.stamp
-+
-+clean-add-archive-debug:
-+	rm -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
-+	rm -f stamps/add-archive-debug.stamp
-+
-+stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \
-+ stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/add-systemtap.stamp \
-+ stamps/add-pulseaudio.stamp stamps/add-tzdata-support.stamp stamps/check-crypto.stamp \
-+ stamps/add-archive.stamp
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-icedtea-stage2: clean-add-jamvm clean-check-crypto clean-add-archive
-+	rm -f stamps/icedtea-stage2.stamp
-+
-+stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \
-+ stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp \
-+ stamps/add-systemtap-debug.stamp stamps/add-pulseaudio-debug.stamp \
-+ stamps/add/tzdata-support-debug.stamp stamps/check-crypto-debug.stamp \
-+ stamps/add-archive-debug.stamp
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-icedtea-debug-stage2: clean-add-jamvm-debug clean-check-crypto-debug \
-+ clean-add-archive-debug
-+	rm -f stamps/icedtea-debug-stage2.stamp
-+
-+# OpenJDK boot Targets
-+# ===================
-+
-+stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \
-+ stamps/download.stamp $(OPENJDK_BOOT_TREE) stamps/cacao.stamp \
-+ stamps/rewrite-rhino.stamp stamps/jamvm.stamp stamps/generated.stamp
-+	$(ARCH_PREFIX) $(MAKE) -j1 \
-+	  $(ICEDTEA_ENV_BOOT) \
-+	  -C openjdk-boot \
-+	  $(ICEDTEA_BUILD_TARGET)
-+	$(abs_top_builddir)/pax-mark-vm $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
-+	@echo "Bootstrapped IcedTea is served:" \
-+	  $(BOOT_BUILD_OUTPUT_DIR)
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-icedtea-boot:
-+	rm -rf $(BOOT_BUILD_OUTPUT_DIR)
-+	rm -f stamps/icedtea-boot.stamp
-+
-+stamps/add-systemtap-boot.stamp: stamps/icedtea-boot.stamp
-+@ENABLE_SYSTEMTAP_TRUE@	mkdir -p $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
-+@ENABLE_SYSTEMTAP_TRUE@	grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
-+@ENABLE_SYSTEMTAP_TRUE@	if test $$? -eq 0; then \
-+@ENABLE_SYSTEMTAP_TRUE@	  sed -e '/\/client\/libjvm.so/d' \
-+@ENABLE_SYSTEMTAP_TRUE@	    < $(abs_top_builddir)/tapset/hotspot.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	  sed -e '/\/client\/libjvm.so/d' \
-+@ENABLE_SYSTEMTAP_TRUE@	    < $(abs_top_builddir)/tapset/hotspot_jni.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	  sed -e '/\/client\/libjvm.so/d' \
-+@ENABLE_SYSTEMTAP_TRUE@	    < $(abs_top_builddir)/tapset/hotspot_gc.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	else \
-+@ENABLE_SYSTEMTAP_TRUE@	  cp $(abs_top_builddir)/tapset/hotspot.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	  cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	  cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	    $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
-+@ENABLE_SYSTEMTAP_TRUE@	fi; \
-+@ENABLE_SYSTEMTAP_TRUE@	cp $(abs_top_builddir)/tapset/jstack.stp \
-+@ENABLE_SYSTEMTAP_TRUE@	  $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
-+	touch stamps/add-systemtap-boot.stamp
-+
-+clean-add-systemtap-boot:
-+	rm -rf $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
-+	rm -f stamps/add-systemtap-boot.stamp
-+
-+stamps/add-pulseaudio-boot.stamp: stamps/icedtea-boot.stamp $(PULSE_JAVA_TARGET)
-+@ENABLE_PULSE_JAVA_TRUE@	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
-+@ENABLE_PULSE_JAVA_TRUE@	  $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-+@ENABLE_PULSE_JAVA_TRUE@	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
-+@ENABLE_PULSE_JAVA_TRUE@	  $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-+@ENABLE_PULSE_JAVA_TRUE@	cp -pPRf pulse-java.jar \
-+@ENABLE_PULSE_JAVA_TRUE@	  $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
-+@ENABLE_PULSE_JAVA_TRUE@	cp -pPRf pulse-java.jar \
-+@ENABLE_PULSE_JAVA_TRUE@	  $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
-+@ENABLE_PULSE_JAVA_TRUE@	(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
-+@ENABLE_PULSE_JAVA_TRUE@	   $(ZIP) -qur $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
-+	touch stamps/add-pulseaudio-boot.stamp
-+
-+# Note: for simplicity, we don't revert the update of src.zip
-+clean-add-pulseaudio-boot:
-+	rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
-+	rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
-+	rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar
-+	rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar
-+	rm -f stamps/add-pulseaudio-boot.stamp
-+
-+stamps/add-tzdata-support-boot.stamp: stamps/icedtea-boot.stamp
-+@WITH_TZDATA_DIR_TRUE@	if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
-+@WITH_TZDATA_DIR_TRUE@	  cp -v $(abs_top_builddir)/tz.properties \
-+@WITH_TZDATA_DIR_TRUE@	    $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; \
-+@WITH_TZDATA_DIR_TRUE@	fi
-+	touch stamps/add-tzdata-support-boot.stamp
-+
-+clean-add-tzdata-support-boot:
-+	if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
-+	  rm -vf $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
-+	fi
-+	rm -f stamps/add-tzdata-support-boot.stamp
-+
-+stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/icedtea-boot.stamp
-+	if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
-+	  $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
-+	fi
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-check-crypto-boot:
-+	rm -f stamps/check-crypto-boot.stamp
-+
-+stamps/add-archive-boot.stamp: stamps/icedtea-boot.stamp
-+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@	if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
-+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@	  $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
-+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@	fi
-+	touch $@
-+
-+clean-add-archive-boot:
-+	rm -vf $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
-+	rm -f stamps/add-archive-boot.stamp
-+
-+stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp \
-+ stamps/add-systemtap-boot.stamp stamps/add-pulseaudio-boot.stamp \
-+ stamps/add-tzdata-support-boot.stamp stamps/check-crypto-boot.stamp \
-+ stamps/add-archive-boot.stamp
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-icedtea-stage1: clean-add-systemtap-boot clean-add-pulseaudio-boot \
-+ clean-add-tzdata-support-boot clean-check-crypto-boot clean-add-archive-boot
-+	rm -f stamps/icedtea-stage1.stamp
-+
-+# Rebuild targets
-+
-+rebuild:
-+@BOOTSTRAPPING_TRUE@	rm -f stamps/icedtea-boot.stamp
-+@BOOTSTRAPPING_TRUE@	rm -f stamps/icedtea-stage1.stamp
-+@BOOTSTRAPPING_TRUE@	$(ARCH_PREFIX) $(MAKE) icedtea-stage1
-+@BOOTSTRAPPING_TRUE@	@echo "bootstrap-poured IcedTea is served (again):" $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
-+@BOOTSTRAPPING_FALSE@	rm -f stamps/icedtea.stamp
-+@BOOTSTRAPPING_FALSE@	rm -f stamps/icedtea-stage2.stamp
-+@BOOTSTRAPPING_FALSE@	$(ARCH_PREFIX) $(MAKE) icedtea-stage2
-+@BOOTSTRAPPING_FALSE@	@echo "IcedTea is served (again):" $(BUILD_OUTPUT_DIR)/j2sdk-image
-+
-+hotspot:
-+@BOOTSTRAPPING_TRUE@	rm -f stamps/icedtea-boot.stamp
-+@BOOTSTRAPPING_TRUE@	rm -f stamps/icedtea-stage1.stamp
-+@BOOTSTRAPPING_TRUE@	$(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-stage1
-+@BOOTSTRAPPING_TRUE@	mkdir -p \
-+@BOOTSTRAPPING_TRUE@	   $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
-+@BOOTSTRAPPING_TRUE@	cp $(BOOT_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
-+@BOOTSTRAPPING_TRUE@	   $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
-+@BOOTSTRAPPING_TRUE@	@echo "HotSpot is served:" $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
-+@BOOTSTRAPPING_FALSE@	rm -f stamps/icedtea.stamp
-+@BOOTSTRAPPING_FALSE@	rm -f stamps/icedtea-stage2.stamp
-+@BOOTSTRAPPING_FALSE@	$(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-stage2
-+@BOOTSTRAPPING_FALSE@	mkdir -p \
-+@BOOTSTRAPPING_FALSE@	   $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
-+@BOOTSTRAPPING_FALSE@	cp $(BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
-+@BOOTSTRAPPING_FALSE@	   $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
-+@BOOTSTRAPPING_FALSE@	@echo "HotSpot is served:" $(BUILD_OUTPUT_DIR)/j2sdk-image
-+
-+# PulseAudio based mixer
-+# (pulse-java)
-+
-+@ENABLE_PULSE_JAVA_TRUE@stamps/pulse-java.stamp: stamps/pulse-java-jar.stamp $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so
-+@ENABLE_PULSE_JAVA_TRUE@	mkdir -p stamps
-+@ENABLE_PULSE_JAVA_TRUE@	touch $@
-+
-+@ENABLE_PULSE_JAVA_TRUE@stamps/pulse-java-class.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
-+@ENABLE_PULSE_JAVA_TRUE@	mkdir -p $(PULSE_JAVA_CLASS_DIR)
-+@ENABLE_PULSE_JAVA_TRUE@	(cd $(PULSE_JAVA_JAVA_SRCDIR); \
-+@ENABLE_PULSE_JAVA_TRUE@	 $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d $(PULSE_JAVA_CLASS_DIR) \
-+@ENABLE_PULSE_JAVA_TRUE@	 -bootclasspath $(RUNTIME) org/classpath/icedtea/pulseaudio/*.java \
-+@ENABLE_PULSE_JAVA_TRUE@	)
-+@ENABLE_PULSE_JAVA_TRUE@	cp  -r $(PULSE_JAVA_JAVA_SRCDIR)/META-INF $(PULSE_JAVA_CLASS_DIR)
-+@ENABLE_PULSE_JAVA_TRUE@	chmod -R ug+w $(PULSE_JAVA_CLASS_DIR)/META-INF
-+@ENABLE_PULSE_JAVA_TRUE@	mkdir -p stamps
-+@ENABLE_PULSE_JAVA_TRUE@	touch $@
-+
-+@ENABLE_PULSE_JAVA_TRUE@stamps/pulse-java-jar.stamp: stamps/pulse-java-class.stamp
-+@ENABLE_PULSE_JAVA_TRUE@	$(BOOT_DIR)/bin/jar cf pulse-java.jar -C $(PULSE_JAVA_CLASS_DIR) .;
-+@ENABLE_PULSE_JAVA_TRUE@	mkdir -p stamps
-+@ENABLE_PULSE_JAVA_TRUE@	touch $@
-+
-+@ENABLE_PULSE_JAVA_TRUE@stamps/pulse-java-headers.stamp: stamps/pulse-java-class.stamp
-+@ENABLE_PULSE_JAVA_TRUE@	mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR)
-+@ENABLE_PULSE_JAVA_TRUE@	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
-+@ENABLE_PULSE_JAVA_TRUE@	  -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \
-+@ENABLE_PULSE_JAVA_TRUE@	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
-+@ENABLE_PULSE_JAVA_TRUE@	  -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \
-+@ENABLE_PULSE_JAVA_TRUE@	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
-+@ENABLE_PULSE_JAVA_TRUE@	  -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \
-+@ENABLE_PULSE_JAVA_TRUE@	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
-+@ENABLE_PULSE_JAVA_TRUE@	  -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
-+@ENABLE_PULSE_JAVA_TRUE@	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
-+@ENABLE_PULSE_JAVA_TRUE@	  -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
-+@ENABLE_PULSE_JAVA_TRUE@	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
-+@ENABLE_PULSE_JAVA_TRUE@	  -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.ContextEvent
-+@ENABLE_PULSE_JAVA_TRUE@	mkdir -p stamps
-+@ENABLE_PULSE_JAVA_TRUE@	touch $@
-+
-+@ENABLE_PULSE_JAVA_TRUE@$(PULSE_JAVA_NATIVE_BUILDDIR)/%.o: $(PULSE_JAVA_NATIVE_SRCDIR)/%.c stamps/pulse-java-headers.stamp
-+@ENABLE_PULSE_JAVA_TRUE@	$(CC) $(IT_CFLAGS) -fPIC -I$(BOOT_DIR)/include/linux -I$(BOOT_DIR)/include \
-+@ENABLE_PULSE_JAVA_TRUE@	 -I$(PULSE_JAVA_NATIVE_BUILDDIR) -o $@ -c $<
-+
-+@ENABLE_PULSE_JAVA_TRUE@$(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so: $(PULSE_JAVA_NATIVE_OBJECTS)
-+@ENABLE_PULSE_JAVA_TRUE@	$(CC) $(LDFLAGS) -shared $(PULSE_JAVA_NATIVE_OBJECTS) $(LIBPULSE_LIBS) \
-+@ENABLE_PULSE_JAVA_TRUE@	 -o $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so
-+
-+clean-pulse-java:
-+	rm -rf $(PULSE_JAVA_NATIVE_BUILDDIR)
-+	rm -rf $(PULSE_JAVA_CLASS_DIR)
-+	rm -f pulse-java.jar
-+	if [ -e $(PULSE_JAVA_BUILDDIR) ]; then \
-+	  rmdir $(PULSE_JAVA_BUILDDIR) ; \
-+	fi
-+	rm -f stamps/pulse-java*.stamp
-+
-+# end of pulse-java
-+
-+# Rhino support
-+
-+stamps/rewriter.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
-+@WITH_RHINO_TRUE@	mkdir -p $(REWRITER_BUILD_DIR)
-+@WITH_RHINO_TRUE@	$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-+@WITH_RHINO_TRUE@	 -d $(REWRITER_BUILD_DIR) $(REWRITER_SRCS)
-+	mkdir -p stamps
-+	touch stamps/rewriter.stamp
-+
-+clean-rewriter:
-+	rm -rf $(REWRITER_BUILD_DIR)
-+	rm -f stamps/rewriter.stamp
-+
-+stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR)
-+@WITH_RHINO_TRUE@	mkdir -p rhino/rhino.{old,new} && \
-+@WITH_RHINO_TRUE@	(cd rhino/rhino.old && $(BOOT_DIR)/bin/jar xf $(RHINO_JAR)) && \
-+@WITH_RHINO_TRUE@	$(BOOT_DIR)/bin/java -cp $(REWRITER_BUILD_DIR) \
-+@WITH_RHINO_TRUE@	  com.redhat.rewriter.ClassRewriter \
-+@WITH_RHINO_TRUE@	  $(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \
-+@WITH_RHINO_TRUE@	  org.mozilla sun.org.mozilla && \
-+@WITH_RHINO_TRUE@	(cd rhino/rhino.old && \
-+@WITH_RHINO_TRUE@	 for files in `find -type f -not -name '*.class'` ; do \
-+@WITH_RHINO_TRUE@	   new_file=../rhino.new/`echo $$files|sed -e 's#org#sun/org#'` ; \
-+@WITH_RHINO_TRUE@	   mkdir -p `dirname $$new_file` ; \
-+@WITH_RHINO_TRUE@	   cp -v $$files $$new_file ; \
-+@WITH_RHINO_TRUE@	   sed -ie 's#org\.mozilla#sun.org.mozilla#g' $$new_file ; \
-+@WITH_RHINO_TRUE@	 done \
-+@WITH_RHINO_TRUE@	) && \
-+@WITH_RHINO_TRUE@	(cd rhino/rhino.new && \
-+@WITH_RHINO_TRUE@	 $(BOOT_DIR)/bin/jar cfm ../rhino.jar META-INF/MANIFEST.MF sun )
-+	mkdir -p stamps
-+	touch stamps/rewrite-rhino.stamp
-+
-+clean-rewrite-rhino:
-+	rm -rf rhino/rhino.old
-+	rm -rf rhino/rhino.new
-+	rm -f rhino/rhino.jar
-+	if [ -e rhino ] ; then \
-+	  rmdir rhino ; \
-+	fi
-+	rm -f stamps/rewrite-rhino.stamp
-+
-+# JamVM
-+
-+stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp
-+@BUILD_JAMVM_TRUE@	cd jamvm/jamvm && \
-+@BUILD_JAMVM_TRUE@	./autogen.sh --with-java-runtime-library=openjdk7 \
-+@BUILD_JAMVM_TRUE@	  --prefix=$(abs_top_builddir)/jamvm/install ; \
-+@BUILD_JAMVM_TRUE@	$(MAKE) ; \
-+@BUILD_JAMVM_TRUE@	$(MAKE) install
-+@BUILD_JAMVM_TRUE@	mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
-+@BUILD_JAMVM_TRUE@	cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
-+@BUILD_JAMVM_TRUE@	ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
-+@BUILD_JAMVM_TRUE@	touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
-+@BUILD_JAMVM_TRUE@	ln -sf client/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
-+	mkdir -p stamps
-+	touch stamps/jamvm.stamp
-+
-+clean-jamvm:
-+	rm -rf jamvm
-+	rm -f stamps/jamvm.stamp
-+
-+# Targets for additional VMs
-+
-+stamps/add-jamvm.stamp: stamps/icedtea.stamp stamps/jamvm.stamp
-+@ADD_JAMVM_BUILD_TRUE@	mkdir -p $(BUILD_JRE_ARCH_DIR)/jamvm
-+@ADD_JAMVM_BUILD_TRUE@	install -m 644 jamvm/install/lib/libjvm.so \
-+@ADD_JAMVM_BUILD_TRUE@		$(BUILD_JRE_ARCH_DIR)/jamvm/
-+@ADD_JAMVM_BUILD_TRUE@	printf -- '-jamvm KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
-+@ADD_JAMVM_BUILD_FALSE@	printf -- '-jamvm ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
-+	touch $@
-+
-+clean-add-jamvm:
-+	rm -rf $(BUILD_JRE_ARCH_DIR)/jamvm
-+	if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \
-+	  sed -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
-+	fi
-+	rm -f stamps/add-jamvm.stamp
-+
-+stamps/add-jamvm-debug.stamp: stamps/icedtea-debug.stamp stamps/jamvm.stamp
-+@ADD_JAMVM_BUILD_TRUE@	mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm
-+@ADD_JAMVM_BUILD_TRUE@	install -m 644 jamvm/install/lib/libjvm.so \
-+@ADD_JAMVM_BUILD_TRUE@		$(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm/
-+@ADD_JAMVM_BUILD_TRUE@	printf -- '-jamvm KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
-+@ADD_JAMVM_BUILD_FALSE@	printf -- '-jamvm ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
-+	touch $@
-+
-+clean-add-jamvm-debug:
-+	rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm
-+	if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \
-+	  sed -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
-+	fi
-+	rm -f stamps/add-jamvm-debug.stamp
-+
-+# CACAO
-+
-+stamps/cacao.stamp: stamps/rt.stamp
-+@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@	cd cacao/cacao && \
-+@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@	./autogen.sh && \
-+@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@	$(ARCH_PREFIX) ./configure \
-+@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@	  --host=$(host_alias) \
-+@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@	  --build=$(build_alias) \
-+@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@	  --target=$(target_alias) \
-+@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@	  --prefix=$(abs_top_builddir)/cacao/install \
-+@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@	  --with-java-runtime-library=openjdk7 \
-+@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@	  --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
-+@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@	  --with-java-runtime-library-classes=$(RUNTIME) \
-+@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@	  --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
-+@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@	$(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install
-+@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@	ln -sf server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
-+@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@	touch $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
-+@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@	ln -sf client/libjvm.so $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-cacao:
-+	rm -rf cacao
-+	rm -f stamps/cacao.stamp
-+
-+# targets for additional VMs
-+
-+stamps/add-cacao.stamp: stamps/icedtea.stamp stamps/cacao.stamp
-+@ADD_CACAO_BUILD_TRUE@	mkdir -p $(BUILD_JRE_ARCH_DIR)/cacao
-+@ADD_CACAO_BUILD_TRUE@	install -m 644 cacao/install/lib/libjvm.so \
-+@ADD_CACAO_BUILD_TRUE@		$(BUILD_JRE_ARCH_DIR)/cacao/
-+@ADD_CACAO_BUILD_TRUE@	install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so \
-+@ADD_CACAO_BUILD_TRUE@		$(BUILD_JRE_ARCH_DIR)/cacao/
-+@ADD_CACAO_BUILD_TRUE@	install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt \
-+@ADD_CACAO_BUILD_TRUE@		$(BUILD_JRE_ARCH_DIR)/cacao/
-+@ADD_CACAO_BUILD_TRUE@	printf -- '-cacao KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
-+@ADD_CACAO_BUILD_FALSE@	printf -- '-cacao ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
-+	touch $@
-+
-+clean-add-cacao:
-+	rm -rf $(BUILD_JRE_ARCH_DIR)/cacao
-+	if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \
-+	  sed -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
-+	fi
-+	rm -f stamps/add-cacao.stamp
-+
-+stamps/add-cacao-debug.stamp: stamps/icedtea-debug.stamp stamps/cacao.stamp
-+@ADD_CACAO_BUILD_TRUE@	mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao
-+@ADD_CACAO_BUILD_TRUE@	install -m 644 cacao/install/lib/libjvm.so \
-+@ADD_CACAO_BUILD_TRUE@		$(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/
-+@ADD_CACAO_BUILD_TRUE@	install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so \
-+@ADD_CACAO_BUILD_TRUE@		$(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/
-+@ADD_CACAO_BUILD_TRUE@	install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt \
-+@ADD_CACAO_BUILD_TRUE@		$(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/
-+@ADD_CACAO_BUILD_TRUE@	printf -- '-cacao KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
-+@ADD_CACAO_BUILD_FALSE@	printf -- '-cacao ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
-+	touch $@
-+
-+clean-add-cacao-debug:
-+	rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao
-+	if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \
-+	  sed -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
-+	fi
-+	rm -f stamps/add-cacao-debug.stamp
-+
-+stamps/add-zero.stamp: stamps/icedtea.stamp
-+	mkdir -p stamps
-+@ADD_ZERO_BUILD_TRUE@	mkdir -p zerovm
-+
-+@ADD_ZERO_BUILD_TRUE@	cd zerovm && \
-+@ADD_ZERO_BUILD_TRUE@	    $(ADD_ZERO_EXTRA_BUILD_ENV) \
-+@ADD_ZERO_BUILD_TRUE@		$(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS)
-+
-+@ADD_ZERO_BUILD_TRUE@	$(ADD_ZERO_EXTRA_BUILD_ENV) \
-+@ADD_ZERO_BUILD_TRUE@		$(ARCH_PREFIX) $(MAKE) -C zerovm ICEDTEA_BUILD_TARGET=hotspot icedtea-stage2
-+
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_TRUE@	mkdir -p $(BUILD_JRE_ARCH_DIR)/shark
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_TRUE@	cp -a zerovm/$(BUILD_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_TRUE@		$(BUILD_JRE_ARCH_DIR)/shark/
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_TRUE@	printf -- '-shark KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_TRUE@	printf -- '-zero ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_FALSE@	mkdir -p $(BUILD_JRE_ARCH_DIR)/zero
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_FALSE@	cp -a zerovm/$(BUILD_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_FALSE@		$(BUILD_JRE_ARCH_DIR)/zero/
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_FALSE@	printf -- '-zero KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_FALSE@	printf -- '-shark ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
-+@ADD_ZERO_BUILD_FALSE@	printf -- '-zero ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
-+@ADD_ZERO_BUILD_FALSE@	printf -- '-shark ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
-+	touch $@
-+
-+clean-add-zero:
-+	rm -rf $(BUILD_JRE_ARCH_DIR)/zero
-+	rm -rf $(BUILD_JRE_ARCH_DIR)/shark
-+	rm -rf zerovm
-+	if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \
-+	  sed -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
-+	  sed -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
-+	fi
-+	rm -f stamps/add-zero.stamp
-+
-+stamps/add-zero-debug.stamp: stamps/icedtea-debug.stamp
-+	mkdir -p stamps
-+@ADD_ZERO_BUILD_TRUE@	mkdir -p zerovm
-+
-+@ADD_ZERO_BUILD_TRUE@	cd zerovm && \
-+@ADD_ZERO_BUILD_TRUE@	    $(ADD_ZERO_EXTRA_BUILD_ENV) \
-+@ADD_ZERO_BUILD_TRUE@		$(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS)
-+
-+@ADD_ZERO_BUILD_TRUE@	$(ADD_ZERO_EXTRA_BUILD_ENV) \
-+@ADD_ZERO_BUILD_TRUE@		$(ARCH_PREFIX) $(MAKE) -C zerovm ICEDTEA_DEBUG_BUILD_TARGET=hotspot icedtea-stage2
-+
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_TRUE@	mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/shark
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_TRUE@	cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_TRUE@		$(BUILD_DEBUG_JRE_ARCH_DIR)/shark/
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_TRUE@	printf -- '-shark KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_FALSE@	mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/zero
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_FALSE@	cp -a zerovm/$(BUILD_OUTPUT_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_FALSE@		$(BUILD_DEBUG_JRE_ARCH_DIR)/zero/
-+@ADD_ZERO_BUILD_TRUE@@ZERO_BUILD_FALSE@	printf -- '-zero KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
-+@ADD_ZERO_BUILD_FALSE@	printf -- '-zero ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
-+@ADD_ZERO_BUILD_FALSE@	printf -- '-shark ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
-+	touch $@
-+
-+clean-add-zero-debug:
-+	rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/zero
-+	rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/shark
-+	rm -rf zerovm
-+	if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \
-+	  sed -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
-+	  sed -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
-+	fi
-+	rm -f stamps/add-zero-debug.stamp
-+
-+# end additional VMs
-+
-+# jtreg
-+
-+stamps/jtreg.stamp: stamps/icedtea-stage2.stamp
-+	rm -rf test/jtreg/classes
-+	mkdir -p test/jtreg/classes
-+	$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d test/jtreg/classes \
-+	   `find $(abs_top_srcdir)/test/jtreg/com -name '*.java'`
-+	(cd $(abs_top_srcdir)/test/jtreg; \
-+	 $(BOOT_DIR)/bin/jar cfm $(abs_top_builddir)/test/jtreg.jar \
-+	   META-INF/MANIFEST.MF \
-+	   legal  README JavaTest.cmdMgrs.lst JavaTest.toolMgrs.lst \
-+	   `find com -type f -a -not -name '*.java'` \
-+	   -C $(abs_top_builddir)/test/jtreg/classes com)
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-jtreg:
-+	rm -rf test/jtreg/classes
-+	if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
-+	  if [ -e test/jtreg ] ; then \
-+	    rmdir test/jtreg ; \
-+	  fi ; \
-+	fi
-+	rm -f test/jtreg.jar
-+	rm -f stamps/jtreg.stamp
-+
-+check-hotspot: stamps/jtreg.stamp
-+	mkdir -p test/hotspot/JTwork test/hotspot/JTreport
-+	$(BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
-+		-w:test/hotspot/JTwork -r:test/hotspot/JTreport \
-+		-jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
-+		$(ICEDTEA_JTREG_OPTIONS) \
-+		`pwd`/openjdk/hotspot/test \
-+	    | tee test/$@.log
-+
-+check-langtools: stamps/jtreg.stamp
-+	mkdir -p test/langtools/JTwork test/langtools/JTreport
-+	$(BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
-+		-w:test/langtools/JTwork -r:test/langtools/JTreport \
-+		$${ICEDTEA_JTREG_OTHERVM:--samevm} \
-+		-jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
-+		$(ICEDTEA_JTREG_OPTIONS) \
-+		-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.langtools.jtx \
-+		`pwd`/openjdk/langtools/test \
-+	    | tee test/$@.log
-+
-+check-jdk: stamps/jtreg.stamp
-+	mkdir -p test/jdk/JTwork test/jdk/JTreport
-+@ENABLE_CACAO_TRUE@	CACAO_EXCLUDE="-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.cacao.jtx"
-+	if test "x$${DISPLAY}" = "x"; then XVFB_RUN="@XVFB_RUN_CMD@"; fi; \
-+	if test "x$${DISPLAY}" = "x" && test "x$${XVFB_RUN}" = "x"; then \
-+		echo "WARNING: DISPLAY not set and xvfb-run not found"; \
-+	fi; \
-+	$${XVFB_RUN} \
-+	$(BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
-+		-w:test/jdk/JTwork -r:test/jdk/JTreport \
-+		$${ICEDTEA_JTREG_OTHERVM:--samevm} \
-+		-jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
-+		$(ICEDTEA_JTREG_OPTIONS) $(CACAO_EXCLUDE) \
-+		-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.jtx \
-+		`pwd`/openjdk/jdk/test \
-+	    | tee test/$@.log
-+
-+clean-jtreg-reports:
-+	rm -rf test/hotspot test/langtools test/jdk
-+	rm -f test/check-*.log test/jtreg-summary.log
-+
-+jtregcheck: $(TESTS_TO_RUN)
-+	for i in $(TEST_SUITES); do \
-+	  echo "--------------- jtreg console summary for $$i ---------------"; \
-+	  egrep -v '^(Passed:|Directory|Re[a-z]+\ written\ to)' test/check-$$i.log; \
-+	done | tee test/jtreg-summary.log
-+
-+	: # kill testsuite processes still hanging
-+	@pids=$$($(jtreg_pids)); \
-+	if [ -n "$$pids" ]; then \
-+	  echo "killing processes..."; \
-+	  $(jtreg_processes); \
-+	  kill -1 $$pids; \
-+	  sleep 2; \
-+	  pids=$$($(jtreg_pids)); \
-+	  if [ -n "$$pids" ]; then \
-+	    echo "try harder..."; \
-+	    $(jtreg_processes); \
-+	    kill -9 $$pids; \
-+	    sleep 2; \
-+	  fi; \
-+	else \
-+	  echo "nothing to cleanup"; \
-+	fi; \
-+	pids=$$($(jtreg_pids)); \
-+	if [ -n "$$pids" ]; then \
-+	  echo "leftover processes..."; \
-+	  $(jtreg_processes); \
-+	fi
-+
-+check-tapset-probes: 
-+@ENABLE_SYSTEMTAP_TRUE@	$(abs_top_srcdir)/test/tapset/jstaptest.pl \
-+@ENABLE_SYSTEMTAP_TRUE@	  -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \
-+@ENABLE_SYSTEMTAP_TRUE@	  -S $(abs_top_srcdir)/test/tapset \
-+@ENABLE_SYSTEMTAP_TRUE@	  -a test/check-stap.log -p
-+check-tapset-jstack: 
-+@ENABLE_SYSTEMTAP_TRUE@	$(abs_top_srcdir)/test/tapset/jstaptest.pl \
-+@ENABLE_SYSTEMTAP_TRUE@	  -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \
-+@ENABLE_SYSTEMTAP_TRUE@	  -S $(abs_top_srcdir)/test/tapset \
-+@ENABLE_SYSTEMTAP_TRUE@	  -a test/check-stap.log -j
-+check-tapset: check-tapset-probes check-tapset-jstack
-+
-+clean-tapset-report:
-+@ENABLE_SYSTEMTAP_TRUE@	rm -f test/check-stap.log
-+
-+# Support classes for non-OpenJDK bootstraps
-+
-+rt-source-files.txt: $(OPENJDK_BOOT_TREE)
-+	rm -f $@
-+	for files in $(ICEDTEA_BOOTSTRAP_CLASSES) ; \
-+	do \
-+	  echo $$files >> $@ ; \
-+	done
-+	touch $@
-+
-+stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt
-+	mkdir -p lib/rt
-+	if echo $(ICEDTEA_BOOTSTRAP_CLASSES) | grep '\S' &> /dev/null ; then \
-+	  $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d lib/rt \
-+	    -classpath $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
-+            -sourcepath '$(SOURCEPATH_DIRS)' \
-+            -bootclasspath \'\' @rt-source-files.txt ; \
-+	fi
-+	mkdir -p stamps
-+	touch $@
-+
-+stamps/rt.stamp: stamps/rt-class-files.stamp
-+	if echo $(ICEDTEA_BOOTSTRAP_CLASSES) | grep '\S' &> /dev/null ; then \
-+	  (set -e ; \
-+	   cd lib/rt ; \
-+	   for dirs in $(ICEDTEA_BOOTSTRAP_RESOURCES) ; \
-+	     do \
-+	     destpath=`echo $$dirs|sed -e 's#$(LANGTOOLS)/##' -e 's#$(SHARE)/##'` ; \
-+	     mkdir -p `dirname $$destpath` ; \
-+	     cp -a ../../$$dirs $$destpath ; \
-+	   done ; \
-+	   if [ -w $(STAGE1_BOOT_RUNTIME) ] ; then \
-+	     $(ZIP) -qur $(STAGE1_BOOT_RUNTIME) com java javax sun ; \
-+	   fi ; ) \
-+	fi
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-rt:
-+	rm -rf lib/rt
-+	rm -f stamps/rt-class-files.stamp stamps/rt.stamp
-+	rm -f rt-source-files.txt
-+	if [ -e $(STAGE1_BOOT_DIR)/jre/lib ] ; then \
-+	  cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_RUNTIME) ; \
-+	  chmod u+w $(STAGE1_BOOT_RUNTIME) ; \
-+	fi
-+
-+# Crypto Level Check
-+
-+stamps/cryptocheck.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
-+	mkdir -p $(CRYPTO_CHECK_BUILD_DIR)
-+	$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-+	  -d $(CRYPTO_CHECK_BUILD_DIR) $(CRYPTO_CHECK_SRCS)
-+	mkdir -p stamps
-+	touch $@
-+
-+clean-cryptocheck:
-+	rm -rf $(CRYPTO_CHECK_BUILD_DIR)
-+	rm -f stamps/cryptocheck.stamp
-+
-+# Target Aliases
-+# ===============
-+
-+add-archive: stamps/add-archive.stamp
-+
-+add-archive-boot: stamps/add-archive-ecj.stamp
-+
-+add-archive-debug: stamps/add-archive-debug.stamp
-+
-+add-nss: stamps/add-nss.stamp
-+
-+add-nss-debug: stamps/add-nss-debug.stamp
-+
-+add-pulseaudio: stamps/add-pulseaudio.stamp
-+
-+add-pulseaudio-debug: stamps/add-pulseaudio-debug.stamp
-+
-+add-systemtap: stamps/add-systemtap.stamp
-+
-+add-systemtap-debug: stamps/add-systemtap-debug.stamp
-+
-+add-tzdata-support: stamps/add-tzdata-support.stamp
-+
-+add-tzdata-support-debug: stamps/add-tzdata-support-debug.stamp
-+
-+add-zero: stamps/add-zero.stamp
-+
-+add-zero-debug: stamps/add-zero-debug.stamp
-+
-+bootstrap-directory-stage1: stamps/bootstrap-directory-stage1.stamp
-+
-+bootstrap-directory-stage2: stamps/bootstrap-directory-stage2.stamp
-+
-+bootstrap-directory-symlink-stage1: stamps/bootstrap-directory-symlink-stage1.stamp
-+
-+bootstrap-directory-symlink-stage2: stamps/bootstrap-directory-symlink-stage2.stamp
-+
-+cacao: stamps/cacao.stamp
-+
-+check-crypto: stamps/check-crypto.stamp
-+
-+check-crypto-boot: stamps/check-crypto-boot.stamp
-+
-+check-crypto-debug: stamps/check-crypto-debug.stamp
-+
-+clone-boot: stamps/clone-boot.stamp
-+
-+cryptocheck: stamps/cryptocheck.stamp
-+
-+download: stamps/download.stamp
-+
-+download-cacao: stamps/download-cacao.stamp
-+
-+download-jamvm: stamps/download-jamvm.stamp
-+
-+download-jaf-drop: stamps/download-jaf-drop.stamp
-+
-+download-jaxp-drop: stamps/download-jaxp-drop.stamp
-+
-+download-jaxws-drop: stamps/download-jaxws-drop.stamp
-+
-+download-openjdk: stamps/download-openjdk.stamp
-+
-+extract: stamps/extract.stamp
-+
-+extract-cacao: stamps/extract-cacao.stamp
-+
-+extract-openjdk: stamps/extract-openjdk.stamp
-+
-+extract-hotspot: stamps/extract-hotspot.stamp
-+
-+generated: stamps/generated.stamp
-+
-+icedtea: stamps/icedtea.stamp
-+
-+icedtea-boot: stamps/icedtea-boot.stamp
-+
-+icedtea-debug: stamps/icedtea-debug.stamp
-+
-+icedtea-debug-stage2: stamps/icedtea-debug-stage2.stamp
-+
-+icedtea-stage1: stamps/icedtea-stage1.stamp
-+
-+icedtea-stage2: stamps/icedtea-stage2.stamp
-+
-+jamvm: stamps/jamvm.stamp
-+
-+jtreg: stamps/jtreg.stamp
-+
-+native-ecj: stamps/native-ecj.stamp
-+
-+overlay: stamps/overlay.stamp
-+
-+patch: stamps/patch.stamp
-+
-+patch-boot: stamps/patch-boot.stamp
-+
-+patch-fsg: stamps/patch-fsg.stamp
-+
-+pulse-java: $(PULSE_JAVA_TARGET)
-+
-+rewriter: stamps/rewriter.stamp
-+
-+rewrite-rhino: stamps/rewrite-rhino.stamp
-+
-+rt: stamps/rt.stamp
-+
-+rt-class-files: stamps/rt-class-files.stamp
-+
-+sanitise-openjdk: stamps/sanitise-openjdk.stamp
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -Nur icedtea-2.4.5.orig/patches/openadk.patch icedtea-2.4.5/patches/openadk.patch
---- icedtea-2.4.5.orig/patches/openadk.patch	1970-01-01 01:00:00.000000000 +0100
-+++ icedtea-2.4.5/patches/openadk.patch	2014-02-12 12:48:40.000000000 +0100
+diff -Nur icedtea-2.4.7.orig/patches/openadk.patch icedtea-2.4.7/patches/openadk.patch
+--- icedtea-2.4.7.orig/patches/openadk.patch	1970-01-01 01:00:00.000000000 +0100
++++ icedtea-2.4.7/patches/openadk.patch	2014-05-01 20:04:14.470603940 +0200
 @@ -0,0 +1,687 @@
 +diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
 +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2014-01-28 18:58:08.000000000 +0100
@@ -3770,8 +579,8 @@ diff -Nur icedtea-2.4.5.orig/patches/openadk.patch icedtea-2.4.5/patches/openadk
 + ifndef JDK_TOPDIR
 +   JDK_TOPDIR=$(TOPDIR)/jdk
 +diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make openjdk-boot/hotspot/make/linux/makefiles/vm.make
-+--- openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make	2014-01-28 18:58:08.000000000 +0100
-++++ openjdk-boot/hotspot/make/linux/makefiles/vm.make	2014-02-10 18:33:11.000000000 +0100
++--- openjdk-boot.orig/hotspot/make/linux/makefiles/vm.make	2014-02-20 19:51:45.000000000 +0100
+++++ openjdk-boot/hotspot/make/linux/makefiles/vm.make	2014-05-01 20:03:03.677930438 +0200
 +@@ -288,7 +288,7 @@
 +   LIBS_VM                  += $(LIBS)
 + endif
@@ -3782,8 +591,8 @@ diff -Nur icedtea-2.4.5.orig/patches/openadk.patch icedtea-2.4.5/patches/openadk
 + endif
 + 
 +diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make openjdk-boot/hotspot/make/linux/makefiles/zero.make
-+--- openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make	2014-01-28 18:58:08.000000000 +0100
-++++ openjdk-boot/hotspot/make/linux/makefiles/zero.make	2014-02-11 17:33:53.000000000 +0100
++--- openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make	2014-02-20 19:51:45.000000000 +0100
+++++ openjdk-boot/hotspot/make/linux/makefiles/zero.make	2014-05-01 20:03:03.677930438 +0200
 +@@ -33,4 +33,4 @@
 + 
 + # Make sure libffi is included
@@ -3791,8 +600,8 @@ diff -Nur icedtea-2.4.5.orig/patches/openadk.patch icedtea-2.4.5/patches/openadk
 +-LIBS_VM += $(LIBFFI_LIBS)
 ++LIBS_VM += $(FFI_LDFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic
 +diff -Nur openjdk-boot.orig/jdk/make/common/Sanity.gmk openjdk-boot/jdk/make/common/Sanity.gmk
-+--- openjdk-boot.orig/jdk/make/common/Sanity.gmk	2014-01-28 19:02:26.000000000 +0100
-++++ openjdk-boot/jdk/make/common/Sanity.gmk	2014-02-11 14:46:04.000000000 +0100
++--- openjdk-boot.orig/jdk/make/common/Sanity.gmk	2014-04-12 01:23:06.000000000 +0200
+++++ openjdk-boot/jdk/make/common/Sanity.gmk	2014-05-01 20:03:03.677930438 +0200
 +@@ -91,8 +91,7 @@
 +     sane-ld_run_path \
 +     sane-alt_bootdir \
@@ -3804,8 +613,8 @@ diff -Nur icedtea-2.4.5.orig/patches/openadk.patch icedtea-2.4.5/patches/openadk
 + ifdef OPENJDK
 + sanity-all:: sane-freetype 
 +diff -Nur openjdk-boot.orig/jdk/make/common/shared/Sanity.gmk openjdk-boot/jdk/make/common/shared/Sanity.gmk
-+--- openjdk-boot.orig/jdk/make/common/shared/Sanity.gmk	2014-01-28 19:02:26.000000000 +0100
-++++ openjdk-boot/jdk/make/common/shared/Sanity.gmk	2014-02-11 14:45:37.000000000 +0100
++--- openjdk-boot.orig/jdk/make/common/shared/Sanity.gmk	2014-04-12 01:23:06.000000000 +0200
+++++ openjdk-boot/jdk/make/common/shared/Sanity.gmk	2014-05-01 20:03:03.681930476 +0200
 +@@ -114,11 +114,6 @@
 +     elif [ -f /etc/lsb-release ] ; then \
 +       $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \
@@ -3863,9 +672,9 @@ diff -Nur icedtea-2.4.5.orig/patches/openadk.patch icedtea-2.4.5/patches/openadk
 + $(SANITY_FILES):
 + 	-@$(prep-target)
 +diff -Nur openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk openjdk-boot/jdk/make/sun/awt/mawt.gmk
-+--- openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk	2014-01-28 19:02:26.000000000 +0100
-++++ openjdk-boot/jdk/make/sun/awt/mawt.gmk	2014-02-10 18:28:56.000000000 +0100
-+@@ -269,12 +269,6 @@
++--- openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk	2014-04-12 01:23:06.000000000 +0200
+++++ openjdk-boot/jdk/make/sun/awt/mawt.gmk	2014-05-01 20:03:03.681930476 +0200
++@@ -270,12 +270,6 @@
 + endif # !HEADLESS
 + endif # PLATFORM
 + 
@@ -3879,8 +688,8 @@ diff -Nur icedtea-2.4.5.orig/patches/openadk.patch icedtea-2.4.5/patches/openadk
 +   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
 +               -I$(OPENWIN_HOME)/include 
 +diff -Nur openjdk-boot.orig/Makefile openjdk-boot/Makefile
-+--- openjdk-boot.orig/Makefile	2014-01-17 21:22:44.000000000 +0100
-++++ openjdk-boot/Makefile	2014-02-10 18:28:56.000000000 +0100
++--- openjdk-boot.orig/Makefile	2014-04-04 19:44:40.000000000 +0200
+++++ openjdk-boot/Makefile	2014-05-01 20:02:54.549843414 +0200
 +@@ -53,9 +53,7 @@
 + REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
 + REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
-- 
cgit v1.2.3


From 65fb15bb8a69aa1669076d22671f1e8c7b43d9a6 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 2 May 2014 09:51:49 +0200
Subject: fix runtime dependency

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

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 4a2a48d30..51447c31e 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -40,7 +40,7 @@ PKGSC_SWAP_UTILS:=	core
 PKGSD_LOSETUP:=		loop devices management utilities
 PKGSS_LOSETUP:=		kmod-blk-dev-loop
 PKGSD_MOUNT:=		mount/umount utilities
-PKGSS_MOUNT:=		libblkid libmount libuuid
+PKGSS_MOUNT:=		libblkid libmount libuuid libncurses
 PKGSC_MOUNT:=		core
 PKGSD_MCOOKIE:=		generate magic cookies for xauth
 PKGSC_MCOOKIE:=		x11/apps
-- 
cgit v1.2.3


From 62b708ebe8ee50d9aa18ca4d98d6dc8363d03163 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 2 May 2014 10:31:32 +0200
Subject: pam required, fix distfiles

---
 package/classpath/Makefile  | 2 ++
 package/fastjar/Makefile    | 2 ++
 package/util-linux/Makefile | 3 +--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/classpath/Makefile b/package/classpath/Makefile
index dd983288e..4475acf02 100644
--- a/package/classpath/Makefile
+++ b/package/classpath/Makefile
@@ -14,6 +14,8 @@ PKG_DEPENDS:=		libgtk gdk-pixbuf orbit2 gconf
 PKG_URL:=		http://www.gnu.org/software/classpath/home.html
 PKG_SITES:=		${MASTER_SITE_GNU:=classpath/}
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+
 PKG_HOST_DEPENDS:=	linux
 PKG_ARCH_DEPENDS:=	!arm
 
diff --git a/package/fastjar/Makefile b/package/fastjar/Makefile
index fe73820fa..d8e54584a 100644
--- a/package/fastjar/Makefile
+++ b/package/fastjar/Makefile
@@ -11,6 +11,8 @@ PKG_DESCR:=		fastjar utility
 PKG_SECTION:=		lang
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fastjar/}
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+
 PKG_CFLINE_FASTJAR:=	depends on ADK_HOST_ONLY
 
 include $(TOPDIR)/mk/host.mk
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 51447c31e..118d48101 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		3f191727a0d28f7204b755cf1b6ea0aa
 PKG_DESCR:=		basic Linux utilities (also provided by busybox)
 PKG_SECTION:=		core
-PKG_BUILDDEP:=		ncurses
+PKG_BUILDDEP:=		ncurses pam
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/util-linux/v2.24/
 PKG_NOPARALLEL:=	1
 PKG_OPTS:=		dev
@@ -32,7 +32,6 @@ PKGSC_SFDISK:=		fs
 PKGSD_CFDISK:=		partition table manipulation utility
 PKGSC_CFDISK:=		fs
 PKGSD_SU:=		switch user utility
-PKGSB_SU:=		pam
 PKGSC_SU:=		core
 PKGSD_SWAP_UTILS:=	swap space management utilities
 PKGSS_SWAP_UTILS:=	libblkid
-- 
cgit v1.2.3


From bf7978f2f3ac4a6ec72aacf752557db689a9b9c2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 2 May 2014 16:44:47 +0200
Subject: some bits for audio support on cubox

---
 mk/modules.mk                       |  6 ++++++
 target/linux/config/Config.in.audio | 27 ++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/mk/modules.mk b/mk/modules.mk
index 59f609cc8..cc862cc13 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1238,6 +1238,12 @@ $(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
 	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \
 ,55, kmod-snd-soc))
 
+$(eval $(call KMOD_template,SND_IMX_SOC,snd-imx-soc,\
+	$(MODULES_DIR)/kernel/sound/soc/fsl/imx-pcm-dma \
+	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-fsl-spdif \
+	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-imx-spdif \
+,55, kmod-snd-soc))
+
 $(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\
 	$(MODULES_DIR)/kernel/sound/arm/snd-bcm2835 \
 ,55))
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index d228feb96..b618c59b7 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -10,6 +10,18 @@ config ADK_KERNEL_SND_PCI
 config ADK_KERNEL_SND_USB
 	boolean
 
+config ADK_KERNEL_SND_SOC_IMX_PCM_DMA
+	boolean
+
+config ADK_KERNEL_SND_SOC_IMX_HDMI_DMA
+	boolean
+
+config ADK_KERNEL_SND_SOC_IMX_SPDIF
+	boolean
+
+config ADK_KERNEL_SND_SOC_IMX_HDMI
+	boolean
+
 config ADK_KERNEL_SND_PXA2XX_AC97
 	boolean
 
@@ -124,7 +136,7 @@ config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
 	select ADK_KPACKAGE_KMOD_SND
 	select ADK_KERNEL_SND_ARM
 	select ADK_KPACKAGE_KMOD_SND_SOC
-	select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_34
+	select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_37
 	select ADK_KPACKAGE_KMOD_SND_COMPRESS
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
@@ -147,4 +159,17 @@ config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DIGI
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
+config ADK_KPACKAGE_KMOD_SND_IMX_SOC
+	prompt "Cubox-i SoC sound chip"
+	tristate
+	depends on ADK_TARGET_SYSTEM_CUBOX_I
+	select ADK_KPACKAGE_KMOD_SND
+	select ADK_KPACKAGE_KMOD_SND_SOC
+	select ADK_KERNEL_SND_SOC_IMX_PCM_DMA
+	select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA
+	select ADK_KERNEL_SND_SOC_IMX_HDMI
+	select ADK_KERNEL_SND_SOC_IMX_SPDIF
+	default y if ADK_TARGET_SYSTEM_CUBOX_I
+	default n
+
 endmenu
-- 
cgit v1.2.3


From 0bf75a65b68aaea449e80998275891b4335c4edb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 3 May 2014 12:52:16 +0200
Subject: revert, breaks libxml2-python, which needs scripts before usr/bin

---
 mk/vars.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/vars.mk b/mk/vars.mk
index 19c43dbf3..96a42592d 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -53,7 +53,7 @@ PACKAGE_DIR:=		$(FW_DIR)/packages
 SCRIPT_TARGET_DIR:=	${STAGING_TARGET_DIR}/scripts
 
 # PATH variables
-TARGET_PATH=		${SCRIPT_DIR}:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${TOOLCHAIN_DIR}/usr/bin:${_PATH}
+TARGET_PATH=		${SCRIPT_DIR}:${STAGING_TARGET_DIR}/scripts:${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
 HOST_PATH=		${SCRIPT_DIR}:${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
 AUTOTOOL_PATH=		${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH}
 
-- 
cgit v1.2.3


From 8ef4280d81f36492720c569803aec5da5e321a22 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 3 May 2014 12:56:51 +0200
Subject: add openjdk7 and pam to hudson build

---
 mk/build.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mk/build.mk b/mk/build.mk
index bc1ce477b..339136238 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -22,7 +22,6 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_BASE_FILES=y \
 			ADK_PACKAGE_E2FSCK_STATIC=n \
 			ADK_PACKAGE_KEXECINIT=n \
-			ADK_PACKAGE_INSTALLER=n \
 			ADK_PACKAGE_LM_SENSORS_DETECT=n \
 			ADK_PACKAGE_PACEMAKER=n \
 			ADK_PACKAGE_PACEMAKER_MGMTD=n \
@@ -31,12 +30,10 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_GRUB=n \
 			ADK_PACKAGE_U_BOOT=n \
 			ADK_PACKAGE_CRYPTINIT=n \
-			ADK_PACKAGE_PAM=n \
 			ADK_PACKAGE_VIRTINST=n \
 			ADK_PACKAGE_URLGRABBER=n \
 			ADK_PACKAGE_LIBSSP=n \
 			ADK_PACKAGE_OPENAFS=n \
-			ADK_PACKAGE_OPENJDK7=n \
 			ADK_PKG_XORG=n \
 			ADK_PKG_CONSOLE=n \
 			ADK_PKG_TEST=n \
-- 
cgit v1.2.3


From 5d154bde3abbae5a275b3627c5f5dbbcc9b6d55b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 3 May 2014 13:00:17 +0200
Subject: as discussed with phil, do not default toolchain to a specific cpu,
 we have -fhonour-copts, to detect when CFLAGS are not used

---
 toolchain/gcc/Makefile | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 7616f2ab3..0d309b60f 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -87,29 +87,6 @@ else
 GCC_CONFOPTS+=		--enable-target-optspace
 endif
 
-ifeq ($(ARCH),arm)
-GCC_CONFOPTS+=		--with-float=$(ADK_TARGET_FLOAT)
-ifneq ($(ADK_TARGET_FPU),)
-GCC_CONFOPTS+=		--with-fpu=$(ADK_TARGET_FPU)
-endif
-endif
-
-ifeq ($(ADK_CPU_ARM926EJ_S),y)
-GCC_CONFOPTS+=          --with-arch=armv5te --with-tune=arm1176jzf-s
-endif
-
-ifeq ($(ADK_CPU_ARM1176JZF_S),y)
-GCC_CONFOPTS+=          --with-arch=armv6 --with-tune=arm1176jzf-s
-endif
-
-ifeq ($(ADK_CPU_CORTEX_A9),y)
-GCC_CONFOPTS+=          --with-arch=armv7-a --with-tune=cortex-a9
-endif
-
-ifeq ($(ADK_CPU_SPARC_V9),y)
-GCC_CONFOPTS+=          --with-cpu=ultrasparc
-endif
-
 ifneq ($(ADK_TARGET_MIPS_ABI),)
 GCC_CONFOPTS+=		--with-abi=${ADK_TARGET_MIPS_ABI}
 endif
-- 
cgit v1.2.3


From 5941e062d3925fb97f2cc144b031299671e69558 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 3 May 2014 13:13:42 +0200
Subject: enable mksh, when not installed on the host

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

diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index 9bb713f6e..3b6ada91e 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -233,6 +233,12 @@ if ! which m4 >/dev/null 2>&1; then
 	host_build_m4=1
 fi
 
+host_build_mksh=0
+if ! which mksh >/dev/null 2>&1; then
+	echo "No mksh found, will build one."
+	host_build_mksh=1
+fi
+
 host_build_patch=0
 if ! which patch >/dev/null 2>&1; then
 	echo "No patch found, will build one."
@@ -317,6 +323,7 @@ if [ $host_build_bzip2 -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_BZIP2
 if [ $host_build_file -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_FILE" >> $topdir/target/config/Config.in.prereq ;fi
 if [ $host_build_flex -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_FLEX" >> $topdir/target/config/Config.in.prereq ;fi
 if [ $host_build_m4 -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_M4" >> $topdir/target/config/Config.in.prereq ;fi
+if [ $host_build_mksh -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_MKSH" >> $topdir/target/config/Config.in.prereq ;fi
 if [ $host_build_patch -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_PATCH" >> $topdir/target/config/Config.in.prereq ;fi
 if [ $host_build_pkgconf -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_PKGCONF" >> $topdir/target/config/Config.in.prereq ;fi
 if [ $host_build_findutils -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_FINDUTILS" >> $topdir/target/config/Config.in.prereq ;fi
-- 
cgit v1.2.3


From b0e912f902203a6ad1fbd54587dc7841c2b1ad4f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 3 May 2014 13:20:27 +0200
Subject: reorder qemu config

---
 target/config/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/config/Config.in b/target/config/Config.in
index 8cc77b06c..47e0e5861 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -1,8 +1,6 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-source "target/config/Config.in.hardware"
-source "target/config/Config.in.qemu"
 
 config ADK_TARGET_KERNEL_VMLINUZ
 	boolean
@@ -75,6 +73,8 @@ config ADK_TOOLCHAIN
 
 source "target/config/Config.in.arch"
 source "target/config/Config.in.system"
+source "target/config/Config.in.hardware"
+source "target/config/Config.in.qemu"
 
 config ADK_LINUX_MIPS64
 	boolean
-- 
cgit v1.2.3


From aa7670cd6d2b560604f75ee93f08a37831c490ef Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 3 May 2014 11:07:02 +0000
Subject: require mksh for the update-patches helper script

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 mk/buildhlp.mk         | 2 +-
 scripts/update-patches | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index ed5c4b88c..7421ff866 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -107,7 +107,7 @@ endif
 	done
 	@toedit=$$(WRKDIST='${WRKDIST}' CURDIR=$$(pwd) \
 	    PATCH_LIST='patch-* *.patch' WRKDIR1='${WRKDIR}' \
-	    ${BASH} ${TOPDIR}/scripts/update-patches); \
+	    PATH='${HOST_PATH}' mksh ${TOPDIR}/scripts/update-patches); \
 	    if [[ -n $$toedit && $$toedit != FAIL ]]; then \
 		echo -n 'edit patches: '; read i; \
 		cd patches && $${VISUAL:-$${EDITOR:-vi}} $$toedit; \
diff --git a/scripts/update-patches b/scripts/update-patches
index f4303f841..8d7559a5c 100644
--- a/scripts/update-patches
+++ b/scripts/update-patches
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env mksh
 # Copyright (c) 2006
 #	Thorsten Glaser <tg@freewrt.org>
 #
-- 
cgit v1.2.3


From fabbb1de0cddf2f096261e95490b8436f9ba8e7c Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 3 May 2014 11:18:01 +0000
Subject: lots of quoting and cleanup for files with spaces in them (ugh)

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 scripts/update-patches | 78 ++++++++++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 35 deletions(-)

diff --git a/scripts/update-patches b/scripts/update-patches
index 8d7559a5c..7609fa34a 100644
--- a/scripts/update-patches
+++ b/scripts/update-patches
@@ -1,4 +1,7 @@
 #!/usr/bin/env mksh
+#-
+# Copyright (c) 2014
+#	Thorsten Glaser <tg@mirbsd.org>
 # Copyright (c) 2006
 #	Thorsten Glaser <tg@freewrt.org>
 #
@@ -24,15 +27,12 @@
 # damage or existence of a defect, except proven that it results out
 # of said person's immediate fault when using the work as intended.
 
-[[ -n $BASH_VERSION ]] && shopt -s extglob
-
-do_diff()
-{
+do_diff() {
 	local f1=$2/$1
 	local f2=$3/$1
 
 	if [[ ! -e $f1 ]]; then
-		[[ -d ${f1%/*}/. ]] || mkdir -p ${f1%/*}
+		[[ -d ${f1%/*}/. ]] || mkdir -p "${f1%/*}"
 		if [[ ! -s $f2 ]]; then
 			cat <<EOF
 --- $f1	(non-existant)
@@ -47,15 +47,18 @@ EOF
 	return $?
 }
 
+set -A accounted
+set -A edit
+
 TRANSFORM='sed s/[.+]/\\\\&/g'
 PATCHDIR=$CURDIR/patches
 EXTRADIR=$CURDIR/extra
 
-mkdir -p $PATCHDIR
+mkdir -p "$PATCHDIR"
 
 SUBDIST=${WRKDIST##${WRKDIR1}?(/)}
 if [[ -n $SUBDIST ]]; then
-	mv ${WRKDIR1}.orig/${SUBDIST} ${WRKDIR1}/${SUBDIST}.orig
+	mv "${WRKDIR1}.orig/${SUBDIST}" "${WRKDIR1}/${SUBDIST}.orig"
 	D_BASE=${WRKDIR1}
 	D_SUB=${SUBDIST}
 #	D_SUBP=$D_SUB
@@ -63,32 +66,32 @@ if [[ -n $SUBDIST ]]; then
 	D_CMP=$D_SUBP
 else
 	# WRKSRC == WRKDIR
-	D_BASE=$(dirname ${WRKDIR1})
-	D_SUB=$(basename ${WRKDIR1})
+	D_BASE=$(dirname "${WRKDIR1}")
+	D_SUB=$(basename "${WRKDIR1}")
 	D_SUBP=$D_SUB
 	D_CMP=
 fi
 ORGDIST=${D_BASE}/${D_SUB}.orig
 
 if [[ -e $WRKDIST/.patched-newfiles ]]; then
-	touch $ORGDIST/.patched-newfiles
+	touch "$ORGDIST/.patched-newfiles"
 	patch_newfiles=1
 else
 	patch_newfiles=0
 fi
 
 if [[ -e $WRKDIST/../.autoreconf_done ]]; then
-	touch $ORGDIST/.autoreconf_done
+	touch "$ORGDIST/.autoreconf_done"
 	ignore_autoconf=1
 else
 	ignore_autoconf=0
 fi
 
-DIFF_FLAGS="-adu -I \"^--- $(echo $D_SUBP.orig/ | $TRANSFORM)@@	.*\""
-DIFF_FLAGS="$DIFF_FLAGS -I \"^\+\+\+ $(echo $D_SUBP/ | $TRANSFORM)@@	.*\""
+DIFF_FLAGS="-adu -I \"^--- $(echo "$D_SUBP.orig/" | $TRANSFORM)@@	.*\""
+DIFF_FLAGS="$DIFF_FLAGS -I \"^\+\+\+ $(echo "$D_SUBP/" | $TRANSFORM)@@	.*\""
 
 for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
-	echo "DEBUG: $file" >> /tmp/debug
+	#echo "DEBUG: $file" >>/tmp/debug
 	[[ ! -e $ORGDIST/$file && $patch_newfiles = 0 ]] && continue
 	[[ $file = configure && $ignore_autoconf = 1 ]] && continue	
 	[[ $file = missing && $ignore_autoconf = 1 ]] && continue	
@@ -101,7 +104,7 @@ for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
 	cmp -s "$ORGDIST/$file" "$WRKDIST/$file" && continue
 	echo "Processing ${file}..." >&2
 	# look in patchdir for an existing patchfile matching this
-	cd $PATCHDIR
+	cd "$PATCHDIR"
 	for i in $PATCH_LIST; do
 		# Ignore non-files, or old backup
 		[[ ! -f $i || $i = *@(.orig|.rej|~) ]] && continue
@@ -109,14 +112,14 @@ for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
 		# Patch found. Is this the one?
 		if grep "^[+-][+-][+-] $D_CMP[^/]*/$file	" "$i" >/dev/null; then
 			# Multiple files in the diff?
-			if [ $(grep -c "^--- $D_CMP" "$i") -gt 1 -o \
-			    $(grep -c "^+++ $D_CMP" "$i") -gt 1 ]; then
+			if [[ $(grep -c "^--- $D_CMP" "$i") -gt 1 || \
+			    $(grep -c "^+++ $D_CMP" "$i") -gt 1 ]]; then
 				echo "Cannot process, $i contains patches" >&2
 				echo "to multiple files! Aborting." >&2
 				echo FAIL
 				[[ -n $SUBDIST ]] && mv \
-				    ${WRKDIR1}/${SUBDIST}.orig \
-				    ${WRKDIR1}.orig/${SUBDIST}
+				    "${WRKDIR1}/${SUBDIST}.orig" \
+				    "${WRKDIR1}.orig/${SUBDIST}"
 				exit 0
 			fi
 			# Multiple diffs with this file?
@@ -136,19 +139,19 @@ for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
 				echo "$pflst" >&2
 				echo FAIL
 				[[ -n $SUBDIST ]] && mv \
-				    ${WRKDIR1}/${SUBDIST}.orig \
-				    ${WRKDIR1}.orig/${SUBDIST}
+				    "${WRKDIR1}/${SUBDIST}.orig" \
+				    "${WRKDIR1}.orig/${SUBDIST}"
 				exit 0
 			fi
 			# No, process this patch
 
-			accounted="$accounted $i"
+			accounted+=("$i")
 			# found it, copy preamble before comparision
-			( sed -e "/^--- /,\$d" <$i; \
-			  cd $D_BASE && do_diff "$file" "$D_SUB.orig" "$D_SUB" \
+			( sed -e "/^--- /,\$d" <"$i"; \
+			  cd "$D_BASE" && do_diff "$file" "$D_SUB.orig" "$D_SUB" \
 			) >"$i.new"
 			# did it change ? mark it as changed
-			tfile="$(echo "$file" | $TRANSFORM)"
+			tfile=$(echo "$file" | $TRANSFORM)
 			if eval diff "$(echo "${DIFF_FLAGS}" \
 			    | sed "s#@@#${tfile}#g")" \
 			    "$i" "$i.new" 1>&2; then
@@ -157,30 +160,35 @@ for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
 				echo "Patch $i for $file updated" >&2
 				mv "$i" "$i.orig"
 				mv "$i.new" "$i"
-				edit="$edit $i"
+				edit+=("$i")
 			fi
 			continue 2
 		fi
 	done
 
 	# Build a sensible name for the new patch file
-	patchname=patch-$(echo "$file" | sed -e 's#[/. ]#_#g')
+	patchname=patch-$(echo "$file" | sed -e 's#[/.
- ]#_#g')
 	echo "No patch-* found for $file, creating $patchname" >&2
-	( cd $D_BASE && do_diff "$file" "$D_SUB.orig" "$D_SUB" ) >$patchname
-	edit="$edit $patchname"
-	accounted="$accounted $patchname"
+	( cd "$D_BASE" && do_diff "$file" "$D_SUB.orig" "$D_SUB" ) >"$patchname"
+	edit+=("$patchname")
+	accounted+=("$patchname")
 done
 
 # Verify all patches accounted for
-cd $PATCHDIR
+cd "$PATCHDIR"
 for i in *; do
 	[[ ! -f $i || $i = *@(.orig|.rej|~) ]] && continue
 	grep '^\\ No newline at end of file' $i >/dev/null \
 	    && echo "*** Patch $i needs manual intervention" >&2
-	[[ $accounted != *@($i)* ]] \
-	    && echo "*** Patch $i not accounted for" >&2
+	found=0
+	for j in "${accounted[@]}"; do
+		[[ $i = "$j" ]] || continue
+		found=1
+		break
+	done
+	(( found )) || echo "*** Patch $i not accounted for" >&2
 done
 
-echo $edit
-[[ -n $SUBDIST ]] && mv ${WRKDIR1}/${SUBDIST}.orig ${WRKDIR1}.orig/${SUBDIST}
+echo "${edit[@]}"
+[[ -n $SUBDIST ]] && mv "${WRKDIR1}/${SUBDIST}.orig" "${WRKDIR1}.orig/${SUBDIST}"
 exit 0
-- 
cgit v1.2.3


From fe8d93fb5856f5a60da3125b9a4c17c85d9b5edc Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 3 May 2014 11:21:27 +0000
Subject: =?UTF-8?q?more=20cleanup:=20echo=20=E2=86=92=20print?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 scripts/update-patches | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/scripts/update-patches b/scripts/update-patches
index 7609fa34a..b7e3d485d 100644
--- a/scripts/update-patches
+++ b/scripts/update-patches
@@ -87,11 +87,11 @@ else
 	ignore_autoconf=0
 fi
 
-DIFF_FLAGS="-adu -I \"^--- $(echo "$D_SUBP.orig/" | $TRANSFORM)@@	.*\""
-DIFF_FLAGS="$DIFF_FLAGS -I \"^\+\+\+ $(echo "$D_SUBP/" | $TRANSFORM)@@	.*\""
+DIFF_FLAGS="-adu -I \"^--- $(print -r -- "$D_SUBP.orig/" | $TRANSFORM)@@	.*\""
+DIFF_FLAGS="$DIFF_FLAGS -I \"^\+\+\+ $(print -r -- "$D_SUBP/" | $TRANSFORM)@@	.*\""
 
 for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
-	#echo "DEBUG: $file" >>/tmp/debug
+	#print -r -- "DEBUG: <$file>" >>/tmp/debug
 	[[ ! -e $ORGDIST/$file && $patch_newfiles = 0 ]] && continue
 	[[ $file = configure && $ignore_autoconf = 1 ]] && continue	
 	[[ $file = missing && $ignore_autoconf = 1 ]] && continue	
@@ -102,7 +102,7 @@ for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
 	[[ $file = config.h.in && $ignore_autoconf = 1 ]] && continue	
 	[[ $(basename $file) = Makefile.in && $ignore_autoconf = 1 ]] && continue	
 	cmp -s "$ORGDIST/$file" "$WRKDIST/$file" && continue
-	echo "Processing ${file}..." >&2
+	print -ru2 -- "Processing ${file}..."
 	# look in patchdir for an existing patchfile matching this
 	cd "$PATCHDIR"
 	for i in $PATCH_LIST; do
@@ -114,8 +114,8 @@ for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
 			# Multiple files in the diff?
 			if [[ $(grep -c "^--- $D_CMP" "$i") -gt 1 || \
 			    $(grep -c "^+++ $D_CMP" "$i") -gt 1 ]]; then
-				echo "Cannot process, $i contains patches" >&2
-				echo "to multiple files! Aborting." >&2
+				print -ru2 -- "Cannot process, $i contains patches"
+				print -ru2 -- "to multiple files! Aborting."
 				echo FAIL
 				[[ -n $SUBDIST ]] && mv \
 				    "${WRKDIR1}/${SUBDIST}.orig" \
@@ -134,9 +134,9 @@ for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
 				pflst="$pflst '$j'"
 			done
 			if (( n != 1 )); then
-				echo "Cannot process, file $file" >&2
-				echo "is contained in multiple patches:" >&2
-				echo "$pflst" >&2
+				print -ru2 -- "Cannot process, file $file"
+				print -ru2 -- "is contained in multiple patches:"
+				print -ru2 -- "$pflst"
 				echo FAIL
 				[[ -n $SUBDIST ]] && mv \
 				    "${WRKDIR1}/${SUBDIST}.orig" \
@@ -151,13 +151,12 @@ for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
 			  cd "$D_BASE" && do_diff "$file" "$D_SUB.orig" "$D_SUB" \
 			) >"$i.new"
 			# did it change ? mark it as changed
-			tfile=$(echo "$file" | $TRANSFORM)
-			if eval diff "$(echo "${DIFF_FLAGS}" \
-			    | sed "s#@@#${tfile}#g")" \
-			    "$i" "$i.new" 1>&2; then
+			tfile=$(print -r -- "$file" | $TRANSFORM)
+			if eval diff "$(print -r -- "${DIFF_FLAGS}" | sed \
+			    "s#@@#${tfile}#g")" "$i" "$i.new" 1>&2; then
 				rm "$i.new"
 			else
-				echo "Patch $i for $file updated" >&2
+				print -ru2 -- "Patch $i for $file updated"
 				mv "$i" "$i.orig"
 				mv "$i.new" "$i"
 				edit+=("$i")
@@ -167,8 +166,8 @@ for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
 	done
 
 	# Build a sensible name for the new patch file
-	patchname=patch-$(echo "$file" | sed -e 's#[/.
- ]#_#g')
-	echo "No patch-* found for $file, creating $patchname" >&2
+	patchname=patch-$(print -r -- "$file" | sed -e 's#[/.
- ]#_#g')
+	print -ru2 -- "No patch-* found for $file, creating $patchname"
 	( cd "$D_BASE" && do_diff "$file" "$D_SUB.orig" "$D_SUB" ) >"$patchname"
 	edit+=("$patchname")
 	accounted+=("$patchname")
@@ -178,17 +177,17 @@ done
 cd "$PATCHDIR"
 for i in *; do
 	[[ ! -f $i || $i = *@(.orig|.rej|~) ]] && continue
-	grep '^\\ No newline at end of file' $i >/dev/null \
-	    && echo "*** Patch $i needs manual intervention" >&2
+	grep '^\\ No newline at end of file' $i >/dev/null && \
+	    print -ru2 -- "*** Patch $i needs manual intervention"
 	found=0
 	for j in "${accounted[@]}"; do
 		[[ $i = "$j" ]] || continue
 		found=1
 		break
 	done
-	(( found )) || echo "*** Patch $i not accounted for" >&2
+	(( found )) || print -ru2 -- "*** Patch $i not accounted for"
 done
 
-echo "${edit[@]}"
+print -r -- "${edit[@]}"
 [[ -n $SUBDIST ]] && mv "${WRKDIR1}/${SUBDIST}.orig" "${WRKDIR1}.orig/${SUBDIST}"
 exit 0
-- 
cgit v1.2.3


From 166aa788c57b5f842f89787b7d22dc47bc746602 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 3 May 2014 11:29:42 +0000
Subject: move calling update-patches into a separate mksh script
 update-patches2 handling quoting much better

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 mk/buildhlp.mk          | 11 ++---------
 scripts/update-patches2 | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 scripts/update-patches2

diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 7421ff866..3262a25cb 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -105,14 +105,7 @@ endif
 			mv $$i.bak $$i; \
 		fi;\
 	done
-	@toedit=$$(WRKDIST='${WRKDIST}' CURDIR=$$(pwd) \
-	    PATCH_LIST='patch-* *.patch' WRKDIR1='${WRKDIR}' \
-	    PATH='${HOST_PATH}' mksh ${TOPDIR}/scripts/update-patches); \
-	    if [[ -n $$toedit && $$toedit != FAIL ]]; then \
-		echo -n 'edit patches: '; read i; \
-		cd patches && $${VISUAL:-$${EDITOR:-vi}} $$toedit; \
-	    fi; \
-	    rm -rf ${WRKDIR}.orig; \
-	    [[ $$toedit != FAIL ]]
+	@WRKDIST='${WRKDIST}' WRKDIR1='${WRKDIR}' \
+	    PATH='${HOST_PATH}' mksh ${TOPDIR}/scripts/update-patches2
 
 .PHONY: update-patches host-update-patches
diff --git a/scripts/update-patches2 b/scripts/update-patches2
new file mode 100644
index 000000000..8f8711af7
--- /dev/null
+++ b/scripts/update-patches2
@@ -0,0 +1,46 @@
+#!/usr/bin/env mksh
+#-
+# Copyright © 2014
+#	Thorsten Glaser <tg@mirbsd.org>
+#
+# Provided that these terms and disclaimer and all copyright notices
+# are retained or reproduced in an accompanying document, permission
+# is granted to deal in this work without restriction, including un‐
+# limited rights to use, publicly perform, distribute, sell, modify,
+# merge, give away, or sublicence.
+#
+# This work is provided “AS IS” and WITHOUT WARRANTY of any kind, to
+# the utmost extent permitted by applicable law, neither express nor
+# implied; without malicious intent or gross negligence. In no event
+# may a licensor, author or contributor be held liable for indirect,
+# direct, other damage, loss, or other issues arising in any way out
+# of dealing in the work, even if advised of the possibility of such
+# damage or existence of a defect, except proven that it results out
+# of said person’s immediate fault when using the work as intended.
+
+PATCH_LIST='patch-* *.patch'
+CURDIR=$PWD
+export CURDIR PATCH_LIST
+
+mksh "${TOPDIR}"/scripts/update-patches |&
+first=1
+set -A toedit
+while IFS= read -p -r; do
+	if (( first )); then
+		if [[ $REPLY = FAIL ]]; then
+			rm -rf "${WRKDIR1}.orig"
+			exit 1
+		fi
+		first=0
+	fi
+	toedit+=("$REPLY")
+done
+if (( !first )); then
+	print -n 'edit patches: '
+	read
+	cd patches
+	${VISUAL:-${EDITOR:-vi}} "${toedit[@]}"
+	cd ..
+fi
+rm -rf "${WRKDIR1}.orig"
+exit 0
-- 
cgit v1.2.3


From 0bb1dee8453d8d723263fe63c38781faf6cb2bc6 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 3 May 2014 11:31:56 +0000
Subject: proper quoting in GNUmakefile as well

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 mk/buildhlp.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 3262a25cb..bf3418b7c 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -1,6 +1,9 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
+shellescape='$(subst ','\'',$(1))'
+shellexport=$(1)=$(call shellescape,${$(1)})
+
 ifneq ($(strip ${PKG_SITES}),)
 ifeq ($(strip ${DISTFILES}),)
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
@@ -105,7 +108,9 @@ endif
 			mv $$i.bak $$i; \
 		fi;\
 	done
-	@WRKDIST='${WRKDIST}' WRKDIR1='${WRKDIR}' \
-	    PATH='${HOST_PATH}' mksh ${TOPDIR}/scripts/update-patches2
+	@WRKDIST=$(call shellescape,${WRKDIST}) \
+	    WRKDIR1=$(call shellescape,${WRKDIR}) \
+	    PATH=$(call shellescape,${HOST_PATH}) \
+	    mksh ${TOPDIR}/scripts/update-patches2
 
 .PHONY: update-patches host-update-patches
-- 
cgit v1.2.3


From 8a0005b61300850e11fe19202ccd2118736ec661 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 3 May 2014 11:36:16 +0000
Subject: pass patches NUL-terminated

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 scripts/update-patches  | 11 +++++++----
 scripts/update-patches2 |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/scripts/update-patches b/scripts/update-patches
index b7e3d485d..1d13a3901 100644
--- a/scripts/update-patches
+++ b/scripts/update-patches
@@ -116,7 +116,7 @@ for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
 			    $(grep -c "^+++ $D_CMP" "$i") -gt 1 ]]; then
 				print -ru2 -- "Cannot process, $i contains patches"
 				print -ru2 -- "to multiple files! Aborting."
-				echo FAIL
+				print -n 'FAIL\0'
 				[[ -n $SUBDIST ]] && mv \
 				    "${WRKDIR1}/${SUBDIST}.orig" \
 				    "${WRKDIR1}.orig/${SUBDIST}"
@@ -137,7 +137,7 @@ for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
 				print -ru2 -- "Cannot process, file $file"
 				print -ru2 -- "is contained in multiple patches:"
 				print -ru2 -- "$pflst"
-				echo FAIL
+				print -n 'FAIL\0'
 				[[ -n $SUBDIST ]] && mv \
 				    "${WRKDIR1}/${SUBDIST}.orig" \
 				    "${WRKDIR1}.orig/${SUBDIST}"
@@ -150,7 +150,7 @@ for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
 			( sed -e "/^--- /,\$d" <"$i"; \
 			  cd "$D_BASE" && do_diff "$file" "$D_SUB.orig" "$D_SUB" \
 			) >"$i.new"
-			# did it change ? mark it as changed
+			# did it change? mark it as changed
 			tfile=$(print -r -- "$file" | $TRANSFORM)
 			if eval diff "$(print -r -- "${DIFF_FLAGS}" | sed \
 			    "s#@@#${tfile}#g")" "$i" "$i.new" 1>&2; then
@@ -188,6 +188,9 @@ for i in *; do
 	(( found )) || print -ru2 -- "*** Patch $i not accounted for"
 done
 
-print -r -- "${edit[@]}"
+for i in "${edit[@]}"; do
+	print -nr -- "$i"
+	print -n '\0'
+done
 [[ -n $SUBDIST ]] && mv "${WRKDIR1}/${SUBDIST}.orig" "${WRKDIR1}.orig/${SUBDIST}"
 exit 0
diff --git a/scripts/update-patches2 b/scripts/update-patches2
index 8f8711af7..2b8349bcf 100644
--- a/scripts/update-patches2
+++ b/scripts/update-patches2
@@ -25,7 +25,7 @@ export CURDIR PATCH_LIST
 mksh "${TOPDIR}"/scripts/update-patches |&
 first=1
 set -A toedit
-while IFS= read -p -r; do
+while IFS= read -p -d '' -r; do
 	if (( first )); then
 		if [[ $REPLY = FAIL ]]; then
 			rm -rf "${WRKDIR1}.orig"
-- 
cgit v1.2.3


From 86e0e3c62349dfb43e66a78a57cf7110ef577a0f Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 3 May 2014 11:37:49 +0000
Subject: use find -print0 with proper shell handling

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 scripts/update-patches | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/update-patches b/scripts/update-patches
index 1d13a3901..ee580c5cf 100644
--- a/scripts/update-patches
+++ b/scripts/update-patches
@@ -90,7 +90,9 @@ fi
 DIFF_FLAGS="-adu -I \"^--- $(print -r -- "$D_SUBP.orig/" | $TRANSFORM)@@	.*\""
 DIFF_FLAGS="$DIFF_FLAGS -I \"^\+\+\+ $(print -r -- "$D_SUBP/" | $TRANSFORM)@@	.*\""
 
-for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
+(cd "${WRKDIST}"; find . -type f -print0) |&
+while IFS= read -p -d '' -r file; do
+	file=${file#./}
 	#print -r -- "DEBUG: <$file>" >>/tmp/debug
 	[[ ! -e $ORGDIST/$file && $patch_newfiles = 0 ]] && continue
 	[[ $file = configure && $ignore_autoconf = 1 ]] && continue	
-- 
cgit v1.2.3


From 15055071e180f96a4309bf93d7a6dc923fdad22f Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 3 May 2014 11:43:16 +0000
Subject: further optimisations

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 scripts/update-patches | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/scripts/update-patches b/scripts/update-patches
index ee580c5cf..438cba2e1 100644
--- a/scripts/update-patches
+++ b/scripts/update-patches
@@ -95,14 +95,16 @@ while IFS= read -p -d '' -r file; do
 	file=${file#./}
 	#print -r -- "DEBUG: <$file>" >>/tmp/debug
 	[[ ! -e $ORGDIST/$file && $patch_newfiles = 0 ]] && continue
-	[[ $file = configure && $ignore_autoconf = 1 ]] && continue	
-	[[ $file = missing && $ignore_autoconf = 1 ]] && continue	
-	[[ $file = depcomp && $ignore_autoconf = 1 ]] && continue	
-	[[ $file = install-sh && $ignore_autoconf = 1 ]] && continue	
-	[[ $file = aclocal.m4 && $ignore_autoconf = 1 ]] && continue	
-	[[ $file = INSTALL && $ignore_autoconf = 1 ]] && continue	
-	[[ $file = config.h.in && $ignore_autoconf = 1 ]] && continue	
-	[[ $(basename $file) = Makefile.in && $ignore_autoconf = 1 ]] && continue	
+	if (( ignore_autoconf )); then
+		[[ $file = configure ]] && continue
+		[[ $file = missing ]] && continue
+		[[ $file = depcomp ]] && continue
+		[[ $file = install-sh ]] && continue
+		[[ $file = aclocal.m4 ]] && continue
+		[[ $file = INSTALL ]] && continue
+		[[ $file = config.h.in ]] && continue
+		[[ ${file##*/} = Makefile.in ]] && continue
+	fi
 	cmp -s "$ORGDIST/$file" "$WRKDIST/$file" && continue
 	print -ru2 -- "Processing ${file}..."
 	# look in patchdir for an existing patchfile matching this
@@ -168,7 +170,7 @@ while IFS= read -p -d '' -r file; do
 	done
 
 	# Build a sensible name for the new patch file
-	patchname=patch-$(print -r -- "$file" | sed -e 's#[/.
- ]#_#g')
+	patchname=patch-${file//[\/.
- ]/_}
 	print -ru2 -- "No patch-* found for $file, creating $patchname"
 	( cd "$D_BASE" && do_diff "$file" "$D_SUB.orig" "$D_SUB" ) >"$patchname"
 	edit+=("$patchname")
@@ -179,7 +181,7 @@ done
 cd "$PATCHDIR"
 for i in *; do
 	[[ ! -f $i || $i = *@(.orig|.rej|~) ]] && continue
-	grep '^\\ No newline at end of file' $i >/dev/null && \
+	grep '^\\ No newline at end of file' "$i" >/dev/null && \
 	    print -ru2 -- "*** Patch $i needs manual intervention"
 	found=0
 	for j in "${accounted[@]}"; do
-- 
cgit v1.2.3


From b66aa23b5661650340eadfb619d305989f7f8eec Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 3 May 2014 13:00:26 +0000
Subject: delete old temporary files of previous run, in case it aborts

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 scripts/update-patches2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/update-patches2 b/scripts/update-patches2
index 2b8349bcf..5b95f33f9 100644
--- a/scripts/update-patches2
+++ b/scripts/update-patches2
@@ -22,6 +22,7 @@ PATCH_LIST='patch-* *.patch'
 CURDIR=$PWD
 export CURDIR PATCH_LIST
 
+rm -f patches/*.new
 mksh "${TOPDIR}"/scripts/update-patches |&
 first=1
 set -A toedit
-- 
cgit v1.2.3


From e8b64ae830c3b612899c496317329f09ab31e703 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 3 May 2014 13:01:07 +0000
Subject: =?UTF-8?q?quote=20more=20for=20=E2=80=9Cevil=E2=80=9D=20eval?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 scripts/update-patches | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update-patches b/scripts/update-patches
index 438cba2e1..3d5424ff0 100644
--- a/scripts/update-patches
+++ b/scripts/update-patches
@@ -157,7 +157,7 @@ while IFS= read -p -d '' -r file; do
 			# did it change? mark it as changed
 			tfile=$(print -r -- "$file" | $TRANSFORM)
 			if eval diff "$(print -r -- "${DIFF_FLAGS}" | sed \
-			    "s#@@#${tfile}#g")" "$i" "$i.new" 1>&2; then
+			    "s#@@#${tfile}#g")" '"$i" "$i.new"' 1>&2; then
 				rm "$i.new"
 			else
 				print -ru2 -- "Patch $i for $file updated"
-- 
cgit v1.2.3


From 5f2187e92c8d151b840454282fe390ebad030e35 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 3 May 2014 13:23:35 +0000
Subject: more flexible list of files to ignore when doing update-patches

e.g. for use with autoconf, but also for build-time generated
files that are part of the distfile

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 mk/buildhlp.mk         |  1 +
 mk/pkg-bottom.mk       |  5 +++++
 package/xbmc/Makefile  |  3 +++
 scripts/update-patches | 16 +++-------------
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index bf3418b7c..4a3baeaf2 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -111,6 +111,7 @@ endif
 	@WRKDIST=$(call shellescape,${WRKDIST}) \
 	    WRKDIR1=$(call shellescape,${WRKDIR}) \
 	    PATH=$(call shellescape,${HOST_PATH}) \
+	    $(call shellexport,DIFF_IGNOREFILES) \
 	    mksh ${TOPDIR}/scripts/update-patches2
 
 .PHONY: update-patches host-update-patches
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 2ccc6ff1e..bdc7104c3 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -267,3 +267,8 @@ ifeq (,$(filter noremove,${PKG_OPTS}))
 	fi
 endif
 	@rm -f '${STAGING_PKG_DIR}/${PKG_NAME}'
+
+ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE}))
+DIFF_IGNOREFILES?=	configure missing depcomp install-sh INSTALL \
+			aclocal.m4 config.h.in Makefile.in */Makefile.in
+endif
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index e8fc5cc40..138c17e10 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -37,6 +37,9 @@ PKG_LIBC_DEPENDS:=	glibc
 
 WRKDIST=		$(WRKDIR)/$(PKG_NAME)-$(PKG_VERSION)-Frodo
 
+DIFF_IGNOREFILES:=	configure missing depcomp install-sh INSTALL \
+			aclocal.m4 config.h.in */Makefile.in
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/scripts/update-patches b/scripts/update-patches
index 3d5424ff0..bf0f134ac 100644
--- a/scripts/update-patches
+++ b/scripts/update-patches
@@ -82,9 +82,6 @@ fi
 
 if [[ -e $WRKDIST/../.autoreconf_done ]]; then
 	touch "$ORGDIST/.autoreconf_done"
-	ignore_autoconf=1
-else
-	ignore_autoconf=0
 fi
 
 DIFF_FLAGS="-adu -I \"^--- $(print -r -- "$D_SUBP.orig/" | $TRANSFORM)@@	.*\""
@@ -95,16 +92,9 @@ while IFS= read -p -d '' -r file; do
 	file=${file#./}
 	#print -r -- "DEBUG: <$file>" >>/tmp/debug
 	[[ ! -e $ORGDIST/$file && $patch_newfiles = 0 ]] && continue
-	if (( ignore_autoconf )); then
-		[[ $file = configure ]] && continue
-		[[ $file = missing ]] && continue
-		[[ $file = depcomp ]] && continue
-		[[ $file = install-sh ]] && continue
-		[[ $file = aclocal.m4 ]] && continue
-		[[ $file = INSTALL ]] && continue
-		[[ $file = config.h.in ]] && continue
-		[[ ${file##*/} = Makefile.in ]] && continue
-	fi
+	for i in $DIFF_IGNOREFILES; do
+		[[ $file = $i ]] && continue
+	done
 	cmp -s "$ORGDIST/$file" "$WRKDIST/$file" && continue
 	print -ru2 -- "Processing ${file}..."
 	# look in patchdir for an existing patchfile matching this
-- 
cgit v1.2.3