diff options
| author | glewis <glewis@FreeBSD.org> | 2012-04-16 05:42:03 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2012-04-16 05:42:03 +0800 |
| commit | b18c8ac7febeed09c75711e6a6cc2cce8eae0cd7 (patch) | |
| tree | 82df4601ffa1d852342084b72be9b2edcfc7bb6e /java/jdk15 | |
| parent | c61ba20c3d8933f317cee09a57f7819bb05f5ac1 (diff) | |
| download | freebsd-ports-gnome-b18c8ac7febeed09c75711e6a6cc2cce8eae0cd7.tar.gz freebsd-ports-gnome-b18c8ac7febeed09c75711e6a6cc2cce8eae0cd7.tar.zst freebsd-ports-gnome-b18c8ac7febeed09c75711e6a6cc2cce8eae0cd7.zip | |
. Switch to the new java-zoneinfo port to provide updated time zone info
rather than relying on the official time zone updater.
Diffstat (limited to 'java/jdk15')
| -rw-r--r-- | java/jdk15/Makefile | 22 | ||||
| -rw-r--r-- | java/jdk15/distinfo | 2 |
2 files changed, 5 insertions, 19 deletions
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index 350b0fdf90cd..df31a7c79450 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}.${JDK_UPDATE_VERSION}p${JDK_PATCHSET_VERSION} -PORTREVISION= 18 +PORTREVISION= 19 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= # http://download.java.net/tiger/ @@ -49,7 +49,6 @@ JRL_SRCFILE= jdk-${JDK_VERSION:S/./_/g}_${JDK_UPDATE_VERSION}-fcs-src-b${JDK_BUI JRL_BINFILE= jdk-${JDK_VERSION:S/./_/g}_${JDK_UPDATE_VERSION}-fcs-bin-b${JDK_BUILD_NUMBER}-jrl-${JDK_BUILD_DATE}.jar PATCHSETFILE= bsd-jdk15-patches-${JDK_PATCHSET_VERSION}.tar.bz2 POLICYFILE= jce_policy-${JDK_VERSION:S/./_/g}.zip -TZUPDATEFILE= tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip JDK_VERSION= 1.5.0 JDK_UPDATE_VERSION= 16 @@ -58,9 +57,6 @@ JDK_BUILD_NUMBER= 02 JDK_BUILD_DATE= 28_may_2008 LATEST_LINK= jdk15 -TZUPDATE_VERSION= 1_3_45 -TZUPDATE_TZVERSION= 2011n - .include <bsd.port.pre.mk> .if !defined(WITH_LINUX_BOOTSTRAP) @@ -85,8 +81,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 native jdk installed? @@ -187,7 +182,7 @@ X11_FILES= ../../j2se/make/sun/motif21/Makefile \ ../../j2se/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java # Check for JDK sources and patch file -.if !defined(PACKAGE_BUILDING) && (!exists(${DISTDIR}/${JRL_SRCFILE}) || !exists(${DISTDIR}/${JRL_BINFILE}) || (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}) || (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})#{ @@ -210,12 +205,6 @@ in a web browser and follow the \"Download\" link for\n\ \"Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy\n\ Files 5.0\" 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/jdk15.html.\n\n @@ -353,9 +342,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/jdk15/distinfo b/java/jdk15/distinfo index 44ba218f7ad4..d2df67fd69d6 100644 --- a/java/jdk15/distinfo +++ b/java/jdk15/distinfo @@ -6,5 +6,3 @@ SHA256 (bsd-jdk15-patches-9.tar.bz2) = f197da850f02456c5ca4f7593401ee6afaf02fa1d SIZE (bsd-jdk15-patches-9.tar.bz2) = 802562 SHA256 (jce_policy-1_5_0.zip) = 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b SIZE (jce_policy-1_5_0.zip) = 8826 -SHA256 (tzupdater-1_3_45-2011n.zip) = c0894921dd6b440b4c99daf2e139d3d240012ed09e602b3101bfcc9fac394b0f -SIZE (tzupdater-1_3_45-2011n.zip) = 468717 |