Update to 6u1; fixes PR pkg/36181.

Give away to pkgsrc-users.

4 files changed, 16 insertions, 15 deletions

diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index 78d04d54ce7..d4f53e125a3 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.1 2007/02/18 19:11:27 tv Exp $
+# $NetBSD: Makefile,v 1.2 2007/04/26 20:35:33 tv Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
-DISTNAME=	jre-6-linux-${DIST_ARCH}
-PKGNAME=	sun-jre6-6.0
+DISTNAME=	jre-6u1-linux-${DIST_ARCH}
+PKGNAME=	sun-jre6-6.0.1
 MASTER_SITES=	# empty
 
+DOWNLOAD_NAME=	Java Runtime Environment (JRE) 6u1
 SHORT_NAME=	JRE
 
-WRKSRC=		${WRKDIR}/jre1.6.0
+WRKSRC=		${WRKDIR}/jre1.6.0_01
 JAVA_WRAPPERS=	java javaws keytool orbd policytool rmid rmiregistry \
 		servertool tnameserv
 REQD_DIRS=	${JAVA_HOME}
diff --git a/lang/sun-jre6/Makefile.common b/lang/sun-jre6/Makefile.common
index 8809eee2b57..7627723d80c 100644
--- a/lang/sun-jre6/Makefile.common
+++ b/lang/sun-jre6/Makefile.common
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile.common,v 1.1 2007/02/18 19:11:28 tv Exp $
+# $NetBSD: Makefile.common,v 1.2 2007/04/26 20:35:33 tv Exp $
 
 CATEGORIES=	lang java
 COMMENT=	Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
 EXTRACT_SUFX=	.bin
 
-MAINTAINER=	tv@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://java.sun.com/
 DOWNLOAD=	http://java.sun.com/javase/downloads/index.jsp
-DOWNLOAD_NAME=	${SHORT_NAME} 5.0 Update ${PKGNAME_NOREV:C/^.*\.//}
 ARCHIVE=	http://java.sun.com/products/archive/
 
 LICENSE=	jdk13-license
@@ -57,7 +56,7 @@ FETCH_MESSAGE+=	" from:"
 FETCH_MESSAGE+=	"	${DOWNLOAD}"
 FETCH_MESSAGE+=	"	or ${ARCHIVE}"
 FETCH_MESSAGE+=	""
-FETCH_MESSAGE+=	" Click 'Download ${DOWNLOAD_NAME}', read and accept the"
+FETCH_MESSAGE+=	" Click Download for '${DOWNLOAD_NAME}', read and accept the"
 FETCH_MESSAGE+=	" license, then choose 'Linux self-extracting file'."
 
 post-fetch:
diff --git a/lang/sun-jre6/PLIST.i386 b/lang/sun-jre6/PLIST.i386
index 6b5d8447b00..8db176eb5a5 100644
--- a/lang/sun-jre6/PLIST.i386
+++ b/lang/sun-jre6/PLIST.i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.i386,v 1.1 2007/02/18 19:11:28 tv Exp $
+@comment $NetBSD: PLIST.i386,v 1.2 2007/04/26 20:35:33 tv Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -249,7 +249,7 @@ java/sun-6/lib/zi/Africa/Abidjan
 java/sun-6/lib/zi/Africa/Accra
 java/sun-6/lib/zi/Africa/Addis_Ababa
 java/sun-6/lib/zi/Africa/Algiers
-java/sun-6/lib/zi/Africa/Asmera
+java/sun-6/lib/zi/Africa/Asmara
 java/sun-6/lib/zi/Africa/Bamako
 java/sun-6/lib/zi/Africa/Bangui
 java/sun-6/lib/zi/Africa/Banjul
@@ -516,7 +516,7 @@ java/sun-6/lib/zi/Atlantic/Azores
 java/sun-6/lib/zi/Atlantic/Bermuda
 java/sun-6/lib/zi/Atlantic/Canary
 java/sun-6/lib/zi/Atlantic/Cape_Verde
-java/sun-6/lib/zi/Atlantic/Faeroe
+java/sun-6/lib/zi/Atlantic/Faroe
 java/sun-6/lib/zi/Atlantic/Madeira
 java/sun-6/lib/zi/Atlantic/Reykjavik
 java/sun-6/lib/zi/Atlantic/South_Georgia
@@ -527,6 +527,7 @@ java/sun-6/lib/zi/Australia/Brisbane
 java/sun-6/lib/zi/Australia/Broken_Hill
 java/sun-6/lib/zi/Australia/Currie
 java/sun-6/lib/zi/Australia/Darwin
+java/sun-6/lib/zi/Australia/Eucla
 java/sun-6/lib/zi/Australia/Hobart
 java/sun-6/lib/zi/Australia/Lindeman
 java/sun-6/lib/zi/Australia/Lord_Howe
diff --git a/lang/sun-jre6/distinfo b/lang/sun-jre6/distinfo
index 4b4c1a91cee..b26b0fb7ebe 100644
--- a/lang/sun-jre6/distinfo
+++ b/lang/sun-jre6/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1 2007/02/18 19:11:28 tv Exp $
+$NetBSD: distinfo,v 1.2 2007/04/26 20:35:33 tv Exp $
 
 SHA1 (jce_policy-6.zip) = 7b1b021bd63152b93a16c96bb3a64f0e685fc425
 RMD160 (jce_policy-6.zip) = 6f45ce5f3c067e186554f79b3f1a61e4d7d22aae
 Size (jce_policy-6.zip) = 9101 bytes
-SHA1 (jre-6-linux-i586.bin) = f6e398fdc34d2367c24fa7f1c7a93b245d002071
-RMD160 (jre-6-linux-i586.bin) = b538b7dfa5eda250ca8ddd4ad15e0fb30352301f
-Size (jre-6-linux-i586.bin) = 18964005 bytes
+SHA1 (jre-6u1-linux-i586.bin) = b66ac52e328499a7d3625ace61e4a069c735c6df
+RMD160 (jre-6u1-linux-i586.bin) = 466246161585981d73d97cd6a9508d22395f5f17
+Size (jre-6u1-linux-i586.bin) = 19036583 bytes