welcome to 6u11

3 files changed, 13 insertions, 20 deletions

diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index 01819006138..269230dcec0 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2008/11/11 16:17:10 reinoud Exp $
+# $NetBSD: Makefile,v 1.15 2009/01/18 21:45:26 christos Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 # Note: Update DOWNLOAD_NAME when you update the JRE version
 
-DISTNAME=	jre-6u5-linux-${DIST_ARCH}
-PKGREVISION=    1
-PKGNAME=	sun-jre6-6.0.5
+DISTNAME=	jre-6u11-linux-${DIST_ARCH}
+#PKGREVISION=    1
+PKGNAME=	sun-jre6-6.0.11
 MASTER_SITES=	# empty
 
 DOWNLOAD_NAME=	Java Runtime Environment (JRE) 6u5
@@ -13,7 +13,7 @@ SHORT_NAME=	JRE
 
 USE_TOOLS+=	pax
 
-WRKSRC=		${WRKDIR}/jre1.6.0_05
+WRKSRC=		${WRKDIR}/jre1.6.0_11
 JAVA_WRAPPERS=	java javaws keytool orbd policytool rmid rmiregistry \
 		servertool tnameserv
 REQD_DIRS=	${JAVA_HOME}
diff --git a/lang/sun-jre6/PLIST.linux-i386 b/lang/sun-jre6/PLIST.linux-i386
index 7c6ebf7b5de..035f8fff83d 100644
--- a/lang/sun-jre6/PLIST.linux-i386
+++ b/lang/sun-jre6/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.8 2008/11/11 15:05:51 reinoud Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.9 2009/01/18 21:45:26 christos Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -54,7 +54,7 @@ java/sun-6/lib/deploy/messages_sv.properties.default
 java/sun-6/lib/deploy/messages_zh_CN.properties.default
 java/sun-6/lib/deploy/messages_zh_HK.properties.default
 java/sun-6/lib/deploy/messages_zh_TW.properties.default
-java/sun-6/lib/deploy/splash.jpg
+java/sun-6/lib/deploy/splash.gif
 java/sun-6/lib/desktop/applications/sun-java.desktop
 java/sun-6/lib/desktop/applications/sun-javaws.desktop
 java/sun-6/lib/desktop/applications/sun_java.desktop
@@ -239,7 +239,6 @@ java/sun-6/lib/psfont.properties.ja.default
 java/sun-6/lib/psfontj2d.properties.default
 java/sun-6/lib/resources.jar
 java/sun-6/lib/rt.jar
-java/sun-6/lib/servicetag/registration.xml
 ${PLIST.jce}java/sun-6/lib/security/COPYRIGHT.html
 ${PLIST.jce}java/sun-6/lib/security/README.txt
 java/sun-6/lib/security/US_export_policy.jar
@@ -456,7 +455,6 @@ java/sun-6/lib/zi/Asia/Bangkok
 java/sun-6/lib/zi/Asia/Beirut
 java/sun-6/lib/zi/Asia/Bishkek
 java/sun-6/lib/zi/Asia/Brunei
-java/sun-6/lib/zi/Asia/Calcutta
 java/sun-6/lib/zi/Asia/Choibalsan
 java/sun-6/lib/zi/Asia/Chongqing
 java/sun-6/lib/zi/Asia/Colombo
@@ -467,6 +465,7 @@ java/sun-6/lib/zi/Asia/Dubai
 java/sun-6/lib/zi/Asia/Dushanbe
 java/sun-6/lib/zi/Asia/Gaza
 java/sun-6/lib/zi/Asia/Harbin
+java/sun-6/lib/zi/Asia/Ho_Chi_Minh
 java/sun-6/lib/zi/Asia/Hong_Kong
 java/sun-6/lib/zi/Asia/Hovd
 java/sun-6/lib/zi/Asia/Irkutsk
@@ -478,6 +477,7 @@ java/sun-6/lib/zi/Asia/Kamchatka
 java/sun-6/lib/zi/Asia/Karachi
 java/sun-6/lib/zi/Asia/Kashgar
 java/sun-6/lib/zi/Asia/Katmandu
+java/sun-6/lib/zi/Asia/Kolkata
 java/sun-6/lib/zi/Asia/Krasnoyarsk
 java/sun-6/lib/zi/Asia/Kuala_Lumpur
 java/sun-6/lib/zi/Asia/Kuching
@@ -501,7 +501,6 @@ java/sun-6/lib/zi/Asia/Riyadh
 java/sun-6/lib/zi/Asia/Riyadh87
 java/sun-6/lib/zi/Asia/Riyadh88
 java/sun-6/lib/zi/Asia/Riyadh89
-java/sun-6/lib/zi/Asia/Saigon
 java/sun-6/lib/zi/Asia/Sakhalin
 java/sun-6/lib/zi/Asia/Samarkand
 java/sun-6/lib/zi/Asia/Seoul
diff --git a/lang/sun-jre6/distinfo b/lang/sun-jre6/distinfo
index 0fc9c6d9c3c..3bbe364c96e 100644
--- a/lang/sun-jre6/distinfo
+++ b/lang/sun-jre6/distinfo
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.5 2008/03/05 22:32:09 tnn Exp $
+$NetBSD: distinfo,v 1.6 2009/01/18 21:45:26 christos Exp $
 
-SHA1 (jce_policy-6.zip) = 7b1b021bd63152b93a16c96bb3a64f0e685fc425
-RMD160 (jce_policy-6.zip) = 6f45ce5f3c067e186554f79b3f1a61e4d7d22aae
-Size (jce_policy-6.zip) = 9101 bytes
-SHA1 (jre-6u5-linux-i586.bin) = 12f469a4796ee1b33a801c2a020ea3fa322cde1e
-RMD160 (jre-6u5-linux-i586.bin) = 7c73f00d762e8f139ebe6ee41b388a6a8acf087b
-Size (jre-6u5-linux-i586.bin) = 19745768 bytes
-SHA1 (jre-6u5-linux-x64.bin) = 136ffb4c9048dc9a52e7e9b79b8e310909c8366d
-RMD160 (jre-6u5-linux-x64.bin) = 7734024c6ea70b801e87a31cc0816f654dfefae6
-Size (jre-6u5-linux-x64.bin) = 18349454 bytes
+SHA1 (jre-6u11-linux-i586.bin) = 85f6e820bc5c31a2eb1eab1a0b4ab3c9cf449445
+RMD160 (jre-6u11-linux-i586.bin) = e9b90a4b795e36c8ca2c0a9557c83ce7650d71eb
+Size (jre-6u11-linux-i586.bin) = 20106959 bytes