aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorglewis <glewis@FreeBSD.org>2007-03-14 11:57:58 +0800
committerglewis <glewis@FreeBSD.org>2007-03-14 11:57:58 +0800
commitaa177c60bffed74090607927b97c30aabf1c8e96 (patch)
treebc4391bb1276fe58f961a9d62fdec949a570f1d5 /java
parent84363026a6a426e7918ee714e130d47b3053dc1e (diff)
downloadfreebsd-ports-gnome-aa177c60bffed74090607927b97c30aabf1c8e96.tar.gz
freebsd-ports-gnome-aa177c60bffed74090607927b97c30aabf1c8e96.tar.zst
freebsd-ports-gnome-aa177c60bffed74090607927b97c30aabf1c8e96.zip
. Fix a backwards compatibility problem with the EST, HST and MST timezones
by running the time zone updater with -bc. See: http://sunsolve.sun.com/search/document.do?assetkey=1-26-102836-1 . Bump PORTREVISION.
Diffstat (limited to 'java')
-rw-r--r--java/diablo-jdk15/Makefile4
-rw-r--r--java/diablo-jdk15/pkg-plist3
-rw-r--r--java/diablo-jre15/Makefile4
-rw-r--r--java/diablo-jre15/pkg-plist3
4 files changed, 4 insertions, 10 deletions
diff --git a/java/diablo-jdk15/Makefile b/java/diablo-jdk15/Makefile
index 27226516e01c..1188f6cc4767 100644
--- a/java/diablo-jdk15/Makefile
+++ b/java/diablo-jdk15/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= java devel
MASTER_SITES= #
PKGNAMEPREFIX= diablo-
@@ -103,7 +103,7 @@ post-extract:
@${UNZIP_CMD} -qo ${DISTDIR}/${TZUPDATEFILE} -d ${WRKDIR}
@# Update time zones
@-${WRKSRC}/bin/java -jar \
- ${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u
+ ${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u -bc
@-${RM} -rf ${WRKSRC}/jre/lib/zi.tzdata*
.endif
diff --git a/java/diablo-jdk15/pkg-plist b/java/diablo-jdk15/pkg-plist
index 5a9b98b80dfa..9e7f45ca52fc 100644
--- a/java/diablo-jdk15/pkg-plist
+++ b/java/diablo-jdk15/pkg-plist
@@ -1927,7 +1927,6 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Sydney
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/CET
%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/CST6CDT
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/EET
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/EST
%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/EST5EDT
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+1
@@ -2002,7 +2001,6 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Warsaw
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Zaporozhye
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Zurich
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/GMT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/HST
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Antananarivo
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Chagos
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Christmas
@@ -2015,7 +2013,6 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mauritius
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mayotte
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Reunion
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/MET
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/MST
%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/MST7MDT
%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/PST8PDT
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Apia
diff --git a/java/diablo-jre15/Makefile b/java/diablo-jre15/Makefile
index 3e307c242705..b8e962768d3b 100644
--- a/java/diablo-jre15/Makefile
+++ b/java/diablo-jre15/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jre
PORTVERSION= ${JRE_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= java devel
MASTER_SITES= #
PKGNAMEPREFIX= diablo-
@@ -102,7 +102,7 @@ post-extract:
@${UNZIP_CMD} -qo ${DISTDIR}/${TZUPDATEFILE} -d ${WRKDIR}
@# Update time zones
@-${WRKSRC}/bin/java -jar \
- ${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u
+ ${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u -bc
@${RM} -rf ${WRKSRC}/lib/zi.tzdata*
.endif
diff --git a/java/diablo-jre15/pkg-plist b/java/diablo-jre15/pkg-plist
index 2037b7fc5ab4..3d67f67d1045 100644
--- a/java/diablo-jre15/pkg-plist
+++ b/java/diablo-jre15/pkg-plist
@@ -451,7 +451,6 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Australia/Sydney
diablo-jre%%JRE_VERSION%%/lib/zi/CET
%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/CST6CDT
diablo-jre%%JRE_VERSION%%/lib/zi/EET
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/EST
%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/EST5EDT
diablo-jre%%JRE_VERSION%%/lib/zi/Etc/GMT
diablo-jre%%JRE_VERSION%%/lib/zi/Etc/GMT+1
@@ -526,7 +525,6 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Europe/Warsaw
diablo-jre%%JRE_VERSION%%/lib/zi/Europe/Zaporozhye
diablo-jre%%JRE_VERSION%%/lib/zi/Europe/Zurich
diablo-jre%%JRE_VERSION%%/lib/zi/GMT
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/HST
diablo-jre%%JRE_VERSION%%/lib/zi/Indian/Antananarivo
diablo-jre%%JRE_VERSION%%/lib/zi/Indian/Chagos
diablo-jre%%JRE_VERSION%%/lib/zi/Indian/Christmas
@@ -539,7 +537,6 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Indian/Mauritius
diablo-jre%%JRE_VERSION%%/lib/zi/Indian/Mayotte
diablo-jre%%JRE_VERSION%%/lib/zi/Indian/Reunion
diablo-jre%%JRE_VERSION%%/lib/zi/MET
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/MST
%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/MST7MDT
%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/PST8PDT
diablo-jre%%JRE_VERSION%%/lib/zi/Pacific/Apia