. Add a TZUPDATE option, defaulting to on, which will update the time zone

  data for the JDK using Sun's tzupdater. [1]
. Some simplification of the convoluted logic around telling the user
  which files to download.  In particular, don't care if we've already
  told them to download a file.
. Bump PORTREVISION since many North American users will need to pick up
  the time zone changes.

Collaboration with:	Tim Zingelman <zingelman@fnal.gov> [1]

4 files changed, 54 insertions, 20 deletions

diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 5ae909857ec4..603e68043d66 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk15.html
@@ -30,6 +31,7 @@ WITHOUT_WEB=	yes
 OPTIONS+=	WEB	"Enable the browser plugin and Java Web Start"	on
 .endif
 OPTIONS+=	POLICY	"Install the Unlimited Strength Policy Files"	off \
+		TZUPDATE "Update the time zone data"			on \
 		JAIL	"Port is being built within a jail"		off
 
 WANT_GNOME=	yes
@@ -48,11 +50,15 @@ SCSL_SRCFILE=	jdk-${JDK_VERSION:S/./_/g}-src-scsl.zip
 SCSL_BINFILE=	jdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip
 PATCHSETFILE=	bsd-jdk15-patches-${JDK_PATCHSET_VERSION}.tar.bz2
 POLICYFILE=	jce_policy-${JDK_VERSION:S/./_/g}.zip
+TZUPDATEFILE=	tzupdater-${TZUPDATE_VERSION:S/./_/g}.zip
 
 JDK_VERSION=	1.5.0
 JDK_PATCHSET_VERSION=	4
 LATEST_LINK=	jdk15
 
+TZUPDATE_VERSION=	1.0.1
+TZUPDATE_TZVERSION=	2007a
+
 SUN_LINUX_JDK_VERSION=	1.4.2
 
 .if !defined(WITH_LINUX_BOOTSTRAP)
@@ -74,6 +80,11 @@ DISTFILES+=	${POLICYFILE}
 EXTRACT_ONLY+=	${POLICYFILE}
 .endif
 
+.if defined(WITH_TZUPDATE)
+DISTFILES+=	${TZUPDATEFILE}
+EXTRACT_ONLY+=	${TZUPDATEFILE}
+.endif
+
 # do we have valid native jdk installed?
 .if !defined(WITH_LINUX_BOOTSTRAP)
 .for CJDK in ${NATIVE_BOOTSTRAP_JDKS}
@@ -164,7 +175,7 @@ X11_FILES=	../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFe
 		../../j2se/src/solaris/native/sun/awt/fontpath.c
 
 # Check for JDK sources and patch file
-.if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{
+.if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || (defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{
 ECHO_MSG=/usr/bin/printf
 IGNORE=	:\n\
 Due to licensing restrictions, certain files must be fetched manually.\n\n
@@ -184,22 +195,20 @@ IGNORE += and the\n
 IGNORE += SCSL Binaries file, ${SCSL_BINFILE}
 .endif#}
 IGNORE += .\n\n
-.if !exists(${DISTDIR}/${PATCHSETFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE}))#{
-IGNORE += In addition, please
-.endif#}
-.elif !exists(${DISTDIR}/${PATCHSETFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE}))#}{
-IGNORE += Please
 .endif#}
 .if defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})#{
-IGNORE += open http://java.sun.com/javase/downloads/index.jsp\n\
+IGNORE += Please open http://java.sun.com/javase/downloads/index.jsp\n\
 in a web browser and follow the \"Download\" link for\n\
 \"Other Downloads\" to obtain the JCE policy file, ${POLICYFILE}.\n\n
-.if !exists(${DISTDIR}/${PATCHSETFILE})#{
-IGNORE += In addition, please
 .endif#}
+.if defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})#{
+IGNORE += Please open http://java.sun.com/javase/downloads/index.jsp\n\
+in a web browser and follow the \"Download\" link for\n\
+\"JDK US DST Timezone Update Tool - ${TZUPDATE_VERSION}\" to obtain the\n\
+time zone update file, ${TZUPDATEFILE}.\n\n
 .endif#}
 .if !exists(${DISTDIR}/${PATCHSETFILE})#{
-IGNORE += download the patchset, ${PATCHSETFILE}, from\n\
+IGNORE += Please download the patchset, ${PATCHSETFILE}, from\n\
 http://www.eyesbeyond.com/freebsddom/java/jdk15.html.\n\n
 .endif#}
 IGNORE += Please place the downloaded file(s) in ${DISTDIR}
@@ -288,6 +297,11 @@ post-build:
 	@# XXX don't install japanese manpages
 	@${RM} -rf ${JDKIMAGEDIR}/man/ja
 	@${RM} -rf ${JDKIMAGEDIR}/man/ja_JP.eucJP
+.if defined(WITH_TZUPDATE)
+	@# Update time zones
+	@-${JDKIMAGEDIR}/bin/java -jar \
+		${WRKDIR}/tzupdater${TZUPDATE_TZVERSION}/tzupdater.jar -u
+.endif
 
 do-install:
 	${MKDIR} ${PREFIX}/jdk${JDK_VERSION}
diff --git a/java/jdk15/distinfo b/java/jdk15/distinfo
index e7e2c58c389c..d869b06aa5f7 100644
--- a/java/jdk15/distinfo
+++ b/java/jdk15/distinfo
@@ -10,3 +10,6 @@ SIZE (bsd-jdk15-patches-4.tar.bz2) = 746062
 MD5 (jce_policy-1_5_0.zip) = 169441bba1ca95e84e030e116f258d79
 SHA256 (jce_policy-1_5_0.zip) = 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
 SIZE (jce_policy-1_5_0.zip) = 8826
+MD5 (tzupdater-1_0_1.zip) = 0f2a4d1321ccf503ebfa73aa4f06b2b4
+SHA256 (tzupdater-1_0_1.zip) = d0ab27a16df850e5a3c26bea927fa3a9ce3f0b6a43c836d43cfbb6dae95df0fe
+SIZE (tzupdater-1_0_1.zip) = 253959
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index 5ae909857ec4..603e68043d66 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk15.html
@@ -30,6 +31,7 @@ WITHOUT_WEB=	yes
 OPTIONS+=	WEB	"Enable the browser plugin and Java Web Start"	on
 .endif
 OPTIONS+=	POLICY	"Install the Unlimited Strength Policy Files"	off \
+		TZUPDATE "Update the time zone data"			on \
 		JAIL	"Port is being built within a jail"		off
 
 WANT_GNOME=	yes
@@ -48,11 +50,15 @@ SCSL_SRCFILE=	jdk-${JDK_VERSION:S/./_/g}-src-scsl.zip
 SCSL_BINFILE=	jdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip
 PATCHSETFILE=	bsd-jdk15-patches-${JDK_PATCHSET_VERSION}.tar.bz2
 POLICYFILE=	jce_policy-${JDK_VERSION:S/./_/g}.zip
+TZUPDATEFILE=	tzupdater-${TZUPDATE_VERSION:S/./_/g}.zip
 
 JDK_VERSION=	1.5.0
 JDK_PATCHSET_VERSION=	4
 LATEST_LINK=	jdk15
 
+TZUPDATE_VERSION=	1.0.1
+TZUPDATE_TZVERSION=	2007a
+
 SUN_LINUX_JDK_VERSION=	1.4.2
 
 .if !defined(WITH_LINUX_BOOTSTRAP)
@@ -74,6 +80,11 @@ DISTFILES+=	${POLICYFILE}
 EXTRACT_ONLY+=	${POLICYFILE}
 .endif
 
+.if defined(WITH_TZUPDATE)
+DISTFILES+=	${TZUPDATEFILE}
+EXTRACT_ONLY+=	${TZUPDATEFILE}
+.endif
+
 # do we have valid native jdk installed?
 .if !defined(WITH_LINUX_BOOTSTRAP)
 .for CJDK in ${NATIVE_BOOTSTRAP_JDKS}
@@ -164,7 +175,7 @@ X11_FILES=	../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFe
 		../../j2se/src/solaris/native/sun/awt/fontpath.c
 
 # Check for JDK sources and patch file
-.if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{
+.if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${SCSL_SRCFILE}) || !exists(${DISTDIR}/${SCSL_BINFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || (defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{
 ECHO_MSG=/usr/bin/printf
 IGNORE=	:\n\
 Due to licensing restrictions, certain files must be fetched manually.\n\n
@@ -184,22 +195,20 @@ IGNORE += and the\n
 IGNORE += SCSL Binaries file, ${SCSL_BINFILE}
 .endif#}
 IGNORE += .\n\n
-.if !exists(${DISTDIR}/${PATCHSETFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE}))#{
-IGNORE += In addition, please
-.endif#}
-.elif !exists(${DISTDIR}/${PATCHSETFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE}))#}{
-IGNORE += Please
 .endif#}
 .if defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})#{
-IGNORE += open http://java.sun.com/javase/downloads/index.jsp\n\
+IGNORE += Please open http://java.sun.com/javase/downloads/index.jsp\n\
 in a web browser and follow the \"Download\" link for\n\
 \"Other Downloads\" to obtain the JCE policy file, ${POLICYFILE}.\n\n
-.if !exists(${DISTDIR}/${PATCHSETFILE})#{
-IGNORE += In addition, please
 .endif#}
+.if defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})#{
+IGNORE += Please open http://java.sun.com/javase/downloads/index.jsp\n\
+in a web browser and follow the \"Download\" link for\n\
+\"JDK US DST Timezone Update Tool - ${TZUPDATE_VERSION}\" to obtain the\n\
+time zone update file, ${TZUPDATEFILE}.\n\n
 .endif#}
 .if !exists(${DISTDIR}/${PATCHSETFILE})#{
-IGNORE += download the patchset, ${PATCHSETFILE}, from\n\
+IGNORE += Please download the patchset, ${PATCHSETFILE}, from\n\
 http://www.eyesbeyond.com/freebsddom/java/jdk15.html.\n\n
 .endif#}
 IGNORE += Please place the downloaded file(s) in ${DISTDIR}
@@ -288,6 +297,11 @@ post-build:
 	@# XXX don't install japanese manpages
 	@${RM} -rf ${JDKIMAGEDIR}/man/ja
 	@${RM} -rf ${JDKIMAGEDIR}/man/ja_JP.eucJP
+.if defined(WITH_TZUPDATE)
+	@# Update time zones
+	@-${JDKIMAGEDIR}/bin/java -jar \
+		${WRKDIR}/tzupdater${TZUPDATE_TZVERSION}/tzupdater.jar -u
+.endif
 
 do-install:
 	${MKDIR} ${PREFIX}/jdk${JDK_VERSION}
diff --git a/java/jdk16/distinfo b/java/jdk16/distinfo
index e7e2c58c389c..d869b06aa5f7 100644
--- a/java/jdk16/distinfo
+++ b/java/jdk16/distinfo
@@ -10,3 +10,6 @@ SIZE (bsd-jdk15-patches-4.tar.bz2) = 746062
 MD5 (jce_policy-1_5_0.zip) = 169441bba1ca95e84e030e116f258d79
 SHA256 (jce_policy-1_5_0.zip) = 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
 SIZE (jce_policy-1_5_0.zip) = 8826
+MD5 (tzupdater-1_0_1.zip) = 0f2a4d1321ccf503ebfa73aa4f06b2b4
+SHA256 (tzupdater-1_0_1.zip) = d0ab27a16df850e5a3c26bea927fa3a9ce3f0b6a43c836d43cfbb6dae95df0fe
+SIZE (tzupdater-1_0_1.zip) = 253959