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

BUGS

@@ -1 +1,3 @@
 - uclibc N64 ABI on mips64{,el} targets does not work, nptl fork problem
+- microblaze big endian: network card emulation fails
+- microblaze: qemu reboot not working

jtools/Makefile

@@ -1,30 +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
-
-TARGETS:=
-# jikes is for ant
-ifneq ($(ADK_PACKAGE_OPENJDK7),)
-TARGETS:=fastjar gcj ecj jikes classpath jamvm ant openjdk7
-endif
-
-TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
-TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
-
-all: install
-compile:
-install: $(TARGETS_INSTALL)
-clean: $(TARGETS_CLEAN)
-
-%-compile: $(TOOLS_BUILD_DIR)
-	$(TRACE) "jtools/$(patsubst %-compile,%,$@)/compile "
-	$(MAKE) -C $(patsubst %-compile,%,$@) compile
-
-%-install:
-	$(TRACE) "jtools/$(patsubst %-install,%,$@)/install "
-	$(MAKE) -C $(patsubst %-install,%,$@) install
-
-%-clean:
-	$(TRACE) "jtools/$(patsubst %-clean,%,$@)/clean "
-	$(MAKE) -C $(patsubst %-clean,%,$@) clean

jtools/ant/Makefile

@@ -1,33 +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:=		ant
-PKG_VERSION:=		1.8.4
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		c474fa9d0c35a24037c23b6e476862c1
-PKG_SITES:=		http://archive.apache.org/dist/ant/source/
-
-DISTFILES:=		apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2
-WRKDIST=		$(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION)
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ant
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
-	cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar
-	cp $(STAGING_JAVA_HOST_DIR)/usr/share/java/ecj.jar $(WRKBUILD)/lib/optional
-	cd ${WRKBUILD}; export BOOTJAVAC_OPTS="-bootclasspath $(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip" \
-		LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
-		JAVA_HOME=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm ; \
-		$(BASH) build.sh
-	touch $@
-
-${STAGING_JAVA_HOST_DIR}/usr/bin/ant: $(WRKBUILD)/.compiled
-	cd $(WRKBUILD)/dist; \
-	$(CP) bin/* $(STAGING_JAVA_HOST_DIR)/usr/bin ; \
-	$(CP) lib/* $(STAGING_JAVA_HOST_DIR)/usr/lib
-
-include $(TOPDIR)/mk/tools.mk

jtools/classpath/Makefile

@@ -1,42 +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:=		classpath
-PKG_VERSION:=		0.98
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		90c6571b8b0309e372faa0f9f6255ea9
-PKG_SITES:=		${MASTER_SITE_GNU:=classpath/}
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip
-
-CPENV:=	LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
-	PATH=${STAGING_JAVA_HOST_DIR}/usr/bin:$$PATH \
-	CLASSPATH=${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).jar
-
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	(cd $(WRKBUILD); env $(CPENV) ./configure --prefix=${STAGING_JAVA_HOST_DIR}/usr \
-		--disable-local-sockets \
-		--disable-alsa \
-		--disable-gconf-peer \
-		--disable-gtk-peer \
-		--disable-qt-peer \
-		--disable-dssi \
-		--disable-plugin \
-		--disable-examples \
-		--disable-gjdoc \
-		--with-jar=no \
-		--disable-Werror)
-	touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-	env $(CPENV) ${MAKE} -C ${WRKBUILD}
-	touch $@
-
-${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip: $(WRKBUILD)/.compiled
-	${MAKE} -C ${WRKBUILD} install
-
-include $(TOPDIR)/mk/tools.mk

jtools/ecj/Makefile

@@ -1,36 +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:=		ecj
-PKG_VERSION:=		1
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
-
-${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
-	env \
-		DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
-		LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
-		PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \
-	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -lgcj -O2 -findirect-dispatch \
-		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \
-		--main=org.eclipse.jdt.internal.compiler.batch.Main \
-		$(TOPDIR)/jtools_build/gcc-$(GCJ_VER)/ecj.jar
-	echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \$$@" > \
-		${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
-	chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
-	# put a wrapper for java here
-	mv ${STAGING_JAVA_HOST_DIR}/usr/bin/gij ${STAGING_JAVA_HOST_DIR}/usr/bin/gij.native
-	echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \
-		${STAGING_JAVA_HOST_DIR}/usr/bin/java
-	chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/java
-	echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \
-		${STAGING_JAVA_HOST_DIR}/usr/bin/gij
-	chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/gij
-
-include $(TOPDIR)/mk/tools.mk

jtools/fastjar/Makefile

@@ -1,27 +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:=		fastjar
-PKG_VERSION:=		0.94
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		14d4bdfac236e347d806c6743dba48c6
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fastjar/}
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/fastjar
-
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	(cd $(WRKBUILD); ./configure --prefix=/usr);
-	touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
-	touch $@
-
-${STAGING_JAVA_HOST_DIR}/usr/bin/fastjar: $(WRKBUILD)/.compiled
-	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
-
-include $(TOPDIR)/mk/tools.mk

jtools/files.needed

@@ -1,11 +0,0 @@
-cups.h;libcups
-jpeglib.h;libjpeg
-gif_lib.h;libgif
-png.h;libpng
-Xtos.h;libXt
-Xinerama.h;libXinerama
-Xrender.h;libXrender
-XTest.h;libXtst
-freetype.h;freetype
-asoundlib.h;libasound
-ffi.h;libffi

jtools/jamvm/Makefile

@@ -1,34 +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:=		jamvm
-PKG_VERSION:=		1.5.4
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		7654e9657691f5f09c4f481ed4686176
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm
-
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	cd $(WRKBUILD); env \
-               CC='${CC_FOR_BUILD}' \
-               CXX='${CXX_FOR_BUILD}' \
-           ./configure \
-               --prefix=$(STAGING_JAVA_HOST_DIR)/usr \
-               --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR)/usr
-	touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
-	touch $@
-
-${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm: $(WRKBUILD)/.compiled
-	${MAKE} -C ${WRKBUILD} install $(MAKE_TRACE)
-	ln -sf ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java
-	ln -sf ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java
-
-include $(TOPDIR)/mk/tools.mk

jtools/jikes/Makefile

@@ -1,31 +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:=		jikes
-PKG_VERSION:=		1.22
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		cda958c7fef6b43b803e1d1ef9afcb85
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/}
-
-DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes
-
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	(cd $(WRKBUILD); ./configure --prefix=/usr);
-	touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
-	touch $@
-
-${STAGING_JAVA_HOST_DIR}/usr/bin/jikes: $(WRKBUILD)/.compiled
-	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
-	$(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/javac
-	$(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/javac
-
-include $(TOPDIR)/mk/tools.mk

jtools/openjdk7/Makefile

@@ -1,58 +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:=		icedtea
-PKG_VERSION:=		2.3.12
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		9b3afa162021e3fca6161ba8f9f7dc11
-PKG_DESCR:=		OpenJDK 7 Java VM
-PKG_SECTION:=		lang
-PKG_URL:=		http://openjdk.org/
-PKG_SITES:=		http://icedtea.classpath.org/download/source/
-
-include ../rules.mk
-
-OPENJDK_NATIVE_ENV+=	JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).jar"
-OPENJDK_NATIVE_ENV+=	DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
-OPENJDK_NATIVE_ENV+=	LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
-OPENJDK_NATIVE_ENV+=	ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj PATH=$$PATH:$(STAGING_JAVA_HOST_DIR)/usr/bin
-OPENJDK_NATIVE_ENV+=	BOOTCLASSPATH="$(STAGING_JAVA_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip"
-
-install: ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java
-
-CONFIGURE_ARGS+=\
-		--enable-bootstrap \
-		--enable-zero \
-		--with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \
-		--with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/java \
-		--with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
-		--with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/java/ecj.jar \
-		--without-hotspot-build \
-                --disable-system-kerberos \
-                --disable-system-jpeg \
-                --disable-system-lcms \
-                --disable-system-zlib \
-                --disable-system-png \
-                --disable-system-gif \
-                --disable-system-gtk \
-                --disable-system-gio \
-                --disable-system-fontconfig \
-                --disable-compile-against-syscalls \
-		--without-rhino \
-		--disable-docs
-
-$(WRKDIST)/.configured: ${WRKDIST}/.prepared
-	(cd ${WRKBUILD}; export ${OPENJDK_NATIVE_ENV}; ./configure ${CONFIGURE_ARGS})
-	touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-	export ${OPENJDK_NATIVE_ENV}; $(MAKE) -C $(WRKBUILD) icedtea-boot
-	touch $@
-
-${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java: $(WRKBUILD)/.compiled
-	$(CP) $(WRKSRC)/openjdk.build-boot/j2sdk-image $(STAGING_JAVA_HOST_DIR)/bootstrap-jdk
-	touch $@
-
-include ${TOPDIR}/mk/pkg-bottom.mk

jtools/openjdk7/patches/openadk.patch

@@ -1,39 +0,0 @@
-diff -Nur icedtea-2.3.4.orig/Makefile.in icedtea-2.3.4/Makefile.in
---- icedtea-2.3.4.orig/Makefile.in	2013-01-15 10:44:02.000000000 +0100
-+++ icedtea-2.3.4/Makefile.in	2013-02-11 17:32:45.000000000 +0100
-@@ -640,7 +640,7 @@
- 	$(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES)
- 
- # Bootstrapping patches
--ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
-+ICEDTEA_BOOT_PATCHES = patches/topdir-openwrt.patch 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/ecj-fphexconstants.patch \
-@@ -2033,7 +2033,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 $(IT_CFLAGS) -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.3.4.orig/patches/topdir-openwrt.patch icedtea-2.3.4/patches/topdir-openwrt.patch
---- icedtea-2.3.4.orig/patches/topdir-openwrt.patch	1970-01-01 01:00:00.000000000 +0100
-+++ icedtea-2.3.4/patches/topdir-openwrt.patch	2013-02-12 09:37:29.000000000 +0100
-@@ -0,0 +1,14 @@
-+diff -Nur openjdk-boot.orig/Makefile icedtea7-forest-2-3-8bd8e70d4a03.2/Makefile
-+--- openjdk-boot.orig/Makefile	2013-01-14 23:24:55.000000000 +0100
-++++ openjdk-boot/Makefile	2013-02-11 17:28:22.000000000 +0100
-+@@ -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)
-+ 
-+-ifndef TOPDIR
-+-  TOPDIR:=.
-+-endif
-++TOPDIR:=.
-+ 
-+ ifndef JDK_TOPDIR
-+   JDK_TOPDIR=$(TOPDIR)/jdk

jtools/prereq.sh

@@ -1,27 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-# test for existing /usr/include/asm
-if [ ! -d "/usr/include/asm" ]; then
-	echo "ERROR: directory \"/usr/include/asm\" not found."
-	echo "on some systems this is name asm-generic."
-	echo "try to create a link to the asm directory with"
-	echo "\"ln -s /usr/include/asm-generic /usr/include/asm\""
-	exit 1
-fi
-
-# test if all files from the files.needed file are available
-for LINE in `cat files.needed`; do
-
-	FILE=`echo ${LINE} | awk -F ";" '{print $1}'`
-	LIB=`echo ${LINE} | awk -F ";" '{print $2}'`
-
-	#echo -n "looking for development files of \"${LIB}\"..."
-	FOUND=`find /usr/include /usr/lib -name "${FILE}" | wc -l`
-	if [ ${FOUND} -lt 1 ]; then
-		echo "not found!";
-		echo "Please install the development header files for the library \"${LIB}\"."
-		exit 1
-	fi
-	
-done

jtools/qemu/Makefile

@@ -1,32 +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:=		qemu
-PKG_VERSION:=		0.14.1
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		b6c713a8db638e173af53a62d5178640
-PKG_SITES:=		http://download.savannah.gnu.org/releases/qemu/
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/qemu-arm
-
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	(cd $(WRKBUILD); ./configure --prefix=/usr \
-				--host-cc=$(CC_FOR_BUILD) \
-				--disable-system \
-				--disable-sdl \
-				--target-list=arm-linux-user,i386-linux-user,mipsel-linux-user,x86_64-linux-user \
-	)
-	touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
-	touch $@
-
-${STAGING_JAVA_HOST_DIR}/usr/bin/qemu-arm: $(WRKBUILD)/.compiled
-	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
-
-include $(TOPDIR)/mk/tools.mk

jtools/rules.mk

@@ -1,8 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-WRKDIR_BASE=    ${JTOOLS_BUILD_DIR}
-WRKDIR=		${WRKDIR_BASE}
-GCJ_VER:=	4.7.3
-
-include ${TOPDIR}/mk/buildhlp.mk

mk/build.mk

@@ -22,11 +22,12 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_E2FSCK_STATIC=n \
 			ADK_PACKAGE_KEXECINIT=n \
 			ADK_PACKAGE_INSTALLER=n \
+			ADK_PACKAGE_HEIMDAL_SERVER=n \
+			ADK_PACKAGE_LIBHEIMDAL=n \
 			ADK_PACKAGE_LM_SENSORS_DETECT=n \
 			ADK_PACKAGE_PACEMAKER=n \
 			ADK_PACKAGE_PACEMAKER_MGMTD=n \
 			ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \
-			ADK_PACKAGE_OPENJDK7=n \
 			ADK_PACKAGE_CLASSPATH=n \
 			ADK_PACKAGE_GRUB=n \
 			ADK_PACKAGE_CRYPTINIT=n \
@@ -152,12 +153,12 @@ ifeq ($(ADK_NATIVE),y)
 else
 ifeq ($(ADK_TOOLCHAIN),y)
 ifeq ($(ADK_TOOLCHAIN_ONLY),y)
-	$(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install package/compile
+	$(MAKE) -f mk/build.mk toolchain/fixup tools/install package/compile
 else
-	$(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install package/compile root_clean package/install
+	$(MAKE) -f mk/build.mk toolchain/fixup tools/install package/compile root_clean package/install
 endif
 else
-	$(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
+	$(MAKE) -f mk/build.mk toolchain/fixup tools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
 endif
 endif
 
@@ -189,9 +190,6 @@ toolchain/%: ${STAGING_DIR}
 tools/%:
 	$(MAKE) -C tools $(patsubst tools/%,%,$@)
 
-jtools/%:
-	$(MAKE) -C jtools $(patsubst jtools/%,%,$@)
-
 image:
 	$(MAKE) -C target image
 
@@ -272,7 +270,7 @@ cleandir:
 	rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) \
 	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
 	rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
-	rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(JTOOLS_BUILD_DIR) $(STAGING_JAVA_HOST_DIR)
+	rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
 	rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk
 
 cleantarget:
@@ -286,9 +284,9 @@ distclean:
 	@$(TRACE) distclean
 	@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
 	@rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
-	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d $(JTOOLS_BUILD_DIR)
+	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
 	@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
-	@rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(STAGING_JAVA_HOST_DIR)
+	@rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
 	@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
 	    .menu ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.*
 
@@ -534,9 +532,9 @@ _mconfig2: ${CONFIG}/conf modconfig .menu
 distclean:
 	@$(MAKE) -C $(CONFIG) clean
 	@rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
-	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d $(JTOOLS_BUILD_DIR)
+	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
 	@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(TOOLS_BUILD_DIR)
-	@rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(STAGING_JAVA_HOST_DIR)
+	@rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
 	@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
 	    .menu .rebuild.* ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG
 

mk/modules.mk

@@ -1092,6 +1092,7 @@ $(eval $(call KMOD_template,SUNRPC,sunrpc,\
 ,24))
 
 $(eval $(call KMOD_template,SUNRPC_GSS,sunrpc-gss,\
+	$(MODULES_DIR)/kernel/lib/oid_registry \
 	$(MODULES_DIR)/kernel/net/sunrpc/auth_gss/auth_rpcgss \
 ,25))
 
@@ -1106,7 +1107,7 @@ $(eval $(call KMOD_template,LOCKD,lockd,\
 ifneq ($(ADK_KERNEL_NFS_FS),y)
 $(eval $(call KMOD_template,NFS_FS,nfs-fs,\
 	$(MODULES_DIR)/kernel/fs/nfs/nfs \
-,30))
+,30, kmod-sunrpc))
 endif
 
 #$(eval $(call KMOD_template,EXPORTFS,exportfs,\
@@ -1162,10 +1163,14 @@ $(eval $(call KMOD_template,SND,snd,\
 	$(MODULES_DIR)/kernel/sound/core/snd-pcm \
 ,40))
 
+$(eval $(call KMOD_template,SND_HRTIMER,snd-hrtimer,\
+	$(MODULES_DIR)/kernel/sound/core/snd-hrtimer \
+,41))
+
 $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\
 	$(MODULES_DIR)/kernel/sound/core/snd-hwdep \
 	$(MODULES_DIR)/kernel/sound/core/snd-rawmidi \
-,41))
+,42))
 
 $(eval $(call KMOD_template,SND_OSSEMUL,snd-ossemul,\
 	$(MODULES_DIR)/kernel/sound/core/oss/snd-mixer-oss \

mk/package.mk

@@ -49,6 +49,7 @@ INSTALL_TARGET?=	install
 MAKE_ENV+=		$(GCC_CHECK) \
 			PATH='${TARGET_PATH}' \
 			LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q' \
+			M4='${STAGING_HOST_DIR}/usr/bin/m4' \
 			WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
 			WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \
 			CFLAGS='$(strip ${TARGET_CFLAGS})' \

mk/vars.mk

@@ -18,7 +18,6 @@ STAGING_PKG_DIR:=	${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_
 STAGING_PKG_DIR_PFX:=	${BASE_DIR}/pkg_*
 STAGING_HOST_DIR:=	${BASE_DIR}/host_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC}
 STAGING_HOST_DIR_PFX:=	${BASE_DIR}/host_*
-STAGING_JAVA_HOST_DIR:=	${BASE_DIR}/jhost
 # use headers and foo-config from system
 ifeq ($(ADK_NATIVE),y)
 STAGING_TARGET_DIR:=
@@ -35,7 +34,6 @@ STAGING_HOST2TARGET:=	../target_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LI
 TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC}
 TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
 TOOLS_BUILD_DIR=	$(BASE_DIR)/tools_build
-JTOOLS_BUILD_DIR=	$(BASE_DIR)/jtools_build
 TOOLS_DIR:=		$(BASE_DIR)/bin/tools
 SCRIPT_DIR:=		$(BASE_DIR)/scripts
 BIN_DIR:=		$(BASE_DIR)/bin/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
@@ -220,7 +218,7 @@ QUIET:=
 else
 QUIET:=			--quiet
 endif
-FETCH_CMD?=		wget --timeout=5 -t 3 $(QUIET)
+FETCH_CMD?=		wget --timeout=10 -t 3 $(QUIET)
 
 ifeq ($(ADK_HOST_CYGWIN),y)
 EXEEXT:=		.exe

package/MesaLib/Makefile

@@ -28,9 +28,13 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 include $(TOPDIR)/mk/python.mk
+
 ifeq ($(ADK_HOST_DARWIN),y)
 PYTHON:=/opt/local/bin/python2.7
 endif
+ifeq ($(ADK_HOST_OPENBSD),y)
+PYTHON:=/usr/local/bin/python2.7
+endif
 
 ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y)
 DRI_DRIVERS:=i915

package/alsa-lib/Makefile

@@ -9,16 +9,20 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		69129a7c37697f81ac092335e9fa452b
 PKG_DESCR:=		ALSA sound library
 PKG_SECTION:=		libs
+PKG_BUILDDEP:=		alsa-lib-host
 PKG_URL:=		http://www.alsa-project.org/
 PKG_SITES:=		ftp://ftp.alsa-project.org/pub/lib/
 PKG_OPTS:=		dev
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
+include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
 TARGET_CPPFLAGS+=	-D_POSIX_C_SOURCE=1
 CONFIGURE_ARGS+=	--disable-python
 
@@ -27,4 +31,5 @@ alsa-lib-install:
 	${CP} ${WRKINST}/usr/lib/libasound.so* ${IDIR_ALSA_LIB}/usr/lib
 	${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/alsa-utils/Makefile

@@ -5,9 +5,9 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		alsa-utils
 PKG_VERSION:=		1.0.27.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		b65e9a04181bd7c9db7667a4566f8dc3
-PKG_DESCR:=		ALSA mixer utility
+PKG_DESCR:=		ALSA mixer/player utility
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		alsa-lib libpthread libgcc librt
 PKG_BUILDDEP:=		alsa-lib
@@ -35,7 +35,7 @@ endif
 
 alsa-utils-install:
 	${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin
-	${CP} ${WRKINST}/usr/bin/amixer ${IDIR_ALSA_UTILS}/usr/bin
+	${CP} ${WRKINST}/usr/bin/{aplay,amixer} ${IDIR_ALSA_UTILS}/usr/bin
 ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y)
 	${INSTALL_BIN} ${WRKINST}/usr/bin/alsamixer \
 		${IDIR_ALSA_UTILS}/usr/bin

package/ant/Makefile

@@ -0,0 +1,42 @@
+# 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:=		ant
+PKG_VERSION:=		1.8.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c474fa9d0c35a24037c23b6e476862c1
+PKG_DESCR:=		ant utility
+PKG_SECTION:=		lang
+PKG_SITES:=		http://archive.apache.org/dist/ant/source/
+
+DISTFILES:=             apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2
+WRKDIST=                $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_ARCH_DEPENDS:=	native
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,ANT,ant,$(PKG_VERSION)-${PKG_RELEASE}))
+
+HOST_STYLE:=		manual
+
+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
+	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 ; \
+		$(BASH) build.sh
+
+ant-hostinstall:
+	cd $(WRKBUILD)/dist; \
+	$(CP) bin/* $(STAGING_HOST_DIR)/usr/bin ; \
+	$(CP) lib/* $(STAGING_HOST_DIR)/usr/lib
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk

package/base-files/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		62
+PKG_RELEASE:=		63
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 PKG_BUILDDEP:=		pkgconf-host file-host

package/base-files/src/etc/init.d/boot

@@ -10,12 +10,10 @@ touch /var/log/lastlog
 touch /var/log/wtmp
 ln -s /tmp /var/tmp
 
-echo 0 > /proc/sys/kernel/printk
-
 HOSTNAME=
 [[ -s /etc/hostname ]] && HOSTNAME=$(cat /etc/hostname)
 HOSTNAME=${HOSTNAME%%.*}
-echo ${HOSTNAME:=linux} >/proc/sys/kernel/hostname
+echo ${HOSTNAME:=openadk} >/proc/sys/kernel/hostname
 
 chown 0:0 /tmp; chmod 1777 /tmp
 

package/base-files/src/init

@@ -3,6 +3,7 @@ echo "System initialization ..."
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 mount -t devtmpfs devtmpfs /dev >/dev/null 2>&1
 mount -nt proc proc /proc
+echo 0 > /proc/sys/kernel/printk
 mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
 [ ! -f /etc/notmpfs ] && {
   size=$(cat /etc/tmpfs 2>/dev/null)

package/bc/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		d44b5dddebd8a7a7309aea6c36fda117
 PKG_DESCR:=		An arbitrary precision calculator language
 PKG_SECTION:=		utils
-PKG_BUILDDEP:=		flex-host
+PKG_BUILDDEP:=		m4-host flex-host
 PKG_URL:=		http://www.gnu.org/software/bc/
 PKG_SITES:=		http://ftp.gnu.org/pub/gnu/bc/
 

package/bison/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		032a7b7b9f1a6e278ccde73f82cec5c2
 PKG_DESCR:=		GNU parser generator
 PKG_SECTION:=		lang
-PKG_BUILDDEP:=		flex-host bison-host
+PKG_BUILDDEP:=		m4-host flex-host bison-host
 PKG_URL:=		http://www.gnu.org/software/bison/
 PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
 

package/bison/patches/patch-Makefile_in

@@ -6,8 +6,8 @@
  $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
 -	$(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp
 -	$(AM_V_at) src/bison$(EXEEXT) --help   >>doc/bison.help.tmp
-+	bison$(EXEEXT) --version >doc/bison.help.tmp
-+	bison$(EXEEXT) --help   >>doc/bison.help.tmp
++	echo "3.0.1" >doc/bison.help.tmp
++	echo "no help"   >>doc/bison.help.tmp
  	$(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@
  
  # Depend on configure to get version number changes.

package/classpath/Makefile

@@ -17,10 +17,21 @@ PKG_SITES:=		${MASTER_SITE_GNU:=classpath/}
 PKG_HOST_DEPENDS:=	linux
 PKG_ARCH_DEPENDS:=	!arm
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,CLASSPATH,classpath,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+HOST_STYLE:=		auto
+HOST_CONFIGURE_ARGS+=	--disable-plugin \
+			--disable-tools \
+			--disable-examples \
+			--disable-gtk-peer \
+			--disable-gconf-peer \
+			--disable-alsa \
+			--disable-Werror \
+			--without-x
 CONFIGURE_ARGS+=	--disable-plugin \
 			--disable-tools \
 			--disable-examples
@@ -37,4 +48,5 @@ classpath-install:
 	$(CP) $(WRKINST)/usr/share/classpath/glibj.zip \
 		$(STAGING_DIR)/usr/share/classpath
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/cups/Makefile

@@ -4,39 +4,55 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cups
-PKG_VERSION:=		1.4.4
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		8776403ad60fea9e85eab9c04d88560d
+PKG_VERSION:=		1.7.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		55277c40fd4b7183dc3671d39c5c42b7
 PKG_DESCR:=		Common Unix Printing System
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		zlib libpthread
-PKG_BUILDDEP:=		zlib
+PKG_BUILDDEP:=		cups-host zlib
 PKG_URL:=		http://www.cups.org/
-PKG_SITES:=		ftp://ftp.easysw.com/pub/cups/${PKG_VERSION}/
+PKG_SITES:=		http://www.cups.org/software/${PKG_VERSION}/
 PKG_NEED_CXX:=		1
 PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}-source.tar.bz2
 
+include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
+HOST_CONFIGURE_ARGS+=	--disable-tcp-wrappers \
+			--disable-webif \
+			--disable-gssapi \
+			--disable-pam \
+			--disable-dbus \
+			--without-java \
+			--without-perl \
+			--without-python \
+			--without-php \
+			--disable-gnutls \
+			--disable-openssl \
+			--disable-cdsassl \
+			--disable-dbus \
+			--disable-ssl
 CONFIGURE_ENV+=		ac_cv_func_sigset=no \
 			OPTIM='-fPIC'
 
 CONFIGURE_ARGS+=	--with-cups-user=cups \
 			--with-cups-group=cups \
-			--disable-ldap \
+			--disable-webif \
+			--disable-tcp-wrappers \
 			--disable-gssapi \
 			--disable-pam \
-			--disable-pap \
 			--disable-dbus \
 			--without-java \
 			--without-perl \
 			--without-python \
 			--without-php \
-			--disable-slp \
 			--disable-gnutls \
 			--disable-openssl \
 			--disable-cdsassl \
@@ -50,35 +66,22 @@ else
 XAKE_FLAGS+=		OPTIM='-fPIC'
 endif
 
+cups-hostpackage:
+
 cups-install:
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/bin
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/sbin
 	${INSTALL_DIR} ${IDIR_CUPS}/etc/cups
-	${INSTALL_DIR} ${IDIR_CUPS}/usr/lib/cups/cgi-bin
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/lib/cups/daemon
-	${INSTALL_DIR} ${IDIR_CUPS}/usr/share/cups/banners
-	${INSTALL_DIR} ${IDIR_CUPS}/usr/share/doc/cups
-	${INSTALL_DIR} ${IDIR_CUPS}/usr/share/cups/templates
 	${CP} ${WRKINST}/etc/cups/* ${IDIR_CUPS}/etc/cups/
 	rm ${IDIR_CUPS}/etc/cups/cupsd.conf.default
 	${CP} ${WRKINST}/usr/bin/* ${IDIR_CUPS}/usr/bin/
-	${CP} ${WRKINST}/usr/share/doc/cups/index.html \
-		${IDIR_CUPS}/usr/share/doc/cups/
-	${CP} ${WRKINST}/usr/share/doc/cups/*.css \
-		${IDIR_CUPS}/usr/share/doc/cups/
-	${CP} ${WRKINST}/usr/share/doc/cups/images \
-		${IDIR_CUPS}/usr/share/doc/cups/
 	rm -f ${IDIR_CUPS}/usr/bin/cups-config
 	${CP} ${WRKINST}/usr/lib/libcups*.so* ${IDIR_CUPS}/usr/lib/
-	${CP} ${WRKINST}/usr/lib/cups/cgi-bin/* \
-		${IDIR_CUPS}/usr/lib/cups/cgi-bin/
 	${CP} ${WRKINST}/usr/lib/cups/daemon/* \
 		${IDIR_CUPS}/usr/lib/cups/daemon/
-	${CP} ${WRKINST}/usr/share/cups/banners/* \
-		${IDIR_CUPS}/usr/share/cups/banners/
-	${CP} ${WRKINST}/usr/share/cups/templates/*.tmpl \
-		${IDIR_CUPS}/usr/share/cups/templates/
 	${CP} ${WRKINST}/usr/sbin/* ${IDIR_CUPS}/usr/sbin/
 	${CP} ./files/etc/cups/* ${IDIR_CUPS}/etc/cups/
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/cups/patches/patch-Makedefs_in

@@ -1,10 +0,0 @@
---- cups-1.4.4.orig/Makedefs.in	2010-04-23 20:56:34.000000000 +0200
-+++ cups-1.4.4/Makedefs.in	2010-09-30 21:33:20.000000000 +0200
-@@ -258,7 +258,6 @@ DBUSDIR		=	@DBUSDIR@
- # Rules...
- #
- 
--.SILENT:
- .SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
- 
- .c.o:

package/cups/patches/patch-Makefile

@@ -1,16 +0,0 @@
---- cups-1.4.4.orig/Makefile	2010-04-23 20:56:34.000000000 +0200
-+++ cups-1.4.4/Makefile	2010-09-29 22:55:01.000000000 +0200
-@@ -20,10 +20,10 @@ include Makedefs
- # Directories to make...
- #
- 
--DIRS	=	cups filter backend berkeley cgi-bin driver locale man monitor \
--		notifier ppdc scheduler systemv test \
-+DIRS	=	cups filter backend berkeley cgi-bin driver locale monitor \
-+		notifier ppdc scheduler systemv \
- 		$(PHPDIR) \
--		conf data doc examples $(FONTS) templates
-+		conf data examples doc $(FONTS) templates
- 
- 
- #

package/cups/patches/patch-conf_Makefile

@@ -1,18 +0,0 @@
---- cups-1.4.2.orig/conf/Makefile	2009-09-22 23:53:31.000000000 +0200
-+++ cups-1.4.2/conf/Makefile	2009-11-19 22:02:20.000000000 +0100
-@@ -72,12 +72,12 @@ install:	all install-data install-header
- install-data:
- 	for file in $(KEEP); do \
- 		if test -r $(SERVERROOT)/$$file ; then \
--			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
-+			$(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \
- 		else \
--			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
-+			$(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
- 		fi ; \
- 	done
--	$(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default
-+	$(INSTALL_CONFIG) cupsd.conf $(SERVERROOT)/cupsd.conf.default
- 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
- 	for file in $(REPLACE); do \
- 		if test -r $(DATADIR)/mime/$$file ; then \

package/cups/patches/patch-configure

@@ -1,40 +1,11 @@
---- cups-1.4.4.orig/configure	2010-06-17 20:25:47.000000000 +0200
-+++ cups-1.4.4/configure	2011-07-29 16:46:45.000000000 +0200
-@@ -1966,7 +1966,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+--- cups-1.7.1.orig/configure	2014-01-08 17:26:27.000000000 +0100
++++ cups-1.7.1/configure	2014-01-24 18:05:03.000000000 +0100
+@@ -5792,7 +5792,7 @@ fi
  
+ case "$COMPONENTS" in
+ 	all)
+-		BUILDDIRS="filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
++		BUILDDIRS="filter backend berkeley monitor notifier ppdc conf data"
+ 		;;
  
- 
--uname=`uname`
-+uname=Linux
- uversion=`uname -r | sed -e '1,$s/^[^0-9]*\([0-9]*\)\.\([0-9]*\).*/\1\2/'`
- uarch=`uname -m`
- 
-@@ -10002,8 +10002,8 @@ if test "$libdir" = "\${exec_prefix}/lib
- 			libdir="$exec_prefix/lib32"
- 			;;
- 		Linux*)
--			if test -d /usr/lib64; then
--				libdir="$exec_prefix/lib64"
-+			if test -d /usr/lib; then
-+				libdir="$exec_prefix/lib"
- 			fi
- 			;;
- 		HP-UX*)
-@@ -10978,7 +10978,7 @@ fi
- if test x$enable_debug = xyes; then
- 	OPTIM="-g"
- else
--	INSTALL_STRIP="-s"
-+	INSTALL_STRIP=""
- fi
- 
- if test x$enable_debug_printfs = xyes; then
-@@ -11199,7 +11199,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
--  PIEFLAGS="-pie -fPIE"
-+  PIEFLAGS=""
- 		{ echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- else
+ 	core)

package/cups/patches/patch-ppdc_Makefile

@@ -1,11 +0,0 @@
---- cups-1.4.4.orig/ppdc/Makefile	2010-04-23 20:56:34.000000000 +0200
-+++ cups-1.4.4/ppdc/Makefile	2010-10-03 00:51:42.000000000 +0200
-@@ -244,7 +244,7 @@ genstrings:		genstrings.o libcupsppdc.a 
- 		libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \
- 		$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
- 	echo Generating localization strings...
--	./genstrings >sample.c
-+	#./genstrings >sample.c
- 
- 
- #

package/cups/patches/patch-scheduler_auth_c

@@ -1,10 +0,0 @@
---- cups-1.4.2.orig/scheduler/auth.c	2009-05-27 00:01:23.000000000 +0200
-+++ cups-1.4.2/scheduler/auth.c	2009-12-30 12:30:13.000000000 +0100
-@@ -57,6 +57,7 @@
-  * Include necessary headers...
-  */
- 
-+#define _GNU_SOURCE
- #include "cupsd.h"
- #include <grp.h>
- #ifdef HAVE_SHADOW_H

package/dbus/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		b02e9c95027a416987b81f9893831061
 PKG_DESCR:=		DBUS daemon
 PKG_SECTION:=		misc
-PKG_DEPENDS:=		libdbus
+PKG_DEPENDS:=		libdbus libexpat
 PKG_BUILDDEP:=		expat util-linux
 PKG_URL:=		http://dbus.freedesktop.org/
 PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus/

package/ecj/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:=		ecj
+PKG_VERSION:=		4.9
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c474fa9d0c35a24037c23b6e476862c1
+PKG_DESCR:=		ecj java compiler
+PKG_SECTION:=		lang
+
+NO_DISTFILES:=		1
+
+PKG_ARCH_DEPENDS:=	native
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,ECJ,ecj,$(PKG_VERSION)-${PKG_RELEASE}))
+
+HOST_STYLE:=		manual
+
+ecj-hostinstall:
+	env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 \
+	$(STAGING_HOST_DIR)/usr/bin/gcj -lgcj -O2 -findirect-dispatch \
+		-o ${STAGING_HOST_DIR}/usr/bin/ecj.native \
+		--main=org.eclipse.jdt.internal.compiler.batch.Main \
+		$(DISTDIR)/ecj.jar
+	echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/ecj.native \$$@" > \
+		${STAGING_HOST_DIR}/usr/bin/ecj
+	chmod u+x ${STAGING_HOST_DIR}/usr/bin/ecj
+	# put a wrapper for java here
+	mv ${STAGING_HOST_DIR}/usr/bin/gij ${STAGING_HOST_DIR}/usr/bin/gij.native
+	echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \
+		${STAGING_HOST_DIR}/usr/bin/java
+	chmod u+x ${STAGING_HOST_DIR}/usr/bin/java
+	echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \
+		${STAGING_HOST_DIR}/usr/bin/gij
+	chmod u+x ${STAGING_HOST_DIR}/usr/bin/gij
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk

package/eglibc/files/libc.so.ppc64

@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf64-powerpc)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld64.so.1 ) )

package/eudev/Makefile

@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		164df78f6f0093578a20bdd00335845f
 PKG_DESCR:=		udev device manager
 PKG_SECTION:=		utils
+PKG_BUILDDEP:=		gperf-host glib
+PKG_DEPENDS:=		glib
 PKG_URL:=		http://www.gentoo.org/proj/en/eudev/
 PKG_SITES:=		http://dev.gentoo.org/~blueness/eudev/
 PKG_LIBNAME:=		libudev

package/fastjar/Makefile

@@ -0,0 +1,24 @@
+# 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:=		fastjar
+PKG_VERSION:=		0.94
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		14d4bdfac236e347d806c6743dba48c6
+PKG_DESCR:=		fastjar utility
+PKG_SECTION:=		lang
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fastjar/}
+
+PKG_ARCH_DEPENDS:=	native
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,FASTJAR,fastjar,$(PKG_VERSION)-${PKG_RELEASE}))
+
+HOST_STYLE:=		auto
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk

package/freetype/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		a359993ad0dc23323c676b04fdb57110
 PKG_DESCR:=		A free, high-quality and portable font engine
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
-PKG_BUILDDEP:=		zlib
+PKG_BUILDDEP:=		zlib freetype-host
 PKG_URL:=		http://www.freetype.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=freetype/}
 PKG_LIBNAME:=		libfreetype
@@ -20,14 +20,18 @@ ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libonly
 endif
 
+include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--without-png
 
 libfreetype-install:
 	${INSTALL_DIR} ${IDIR_LIBFREETYPE}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libfreetype.so* ${IDIR_LIBFREETYPE}/usr/lib
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/gcc/Makefile

@@ -46,7 +46,7 @@ CONFIGURE_ARGS+=	--enable-languages=c,c++
 else
 CONFIGURE_ARGS+=	--enable-languages=c
 endif
-ifeq ($(ARCH),powerpc)
+ifeq ($(CPU_ARCH),ppc)
 CONFIGURE_ARGS+=	--disable-target-optspace --with-long-double-64 --enable-secureplt
 TARGET_CFLAGS+=		'-Wl,--secure-plt'
 else

jtools/gcj/Makefile → package/gcj/Makefile

@@ -4,24 +4,25 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		gcj
-PKG_RELEASE:=		1
 PKG_VERSION:=		4.7.3
+PKG_RELEASE:=		1
 PKG_MD5SUM:=		86f428a30379bdee0224e353ee2f999e
+PKG_DESCR:=		GNU java compiler
+PKG_SECTION:=		lang
 PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
 DISTFILES:=		gcc-$(PKG_VERSION).tar.bz2
 
+PKG_ARCH_DEPENDS:=	native
 WRKDIST=		${WRKDIR}/gcc-${PKG_VERSION}
 
-include ../rules.mk
-GCJ_ENV+=		"JAR=no LDFLAGS=-liconv"
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
 
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj
+$(eval $(call HOST_template,GCJ,gcj,$(PKG_VERSION)-${PKG_RELEASE}))
 
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	(cd $(WRKBUILD); \
-		wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar; \
-		env ${GCJ_ENV} ./configure \
-			--prefix=/usr \
+HOST_STYLE:=		auto
+HOST_MAKE_ENV+=		"JAR=no LDFLAGS=-liconv"
+HOST_CONFIGURE_ARGS:=	\
 			--enable-java-home \
 			--enable-languages=java \
 			--enable-shared \
@@ -36,17 +37,11 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 			--disable-biarch \
 			--disable-decimal-float \
 			--disable-multilib \
-			--disable-bootstrap \
-	);
-	touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-	env ${GCJ_ENV} ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
-	touch $@
+			--disable-bootstrap
 
-${STAGING_JAVA_HOST_DIR}/usr/bin/gcj: $(WRKBUILD)/.compiled
-	$(INSTALL_DIR) ${STAGING_JAVA_HOST_DIR}
-	env ${GCJ_ENV} ${MAKE} -C ${WRKBUILD} \
-	    DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+post-extract:
+	(cd $(DISTDIR); wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar)
+	(cd $(WRKBUILD); $(CP) $(DISTDIR)/ecj.jar .)
 
-include $(TOPDIR)/mk/tools.mk
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk

package/gmediaserver/Makefile

@@ -15,6 +15,8 @@ PKG_URL:=		http://www.gnu.org/software/gmediaserver
 PKG_SITES:=		http://savannah.nongnu.org/download/gmediaserver/
 PKG_CXX:=		GMEDIASERVER
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/gmp/Makefile

@@ -8,7 +8,7 @@ PKG_NAME:=		gmp
 PKG_DESCR:=		GNU multiprecision arithmetic library
 PKG_SECTION:=		libs
 PKG_URL:=		http://gmplib.org/
-PKG_BUILDDEP:=		flex-host bison-host m4-host
+PKG_BUILDDEP:=		m4-host flex-host bison-host
 PKG_LIBNAME:=		libgmp
 PKG_OPTS:=		dev
 

package/inputproto/Makefile

@@ -8,12 +8,18 @@ PKG_VERSION:=		2.2
 PKG_RELEASE:=		1
 PKG_DESCR:=		X Input Extension headers
 PKG_SECTION:=		devel
+PKG_BUILDDEP:=		inputproto-host
 PKG_MD5SUM:=		e0047823230413e67d74e92af77fbe58
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,INPUTPROTO,inputproto,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,INPUTPROTO,inputproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
+
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/jamvm/Makefile

@@ -16,10 +16,14 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
 
 PKG_ARCH_DEPENDS:=	!m68k
 
+include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+HOST_STYLE:=		auto
+HOST_CONFIGURE_ARGS+=	--with-classpath-install-dir=$(STAGING_HOST_DIR)/usr
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
@@ -31,6 +35,10 @@ ifeq ($(ARCH),arm)
 CONFIGURE_ARGS+=	--disable-tls
 endif
 
+hostpost-install:
+	ln -sf ${STAGING_HOST_DIR}/usr/bin/jamvm ${STAGING_HOST_DIR}/usr/lib/jvm/bin/java
+	ln -sf ${STAGING_HOST_DIR}/usr/bin/jamvm ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/java
+
 do-build:
 	${INSTALL_DIR} ${WRKINST}/usr/bin
 	${INSTALL_DIR} ${WRKINST}/usr/share/jamvm
@@ -47,4 +55,5 @@ do-install:
 	${CP} ${WRKINST}/usr/share/jamvm/classes.zip \
 		${IDIR_JAMVM}/usr/share/jamvm
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/jikes/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:=		jikes
+PKG_VERSION:=		1.22
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		cda958c7fef6b43b803e1d1ef9afcb85
+PKG_DESCR:=		jikes java compiler
+PKG_SECTION:=		lang
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/}
+
+DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.bz2
+
+PKG_ARCH_DEPENDS:=	native
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE}))
+
+HOST_STYLE:=		auto
+
+hostpost-install:
+	$(INSTALL_DIR) ${STAGING_HOST_DIR}/usr/lib/jvm/bin/
+	$(INSTALL_DIR) ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/
+	$(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/bin/javac
+	$(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/javac
+
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk

package/json-c/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:=		json-c
+PKG_VERSION:=		0.11
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		aa02367d2f7a830bf1e3376f77881e98
+PKG_DESCR:=		JSON library
+PKG_SECTION:=		libs
+PKG_URL:=		https://github.com/json-c/json-c/wiki
+PKG_SITES:=		https://s3.amazonaws.com/json-c_releases/releases/
+PKG_OPTS:=		dev
+PKG_NOPARALLEL:=	1
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,JSON_C,json-c,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+json-c-install:
+	$(INSTALL_DIR) $(IDIR_JSON_C)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libjson*.so* \
+		$(IDIR_JSON_C)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/kbproto/Makefile

@@ -8,12 +8,18 @@ PKG_VERSION:=		1.0.6
 PKG_RELEASE:=		1
 PKG_DESCR:=		X11 keyboard protocol headers
 PKG_SECTION:=		devel
+PKG_BUILDDEP:=		kbproto-host
 PKG_MD5SUM:=		9c650b7947fe59b3f144518400e8d029
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,KBPROTO,kbproto,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,KBPROTO,kbproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
+
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/knock/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		knock
-PKG_VERSION:=		0.5
+PKG_VERSION:=		0.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ca09d61458974cff90a700aba6120891
+PKG_MD5SUM:=		e6e486be75b0d6433bac22a7de0e11f5
 PKG_DESCR:=		A port-knocking client
 PKG_SECTION:=		firewall
 PKG_BUILDDEP:=		libpcap
@@ -22,6 +22,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,KNOCK,knock,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_KNOCKD},${PKGSD_KNOCKD},${PKG_SECTION}))
 
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE
 CONFIGURE_ENV+=		ac_cv_lib_pcap_pcap_open_live=yes
 
 knock-install:

package/knock/patches/patch-Makefile_in

@@ -1,24 +0,0 @@
---- knock-0.5.orig/Makefile.in	2005-06-27 07:11:34.000000000 +0200
-+++ knock-0.5/Makefile.in	2009-06-13 09:49:14.000000000 +0200
-@@ -68,11 +68,16 @@ dist: distclean
- 	(cd ..; tar czvf knock-$(VERSION).tar.gz knock-$(VERSION))
- 
- install: all
--	$(INSTALL) -D -m0755 knockd $(DESTDIR)$(SBINDIR)/knockd
--	$(INSTALL) -D -m0755 knock $(DESTDIR)$(BINDIR)/knock
--	$(INSTALL) -D -m0644 $(MANSRC)knockd.1 $(DESTDIR)$(MANDIR)/man1/knockd.1
--	$(INSTALL) -D -m0644 $(MANSRC)knock.1 $(DESTDIR)$(MANDIR)/man1/knock.1
--	$(INSTALL) -D -m0644 knockd.conf $(DESTDIR)/etc/knockd.conf
-+	$(INSTALL) -d -m0755 $(DESTDIR)$(SBINDIR)
-+	$(INSTALL) -d -m0755 $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -d -m0755 $(DESTDIR)$(MANDIR)/man1
-+	$(INSTALL) -d -m0755 $(DESTDIR)/etc
-+	$(INSTALL) -m0755 knock $(DESTDIR)$(BINDIR)/knock
-+	$(INSTALL) -m0755 knockd $(DESTDIR)$(SBINDIR)/knockd
-+	$(INSTALL) -m0755 knock $(DESTDIR)$(BINDIR)/knock
-+	$(INSTALL) -m0644 $(MANSRC)knockd.1 $(DESTDIR)$(MANDIR)/man1/knockd.1
-+	$(INSTALL) -m0644 $(MANSRC)knock.1 $(DESTDIR)$(MANDIR)/man1/knock.1
-+	$(INSTALL) -m0644 knockd.conf $(DESTDIR)/etc/knockd.conf
- 
- clean:
- 	rm -f *~ $(OBJDIR)*.o $(MANSRC)*.1

package/knock/patches/patch-src_knockd_c

@@ -1,20 +1,23 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- knock-0.5.orig/src/knockd.c	2005-06-27 07:11:34.000000000 +0200
-+++ knock-0.5/src/knockd.c	2009-06-01 21:43:53.000000000 +0200
-@@ -46,6 +46,7 @@
- #include <syslog.h>
- #include <pcap.h>
- #include <errno.h>
-+#include <linux/limits.h>
- #include "list.h"
- 
- static char version[] = "0.5";
-@@ -1064,7 +1065,7 @@ char* get_ip(const char* iface, char *bu
- 		return(NULL);
- 	}
- 
--	bzero((void*)(&ifr.ifr_name), sizeof(ifr.ifr_name));
-+	memset((void*)(&ifr.ifr_name), 0, sizeof(ifr.ifr_name));
- 	strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name)-1);
- 	ifr.ifr_name[sizeof(ifr.ifr_name)-1] = '\0';
- 	if(ioctl(s, SIOCGIFADDR, &ifr)) {
+--- knock-0.6.orig/src/knockd.c	2013-04-08 20:11:56.000000000 +0200
++++ knock-0.6/src/knockd.c	2014-01-16 16:59:04.000000000 +0100
+@@ -28,8 +28,8 @@
+ #include <ctype.h>
+ #include <string.h>
+ #include <fcntl.h>
+-#if defined(__FreeBSD__) || defined(__APPLE__)
+ #include <limits.h>
++#if defined(__FreeBSD__) || defined(__APPLE__)
+ #include <sys/socket.h>
+ #include <netinet/in_systm.h>
+ #endif
+@@ -40,10 +40,6 @@
+ #include <netinet/udp.h>
+ #include <netinet/ip_icmp.h>
+ #include <net/if.h>
+-#if !defined(__FreeBSD__) && !defined(__APPLE__)
+-#include <bits/time.h>
+-#include <linux/limits.h>
+-#endif
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <sys/ioctl.h>

package/libICE/Makefile

@@ -9,19 +9,23 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		4b8dae73fce37e994c3a6fa05d6db7ca
 PKG_DESCR:=		Inter-Client Exchange library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xtrans xproto
+PKG_BUILDDEP:=		xtrans-host xtrans xproto-host xproto libICE-host
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libice
 PKG_OPTS:=		dev
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(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
 	${CP} ${WRKINST}/usr/lib/libICE.so* ${IDIR_LIBICE}/usr/lib
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libIDL/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		531fbc1b40b80dd1d6f3b5e76b99067c
 PKG_DESCR:=		libraries for Interface Definition Language files
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		glib
-PKG_BUILDDEP:=		glib-host glib flex-host bison-host libIDL-host
+PKG_BUILDDEP:=		glib-host glib m4-host flex-host bison-host libIDL-host
 PKG_URL:=		http://www.gnome.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/
 PKG_LIBNAME:=		libidl

package/libSM/Makefile

@@ -10,17 +10,22 @@ PKG_MD5SUM:=		1d507651e9fa50aab7ef11be9e0e2f20
 PKG_DESCR:=		X11 Session Management library
 PKG_SECTION:=		x11/libs
 PKG_DEPENDS:=		libuuid
-PKG_BUILDDEP:=		libICE util-linux
+PKG_BUILDDEP:=		libSM-host libICE util-linux
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libsm
 PKG_OPTS:=		dev
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBSM,libsm,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBSM,libsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
+
 libsm-install:
 	${INSTALL_DIR} ${IDIR_LIBSM}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libSM.so* ${IDIR_LIBSM}/usr/lib
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libX11/Makefile

@@ -9,7 +9,9 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		395455e4d3a51459374fe5ca8420aae8
 PKG_DESCR:=		X11 client-side library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xproto-host
+PKG_BUILDDEP:=		xproto-host xextproto-host libXau-host libpthread-stubs-host
+PKG_BUILDDEP+=		xcb-proto-host libxcb-host kbproto-host
+PKG_BUILDDEP+=		inputproto-host xtrans-host libX11-host
 PKG_BUILDDEP+=		xproto xextproto xtrans libXdmcp libXau xcb-proto
 PKG_BUILDDEP+=		xcmiscproto bigreqsproto kbproto inputproto libxcb
 PKG_DEPENDS:=		libxdmcp libxcb libxau
@@ -21,14 +23,18 @@ ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libonly
 endif
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--enable-xlocale \
 			--disable-specs \
 			--disable-xf86bigfont \
 			--disable-malloc0returnsnull
+HOST_CONFIGURE_ARGS+=	$(CONFIGURE_ARGS)
 
 libx11-install:
 	${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11
@@ -37,4 +43,5 @@ libx11-install:
 	${CP} ${WRKINST}/usr/share/X11/XErrorDB ${IDIR_LIBX11}/usr/share/X11
 	${CP} ${WRKINST}/usr/share/X11/locale ${IDIR_LIBX11}/usr/share/X11
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXau/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		3ab7a4d1aac1b7f8ccc6b9755a19f252
 PKG_DESCR:=		X11 authorisation library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xproto
+PKG_BUILDDEP:=		xproto libXau-host
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libxau
 PKG_OPTS:=		dev
@@ -18,12 +18,17 @@ ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libonly
 endif
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
+
 libxau-install:
 	${INSTALL_DIR} ${IDIR_LIBXAU}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXau.so* ${IDIR_LIBXAU}/usr/lib/
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXext/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		249478eae5c4fab7722894cb99565405
 PKG_DESCR:=		X client interface to extensions of the X protocol
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		libX11 xextproto
+PKG_BUILDDEP:=		libX11 xextproto libXext-host
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libxext
 PKG_OPTS:=		dev
@@ -18,14 +18,18 @@ ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libonly
 endif
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
 libxext-install:
 	${INSTALL_DIR} ${IDIR_LIBXEXT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXext.so* ${IDIR_LIBXEXT}/usr/lib/
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXi/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		d024a9de73191628f9772893f02054d8
 PKG_DESCR:=		X Window System client interface to the XINPUT extension to the X protocol.
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xproto xextproto libXext
+PKG_BUILDDEP:=		xproto xextproto libXext libXi-host
 PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libxi
@@ -19,10 +19,13 @@ ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libonly
 endif
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
 
+HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
 libxi-install:
@@ -30,4 +33,5 @@ libxi-install:
 	$(CP) $(WRKINST)/usr/lib/libXi*.so* \
 		$(IDIR_LIBXI)/usr/lib
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXinerama/Makefile

@@ -9,19 +9,23 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		29a813b3850d499a3524a8d5d5ecb099
 PKG_DESCR:=		Xinerama library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xineramaproto
+PKG_BUILDDEP:=		xineramaproto-host xineramaproto libXext-host libXinerama-host
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libxinerama
 PKG_OPTS:=		dev
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
 CONFIGURE_ARGS+= 	--disable-malloc0returnsnull
 
 libxinerama-install:
 	${INSTALL_DIR} ${IDIR_LIBXINERAMA}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXinerama.so* ${IDIR_LIBXINERAMA}/usr/lib
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXt/Makefile

@@ -5,20 +5,25 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libXt
 PKG_VERSION:=		1.1.3
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		7a80ed7aba06668b12ebd0910318a1f1
 PKG_DESCR:=		X Toolkit Intrinsics libraries
 PKG_SECTION:=		x11/libs
 PKG_DEPENDS:=		libsm libice libuuid libx11 libxau libxdmcp libxcb
-PKG_BUILDDEP:=		autotool libSM libX11 kbproto util-macros
+PKG_BUILDDEP:=		autotool util-macros-host libICE-host libSM-host
+PKG_BUILDDEP+=		libXt-host
+PKG_BUILDDEP+=		libSM libX11 kbproto util-macros
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libxt
 PKG_OPTS:=		dev
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
 AUTOTOOL_STYLE:=	autoreconf
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
@@ -27,4 +32,5 @@ libxt-install:
 	${INSTALL_DIR} ${IDIR_LIBXT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXt.so* ${IDIR_LIBXT}/usr/lib
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libXtst/Makefile

@@ -9,19 +9,24 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		8918809e47c29b44d25eb16b1586a15b
 PKG_DESCR:=		Xtst library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		recordproto libXi
+PKG_BUILDDEP:=		recordproto-host libXi-host libXtst-host
+PKG_BUILDDEP+=		recordproto libXi
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libxtst
 PKG_OPTS:=		dev
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
 CONFIGURE_ARGS+= 	--disable-malloc0returnsnull
 
 libxtst-install:
 	${INSTALL_DIR} ${IDIR_LIBXTST}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXtst.so* ${IDIR_LIBXTST}/usr/lib
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libffi/Makefile

@@ -22,8 +22,8 @@ $(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
 
 AUTOTOOL_STYLE:=	autoreconf
 HOST_STYLE:=		auto
-HOST_CONFIGURE_ARGS+=	--disable-builddir
-CONFIGURE_ARGS+=	--disable-builddir
+HOST_CONFIGURE_ARGS+=	--disable-builddir --with-pic
+CONFIGURE_ARGS+=	--disable-builddir --with-pic
 
 libffi-install:
 	${INSTALL_DIR} ${IDIR_LIBFFI}/usr/lib

package/libjson/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:=		libjson
+PKG_VERSION:=		7.6.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		82f3fcbf9f8cf3c4e25e1bdd77d65164
+PKG_DESCR:=		JSON library
+PKG_SECTION:=		libs
+PKG_URL:=		http://sourceforge.net/projects/libjson/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libjson/}
+PKG_OPTS:=		dev
+
+PKG_NOPARALLEL:=	1
+
+DISTFILES:=             ${PKG_NAME}_${PKG_VERSION}.zip
+WRKDIST=		${WRKDIR}/${PKG_NAME}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBJSON,libjson,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+MAKE_FILE:=		makefile
+FAKE_FLAGS+=		prefix=${WRKINST}/usr
+CONFIG_STYLE:=		manual
+
+libjson-install:
+	$(INSTALL_DIR) $(IDIR_LIBJSON)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libjson*.so* \
+		$(IDIR_LIBJSON)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/libjson/patches/patch-makefile

@@ -0,0 +1,50 @@
+--- libjson.orig/makefile	2014-01-17 20:38:29.584543459 +0100
++++ libjson/makefile	2014-01-17 20:38:14.372460375 +0100
+@@ -128,7 +128,7 @@ objects        = internalJSONNode.o JSON
+                  JSONDebug.o JSONIterators.o JSONMemory.o JSONNode.o \
+                  JSONNode_Mutex.o JSONPreparse.o JSONStream.o JSONValidator.o \
+                  JSONWorker.o JSONWriter.o libjson.o 
+-OS=$(shell uname)
++OS=Linux
+ 
+ # Defaults
+ ifeq ($(OS), Darwin)
+@@ -158,8 +158,7 @@ srcdir          ?= _internal/Source
+ CXX             ?= c++
+ AR              ?= ar
+ PIC             ?= PIC
+-BUILD_TYPE      ?= "default"
+-SHARED          ?= "1"
++SHARED          ?= 1
+ 
+ 
+ # Internal Variables
+@@ -237,18 +236,16 @@ endif
+ 
+ # Compile object files
+ $(objdir)/%.o: $(srcdir)/%.cpp
+-	$(CXX) $< -o $@ -c $(CXXFLAGS)
++	$(CXX) $< -o $@ -c $(CPPFLAGS) $(CXXFLAGS)
+ 
+ ifeq ($(SHARED),1)
+ install: banner install_headers $(lib_target)
+ 	@echo "Install shared library"
++	mkdir -p $(inst_path)
+ 	cp -f ./$(lib_target) $(inst_path)
+ 	cd $(inst_path) ; \
+ 	ln -sf $(lib_target) $(libname_shared_major_version) ; \
+ 	ln -sf $(libname_shared_major_version) $(libname_shared)
+-ifneq ($(OS),Darwin)
+-	ldconfig
+-endif
+ 	@echo "Install shared library: Done."
+ else
+ install: banner install_headers $(lib_target)
+@@ -266,7 +263,6 @@ install_headers: banner
+ 	cp -r ./$(srcdir)/JSONDefs $(include_path)/$(libname_hdr)/$(srcdir)
+ 	chmod -R a+r $(include_path)/$(libname_hdr)
+ 	find  $(include_path)/$(libname_hdr) -type d -exec chmod a+x {} \;
+-	cp -rv $(srcdir)/Dependencies/ $(include_path)/$(libname_hdr)/$(srcdir)
+ 	@echo "Install header files: Done."
+ 
+ clean: banner

package/libnl/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		2e1c889494d274aca24ce5f6a748e66e
 PKG_DESCR:=		Netlink library
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		flex-host
+PKG_BUILDDEP:=		m4-host flex-host
 PKG_URL:=		http://www.infradead.org/~tgr/libnl/
 PKG_SITES:=		http://www.infradead.org/~tgr/libnl/files/
 PKG_NOPARALLEL:=	1

package/libpcap/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		33ba2f10f3a402cb5d34f5e2a904794a
 PKG_DESCR:=		a low-level packet capture library
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		flex-host bison-host libnl
+PKG_BUILDDEP:=		m4-host flex-host bison-host libnl
 PKG_URL:=		http://www.tcpdump.org/
 PKG_SITES:=		http://www.tcpdump.org/release/
 PKG_OPTS:=		dev

package/libpthread-stubs/Makefile

@@ -9,12 +9,18 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		a09d928c4af54fe5436002345ef71138
 PKG_DESCR:=		Pthread-stubs
 PKG_SECTION:=		devel
+PKG_BUILDDEP:=		libpthread-stubs-host
 PKG_URL:=		http://xcb.freedesktop.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBPTHREAD_STUBS,libpthread-stubs,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBPTHREAD_STUBS,libpthread-stubs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
+
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libsamplerate/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libsamplerate
 PKG_VERSION:=		0.1.8
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		1c7fb25191b4e6e3628d198a66a84f47
 PKG_DESCR:=		sample rate converter for audio
 PKG_SECTION:=		libs
@@ -17,6 +17,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBSAMPLERATE,libsamplerate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+CONFIGURE_ARGS+=	--disable-sndfile
+
 libsamplerate-install:
 	$(INSTALL_DIR) $(IDIR_LIBSAMPLERATE)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libsamplerate*.so* \

package/libsndfile/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:=		libsndfile
+PKG_VERSION:=		1.0.25
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		e2b7bb637e01022c7d20f95f9c3990a2
+PKG_DESCR:=		reading and writing files containing sampled sound
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.mega-nerd.com/libsndfile/
+PKG_SITES:=		http://www.mega-nerd.com/libsndfile/files/
+PKG_OPTS:=		dev
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSNDFILE,libsndfile,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+libsndfile-install:
+	$(INSTALL_DIR) $(IDIR_LIBSNDFILE)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libsndfile*.so* \
+		$(IDIR_LIBSNDFILE)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/libtool/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		d2f3b7d4627e69e13514a40e72a24d50
 PKG_DESCR:=		a generic dynamic object loading library
 PKG_SECTION:=		lang
-PKG_BUILDDEP:=		libtool-host
+PKG_BUILDDEP:=		m4-host libtool-host
 PKG_URL:=		http://www.gnu.org/software/libtool/
 PKG_SITES:=		${MASTER_SITE_GNU:=libtool/}
 PKG_LIBNAME:=		libltdl

package/libupnp/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libupnp
-PKG_VERSION:=		1.6.6
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		8918dcf7428cd119d0c8275765ff2833
+PKG_VERSION:=		1.6.19
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		ee16e5d33a3ea7506f38d71facc057dd
 PKG_DESCR:=		The Universal Plug and Play (UPnP) SDK library
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		autotool

package/libx264/Makefile

@@ -4,16 +4,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libx264
-# actually is snapshot x264-snapshot-20131010-2245
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		e6718029b4bc955f1dbb9bdafeed3ac0
+# actually is git checkout from 22.01.2014
+PKG_VERSION:=		1.0.1
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		6be3e8adeaf6b007bbc04026b6ebd304
 PKG_DESCR:=		H264 encoding library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.videolan.org/developers/x264.html
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_OPTS:=		dev
 
+PKG_BUILDDEP_IBM_X40:=	yasm-host
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
@@ -21,7 +23,8 @@ $(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
 ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
 CONFIGURE_ARGS+=	--disable-asm
 endif
-CONFIGURE_ARGS+=	--disable-cli
+CONFIGURE_ARGS+=	--disable-cli \
+			--cross-prefix=$(TARGET_CROSS)
 
 libx264-install:
 	$(INSTALL_DIR) $(IDIR_LIBX264)/usr/lib

package/libx264/patches/patch-Makefile

@@ -1,6 +1,6 @@
---- libx264-1.0.orig/Makefile	2013-10-10 22:45:04.000000000 +0200
-+++ libx264-1.0/Makefile	2013-10-12 17:50:05.000000000 +0200
-@@ -118,7 +118,7 @@ endif
+--- libx264-1.0.1.orig/Makefile	2014-01-22 11:20:21.000000000 +0100
++++ libx264-1.0.1/Makefile	2014-01-22 11:26:46.000000000 +0100
+@@ -117,7 +117,7 @@ endif
  
  # NEON optims
  ifeq ($(ARCH),ARM)

package/libx264/patches/patch-configure

@@ -1,6 +1,15 @@
---- libx264-1.0.orig/configure	2013-10-10 22:45:04.000000000 +0200
-+++ libx264-1.0/configure	2013-10-12 17:49:39.000000000 +0200
-@@ -985,9 +985,9 @@ if [ "$debug" = "yes" ]; then
+--- libx264-1.0.1.orig/configure	2014-01-22 11:20:21.000000000 +0100
++++ libx264-1.0.1/configure	2014-01-22 19:42:21.000000000 +0100
+@@ -662,7 +662,7 @@ case $host_cpu in
+                 LDFLAGS="$LDFLAGS -arch armv7"
+             fi
+         else
+-            AS="${AS-${cross_prefix}gcc}"
++            AS="${cross_prefix}gcc"
+         fi
+         ;;
+     s390|s390x)
+@@ -1007,9 +1007,9 @@ if [ "$debug" = "yes" ]; then
  elif [ $ARCH = ARM ]; then
      # arm-gcc-4.2 produces incorrect output with -ffast-math
      # and it doesn't save any speed anyway on 4.4, so disable it
@@ -12,7 +21,7 @@
  fi
  
  if cc_check '' -fno-tree-vectorize ; then
-@@ -1125,6 +1125,7 @@ bindir=$bindir
+@@ -1147,6 +1147,7 @@ bindir=$bindir
  libdir=$libdir
  includedir=$includedir
  ARCH=$ARCH
@@ -20,12 +29,3 @@
  SYS=$SYS
  CC=$CC
  CFLAGS=$CFLAGS
-@@ -1136,7 +1137,7 @@ LIBX264=$LIBX264
- AR=$AR
- RANLIB=$RANLIB
- STRIP=$STRIP
--AS=$AS
-+AS=$CC
- ASFLAGS=$ASFLAGS
- RC=$RC
- RCFLAGS=$RCFLAGS

package/libxcb/Makefile

@@ -9,16 +9,21 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		324c76024a73dba8a902638696ba87de
 PKG_DESCR:=		X11 keyboard library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		python2 libpthread-stubs libxslt libXau xcb-proto
+PKG_BUILDDEP:=		libXau-host libpthread-stubs-host xcb-proto-host
+PKG_BUILDDEP+=		libxcb-host
+PKG_BUILDDEP+=		python2 libpthread-stubs libxslt libXau xcb-proto
 PKG_SITES:=		http://xcb.freedesktop.org/dist/
 PKG_OPTS:=		dev
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,LIBXCB,libxcb,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBXCB,libxcb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 include $(TOPDIR)/mk/python.mk
 
+HOST_STYLE:=		auto
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ENV+=		PYTHON=$(PYTHON)
 
@@ -26,4 +31,5 @@ libxcb-install:
 	${INSTALL_DIR} ${IDIR_LIBXCB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libxcb*.so* ${IDIR_LIBXCB}/usr/lib
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/mpd/Makefile

@@ -5,13 +5,13 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mpd
 PKG_VERSION:=		0.18.5
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		63bcf6ce338caa2ae2cd6dc8e9710d5c
 PKG_DESCR:=		A music player daemon
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		glib libstdcxx libgcc libiconv
-PKG_FDEPENDS:=		glib libstdcxx libgcc libiconv
-PKG_BUILDDEP:=		glib
+PKG_DEPENDS:=		glib libstdcxx libgcc libiconv-tiny libmpdclient
+PKG_FDEPENDS:=		glib libstdcxx libgcc libiconv-tiny libmpdclient
+PKG_BUILDDEP:=		glib libmpdclient
 PKG_URL:=		http://www.musicpd.org/
 PKG_SITES:=		http://www.musicpd.org/download/mpd/0.18/
 PKG_NEED_CXX:=		1
@@ -23,7 +23,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 PKG_FLAVOURS_MPD:=	WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR
 PKG_FLAVOURS_MPD+=	WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG
 PKG_FLAVOURS_MPD+=	WITH_SHOUT WITH_CURL WITH_SAMPLERATE WITH_HTTPD
-PKG_FLAVOURS_MPD+=	WITH_OPUS
+PKG_FLAVOURS_MPD+=	WITH_OPUS WITH_PULSE
 
 PKGFD_WITH_ALSA:=	enable ALSA output
 PKGFS_WITH_ALSA:=	alsa-lib
@@ -112,6 +112,13 @@ ifeq ($(ADK_PACKAGE_MPD_WITH_OPUS),y)
 PKG_FDEPENDS+=		libopus
 endif
 
+PKGFD_WITH_PULSE:=	enable PULSE support
+PKGFS_WITH_PULSE:=	pulseaudio
+PKGFB_WITH_PULSE:=	pulseaudio
+ifeq ($(ADK_PACKAGE_MPD_WITH_PULSE),y)
+PKG_FDEPENDS+=		pulseaudio
+endif
+
 PKGFD_WITH_HTTPD:=	enable HTTP output
 
 include ${TOPDIR}/mk/package.mk
@@ -123,7 +130,6 @@ TARGET_CFLAGS+=		-std=gnu99
 CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--disable-jack \
 			--disable-fifo \
-			--disable-pulse \
 			--disable-oss \
 			--disable-bzip2 \
 			--disable-libwrap \
@@ -142,6 +148,12 @@ else
 CONFIGURE_ARGS+=	--disable-httpd-output
 endif
 
+ifneq (${ADK_PACKAGE_MPD_WITH_PULSE},)
+CONFIGURE_ARGS+=	--enable-pulse
+else
+CONFIGURE_ARGS+=	--disable-pulse
+endif
+
 ifneq (${ADK_PACKAGE_MPD_WITH_ALSA},)
 CONFIGURE_ARGS+=	--enable-alsa
 else

package/mpdbox/Makefile

@@ -0,0 +1,30 @@
+# 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:=		mpdbox
+PKG_VERSION:=		1.0
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		ac0dc1cc7141c1eca66d8ddd98574e0b
+PKG_DESCR:=		MPD web interface
+PKG_SECTION:=		multimedia
+PKG_URL:=		http://www.openadk.org/cgi-bin/gitweb.cgi?p=mpdbox.git;a=summary
+PKG_SITES:=		http://www.openadk.org/distfiles/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,MPDBOX,mpdbox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+mpdbox-install:
+	$(INSTALL_DIR) $(IDIR_MPDBOX)/srv/www/htdocs
+	$(CP) $(WRKBUILD)/* \
+		$(IDIR_MPDBOX)/srv/www/htdocs
+	$(CP) $(IDIR_MPDBOX)/srv/www/htdocs/inc/config.inc.example \
+		$(IDIR_MPDBOX)/srv/www/htdocs/inc/config.inc
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/mt-daapd/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mt-daapd
 PKG_VERSION:=		0.2.4.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		67bef9fb14d487693b0dfb792c3f1b05
 PKG_DESCR:=		a multi-threaded DAAP daemon
 PKG_SECTION:=		multimedia

package/mt-daapd/patches/patch-src_mp3-scanner_c

@@ -0,0 +1,10 @@
+--- mt-daapd-0.2.4.2.orig/src/mp3-scanner.c	2008-04-19 21:17:23.000000000 +0200
++++ mt-daapd-0.2.4.2/src/mp3-scanner.c	2014-01-20 12:19:42.000000000 +0100
+@@ -40,6 +40,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/param.h>
+ 
+ #include <netinet/in.h>  /* htons and friends */
+ #include <sys/stat.h>

package/ndisc/Makefile

@@ -4,14 +4,16 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ndisc6
-PKG_VERSION:=		0.9.8
+PKG_VERSION:=		1.0.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		cb8d70564b8d40aae95e19592c6be183
+PKG_MD5SUM:=		50cb4c19606cf6ff2b7388e71832f579
 PKG_DESCR:=		ICMPv6 Neighbour Discovery tools
 PKG_SECTION:=		ipv6
 PKG_URL:=		http://www.remlab.net/
 PKG_SITES:=		http://www.remlab.net/files/ndisc6/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 PKG_SUBPKGS:=		NDISC6 RDISC6 TCPTRACEROUTE6
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2

package/nfs-utils/Makefile

@@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
 PKG_VERSION:=		1.2.8
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		fb48630b7c145fb9d6602a79c6eaab11
 PKG_DESCR:=		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net/fs
-PKG_DEPENDS:=		kmod-nfsd keyutils libtirpc rpcbind libdevmapper libpthread
+PKG_DEPENDS:=		keyutils libtirpc rpcbind libdevmapper libpthread
 PKG_FDEPENDS:=		$(PKG_DEPENDS)
 PKG_BUILDDEP:=		keyutils libtirpc lvm
 PKG_URL:=		http://sourceforge.net/projects/nfs
@@ -20,6 +20,12 @@ PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 
+PKG_SUBPKGS:=		NFS_UTILS NFS_UTILS_CLIENT NFS_UTILS_SERVER
+PKGSS_NFS_UTILS_CLIENT:=kmod-nfs-fs kmod-sunrpc
+PKGSD_NFS_UTILS_CLIENT:=NFS client utilities (mount)
+PKGSS_NFS_UTILS_SERVER:=kmod-nfsd kmod-sunrpc
+PKGSD_NFS_UTILS_SERVER:=NFS server daemons and utilities
+
 PKG_FLAVOURS_NFS_UTILS:=WITH_KERBEROS
 PKGFD_WITH_KERBEROS:=	enable Kerberos support (MIT)
 PKGFS_WITH_KERBEROS:=	libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue kmod-rpcsec-gss-krb5 kmod-sunrpc-gss
@@ -34,6 +40,8 @@ endif
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,NFS_UTILS,nfs-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NFS_UTILS_CLIENT,nfs-utils-client,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_NFS_UTILS_CLIENT},${PKGSD_NFS_UTILS_CLIENT},${PKG_SECTION}))
+$(eval $(call PKG_template,NFS_UTILS_SERVER,nfs-utils-server,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_NFS_UTILS_SERVER},${PKGSD_NFS_UTILS_SERVER},${PKG_SECTION}))
 
 ifeq ($(ADK_NATIVE),)
 KRB5INC:=		${STAGING_TARGET_DIR}/usr
@@ -63,26 +71,31 @@ CONFIGURE_ARGS+=	--without-tcp-wrappers \
 			--with-tirpcinclude=${TIRPCINC} \
 			--disable-uuid
 
-nfs-utils-install:
-	${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin ${IDIR_NFS_UTILS}/etc
-	${INSTALL_DIR} ${IDIR_NFS_UTILS}/sbin
-	${CP} ${WRKINST}/sbin/{u,}mount.nfs* ${IDIR_NFS_UTILS}/sbin
-	${INSTALL_DATA} ./files/rpc ${IDIR_NFS_UTILS}/etc
+nfs-utils-client-install:
+	${INSTALL_DIR} ${IDIR_NFS_UTILS_CLIENT}/sbin
+	${CP} ${WRKINST}/sbin/{u,}mount.nfs* ${IDIR_NFS_UTILS_CLIENT}/sbin
+
+nfs-utils-server-install:
+	${INSTALL_DIR} ${IDIR_NFS_UTILS_SERVER}/usr/sbin ${IDIR_NFS_UTILS_SERVER}/etc
 	${INSTALL_BIN} ${WRKBUILD}/utils/exportfs/exportfs \
-		${IDIR_NFS_UTILS}/usr/sbin/
-	${INSTALL_DATA} ./files/nfsd.exports ${IDIR_NFS_UTILS}/etc/exports
+		${IDIR_NFS_UTILS_SERVER}/usr/sbin/
+	${INSTALL_DATA} ./files/nfsd.exports ${IDIR_NFS_UTILS_SERVER}/etc/exports
 	${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd \
-		${IDIR_NFS_UTILS}/usr/sbin/
+		${IDIR_NFS_UTILS_SERVER}/usr/sbin/
 	${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd \
-		${IDIR_NFS_UTILS}/usr/sbin/
+		${IDIR_NFS_UTILS_SERVER}/usr/sbin/
 ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
-	${INSTALL_DATA} ./files/idmapd.conf ${IDIR_NFS_UTILS}/etc
+	${INSTALL_DATA} ./files/idmapd.conf ${IDIR_NFS_UTILS_SERVER}/etc
 	${INSTALL_BIN} ${WRKBUILD}/utils/gssd/gssd \
-		${IDIR_NFS_UTILS}/usr/sbin/
+		${IDIR_NFS_UTILS_SERVER}/usr/sbin/
 	${INSTALL_BIN} ${WRKBUILD}/utils/gssd/svcgssd \
-		${IDIR_NFS_UTILS}/usr/sbin/
+		${IDIR_NFS_UTILS_SERVER}/usr/sbin/
 	${INSTALL_BIN} ${WRKBUILD}/utils/idmapd/idmapd \
-		${IDIR_NFS_UTILS}/usr/sbin/
+		${IDIR_NFS_UTILS_SERVER}/usr/sbin/
 endif
 
+nfs-utils-install:
+	${INSTALL_DIR} ${IDIR_NFS_UTILS}/etc
+	${INSTALL_DATA} ./files/rpc ${IDIR_NFS_UTILS}/etc
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/openjdk7/Makefile

@@ -10,6 +10,10 @@ PKG_MD5SUM:=		9b3afa162021e3fca6161ba8f9f7dc11
 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+=		alsa-lib-host libffi-host gcj-host ecj-host jikes-host 
+PKG_BUILDDEP+=		classpath-host jamvm-host ant-host cups-host openjdk7-host
 PKG_BUILDDEP+=		alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups
 PKG_BUILDDEP+=		libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny
 PKG_DEPENDS:=		zlib libstdcxx libffi libpthread libxtst libxi libgcc
@@ -19,6 +23,8 @@ PKG_SITES:=		http://icedtea.classpath.org/download/source/
 DISTFILES:=		icedtea-$(PKG_VERSION).tar.gz
 WRKDIST=		${WRKDIR}/icedtea-${PKG_VERSION}
 
+GCJ_VER:=		4.7.3
+
 PKG_HOST_DEPENDS:=	linux
 PKG_ARCH_DEPENDS:=	arm mips ppc sparc x86 x86_64
 PKG_SYSTEM_DEPENDS:=	!linksys-ag241 !fon-fon2100 !broadcom-bcm47xx !lemote-yeelong
@@ -30,9 +36,11 @@ PKGCD_SHARK:=		Shark JIT backend (needs eglibc/glibc)
 PKGCB_SHARK:=		llvm
 PKGCD_CACAO:=		Cacao JIT backend
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 include $(TOPDIR)/mk/qemu.mk
 
+$(eval $(call HOST_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 # for UINTPTR_MAX in stdint.h
@@ -41,7 +49,7 @@ TARGET_CFLAGS+=		-D__STDC_LIMIT_MACROS
 TARGET_CFLAGS:=		$(subst march=pentium-m,march=i686,$(TARGET_CFLAGS))
 TARGET_CFLAGS:=		$(subst march=atom,march=i686,$(TARGET_CFLAGS))
 TARGET_CFLAGS:=         $(filter-out -fhonour-copts,$(TARGET_CFLAGS))
-BOOTSTRAPJDK:=		${STAGING_JAVA_HOST_DIR}/bootstrap-jdk
+BOOTSTRAPJDK:=		${STAGING_HOST_DIR}/bootstrap-jdk
 
 JDKARCH:=		$(CPU_ARCH)
 ifeq ($(ARCH),x86)
@@ -70,12 +78,11 @@ CONFIGURE_COMMON:=	--disable-docs \
 			--with-jar=$(BOOTSTRAPJDK)/bin/jar \
 			--with-rmic=$(BOOTSTRAPJDK)/bin/rmic \
 			--with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
-			--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
+			--with-gcj=$(STAGING_HOST_DIR)/usr/bin/gcj \
 			--without-hotspot-build \
 			--disable-system-jpeg \
 			--disable-system-lcms \
 			--disable-system-zlib \
-			--disable-system-kerberos \
 			--disable-system-png \
 			--disable-system-gif \
 			--disable-system-gtk \
@@ -88,17 +95,56 @@ CONFIGURE_ARGS+=	$(CONFIGURE_BACKEND)
 CONFIGURE_ARGS+=	$(CONFIGURE_COMMON)
 CONFIGURE_ARGS+=	--disable-bootstrap
 
-CONFIGURE_ENV+=		PATH="$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}"
+CONFIGURE_ENV+=		LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib
 MAKE_ENV+=		ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
 			ALT_OPENWIN_HOME=$(STAGING_DIR)/usr/ \
 			ALT_CUPS_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \
 			ALT_FREETYPE_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \
 			OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
 			OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
-			GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(JDKARCH) QEMU=$(QEMU)
+			OTHER_LDFLAGS='$(TARGET_LDFLAGS)' \
+			GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(JDKARCH) QEMU=$(QEMU) \
+			LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib
 
 ALL_TARGET:=		icedtea
 
+# host stuff
+OPENJDK_NATIVE_ENV+=	JAVACFLAGS="-cp ${STAGING_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).jar"
+OPENJDK_NATIVE_ENV+=	LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64
+OPENJDK_NATIVE_ENV+=	ADK_ECJ=$(STAGING_HOST_DIR)/usr/bin/ecj
+OPENJDK_NATIVE_ENV+=	BOOTCLASSPATH="$(STAGING_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip"
+OPENJDK_NATIVE_ENV+=	FFI_LDFLAGS="$(LDFLAGS_FOR_BUILD)" \
+			ALT_CUPS_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include"
+
+HOST_STYLE:=		auto
+HOST_CONFIGURE_ENV+=	$(OPENJDK_NATIVE_ENV)
+HOST_MAKE_ENV+=		$(OPENJDK_NATIVE_ENV)
+HOST_ALL_TARGET:=	icedtea-boot
+
+HOST_CONFIGURE_ARGS+=\
+		--enable-bootstrap \
+		--enable-zero \
+		--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 \
+		--without-hotspot-build \
+                --disable-system-jpeg \
+                --disable-system-lcms \
+                --disable-system-zlib \
+                --disable-system-png \
+                --disable-system-gif \
+                --disable-system-gtk \
+                --disable-system-gio \
+                --disable-system-fontconfig \
+                --disable-compile-against-syscalls \
+		--without-rhino \
+		--disable-docs
+
+hostpost-install:
+	-rm -rf $(STAGING_HOST_DIR)/bootstrap-jdk
+	$(CP) $(WRKBUILD)/openjdk.build-boot/j2sdk-image $(STAGING_HOST_DIR)/bootstrap-jdk
+
 openjdk7-install:
 	$(INSTALL_DIR) $(IDIR_OPENJDK7)/usr/lib/jvm/jre
 	$(INSTALL_DIR) $(IDIR_OPENJDK7)/usr/bin
@@ -107,4 +153,5 @@ openjdk7-install:
 	(cd $(IDIR_OPENJDK7)/usr/bin && ln -sf ../lib/jvm/jre/bin/java .)
 	(cd $(IDIR_OPENJDK7)/usr/lib/jvm/jre/lib/$(JDKARCH) && ln -sf server/libjvm.so .)
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/openjdk7/patches/openadk.patch

@@ -1,6 +1,6 @@
-diff -Nur icedtea-2.3.11.orig/Makefile.in icedtea-2.3.11/Makefile.in
---- icedtea-2.3.11.orig/Makefile.in	2013-07-25 02:39:55.000000000 +0200
-+++ icedtea-2.3.11/Makefile.in	2013-12-08 15:43:27.000000000 +0100
+diff -Nur icedtea-2.3.12.orig/Makefile.in icedtea-2.3.12/Makefile.in
+--- icedtea-2.3.12.orig/Makefile.in	2013-07-26 20:18:01.000000000 +0200
++++ icedtea-2.3.12/Makefile.in	2014-01-16 08:54:53.000000000 +0100
 @@ -695,7 +695,7 @@
  	$(DISTRIBUTION_PATCHES)
  
@@ -19,10 +19,10 @@ diff -Nur icedtea-2.3.11.orig/Makefile.in icedtea-2.3.11/Makefile.in
  @BUILD_NATIVE_ECJ_TRUE@	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR}
  	touch $@
  
-diff -Nur icedtea-2.3.11.orig/patches/openadk.patch icedtea-2.3.11/patches/openadk.patch
---- icedtea-2.3.11.orig/patches/openadk.patch	1970-01-01 01:00:00.000000000 +0100
-+++ icedtea-2.3.11/patches/openadk.patch	2013-12-08 16:22:41.000000000 +0100
-@@ -0,0 +1,493 @@
+diff -Nur icedtea-2.3.12.orig/patches/openadk.patch icedtea-2.3.12/patches/openadk.patch
+--- icedtea-2.3.12.orig/patches/openadk.patch	1970-01-01 01:00:00.000000000 +0100
++++ icedtea-2.3.12/patches/openadk.patch	2014-01-16 08:55:05.000000000 +0100
+@@ -0,0 +1,546 @@
 +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	2013-07-17 20:14:46.000000000 +0200
 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2013-12-08 15:44:03.000000000 +0100
@@ -516,3 +516,56 @@ diff -Nur icedtea-2.3.11.orig/patches/openadk.patch icedtea-2.3.11/patches/opena
 + 
 + 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	2013-07-26 12:31:42.000000000 +0200
+++++ openjdk-boot/hotspot/make/linux/makefiles/vm.make	2014-01-14 21:28:27.000000000 +0100
++@@ -285,7 +285,7 @@
++   LIBS_VM                  += $(LIBS)
++ endif
++ ifeq ($(ZERO_BUILD), true)
++-  LIBS_VM += $(LIBFFI_LIBS)
+++  LIBS_VM += $(FFI_LDFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic
++ endif
++ ifeq ($(SHARK_BUILD), true)
++   LFLAGS_VM += $(LLVM_LDFLAGS)
++diff -Nur openjdk-boot.orig/Makefile openjdk-boot/Makefile
++--- openjdk-boot.orig/Makefile	2013-07-24 23:26:43.000000000 +0200
+++++ openjdk-boot/Makefile	2014-01-13 22:15:04.000000000 +0100
++@@ -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)
++ 
++-ifndef TOPDIR
++-  TOPDIR:=.
++-endif
+++TOPDIR:=.
++ 
++ ifndef JDK_TOPDIR
++   JDK_TOPDIR=$(TOPDIR)/jdk
++diff -Nur openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
++--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make	2013-07-26 12:31:42.000000000 +0200
+++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make	2014-01-16 08:45:53.000000000 +0100
++@@ -38,7 +38,7 @@
++ 
++ offsets_arm.s:	mkoffsets
++ 	@echo Generating assembler offsets
++-	./mkoffsets > $@
+++	$(QEMU) ./mkoffsets > $@
++ 
++ bytecodes_arm.s: bytecodes_arm.def mkbc
++ 	@echo Generating ARM assembler bytecode sequences
++@@ -46,12 +46,12 @@
++ 
++ mkbc:	$(GAMMADIR)/tools/mkbc.c
++ 	@echo Compiling mkbc tool
++-	$(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
+++	$(CC_FOR_BUILD) -o $@ $< $(COMPILE_DONE)
++ 
++ mkoffsets:	asm_helper.cpp
++ 	@echo Compiling offset generator
++ 	$(QUIETLY) $(REMOVE_TARGET)
++-	$(CC_COMPILE) $(CFLAGS) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
+++	$(CC_COMPILE) $(CFLAGS) -static -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
++ 
++ endif
++ 

package/pulseaudio/Makefile

@@ -0,0 +1,68 @@
+# 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:=		pulseaudio
+PKG_VERSION:=		4.0
+PKG_RELEASE:=		4
+PKG_MD5SUM:=		591f211db2790a7e4d222f2dc6858db3
+PKG_DESCR:=		a sound system for POSIX OSes
+PKG_SECTION:=		multimedia
+PKG_DEPENDS:=		libltdl json-c libsndfile libspeex libncurses
+PKG_DEPENDS+=		libflac libvorbis libogg libuuid libsndfile
+PKG_DEPENDS+=		libgcc libpthread librt alsa-lib libsamplerate
+PKG_BUILDDEP:=		libtool json-c libsndfile speex libsamplerate
+PKG_BUILDDEP+=		flac libvorbis libogg util-linux ncurses alsa-lib
+PKG_URL:=		http://www.freedesktop.org/wiki/Software/PulseAudio/
+PKG_SITES:=		http://freedesktop.org/software/pulseaudio/releases/
+PKG_OPTS:=		dev
+
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,PULSEAUDIO,pulseaudio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D_POSIX_SOURCE
+CONFIGURE_ARGS+=	--disable-systemd \
+			--disable-manpages \
+			--disable-neon-opt \
+			--disable-x11 \
+			--disable-avahi \
+			--disable-lirc \
+			--disable-openssl \
+			--disable-orc \
+			--disable-tcpwrap \
+			--disable-oss-output \
+			--disable-oss-wrapper \
+			--disable-esound \
+			--disable-jack \
+			--disable-gconf \
+			--disable-udev \
+			--disable-dbus \
+			--disable-hal-compat \
+			--enable-samplerate \
+			--enable-alsa \
+			--with-speex
+
+pulseaudio-install:
+	$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/etc/pulse
+	$(CP) ./files/*.{conf,pa} \
+		$(IDIR_PULSEAUDIO)/etc/pulse
+	$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/* \
+		$(IDIR_PULSEAUDIO)/usr/bin
+	$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libpulse*.so* \
+		$(IDIR_PULSEAUDIO)/usr/lib
+	$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/lib/pulseaudio
+	$(CP) $(WRKINST)/usr/lib/pulseaudio/libpulse*.so* \
+		$(IDIR_PULSEAUDIO)/usr/lib/pulseaudio
+	$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/lib/pulse-$(PKG_VERSION)/modules
+	$(CP) $(WRKINST)/usr/lib/pulse-$(PKG_VERSION)/modules/*.so \
+		$(IDIR_PULSEAUDIO)/usr/lib/pulse-$(PKG_VERSION)/modules
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/pulseaudio/files/client.conf

@@ -0,0 +1,2 @@
+autospawn = no
+cookie-file = /var/run/pulse/cookie

package/pulseaudio/files/daemon.conf

@@ -0,0 +1,26 @@
+daemonize = yes
+allow-module-loading = no
+allow-exit = no
+use-pid-file = yes
+high-priority = yes
+nice-level = -11
+fail = yes
+system-instance = yes
+enable-shm = no
+realtime-scheduling = yes
+realtime-priority = 5
+resample-method = src-sinc-fastest
+exit-idle-time = -1
+load-default-script-file = yes
+default-script-file = /etc/pulse/system.pa
+log-target = syslog
+log-level = error
+log-time = yes
+; default-sample-format = s16le
+; default-sample-rate = 44100
+; alternate-sample-rate = 48000
+; default-sample-channels = 2
+; default-channel-map = front-left,front-right
+
+; default-fragments = 4
+; default-fragment-size-msec = 25

package/pulseaudio/files/pulseaudio.init

@@ -0,0 +1,32 @@
+#!/bin/sh
+#PKG pulseaudio
+#INIT 60
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	test x"${pulseaudio:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	if [ ! -d /var/run/pulse ]; then 
+		mkdir -p /var/run/pulse/ && chown -R pulse.pulse /var/run/pulse && chmod 750 /var/run/pulse
+	fi
+	if [ ! -d /var/lib/pulse ]; then 
+		mkdir -p /var/lib/pulse/.pulse-cookie && chown -R pulse.pulse /var/lib/pulse && chmod 750 /var/lib/pulse
+	fi
+	/usr/bin/pulseaudio $pulseaudio_flags
+	;;
+stop)
+	kill $(pgrep -f /usr/bin/pulseaudio)
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "usage: $0 {start | stop | restart}"
+	exit 1
+esac
+exit $?

package/pulseaudio/files/pulseaudio.postinst

@@ -0,0 +1,7 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf pulseaudio pulseaudio NO
+gid=$(get_next_gid)
+add_user pulse $(get_next_uid) $gid /var/run/pulse
+add_group pulse $gid
+add_rcconf pulseaudio_flags pulseaudio_flags ""

package/pulseaudio/files/system.pa

@@ -0,0 +1,27 @@
+#!/usr/bin/pulseaudio -nF
+
+load-module module-native-protocol-unix
+
+### Automatically restore the volume of streams and devices
+load-module module-stream-restore
+load-module module-device-restore
+
+### Automatically restore the default sink/source when changed by the user
+### during runtime
+### NOTE: This should be loaded as early as possible so that subsequent modules
+### that look up the default sink/source get the right value
+load-module module-default-device-restore
+
+### Automatically move streams to the default sink if the sink they are
+### connected to dies, similar for sources
+load-module module-rescue-streams
+
+### Make sure we always have a sink around, even if it is a null sink.
+load-module module-always-sink
+
+### Enable positioned event sounds
+load-module module-position-event-sounds
+
+load-module module-null-sink sink_name=rtp format=s16be channels=2
+load-module module-rtp-send source=rtp.monitor destination=224.0.0.56
+

package/pulseaudio/patches/patch-src_pulsecore_native-common_h

@@ -0,0 +1,11 @@
+--- pulseaudio-4.0.orig/src/pulsecore/native-common.h	2012-09-26 13:27:01.000000000 +0200
++++ pulseaudio-4.0/src/pulsecore/native-common.h	2014-01-21 12:19:09.178012326 +0100
+@@ -180,7 +180,7 @@ enum {
+ };
+ 
+ #define PA_NATIVE_COOKIE_LENGTH 256
+-#define PA_NATIVE_COOKIE_FILE ".config/pulse/cookie"
++#define PA_NATIVE_COOKIE_FILE "cookie"
+ #define PA_NATIVE_COOKIE_FILE_FALLBACK ".pulse-cookie"
+ 
+ #define PA_NATIVE_DEFAULT_PORT 4713

package/qingy/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		qingy
 PKG_VERSION:=		1.0.0
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		1e0912655e240adfd0ce5ced30bbc685
 PKG_DESCR:=		a DirectFB getty replacement
 PKG_SECTION:=		misc

package/qingy/patches/patch-src_libraries_misc_h

@@ -0,0 +1,10 @@
+--- qingy-1.0.0.orig/src/libraries/misc.h	2008-11-27 10:29:01.000000000 +0100
++++ qingy-1.0.0/src/libraries/misc.h	2014-01-20 07:38:44.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <time.h>
+ #include "qingy_constants.h"
+ 
+ /* Computes the integer part of the base 10 log */

package/qingy/patches/patch-src_libraries_vt_c

@@ -0,0 +1,39 @@
+--- qingy-1.0.0.orig/src/libraries/vt.c	2008-11-25 12:21:28.000000000 +0100
++++ qingy-1.0.0/src/libraries/vt.c	2014-01-20 07:53:43.000000000 +0100
+@@ -98,14 +98,15 @@ static int getfd()
+ int switch_to_tty(int tty)
+ {
+   char *ttyname = create_tty_name(tty);
++  FILE *_stdin, *_stdout, *_stderr;
+   
+   if (!ttyname) return 0;
+   /* we set stdin, stdout and stderr to the new tty */
+-  stdin  = freopen(ttyname, "r", stdin);
+-  stdout = freopen(ttyname, "w", stdout);
+-  stderr = freopen(ttyname, "w", stderr);
++  _stdin  = freopen(ttyname, "r", stdin);
++  _stdout = freopen(ttyname, "w", stdout);
++  _stderr = freopen(ttyname, "w", stderr);
+   free(ttyname);
+-  if (!stdin || !stdout || !stderr) return 0;
++  if (!_stdin || !_stdout || !_stderr) return 0;
+ 
+   return 1;
+ }
+@@ -197,6 +198,7 @@ void stderr_disable(void)
+ void stderr_enable(int *vt)
+ {
+   char *ttyname;
++  FILE *_stderr;
+ 
+ 	if (!vt)
+ 		ttyname = create_tty_name(get_active_tty());
+@@ -205,7 +207,7 @@ void stderr_enable(int *vt)
+   
+   if (!ttyname) return;
+ 
+-	stderr = fopen(ttyname, "w");
++	_stderr = freopen(ttyname, "w", stderr);
+   free(ttyname);
+ }
+ 

package/recordproto/Makefile

@@ -8,12 +8,18 @@ PKG_VERSION:=		1.14.2
 PKG_RELEASE:=		1
 PKG_DESCR:=		RECORD extension headers
 PKG_SECTION:=		devel
+PKG_BUILDDEP:=		recordproto-host
 PKG_MD5SUM:=		868235e1e150e68916d5a316ebc4ccc4
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,RECORDPROTO,recordproto,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,RECORDPROTO,recordproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
+
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk