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

102 files changed, 2396 insertions, 504 deletions

diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 10726ac09..027aa4da0 100644
--- a/package/alsa-lib/Makefile
+++ b/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
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 721c5757d..e2311e221 100644
--- a/package/alsa-utils/Makefile
+++ b/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
diff --git a/package/ant/Makefile b/package/ant/Makefile
new file mode 100644
index 000000000..5476596eb
--- /dev/null
+++ b/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
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 7f68bad96..f1e0d0666 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		62
+PKG_RELEASE:=		63
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 PKG_BUILDDEP:=		pkgconf-host file-host
diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot
index ed55ccc88..df2c493d7 100644
--- a/package/base-files/src/etc/init.d/boot
+++ b/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
 
diff --git a/package/base-files/src/init b/package/base-files/src/init
index 003808452..ad519e96d 100755
--- a/package/base-files/src/init
+++ b/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)
diff --git a/package/classpath/Makefile b/package/classpath/Makefile
index 2f133cdef..3d2166c60 100644
--- a/package/classpath/Makefile
+++ b/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
diff --git a/package/classpath/patches/classpath-fix.patch b/package/classpath/patches/classpath-fix.patch
new file mode 100644
index 000000000..e03eb2342
--- /dev/null
+++ b/package/classpath/patches/classpath-fix.patch
@@ -0,0 +1,12 @@
+diff -Nur classpath-0.98.orig//lib/Makefile.in classpath-0.98/lib/Makefile.in
+--- classpath-0.98.orig//lib/Makefile.in	2009-02-06 02:01:32.000000000 +0100
++++ classpath-0.98/lib/Makefile.in	2011-08-05 22:55:25.965284504 +0200
+@@ -272,7 +272,7 @@
+ uudecode = @uudecode@
+ vm_classes = @vm_classes@
+ JAVA_DEPEND = java.dep
+-compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:$(top_srcdir)/external/jsr166:.:$(PATH_TO_GLIBJ_ZIP):$(PATH_TO_ESCHER)
++compile_classpath = $(vm_classes) -cp $(top_srcdir) -cp $(top_srcdir)/external/w3c_dom -cp $(top_srcdir)/external/sax -cp $(top_srcdir)/external/relaxngDatatype -cp $(top_srcdir)/external/jsr166 -cp . -cp $(PATH_TO_GLIBJ_ZIP) -cp $(PATH_TO_ESCHER)
+ @GCJ_JAVAC_FALSE@JCOMPILER = $(JAVAC) $(JAVACFLAGS) $(JAVAC_MEM_OPT) -source 1.5 -target 1.5 -bootclasspath '' -classpath $(compile_classpath) -d . @classes
+ 
+ # handling source to bytecode compiler programs like gcj, jikes  and kjc
diff --git a/package/cups/Makefile b/package/cups/Makefile
index adf8dcade..e3fc672e9 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -4,44 +4,64 @@
 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:=		3
+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