merge some changes, cosmetic fixes

jtools/cacao/Makefile

@@ -7,29 +7,28 @@ PKG_NAME:=		cacao
 PKG_VERSION:=		0.99.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
-PKG_SITES:=		http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/
+PKG_SITES:=		http://www.complang.tuwien.ac.at/cacaojvm/download/$(PKG_NAME)-$(PKG_VERSION)/
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 include ../rules.mk
 
-install: ${STAGING_HOST_DIR}/usr/bin/cacao
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/cacao
 
 $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	(cd $(WRKBUILD); ./configure --prefix=/usr --disable-libjvm --enable-debug \
-		--with-vm-zip=$(STAGING_HOST_DIR)/usr/share/cacao/vm.zip \
+	cd $(WRKBUILD); ./configure --prefix=/usr --disable-libjvm --enable-debug \
+		--with-vm-zip=$(STAGING_JAVA_HOST_DIR)/usr/share/cacao/vm.zip \
 		--with-java-runtime-library=gnuclasspath \
-		--with-java-runtime-library-classes=$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip \
-		--with-java-runtime-library-prefix=$(STAGING_HOST_DIR)/usr \
-		--with-jni_md_h=$(STAGING_HOST_DIR)/usr/include \
-	);
+		--with-java-runtime-library-classes=$(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip \
+		--with-java-runtime-library-prefix=$(STAGING_JAVA_HOST_DIR)/usr \
+		--with-jni_md_h=$(STAGING_JAVA_HOST_DIR)/usr/include \
 	touch $@
 
 $(WRKBUILD)/.compiled: ${WRKDIST}/.configured
 	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
 	touch $@
 
-${STAGING_HOST_DIR}/usr/bin/cacao: $(WRKBUILD)/.compiled
-	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_HOST_DIR) install $(MAKE_TRACE)
+${STAGING_JAVA_HOST_DIR}/usr/bin/cacao: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
 
 include $(TOPDIR)/mk/tools.mk

package/openjdk/Makefile

@@ -85,15 +85,17 @@ CONFIGURE_ENV+=		${OPENJDK_BUILD_ENV}
 MAKE_ENV+=		${OPENJDK_BUILD_ENV}
 
 do-extract:
-	(cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION) ; tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C $(PKG_NAME)-$(PKG_VERSION))
-	(cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz)
+	cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION) ; \
+		tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz \
+		-C $(PKG_NAME)-$(PKG_VERSION)
+	cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz
 	cd ${WRKDIST}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
 	mkdir -p ${WRKBUILD}/drops
 	cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip \
-	    ${WRKBUILD}/drops/
+	    ${WRKBUILD}/drops
 
-x-pre-configure:
-	cd ${WRKBUILD}; rm -rf config.{cache,status};\
+pre-configure:
+	cd ${WRKBUILD}; rm -rf config.{cache,status}; \
 	export ${OPENJDK_BUILD_ENV}; ./configure \
 		--enable-bootstrap \
 		--enable-zero \