[Midnightbsd-cvs] mports [17865] trunk/java/openjdk7: update ant

[laffer1 at midnightbsd.org]

Revision: 17865
          http://svnweb.midnightbsd.org/mports/?rev=17865
Author:   laffer1
Date:     2014-12-08 11:17:33 -0500 (Mon, 08 Dec 2014)
Log Message:
-----------
update ant

Modified Paths:
--------------
    trunk/java/openjdk7/Makefile
    trunk/java/openjdk7/distinfo

Modified: trunk/java/openjdk7/Makefile
===================================================================
--- trunk/java/openjdk7/Makefile	2014-12-08 16:09:15 UTC (rev 17864)
+++ trunk/java/openjdk7/Makefile	2014-12-08 16:17:33 UTC (rev 17865)
@@ -23,12 +23,10 @@
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_ZIP=	yes
-USES=		iconv gmake
+USES=		iconv gmake zip
 USE_XORG+=	x11 xext xi xrender xt xtst
-MAKE_ARGS=	CC=${CC} CXX=${CXX} HOST_CC=${CC}
+MAKE_ARGS=	CC=${CC:Q} CXX=${CXX:Q} HOST_CC=${CC:Q}
 MAKE_JOBS_UNSAFE=	yes
-USE_GCC=	any
 
 OPTIONS_DEFINE=		DEBUG POLICY TZUPDATE
 OPTIONS_DEFAULT=	POLICY TZUPDATE
@@ -45,12 +43,13 @@
 JDK_SRC_DISTFILE=	${PORTNAME}-${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE}
 
 # Use our own version of ant to avoid circular dependencies
-ANT_VERSION=		1.8.4
+ANT_VERSION=		1.9.4
 ANT_DISTFILE=		apache-ant-${ANT_VERSION}-bin
 
 LATEST_LINK=		openjdk7
 
 LIB_DEPENDS+=	freetype:${PORTSDIR}/print/freetype2 \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		asound:${PORTSDIR}/audio/alsa-lib
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
@@ -65,9 +64,6 @@
 
 NOPRECIOUSMAKEVARS=	yes
 
-ONLY_FOR_ARCHS=	i386 amd64
-
-FETCH_ARGS=	-Fpr
 MAKE_ENV+=	LANG="C" \
 		LC_ALL="C" \
 		JAVA_HOME="" \
@@ -94,7 +90,8 @@
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		MILESTONE="fcs" \
 		JDK_MICRO_VERSION="0_${PORT_MINOR_VERSION}" \
-		BUILD_NUMBER="b${PORT_BUILD_NUMBER}" \
+		COMPILER_WARNINGS_FATAL="false" \
+		BUILD_NUMBER="b${PORT_BUILD_NUMBER}"
 
 MAKE_ENV+=	HOTSPOT_BUILD_JOBS=${MAKE_JOBS_NUMBER}
 

Modified: trunk/java/openjdk7/distinfo
===================================================================
--- trunk/java/openjdk7/distinfo	2014-12-08 16:09:15 UTC (rev 17864)
+++ trunk/java/openjdk7/distinfo	2014-12-08 16:17:33 UTC (rev 17865)
@@ -1,4 +1,4 @@
 SHA256 (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 00f8ea561876cbcad174ba3ca7a9ae10b50df46a782ac64c2ac57ac357b50596
 SIZE (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 104575196
-SHA256 (apache-ant-1.8.4-bin.zip) = d49d60bc0468279125e4a0db4d9b6637cab342a4bd736c90c0b71865b26c1479
-SIZE (apache-ant-1.8.4-bin.zip) = 8043520
+SHA256 (apache-ant-1.9.4-bin.zip) = 973d97d656e65561e2753823de6cf6db35570aaf93eeec6e7cb3d68e1ec4d0e8
+SIZE (apache-ant-1.9.4-bin.zip) = 8309406