[pkgsrc/trunk]: pkgsrc/lang Update to 6u1; fixes PR pkg/36181.

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4387a6af2418
branches:  trunk
changeset: 528262:4387a6af2418
user:      tv <tv%pkgsrc.org@localhost>
date:      Thu Apr 26 20:35:33 2007 +0000

description:
Update to 6u1; fixes PR pkg/36181.

Give away to pkgsrc-users.

diffstat:

 lang/sun-jdk6/Makefile        |  7 ++++---
 lang/sun-jdk6/distinfo        |  8 ++++----
 lang/sun-jre6/Makefile        |  9 +++++----
 lang/sun-jre6/Makefile.common |  7 +++----
 lang/sun-jre6/PLIST.i386      |  7 ++++---
 lang/sun-jre6/distinfo        |  8 ++++----
 6 files changed, 24 insertions(+), 22 deletions(-)

diffs (138 lines):

diff -r f757741d14c5 -r 4387a6af2418 lang/sun-jdk6/Makefile
--- a/lang/sun-jdk6/Makefile    Thu Apr 26 20:14:29 2007 +0000
+++ b/lang/sun-jdk6/Makefile    Thu Apr 26 20:35:33 2007 +0000
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.1 2007/02/18 19:11:26 tv Exp $
+# $NetBSD: Makefile,v 1.2 2007/04/26 20:35:33 tv Exp $
 
-DISTNAME=      jdk-6-linux-i586
+DISTNAME=      jdk-6u1-linux-i586
 PKGNAME=       sun-jdk6-6.0
 MASTER_SITES=  # empty
 
+DOWNLOAD_NAME= JDK 6u1
 SHORT_NAME=    JDK
 
 DEPENDS+=      ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6
 
 CHECK_SHLIBS=  no      # One of the demos is broken.
-WRKSRC=                ${WRKDIR}/jdk1.6.0
+WRKSRC=                ${WRKDIR}/jdk1.6.0_01
 JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \
                javac javadoc javah javap jdb rmic serialver
 
diff -r f757741d14c5 -r 4387a6af2418 lang/sun-jdk6/distinfo
--- a/lang/sun-jdk6/distinfo    Thu Apr 26 20:14:29 2007 +0000
+++ b/lang/sun-jdk6/distinfo    Thu Apr 26 20:35:33 2007 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2007/02/18 19:11:27 tv Exp $
+$NetBSD: distinfo,v 1.2 2007/04/26 20:35:33 tv Exp $
 
-SHA1 (jdk-6-linux-i586.bin) = 7db73e2ff4e9a7c52fc8ef182d130fbe51e6115b
-RMD160 (jdk-6-linux-i586.bin) = 57ed7705405bc5c31435ced005543b72b843e783
-Size (jdk-6-linux-i586.bin) = 62678298 bytes
+SHA1 (jdk-6u1-linux-i586.bin) = 59e2ecc5ef4c4db126110abe1ecd80c9f5502c3f
+RMD160 (jdk-6u1-linux-i586.bin) = 80e6b5ba57f9be5b284efa9df48bb198ba40193e
+Size (jdk-6u1-linux-i586.bin) = 62772481 bytes
diff -r f757741d14c5 -r 4387a6af2418 lang/sun-jre6/Makefile
--- a/lang/sun-jre6/Makefile    Thu Apr 26 20:14:29 2007 +0000
+++ b/lang/sun-jre6/Makefile    Thu Apr 26 20:35:33 2007 +0000
@@ -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 -r f757741d14c5 -r 4387a6af2418 lang/sun-jre6/Makefile.common
--- a/lang/sun-jre6/Makefile.common     Thu Apr 26 20:14:29 2007 +0000
+++ b/lang/sun-jre6/Makefile.common     Thu Apr 26 20:35:33 2007 +0000
@@ -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@localhost
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 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+=        "       ${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 -r f757741d14c5 -r 4387a6af2418 lang/sun-jre6/PLIST.i386
--- a/lang/sun-jre6/PLIST.i386  Thu Apr 26 20:14:29 2007 +0000
+++ b/lang/sun-jre6/PLIST.i386  Thu Apr 26 20:35:33 2007 +0000
@@ -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/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/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/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 -r f757741d14c5 -r 4387a6af2418 lang/sun-jre6/distinfo
--- a/lang/sun-jre6/distinfo    Thu Apr 26 20:14:29 2007 +0000
+++ b/lang/sun-jre6/distinfo    Thu Apr 26 20:35:33 2007 +0000
@@ -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