ports/162646: [patch] java/openjdk6: update to b24

[Jason Helfman]

>Number:         162646
>Category:       ports
>Synopsis:       [patch] java/openjdk6: update to b24
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 18 00:40:06 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jason Helfman
>Release:        FreeBSD 8.2-RELEASE i386
>Organization:
Experts Exchange, LLC.
>Environment:
System: FreeBSD dormouse.experts-exchange.com 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011 root at mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  amd64


	
>Description:
* Update to b24
* cacerts file pulled from jre update 6u29 (novel@ is kind enough to host this for me)
 * http://people.freebsd.org/~novel/misc/cacerts
 * http://people.freebsd.org/~novel/misc/cacerts.SHA256
* Builds cleanly in Tinderbox => http://jgh.devio.us/files/logs/openjdk6-b24.log.gz

>How-To-Repeat:
	
>Fix:

Index: openjdk6/Makefile
===================================================================
RCS file: /home/jhelfman/ncvs/ports/java/openjdk6/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- openjdk6/Makefile	9 Aug 2011 22:56:39 -0000	1.52
+++ openjdk6/Makefile	18 Nov 2011 00:25:51 -0000
@@ -6,19 +6,18 @@
 #
 
 PORTNAME=	openjdk6
-PORTVERSION=	b23
-PORTREVISION=	1
+PORTVERSION=	b24
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk6/promoted/${PORTVERSION}/ \
 		http://download.java.net/jaxp/openjdk/jdk6/:jaxp \
-		http://download.java.net/glassfish/components/jax-ws/openjdk/jdk6:jaxws \
+		http://dlc.sun.com.edgesuite.net/glassfish/components/jax-ws/openjdk/jdk6/:jaxws \
 		https://java.net/downloads/jax-ws/OpenJDK6/:jaf \
 		http://icedtea.classpath.org/builds/icedtea6/src/ \
 		http://icedtea.classpath.org/download/drops/:jaxp \
 		http://icedtea.classpath.org/download/drops/:jaxws \
 		http://icedtea.classpath.org/download/drops/:jaf \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \
-		http://download.java.net/openjdk/jtreg/promoted/${JTREGVERSION}/:jtreg
+		http://download.java.net/openjdk/jtreg/promoted/${JTREGSRCVERSION}/${JTREGVERSION}/:jtreg
 DISTNAME=	openjdk-6-src-${PORTVERSION}-${OPENJDK_BUILDDATE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${JAXPFILE}:jaxp \
@@ -39,7 +38,7 @@
 
 LICENSE=	GPLv2
 
-OPENJDK_BUILDDATE=	05_jul_2011
+OPENJDK_BUILDDATE=	14_nov_2011
 
 OPTIONS=	DEBUG "Enable legacy debugging support" off \
 		FASTDEBUG "Include fastdebug build" off \
@@ -59,12 +58,13 @@
 
 JAXP_BUILD=	144_03
 JAXPFILE=	jaxp${JAXP_BUILD}.zip
-JAXWS_BUILD=	2_1_6-2011_06_08
+JAXWS_BUILD=	2_1_6-2011_06_13
 JAXWSFILE=	jdk6-jaxws${JAXWS_BUILD}.zip
 JAF_BUILD=	b20
 JAFFILE=	jdk6-jaf-${JAF_BUILD}.zip
-JTREGVERSION=	b02
-JTREGFILE=	jtreg-4.1-bin-${JTREGVERSION}_21_may_2010.zip
+JTREGVERSION=	b03
+JTREGSRCVERSION=	4.1
+JTREGFILE=	jtreg-${JTREGSRCVERSION}-bin-${JTREGVERSION}_11_jul_2011.zip
 
 # do not depend on devel/apache-ant to avoid circular dependency, but
 # use .tar.bz2 distfile to avoid duplicated downloads
Index: openjdk6/distinfo
===================================================================
RCS file: /home/jhelfman/ncvs/ports/java/openjdk6/distinfo,v
retrieving revision 1.24
diff -u -r1.24 distinfo
--- openjdk6/distinfo	11 Jul 2011 20:58:58 -0000	1.24
+++ openjdk6/distinfo	18 Nov 2011 00:26:45 -0000
@@ -1,12 +1,12 @@
-SHA256 (openjdk-6-src-b23-05_jul_2011.tar.gz) = f36198920e84053d7bfa3599ee32477c1e2b911dba38d75a669b79e9ae5393e5
-SIZE (openjdk-6-src-b23-05_jul_2011.tar.gz) = 45428097
+SHA256 (openjdk-6-src-b24-14_nov_2011.tar.gz) = f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227
+SIZE (openjdk-6-src-b24-14_nov_2011.tar.gz) = 45742125
 SHA256 (jaxp144_03.zip) = c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012
 SIZE (jaxp144_03.zip) = 5964999
-SHA256 (jdk6-jaxws2_1_6-2011_06_08.zip) = be95ff0ae05b474d0bbb3ad8bdb2a23f20cb8c48b1a21f16aa079e43a50c057f
-SIZE (jdk6-jaxws2_1_6-2011_06_08.zip) = 5512710
+SHA256 (jdk6-jaxws2_1_6-2011_06_13.zip) = 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3
+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.2-bin.tar.bz2) = ecb49f5017807c9320bf19702149328cf4779a01bddca2b6c47e3ebb0e39c9c7
 SIZE (apache-ant-1.8.2-bin.tar.bz2) = 6740047
-SHA256 (jtreg-4.1-bin-b02_21_may_2010.zip) = 9a9ca107e8004e8d29e6c708e03e347c38ac4d7fdfd1930a25d6dc5cf61ad0f4
-SIZE (jtreg-4.1-bin-b02_21_may_2010.zip) = 5038412
+SHA256 (jtreg-4.1-bin-b03_11_jul_2011.zip) = 7ae38e80d3342670cc9142eee423d0a755bf005e4d83b40c5681f0f7d95f1cce
+SIZE (jtreg-4.1-bin-b03_11_jul_2011.zip) = 4901245
Index: openjdk6/files/cacerts
===================================================================
RCS file: /home/jhelfman/ncvs/ports/java/openjdk6/files/cacerts,v
retrieving revision 1.4
diff -u -r1.4 cacerts
Binary files /tmp/cvs4snWvi and cacerts differ
>Release-Note:
>Audit-Trail:
>Unformatted: