Update lang/sun-jre6 to 6.0.3 and lang/sun-jdk6 to 6.0.4.

Please see the release notes online[1] for the list of fixed bugs.
Also, the license was wrong. There are several differences in all clauses
between the 1.3 and 6 licenses, so add the proper license files.
[1] http://java.sun.com/javase/6/webnotes/ReleaseNotes.html

6 files changed, 19 insertions, 16 deletions

diff --git a/lang/sun-jre6/DESCR b/lang/sun-jre6/DESCR
index df0d98a3ae2..afdc73830bc 100644
--- a/lang/sun-jre6/DESCR
+++ b/lang/sun-jre6/DESCR
@@ -1 +1 @@
-This is the Linux port of the Sun Java(tm) Runtime Environment (J2SE 5.0).
+This is the Linux port of the Sun Java(tm) Runtime Environment (J2SE 6.0).
diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index bf5264d230b..c645933772a 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.6 2007/08/27 21:51:24 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/01/20 02:31:47 tnn Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
-DISTNAME=	jre-6u1-linux-${DIST_ARCH}
-PKGNAME=	sun-jre6-6.0.1
-PKGREVISION=	2
+DISTNAME=	jre-6u3-linux-${DIST_ARCH}
+PKGNAME=	sun-jre6-6.0.3
 MASTER_SITES=	# empty
 
 DOWNLOAD_NAME=	Java Runtime Environment (JRE) 6u1
 SHORT_NAME=	JRE
 
-WRKSRC=		${WRKDIR}/jre1.6.0_01
+WRKSRC=		${WRKDIR}/jre1.6.0_03
 JAVA_WRAPPERS=	java javaws keytool orbd policytool rmid rmiregistry \
 		servertool tnameserv
 REQD_DIRS=	${JAVA_HOME}
@@ -21,6 +20,8 @@ REQD_DIRS+=	${JAVA_HOME}/lib/images/cursors
 REQD_DIRS+=	${JAVA_HOME}/lib/security
 CONF_FILES=	# empty
 
+LICENSE=	sun-jre6-license
+
 .include "../../lang/sun-jre6/Makefile.common"
 
 .sinclude "sfiles-${EMUL_ARCH}.mk"
diff --git a/lang/sun-jre6/Makefile.common b/lang/sun-jre6/Makefile.common
index c8832d7e561..e62561cbddc 100644
--- a/lang/sun-jre6/Makefile.common
+++ b/lang/sun-jre6/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2007/08/22 14:03:49 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2008/01/20 02:31:47 tnn Exp $
 
 CATEGORIES=	lang java
 COMMENT=	Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
@@ -6,10 +6,9 @@ EXTRACT_SUFX=	.bin
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://java.sun.com/
-DOWNLOAD=	http://java.sun.com/javase/downloads/index.jsp
+DOWNLOAD=	http://www.java.com/en/download/manual.jsp
 ARCHIVE=	http://java.sun.com/products/archive/
 
-LICENSE=	jdk13-license
 RESTRICTED=	Redistribution of repackaged binaries not permitted
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_SRC_ON_FTP=	${RESTRICTED}
diff --git a/lang/sun-jre6/PLIST.linux-i386 b/lang/sun-jre6/PLIST.linux-i386
index 913591b9e83..2da32acd70a 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.3 2007/08/27 21:51:24 jlam Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.4 2008/01/20 02:31:47 tnn Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -360,8 +360,10 @@ java/sun-6/lib/zi/America/Indiana/Indianapolis
 java/sun-6/lib/zi/America/Indiana/Knox
 java/sun-6/lib/zi/America/Indiana/Marengo
 java/sun-6/lib/zi/America/Indiana/Petersburg
+java/sun-6/lib/zi/America/Indiana/Tell_City
 java/sun-6/lib/zi/America/Indiana/Vevay
 java/sun-6/lib/zi/America/Indiana/Vincennes
+java/sun-6/lib/zi/America/Indiana/Winamac
 java/sun-6/lib/zi/America/Inuvik
 java/sun-6/lib/zi/America/Iqaluit
 java/sun-6/lib/zi/America/Jamaica
@@ -404,6 +406,7 @@ java/sun-6/lib/zi/America/Rainy_River
 java/sun-6/lib/zi/America/Rankin_Inlet
 java/sun-6/lib/zi/America/Recife
 java/sun-6/lib/zi/America/Regina
+java/sun-6/lib/zi/America/Resolute
 java/sun-6/lib/zi/America/Rio_Branco
 java/sun-6/lib/zi/America/Santiago
 java/sun-6/lib/zi/America/Santo_Domingo
diff --git a/lang/sun-jre6/buildlink3.mk b/lang/sun-jre6/buildlink3.mk
index df95e390730..e7d47c129fd 100644
--- a/lang/sun-jre6/buildlink3.mk
+++ b/lang/sun-jre6/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/05/25 02:04:15 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2008/01/20 02:31:47 tnn Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUN_JRE6_BUILDLINK3_MK:=	${SUN_JRE6_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jre6
 
 .if !empty(SUN_JRE6_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sun-jre6+=		sun-jre6-[0-9]*
-BUILDLINK_ABI_DEPENDS.sun-jre6?=		sun-jre6>=6.0.1
+BUILDLINK_ABI_DEPENDS.sun-jre6?=		sun-jre6>=6.0.3
 BUILDLINK_PKGSRCDIR.sun-jre6?=		../../lang/sun-jre6
 BUILDLINK_JAVA_PREFIX.sun-jre6=	${PREFIX}/java/sun-6
 
diff --git a/lang/sun-jre6/distinfo b/lang/sun-jre6/distinfo
index b26b0fb7ebe..f92e066827d 100644
--- a/lang/sun-jre6/distinfo
+++ b/lang/sun-jre6/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2007/04/26 20:35:33 tv Exp $
+$NetBSD: distinfo,v 1.3 2008/01/20 02:31:47 tnn Exp $
 
 SHA1 (jce_policy-6.zip) = 7b1b021bd63152b93a16c96bb3a64f0e685fc425
 RMD160 (jce_policy-6.zip) = 6f45ce5f3c067e186554f79b3f1a61e4d7d22aae
 Size (jce_policy-6.zip) = 9101 bytes
-SHA1 (jre-6u1-linux-i586.bin) = b66ac52e328499a7d3625ace61e4a069c735c6df
-RMD160 (jre-6u1-linux-i586.bin) = 466246161585981d73d97cd6a9508d22395f5f17
-Size (jre-6u1-linux-i586.bin) = 19036583 bytes
+SHA1 (jre-6u3-linux-i586.bin) = 6d729efc48b2539ffcc216a7fadf8fb1d9294410
+RMD160 (jre-6u3-linux-i586.bin) = 817bb20a878924a309dc22960f5a353fc26e76fc
+Size (jre-6u3-linux-i586.bin) = 19119599 bytes