. Switch to the new java-zoneinfo port to provide updated time zone info

  rather than relying on the official time zone updater.

2 files changed, 5 insertions, 19 deletions

diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index dfac5887d365..d6950ad4ef95 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${JDK_UPDATE_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	java devel
 MASTER_SITES=	# http://download.java.net/jdk6/
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk16.html
@@ -52,7 +52,6 @@ JRL_BINFILE=	jdk-${JDK_MAJOR_VERSION}u${JDK_UPDATE_VERSION}-fcs-bin-b${JDK_BUILD
 JRL_MOZFILE=	jdk-${JDK_MAJOR_VERSION}u${JDK_UPDATE_VERSION}-fcs-mozilla_headers-b${JDK_BUILD_NUMBER}-unix-${JDK_BUILD_DATE}.jar
 PATCHSETFILE=	bsd-jdk16-patches-${JDK_PATCHSET_VERSION}.tar.bz2
 POLICYFILE=	jce_policy-${JDK_MAJOR_VERSION}.zip
-TZUPDATEFILE=	tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
 
 JDK_VERSION=	1.6.0
 JDK_MAJOR_VERSION=	6
@@ -62,9 +61,6 @@ JDK_BUILD_NUMBER=	05
 JDK_BUILD_DATE=		24_sep_2007
 LATEST_LINK=	jdk16
 
-TZUPDATE_VERSION=	1_3_45
-TZUPDATE_TZVERSION=	2011n
-
 .include <bsd.port.pre.mk>
 
 BOOTSTRAP_JDKS=	${LOCALBASE}/diablo-jdk1.6.0 \
@@ -81,8 +77,7 @@ EXTRACT_ONLY+=	${POLICYFILE}
 .endif
 
 .if defined(WITH_TZUPDATE)
-DISTFILES+=	${TZUPDATEFILE}
-EXTRACT_ONLY+=	${TZUPDATEFILE}
+RUN_DEPENDS+=	${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo
 .endif
 
 # do we have valid bootstrap jdk installed?
@@ -177,7 +172,7 @@ DESKTOP_FILES=	../../deploy/src/desktop/freedesktop/applications/sun-java.deskto
 		../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop
 
 # Check for JDK sources and patch file
-.if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE}) || !exists(${DISTDIR}/${JRL_MOZFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || (defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{
+.if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE}) || !exists(${DISTDIR}/${JRL_MOZFILE}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || !exists(${DISTDIR}/${PATCHSETFILE}))#{
 DISTFILE_INSTRUCTIONS=\n\
 Due to licensing restrictions, certain files must be fetched manually.\n\n
 .if !exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE}) || !exists(${DISTDIR}/${JRL_MOZFILE})#{
@@ -208,12 +203,6 @@ in a web browser and follow the \"Download\" link for\n\
 \"Java Cryptography Extension (JCE) Unlimited Strength\n\
 Jurisdiction Policy Files 6\" to obtain the JCE policy file, ${POLICYFILE}.\n\n
 .endif#}
-.if defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})#{
-DISTFILE_INSTRUCTIONS += Please open http://www.oracle.com/technetwork/java/javase/downloads/index.html\n\
-in a web browser and follow the \"Download\" link for\n\
-\"JDK DST Timezone Update Tool - ${TZUPDATE_VERSION}\" to obtain the\n\
-time zone update file, ${TZUPDATEFILE}.\n\n
-.endif#}
 .if !exists(${DISTDIR}/${PATCHSETFILE})#{
 DISTFILE_INSTRUCTIONS += Please download the patchset, ${PATCHSETFILE}, from\n\
 http://www.eyesbeyond.com/freebsddom/java/jdk16.html.\n\n
@@ -297,9 +286,8 @@ post-build:
 	@${RM} -rf ${JDKIMAGEDIR}/man/ja_JP.eucJP
 .if defined(WITH_TZUPDATE)
 	@# Update time zones
-	@-${JDKIMAGEDIR}/bin/java -jar \
-		${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/tzupdater.jar -u -bc
-	@-${RM} -rf ${JDKIMAGEDIR}/jre/lib/zi.tzdata*
+	@${RM} -rf ${JDKIMAGEDIR}/jre/lib/zi
+	@${LN} -s -f ${LOCALBASE}/share/java/zi ${JDKIMAGEDIR}/jre/lib
 .endif
 
 do-install:
diff --git a/java/jdk16/distinfo b/java/jdk16/distinfo
index cc0a0c1b4bad..62c3017af32e 100644
--- a/java/jdk16/distinfo
+++ b/java/jdk16/distinfo
@@ -8,5 +8,3 @@ SHA256 (bsd-jdk16-patches-4.tar.bz2) = 5dc753bee15676f35b0630f874fdd09e15282144d
 SIZE (bsd-jdk16-patches-4.tar.bz2) = 960930
 SHA256 (jce_policy-6.zip) = d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262
 SIZE (jce_policy-6.zip) = 9101
-SHA256 (tzupdater-1_3_45-2011n.zip) = c0894921dd6b440b4c99daf2e139d3d240012ed09e602b3101bfcc9fac394b0f
-SIZE (tzupdater-1_3_45-2011n.zip) = 468717