. Update to 7u6.

. Enlist openjdk7 users as testers of ant 1.8.4.

java/openjdk7/Makefile

@@ -17,9 +17,6 @@ MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MIN
 		http://icedtea.classpath.org/download/drops/:jaf \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,}
 DISTFILES=	${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \
-		${JAXPFILE}:jaxp \
-		${JAXWSFILE}:jaxws \
-		${JAFFILE}:jaf \
 		${ANT_DISTFILE}${EXTRACT_SUFX}:ant
 EXTRACT_ONLY=	${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \
 		${ANT_DISTFILE}${EXTRACT_SUFX}
@@ -37,16 +34,16 @@ MAKE_JOBS_UNSAFE=	YES
 OPTIONS=	POLICY   "Install the Unlimited Strength Policy Files"      on \
 		TZUPDATE "Update the time zone data"                        on
 
-PORT_MINOR_VERSION=	5
-PORT_BUILD_NUMBER=	06
+PORT_MINOR_VERSION=	${JDK_MINOR_VERSION}
+PORT_BUILD_NUMBER=	${JDK_BUILD_NUMBER}
 JDK_MAJOR_VERSION=	7
-JDK_MINOR_VERSION=	4
-JDK_BUILD_NUMBER=	22
-JDK_BUILD_DATE=		02_may_2012
+JDK_MINOR_VERSION=	6
+JDK_BUILD_NUMBER=	24
+JDK_BUILD_DATE=		09_aug_2012
 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.3
+ANT_VERSION=		1.8.4
 ANT_DISTFILE=		apache-ant-${ANT_VERSION}-bin
 
 LATEST_LINK=		openjdk7
@@ -56,10 +53,6 @@ USE_ICONV=	YES
 USE_XORG+=	x11 xext xi xrender xt xtst
 MAKE_JOBS_UNSAFE=	yes
 
-JAXPFILE=	jaxp145_01.zip
-JAXWSFILE=	jdk7-jaxws2_2_4-b04-2011_06_01.zip
-JAFFILE=	jdk7-jaf-2010_08_19.zip
-
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2 \
 		asound.2:${PORTSDIR}/audio/alsa-lib
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
@@ -88,7 +81,6 @@ MAKE_ENV+=	LANG="C" \
 		ALT_X11_PATH="${LOCALBASE}" \
 		ALT_PKG_PATH="${LOCALBASE}" \
 		ALT_PACKAGE_PATH="${LOCALBASE}" \
-		ALT_DROPS_DIR="${DISTDIR}" \
 		ANT_HOME="${WRKDIR}/apache-ant-${ANT_VERSION}" \
 		X11DIR="${LOCALBASE}" \
 		LOCALDIR="${LOCALBASE}" \
@@ -96,6 +88,8 @@ MAKE_ENV+=	LANG="C" \
 		SKIP_COMPARE_IMAGES="true" \
 		SKIP_FASTDEBUG_BUILD="true" \
 		SKIP_DEBUG_BUILD="true" \
+		ZIP_DEBUGINFO_FILES=0 \
+		ENABLE_FULL_DEBUG_SYMBOLS=0 \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		MILESTONE="fcs" \
 		JDK_MICRO_VERSION="0_0${PORT_MINOR_VERSION}" \

java/openjdk7/distinfo

@@ -1,10 +1,4 @@
-SHA256 (openjdk-7u4-fcs-src-b22-02_may_2012.zip) = ed89f8e21c18bf2ff6e6711a351d06b08961a22f3dae6f8c9b4d3683b172a1af
-SIZE (openjdk-7u4-fcs-src-b22-02_may_2012.zip) = 97155994
-SHA256 (jaxp145_01.zip) = c5924c6188988e2e8397ee5143bd8eaa062569d052567afd2ac9326a54a848cb
-SIZE (jaxp145_01.zip) = 6389175
-SHA256 (jdk7-jaxws2_2_4-b04-2011_06_01.zip) = 6a8734d37553103da47715ebd74077d5397cae4730775b09fa2ab679650aa824
-SIZE (jdk7-jaxws2_2_4-b04-2011_06_01.zip) = 6046342
-SHA256 (jdk7-jaf-2010_08_19.zip) = e6aefedfdbb4673e8019583d1344fb162b94e1b10382c362364dbbfd5889c09e
-SIZE (jdk7-jaf-2010_08_19.zip) = 70613
-SHA256 (apache-ant-1.8.3-bin.zip) = bfc608eb306fe743493930d126408ac1cd1df14d67776616289b2f6307b14a53
-SIZE (apache-ant-1.8.3-bin.zip) = 8093329
+SHA256 (openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = 22aec9bcc660d2e6502c9d24e5fdac97da9c4d251dafd87f708bcf6dabbbb431
+SIZE (openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = 103796914
+SHA256 (apache-ant-1.8.4-bin.zip) = d49d60bc0468279125e4a0db4d9b6637cab342a4bd736c90c0b71865b26c1479
+SIZE (apache-ant-1.8.4-bin.zip) = 8043520

java/openjdk7/files/patch-src-os-bsd-vm-attachListener_bsd.cpp

@@ -1,16 +0,0 @@
-$FreeBSD$
-
---- hotspot/src/os/bsd/vm/attachListener_bsd.cpp.orig	2012-06-05 23:51:31.000000000 -0700
-+++ hotspot/src/os/bsd/vm/attachListener_bsd.cpp	2012-06-05 23:54:28.000000000 -0700
-@@ -208,7 +208,10 @@
-   if (res == 0) {
-       RESTARTABLE(::chmod(initial_path, S_IREAD|S_IWRITE), res);
-       if (res == 0) {
--          res = ::rename(initial_path, path);
-+          RESTARTABLE(::chown(initial_path, geteuid(), getegid()), res);
-+          if (res == 0) {
-+              res = ::rename(initial_path, path);
-+          }
-       }
-   }
-   if (res == -1) {

java/openjdk7/files/patch-src-solaris-native-java-net-NetworkInterface.c

@@ -1,17 +0,0 @@
-$FreeBSD$
-
---- jdk/src/solaris/native/java/net/NetworkInterface.c	Mon Jun 27 22:08:16 2011 -0700
-+++ jdk/src/solaris/native/java/net/NetworkInterface.c	Thu Jul 07 23:37:05 2011 -0700
-@@ -1968,7 +1968,11 @@
-       return -1;
-   }
- 
--  return if2.ifr_flags;
-+#ifdef __FreeBSD__
-+  return ((if2.ifr_flags & 0xffff) | (if2.ifr_flagshigh << 16));
-+#else
-+  return (((int) if2.ifr_flags) & 0xffff);
-+#endif
- }
- 
- #endif