From 93ec3ca4597f64d658b99dbe3c1db1e623f4d04b Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Fri, 7 Sep 2012 22:16:05 +0000 Subject: [PATCH] - Enlist openjdk6 users as testers of ant 1.8.4 as well. - Set JAVACMD environment variable to point to bootstrap JDK for ant. When it is unset or empty, ant sets it by executing `which java`, which may be different from bootstrap JDK. --- java/openjdk6/Makefile | 3 ++- java/openjdk6/distinfo | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index 4eed2e3ead4e..37e90d36d408 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -75,7 +75,7 @@ UPDATE_VERSION= 32 # do not depend on devel/apache-ant to avoid circular dependency, but # use .tar.bz2 distfile to avoid duplicated downloads -ANTVERSION= 1.8.3 +ANTVERSION= 1.8.4 ANTFILE= apache-ant-${ANTVERSION}-bin.tar.bz2 # rely on bsdtar ability to extract .gz, .bz2 and .zip archives @@ -131,6 +131,7 @@ MAKE_ENV= LANG=C LC_ALL=C \ ALT_PACKAGE_PATH=${LOCALBASE} \ ALT_DROPS_DIR=${DISTDIR} \ ANT_HOME=${WRKDIR}/apache-ant-${ANTVERSION} \ + JAVACMD=${BOOTSTRAPJDKDIR}/bin/java \ BUILD_NUMBER=${PORTVERSION} \ NO_DOCS=true \ MILESTONE=fcs \ diff --git a/java/openjdk6/distinfo b/java/openjdk6/distinfo index 6b334d75bc5f..92d2ebe58535 100644 --- a/java/openjdk6/distinfo +++ b/java/openjdk6/distinfo @@ -6,7 +6,7 @@ SHA256 (jdk6-jaxws2_1_6-2011_06_13.zip) = 229040544e791f44906e8e7b6f6faf503c730a SIZE (jdk6-jaxws2_1_6-2011_06_13.zip) = 5512710 SHA256 (jdk6-jaf-b20.zip) = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 SIZE (jdk6-jaf-b20.zip) = 71243 -SHA256 (apache-ant-1.8.3-bin.tar.bz2) = 93238e8861acf0ca0546dc4f7c9256e0bf83effbff4afca0ba0aa024d4abd4d1 -SIZE (apache-ant-1.8.3-bin.tar.bz2) = 4254036 +SHA256 (apache-ant-1.8.4-bin.tar.bz2) = aeaed7d5c2b1e73ffc195d713931047ecc113b8c9844df5cbac2797007455069 +SIZE (apache-ant-1.8.4-bin.tar.bz2) = 4257152 SHA256 (jtreg-4.1-bin-b04_14_mar_2012.zip) = 6d63447f3b70828b4d5f9e5c2416ba08ca00d54714a9d219837eae989df676c5 SIZE (jtreg-4.1-bin-b04_14_mar_2012.zip) = 6126941