From 1c96072b83bb82777355661a37ae1586d527bd27 Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Sat, 14 Apr 2012 20:53:53 +0000
Subject: [PATCH] . Use the new java-zoneinfo port to provide updated time zone
 info.

---
 java/openjdk7/Makefile | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 348d9cff0423..52f4c8be480b 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_BUILD_NUMBER}
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk7u2/promoted/b${JDK_BUILD_NUMBER}/ \
 		http://download.java.net/jaxp/1.4.5/:jaxp \
@@ -34,6 +35,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_ZIP=	YES
 MAKE_JOBS_UNSAFE=	YES
 
+OPTIONS=	TZUPDATE	"Update the time zone data"	on
+
 JDK_MAJOR_VERSION=	7
 JDK_MINOR_VERSION=	2
 JDK_BUILD_NUMBER=	13
@@ -112,6 +115,10 @@ BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk7 \
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_TZUPDATE)
+RUN_DEPENDS+=  ${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo
+.endif
+
 # do we have valid native jdk installed?
 .for BJDK in ${BOOTSTRAP_JDKS}
 .  if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac)
@@ -147,6 +154,14 @@ post-patch:
 	@${REINPLACE_CMD} 's|build-policy install-limited|build-policy install-unlimited|' \
 		${WRKSRC}/jdk/make/javax/crypto/Makefile
 
+.if defined(WITH_TZUPDATE)
+pre-install:
+	@# Update time zones
+	@${RM} -rf ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib/zi
+	@${LN} -s -f ${LOCALBASE}/share/java/zi \
+		${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib
+.endif
+
 do-install:
 	@${MKDIR} ${INSTALLDIR}
 	@cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \