Index: java/diablo-jdk15/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/diablo-jdk15/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- java/diablo-jdk15/Makefile	28 Jun 2011 06:11:53 -0000	1.43
+++ java/diablo-jdk15/Makefile	21 Aug 2011 03:05:28 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION=	25
+PORTREVISION=	26
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -53,8 +53,8 @@
 
 .if !defined(WITHOUT_TZUPDATE)
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-TZUPDATE_VERSION=	1_3_39
-TZUPDATE_TZVERSION=	2011g
+TZUPDATE_VERSION=	1_3_40
+TZUPDATE_TZVERSION=	2011h
 TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${TZUPDATEFILE}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
Index: java/diablo-jdk15/distinfo
===================================================================
RCS file: /home/ncvs/ports/java/diablo-jdk15/distinfo,v
retrieving revision 1.27
diff -u -r1.27 distinfo
--- java/diablo-jdk15/distinfo	28 Jun 2011 06:11:54 -0000	1.27
+++ java/diablo-jdk15/distinfo	21 Aug 2011 03:05:28 -0000
@@ -1,6 +1,4 @@
 SHA256 (diablo-caffe-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = 2f2964506589589ccf4c7175f18c5a7053047ae1beeb3fdd167139c639c37585
 SIZE (diablo-caffe-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = 46868094
-SHA256 (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = b7e010658271bebadaa9ea1f410d7af27fcbc0f864a69feea5cd60c6683aa4c9
-SIZE (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 54347274
-SHA256 (tzupdater-1_3_39-2011g.zip) = 0db7131275df13827d2ca3a20c35e916cbc5a058215d3b09442d5d1bba0768f6
-SIZE (tzupdater-1_3_39-2011g.zip) = 258027
+SHA256 (tzupdater-1_3_40-2011h.zip) = 5d768948b500d5151f32a5be479fe9466151f0b114c2db0210b7a27e2c96084d
+SIZE (tzupdater-1_3_40-2011h.zip) = 251050
Index: java/diablo-jdk16/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/diablo-jdk16/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- java/diablo-jdk16/Makefile	28 Jun 2011 06:11:54 -0000	1.20
+++ java/diablo-jdk16/Makefile	21 Aug 2011 03:05:29 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -77,8 +77,8 @@
 DISTFILES+=	${POLICYFILE}
 .endif
 
-TZUPDATE_VERSION=	1_3_39
-TZUPDATE_TZVERSION=	2011g
+TZUPDATE_VERSION=	1_3_40
+TZUPDATE_TZVERSION=	2011h
 TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
 .if !defined(WITHOUT_TZUPDATE)
 DISTFILES+=		${TZUPDATEFILE}
Index: java/diablo-jdk16/distinfo
===================================================================
RCS file: /home/ncvs/ports/java/diablo-jdk16/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- java/diablo-jdk16/distinfo	28 Jun 2011 06:11:54 -0000	1.16
+++ java/diablo-jdk16/distinfo	21 Aug 2011 03:05:29 -0000
@@ -1,12 +1,4 @@
-SHA256 (diablo-caffe-freebsd6-amd64-1.6.0_07-b02.tar.bz2) = 1bbe2c35d754fa09530cff81bda6b6452c5bf0feeac25e1d02a4c29a8e52ef66
-SIZE (diablo-caffe-freebsd6-amd64-1.6.0_07-b02.tar.bz2) = 63004389
-SHA256 (diablo-caffe-freebsd6-i386-1.6.0_07-b02.tar.bz2) = 208e051014cdaecde07145cb510e4c0a0840ef35e4559c301ce324602a77f9ec
-SIZE (diablo-caffe-freebsd6-i386-1.6.0_07-b02.tar.bz2) = 64381886
 SHA256 (diablo-caffe-freebsd7-amd64-1.6.0_07-b02.tar.bz2) = 09f9fb014779f1e02456d51692c61902125800830b82078be9eac95190343109
 SIZE (diablo-caffe-freebsd7-amd64-1.6.0_07-b02.tar.bz2) = 62778916
-SHA256 (diablo-caffe-freebsd7-i386-1.6.0_07-b02.tar.bz2) = 971a537f8e852166fa94a9666b14e2f0a8ee51dcf7a470ab7bcb5be0dba05409
-SIZE (diablo-caffe-freebsd7-i386-1.6.0_07-b02.tar.bz2) = 64093245
-SHA256 (jce_policy-6.zip) = d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262
-SIZE (jce_policy-6.zip) = 9101
-SHA256 (tzupdater-1_3_39-2011g.zip) = 0db7131275df13827d2ca3a20c35e916cbc5a058215d3b09442d5d1bba0768f6
-SIZE (tzupdater-1_3_39-2011g.zip) = 258027
+SHA256 (tzupdater-1_3_40-2011h.zip) = 5d768948b500d5151f32a5be479fe9466151f0b114c2db0210b7a27e2c96084d
+SIZE (tzupdater-1_3_40-2011h.zip) = 251050
Index: java/diablo-jre15/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/diablo-jre15/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- java/diablo-jre15/Makefile	28 Jun 2011 06:11:54 -0000	1.42
+++ java/diablo-jre15/Makefile	21 Aug 2011 03:05:29 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	jre
 PORTVERSION=	${JRE_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION=	25
+PORTREVISION=	26
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -53,8 +53,8 @@
 
 .if defined(WITH_TZUPDATE)
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-TZUPDATE_VERSION=	1_3_39
-TZUPDATE_TZVERSION=	2011g
+TZUPDATE_VERSION=	1_3_40
+TZUPDATE_TZVERSION=	2011h
 TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${TZUPDATEFILE}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
Index: java/diablo-jre15/distinfo
===================================================================
RCS file: /home/ncvs/ports/java/diablo-jre15/distinfo,v
retrieving revision 1.27
diff -u -r1.27 distinfo
--- java/diablo-jre15/distinfo	28 Jun 2011 06:11:54 -0000	1.27
+++ java/diablo-jre15/distinfo	21 Aug 2011 03:05:29 -0000
@@ -1,6 +1,4 @@
 SHA256 (diablo-latte-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = e242f4f8ee2973cf1dda320f46df71d8c57bf4aa8147e9d30c81243eef959673
 SIZE (diablo-latte-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = 20580050
-SHA256 (diablo-latte-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 4585f35124416de052c8be10f0f48536053ab5c33dc3b7d728bf6e84d9b42c14
-SIZE (diablo-latte-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 23104037
-SHA256 (tzupdater-1_3_39-2011g.zip) = 0db7131275df13827d2ca3a20c35e916cbc5a058215d3b09442d5d1bba0768f6
-SIZE (tzupdater-1_3_39-2011g.zip) = 258027
+SHA256 (tzupdater-1_3_40-2011h.zip) = 5d768948b500d5151f32a5be479fe9466151f0b114c2db0210b7a27e2c96084d
+SIZE (tzupdater-1_3_40-2011h.zip) = 251050
Index: java/diablo-jre16/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/diablo-jre16/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- java/diablo-jre16/Makefile	28 Jun 2011 06:11:54 -0000	1.20
+++ java/diablo-jre16/Makefile	21 Aug 2011 03:05:29 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	jre
 PORTVERSION=	${JRE_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -78,8 +78,8 @@
 DISTFILES+=	${POLICYFILE}
 .endif
 
-TZUPDATE_VERSION=	1_3_39
-TZUPDATE_TZVERSION=	2011g
+TZUPDATE_VERSION=	1_3_40
+TZUPDATE_TZVERSION=	2011h
 TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
 .if !defined(WITHOUT_TZUPDATE)
 DISTFILES+=		${TZUPDATEFILE}
Index: java/diablo-jre16/distinfo
===================================================================
RCS file: /home/ncvs/ports/java/diablo-jre16/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- java/diablo-jre16/distinfo	28 Jun 2011 06:11:54 -0000	1.15
+++ java/diablo-jre16/distinfo	21 Aug 2011 03:05:29 -0000
@@ -1,12 +1,4 @@
-SHA256 (diablo-latte-freebsd6-amd64-1.6.0_07-b02.tar.bz2) = b019b485acafdcfe2a2770ea9d2a547f3918f78ba76191714072c57b47935eef
-SIZE (diablo-latte-freebsd6-amd64-1.6.0_07-b02.tar.bz2) = 27577577
-SHA256 (diablo-latte-freebsd6-i386-1.6.0_07-b02.tar.bz2) = bdd412cbb91161eeb151d9b275b33ee817c6c20f127a8d8c0ea9eaf1e9bc72f4
-SIZE (diablo-latte-freebsd6-i386-1.6.0_07-b02.tar.bz2) = 28952258
 SHA256 (diablo-latte-freebsd7-amd64-1.6.0_07-b02.tar.bz2) = c5f652431e0ea299ed47be83daea9a44ce7e4621dc5658379a3faa3af8cf8430
 SIZE (diablo-latte-freebsd7-amd64-1.6.0_07-b02.tar.bz2) = 27350295
-SHA256 (diablo-latte-freebsd7-i386-1.6.0_07-b02.tar.bz2) = d4cfbdaa0a8d8f819b54b8f4005686ff1a62b59107ef02619fd2366ad0abf4d4
-SIZE (diablo-latte-freebsd7-i386-1.6.0_07-b02.tar.bz2) = 28718252
-SHA256 (jce_policy-6.zip) = d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262
-SIZE (jce_policy-6.zip) = 9101
-SHA256 (tzupdater-1_3_39-2011g.zip) = 0db7131275df13827d2ca3a20c35e916cbc5a058215d3b09442d5d1bba0768f6
-SIZE (tzupdater-1_3_39-2011g.zip) = 258027
+SHA256 (tzupdater-1_3_40-2011h.zip) = 5d768948b500d5151f32a5be479fe9466151f0b114c2db0210b7a27e2c96084d
+SIZE (tzupdater-1_3_40-2011h.zip) = 251050
Index: java/linux-sun-jdk15/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/linux-sun-jdk15/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- java/linux-sun-jdk15/Makefile	8 Mar 2011 11:01:56 -0000	1.36
+++ java/linux-sun-jdk15/Makefile	21 Aug 2011 03:05:29 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${DL_JDK_VERSION:S/_/./g}
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	java devel
 MASTER_SITES=	#
Index: java/linux-sun-jdk16/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/linux-sun-jdk16/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- java/linux-sun-jdk16/Makefile	17 Feb 2011 22:48:52 -0000	1.44
+++ java/linux-sun-jdk16/Makefile	21 Aug 2011 03:05:29 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${DL_JDK_VERSION:S/_/./g}
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	linux-sun-
Index: java/linux-sun-jre15/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/linux-sun-jre15/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- java/linux-sun-jre15/Makefile	17 Feb 2011 22:48:52 -0000	1.5
+++ java/linux-sun-jre15/Makefile	21 Aug 2011 03:05:29 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	jre
 PORTVERSION=	${DL_JRE_VERSION:S/_/./g}
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	#
 PKGNAMEPREFIX=	linux-sun-
Index: java/linux-sun-jre16/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/linux-sun-jre16/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- java/linux-sun-jre16/Makefile	17 Feb 2011 22:48:52 -0000	1.5
+++ java/linux-sun-jre16/Makefile	21 Aug 2011 03:05:29 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	jre
 PORTVERSION=	${DL_JRE_VERSION:S/_/./g}
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	#
 PKGNAMEPREFIX=	linux-sun-