[Midnightbsd-cvs] CVS Commit: java/diablo-jre15: Merge in the timezone update
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Aug 7 15:53:06 EDT 2007
Log Message:
-----------
Merge in the timezone update
Modified Files:
--------------
mports/java/diablo-jre15:
Makefile (r1.5 -> r1.6)
distinfo (r1.2 -> r1.3)
pkg-plist (r1.2 -> r1.3)
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/java/diablo-jre15/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ljava/diablo-jre15/pkg-plist -Ljava/diablo-jre15/pkg-plist -u -r1.2 -r1.3
--- java/diablo-jre15/pkg-plist
+++ java/diablo-jre15/pkg-plist
@@ -316,6 +316,7 @@
diablo-jre%%JRE_VERSION%%/lib/zi/America/Rankin_Inlet
diablo-jre%%JRE_VERSION%%/lib/zi/America/Recife
diablo-jre%%JRE_VERSION%%/lib/zi/America/Regina
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Resolute
diablo-jre%%JRE_VERSION%%/lib/zi/America/Rio_Branco
diablo-jre%%JRE_VERSION%%/lib/zi/America/Santiago
diablo-jre%%JRE_VERSION%%/lib/zi/America/Santo_Domingo
@@ -451,7 +452,6 @@
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 +526,6 @@
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 +538,6 @@
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
@@ -580,6 +578,19 @@
diablo-jre%%JRE_VERSION%%/lib/zi/Pacific/Truk
diablo-jre%%JRE_VERSION%%/lib/zi/Pacific/Wake
diablo-jre%%JRE_VERSION%%/lib/zi/Pacific/Wallis
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/AST4
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/AST4ADT
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/CST6
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/CST6CDT
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/EST5
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/EST5EDT
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/HST10
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/MST7
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/MST7MDT
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/PST8
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/PST8PDT
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/YST9
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/YST9YDT
diablo-jre%%JRE_VERSION%%/lib/zi/WET
diablo-jre%%JRE_VERSION%%/lib/zi/ZoneInfoMappings
diablo-jre%%JRE_VERSION%%/man/ja
@@ -623,6 +634,7 @@
@dirrm diablo-jre%%JRE_VERSION%%/man/ja_JP.eucJP/man1
@dirrm diablo-jre%%JRE_VERSION%%/man/ja_JP.eucJP
@dirrm diablo-jre%%JRE_VERSION%%/man
+%%TZUPDATE%%@dirrm diablo-jre%%JRE_VERSION%%/lib/zi/SystemV
@dirrm diablo-jre%%JRE_VERSION%%/lib/zi/Pacific
@dirrm diablo-jre%%JRE_VERSION%%/lib/zi/Indian
@dirrm diablo-jre%%JRE_VERSION%%/lib/zi/Europe
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/java/diablo-jre15/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -Ljava/diablo-jre15/Makefile -Ljava/diablo-jre15/Makefile -u -r1.5 -r1.6
--- java/diablo-jre15/Makefile
+++ java/diablo-jre15/Makefile
@@ -52,9 +52,9 @@
.if !defined(WITHOUT_TZUPDATE)
EXTRACT_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
-TZUPDATE_VERSION= 1.1.0
-TZUPDATE_TZVERSION= 2007c
-TZUPDATEFILE= tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
+TZUPDATE_VERSION= 1.2.1
+TZUPDATE_TZVERSION= 2007f
+TZUPDATEFILE= tzupdater-${TZUPDATE_VERSION:S/./_/g}-${TZUPDATE_TZVERSION}.zip
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${TZUPDATEFILE}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PLIST_SUB+= TZORIGINAL="@comment "
@@ -99,7 +99,7 @@
@${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
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/java/diablo-jre15/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ljava/diablo-jre15/distinfo -Ljava/diablo-jre15/distinfo -u -r1.2 -r1.3
--- java/diablo-jre15/distinfo
+++ java/diablo-jre15/distinfo
@@ -1,12 +1,6 @@
-MD5 (diablo-latte-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = 7f7a0cc1c6f6441756e90757fd731cc6
-SHA256 (diablo-latte-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = e242f4f8ee2973cf1dda320f46df71d8c57bf4aa8147e9d30c81243eef959673
-SIZE (diablo-latte-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = 20580050
MD5 (diablo-latte-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 4ab052253faf251129737e999916de1b
SHA256 (diablo-latte-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 4585f35124416de052c8be10f0f48536053ab5c33dc3b7d728bf6e84d9b42c14
SIZE (diablo-latte-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 23104037
-MD5 (diablo-latte-freebsd5-i386-1.5.0_07-b01.tar.bz2) = 8d678db9f1e88a63bfa8fde387ebe36f
-SHA256 (diablo-latte-freebsd5-i386-1.5.0_07-b01.tar.bz2) = f684f425a9cf07e2d8cfe90d1cb6e543d162b026003e7fcf9b655dd8f8f9e3f5
-SIZE (diablo-latte-freebsd5-i386-1.5.0_07-b01.tar.bz2) = 23036449
-MD5 (tzupdater-1.1.0-2007c.zip) = 1f1e1573d77dd9387a0ef3f2d93e759b
-SHA256 (tzupdater-1.1.0-2007c.zip) = 252d2d390bb1a0df27650603cbca6e5931e29c13d9c3b3538290a58cad06d769
-SIZE (tzupdater-1.1.0-2007c.zip) = 480534
+MD5 (tzupdater-1_2_1-2007f.zip) = f2ea5ca92b89ef767488a7ffd351cb3f
+SHA256 (tzupdater-1_2_1-2007f.zip) = 48c21fe64c9fcf8c612ea2ec5043e4bbeb37fea2e07d980d7297b130a32a29c1
+SIZE (tzupdater-1_2_1-2007f.zip) = 258198
More information about the Midnightbsd-cvs
mailing list