svn commit: r361627 - in head/java/openjdk7: . files

[Greg Lewis]

Author: glewis
Date: Sat Jul 12 17:36:17 2014
New Revision: 361627
URL: http://svnweb.freebsd.org/changeset/ports/361627
QAT: https://qat.redports.org/buildarchive/r361627/

Log:
  . Fix unpack200 on i386/amd64 by only swapping bytes when this is actually
    a big endian machine. [1]
  . Bump PORTREVISION for the fix.
  . Speed up the build on multi-core machines using the MAKE_JOBS trickery
    from the openjdk8 Makefile.
  . Enlist openjdk7 users as testers of ant 1.9.4.
  . Add a dependency on fontconfig.
  
  PR:		191735 [1]
  Requested by:	Michael Schmiedgen <schmiedgen at takwa.de> [2]

Added:
  head/java/openjdk7/files/patch-src-share-native-com-sun-java-util-jar-pack-zip.cpp   (contents, props changed)
Modified:
  head/java/openjdk7/Makefile
  head/java/openjdk7/distinfo

Modified: head/java/openjdk7/Makefile
==============================================================================
--- head/java/openjdk7/Makefile	Sat Jul 12 17:35:20 2014	(r361626)
+++ head/java/openjdk7/Makefile	Sat Jul 12 17:36:17 2014	(r361627)
@@ -3,7 +3,7 @@
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \
@@ -29,7 +29,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USES=		dos2unix iconv gmake zip
 USE_XORG+=	x11 xext xi xrender xt xtst
 MAKE_ARGS=	CC=${CC:Q} CXX=${CXX:Q} HOST_CC=${CC:Q}
-MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		DEBUG POLICY TZUPDATE
 OPTIONS_DEFAULT=	POLICY TZUPDATE
@@ -46,13 +45,14 @@ JDK_BUILD_DATE=		26_aug_2013
 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.9.3
+ANT_VERSION=		1.9.4
 ANT_DISTFILE=		apache-ant-${ANT_VERSION}-bin
 
 LATEST_LINK=		openjdk7
 
-LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libasound.so:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+		libfreetype.so:${PORTSDIR}/print/freetype2
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \
 		${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client
@@ -68,6 +68,7 @@ NOPRECIOUSMAKEVARS=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
 
+_MAKE_JOBS=	#
 MAKE_ENV+=	LANG="C" \
 		LC_ALL="C" \
 		JAVA_HOME="" \

Modified: head/java/openjdk7/distinfo
==============================================================================
--- head/java/openjdk7/distinfo	Sat Jul 12 17:35:20 2014	(r361626)
+++ head/java/openjdk7/distinfo	Sat Jul 12 17:36:17 2014	(r361627)
@@ -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.9.3-bin.zip) = 32caa50e473a81c3f6a0f68eb6a103b2eeb95bff09e62f78e93571b20f8237e1
-SIZE (apache-ant-1.9.3-bin.zip) = 8264969
+SHA256 (apache-ant-1.9.4-bin.zip) = 973d97d656e65561e2753823de6cf6db35570aaf93eeec6e7cb3d68e1ec4d0e8
+SIZE (apache-ant-1.9.4-bin.zip) = 8309406

Added: head/java/openjdk7/files/patch-src-share-native-com-sun-java-util-jar-pack-zip.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk7/files/patch-src-share-native-com-sun-java-util-jar-pack-zip.cpp	Sat Jul 12 17:36:17 2014	(r361627)
@@ -0,0 +1,22 @@
+--- jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp.orig	2014-07-12 09:24:56.000000000 -0700
++++ jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	2014-07-12 09:28:38.000000000 -0700
+@@ -33,6 +33,10 @@
+ 
+ #include <stdlib.h>
+ 
++#ifdef _ALLBSD_SOURCE
++#include <machine/endian.h>
++#endif
++
+ #ifndef _MSC_VER
+ #include <strings.h>
+ #endif
+@@ -62,7 +66,7 @@
+ 
+ #endif // End of ZLIB
+ 
+-#ifdef _BIG_ENDIAN
++#if (BYTE_ORDER == BIG_ENDIAN)
+ #define SWAP_BYTES(a) \
+     ((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00)
+ #else