Update to 7.0.21

Changelog:
* Update timezone data to 2012i
* Bugfixes

4 files changed, 36 insertions, 36 deletions

diff --git a/lang/sun-jdk7/Makefile b/lang/sun-jdk7/Makefile
index ed44b0e459c..86e524e9f99 100644
--- a/lang/sun-jdk7/Makefile
+++ b/lang/sun-jdk7/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.9 2013/04/13 11:20:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2013/04/20 01:10:56 ryoon Exp $
 
 # Note: This must be kept in sync with the sun-jre7 package
 # Note: make sure you include sums for both the x86_64 and the x86_32
 # in distinfo (make makesum will eat one of them)
 
-DISTNAME=	jdk-7u17-${DIST_OS}-${DIST_ARCH}
-PKGNAME=	sun-jdk7-7.0.17
+DISTNAME=	jdk-7u21-${DIST_OS}-${DIST_ARCH}
+PKGNAME=	sun-jdk7-7.0.21
 MASTER_SITES=	# empty
 
 LICENSE=	oracle-binary-code-license
 
-DOWNLOAD_NAME=	Java Development Kit (JDK) 7u17
+DOWNLOAD_NAME=	Java Development Kit (JDK) 7u21
 
 DEPENDS+=	${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre7
 
-WRKSRC=		${WRKDIR}/jdk1.7.0_17
+WRKSRC=		${WRKDIR}/jdk1.7.0_21
 JAVA_WRAPPERS=	appletviewer apt extcheck idlj jar jarsigner \
 		javac javadoc javah javap jdb rmic serialver
 
diff --git a/lang/sun-jdk7/distinfo b/lang/sun-jdk7/distinfo
index 86295b66ad6..2152d1af3ea 100644
--- a/lang/sun-jdk7/distinfo
+++ b/lang/sun-jdk7/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.8 2013/04/13 11:20:05 ryoon Exp $
+$NetBSD: distinfo,v 1.9 2013/04/20 01:10:56 ryoon Exp $
 
-SHA1 (jdk-7u17-linux-i586.tar.gz) = 5c85e1be8da066481e28ed2cac8298845ec2eeab
-RMD160 (jdk-7u17-linux-i586.tar.gz) = 8ae9ed7df971833c48373871624a440c9fe1f23a
-Size (jdk-7u17-linux-i586.tar.gz) = 97488905 bytes
-SHA1 (jdk-7u17-linux-x64.tar.gz) = d9b26c0db4e9b9d5331198830eb25582e3bb5e38
-RMD160 (jdk-7u17-linux-x64.tar.gz) = 5162f0e9f28d29c105bf74af6cda5d5abfc14d0a
-Size (jdk-7u17-linux-x64.tar.gz) = 96160926 bytes
-SHA1 (jdk-7u17-solaris-i586.tar.gz) = 1dc3ba116242c8b8d173d5fe49fdf01bd5878b44
-RMD160 (jdk-7u17-solaris-i586.tar.gz) = 8f28d2ffbbaac658543086c0ca3f1e6ff4fce05f
-Size (jdk-7u17-solaris-i586.tar.gz) = 96126242 bytes
-SHA1 (jdk-7u17-solaris-x64.tar.gz) = b1cdf58929b0781feb5a3035fbe2c7df4056f335
-RMD160 (jdk-7u17-solaris-x64.tar.gz) = 771ac509bcf878c4a1dc1d454b3a6a64ed516ba4
-Size (jdk-7u17-solaris-x64.tar.gz) = 15745261 bytes
+SHA1 (jdk-7u21-linux-i586.tar.gz) = ce05b9a7ecfe348878389671bd82ddc68eac2491
+RMD160 (jdk-7u21-linux-i586.tar.gz) = 59629bd9010b2995e5889d830f268662783f4d66
+Size (jdk-7u21-linux-i586.tar.gz) = 97585097 bytes
+SHA1 (jdk-7u21-linux-x64.tar.gz) = 5391a86ac11dcd62849de2b354048d83881d2a94
+RMD160 (jdk-7u21-linux-x64.tar.gz) = 053f647c7b36cc2749b531fc8e7ee945e9d596ee
+Size (jdk-7u21-linux-x64.tar.gz) = 96272413 bytes
+SHA1 (jdk-7u21-solaris-i586.tar.gz) = 7c31939ca9adfc3fd989e2c8af5ab8fe589aa795
+RMD160 (jdk-7u21-solaris-i586.tar.gz) = 78ff39818ac175f17c5cafe6b6731fec78c02ca4
+Size (jdk-7u21-solaris-i586.tar.gz) = 96552938 bytes
+SHA1 (jdk-7u21-solaris-x64.tar.gz) = 52bccba67efe951c59881756c4d1918904e789ea
+RMD160 (jdk-7u21-solaris-x64.tar.gz) = d39f8e3ffc31869704e4a44c78ec74fd26d5311e
+Size (jdk-7u21-solaris-x64.tar.gz) = 15749823 bytes
diff --git a/lang/sun-jre7/Makefile b/lang/sun-jre7/Makefile
index 314e6f8679b..597dd354f29 100644
--- a/lang/sun-jre7/Makefile
+++ b/lang/sun-jre7/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.13 2013/04/13 11:19:36 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2013/04/20 01:10:19 ryoon Exp $
 
 # Note: Regen distinfo with PKG_OPTIONS.sun-jre7+=sun-jre-jce
 # Note: Update DOWNLOAD_NAME when you update the JRE version
 # Note: This needs to be kept in sync with the sun-jdk7 package
 # Note: If you make makesum, make sure that you include both archs in distinfo
 
-DISTNAME=	jre-7u17-${DIST_OS}-${DIST_ARCH}
-PKGNAME=	sun-jre7-7.0.17
+DISTNAME=	jre-7u21-${DIST_OS}-${DIST_ARCH}
+PKGNAME=	sun-jre7-7.0.21
 MASTER_SITES=	# empty
 
 LICENSE=	oracle-binary-code-license
 
-DOWNLOAD_NAME=	Java Runtime Environment (JRE) 7u17
+DOWNLOAD_NAME=	Java Runtime Environment (JRE) 7u21
 
 USE_TOOLS+=	pax
 
-WRKSRC=		${WRKDIR}/jre1.7.0_17
+WRKSRC=		${WRKDIR}/jre1.7.0_21
 JAVA_WRAPPERS=	java javaws keytool orbd policytool rmid rmiregistry \
 		servertool tnameserv
 REQD_DIRS=	${JAVA_HOME}
diff --git a/lang/sun-jre7/distinfo b/lang/sun-jre7/distinfo
index d922749c87b..b84930f3bf1 100644
--- a/lang/sun-jre7/distinfo
+++ b/lang/sun-jre7/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.10 2013/04/13 11:19:36 ryoon Exp $
+$NetBSD: distinfo,v 1.11 2013/04/20 01:10:19 ryoon Exp $
 
 SHA1 (UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
 RMD160 (UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
 Size (UnlimitedJCEPolicyJDK7.zip) = 7426 bytes
-SHA1 (jre-7u17-linux-i586.tar.gz) = 9961b47ca754e8bd48e646ecc362b2fdb4066a22
-RMD160 (jre-7u17-linux-i586.tar.gz) = 313c0d3aec9fc55709c68d9c7e3465630e6bdf50
-Size (jre-7u17-linux-i586.tar.gz) = 48128443 bytes
-SHA1 (jre-7u17-linux-x64.tar.gz) = 108a720a509f610133f7dc29b8b5856d7e4f5279
-RMD160 (jre-7u17-linux-x64.tar.gz) = 49cd6d4ab9647232b909eabcab7fc7b413a4f9a6
-Size (jre-7u17-linux-x64.tar.gz) = 46800474 bytes
-SHA1 (jre-7u17-solaris-i586.tar.gz) = e885623c30acf86bcc1f214d77af3be5aebaffc8
-RMD160 (jre-7u17-solaris-i586.tar.gz) = b2086fdd1836bb27457066c1cb9c8c44793ff81c
-Size (jre-7u17-solaris-i586.tar.gz) = 47640677 bytes
-SHA1 (jre-7u17-solaris-x64.tar.gz) = a39d26ecafe732f02ff5bc90e897b0c0ff1f5ca1
-RMD160 (jre-7u17-solaris-x64.tar.gz) = e909eabbf1e12aa8ee109fb8cd477ecfb625e171
-Size (jre-7u17-solaris-x64.tar.gz) = 15575260 bytes
+SHA1 (jre-7u21-linux-i586.tar.gz) = b5277744dc56e33db2507acd02f22e4f555d2246
+RMD160 (jre-7u21-linux-i586.tar.gz) = 0bc1c78a545bbb54ebbe1ae3f351d6fda6442005
+Size (jre-7u21-linux-i586.tar.gz) = 48233160 bytes
+SHA1 (jre-7u21-linux-x64.tar.gz) = 76c4acd98d916aee370dc6aa8c094280606f92c5
+RMD160 (jre-7u21-linux-x64.tar.gz) = 0d6e8f137139eea8eb4c37398beb272b61a78e24
+Size (jre-7u21-linux-x64.tar.gz) = 46934987 bytes
+SHA1 (jre-7u21-solaris-i586.tar.gz) = c4c7d909cd4da09e01c5d464744b3f90c9ec7135
+RMD160 (jre-7u21-solaris-i586.tar.gz) = a6c3cc2f6c646206d2814d174826253156754c40
+Size (jre-7u21-solaris-i586.tar.gz) = 47771041 bytes
+SHA1 (jre-7u21-solaris-x64.tar.gz) = 343cc7c9d7af31b5d75da9621b4295d6ce211e21
+RMD160 (jre-7u21-solaris-x64.tar.gz) = 22ebee71a29e46df525f2c0c82eb9e331013bc7b
+Size (jre-7u21-solaris-x64.tar.gz) = 15580629 bytes