- Update to sun-jdk14-2.16 and sun-jre14-2.16.

    Update 16 adds a GlobalSign root certificate.
    Update 15 is a bugfix release, see
      http://java.sun.com/j2se/1.4.2/ReleaseNotes.html#142_15
- Add the appropriate license files.

5 files changed, 24 insertions, 20 deletions

diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile
index 5a32902364d..0e44be7668b 100644
--- a/lang/sun-jdk14/Makefile
+++ b/lang/sun-jdk14/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2007/08/22 14:03:47 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2008/01/21 01:39:01 tnn Exp $
 
-DISTNAME=	j2sdk-1_4_2_14-linux-${DIST_ARCH}
-PKGNAME=	sun-jdk14-2.14
-PKGREVISION=	1
+DISTNAME=	j2sdk-1_4_2_16-linux-${DIST_ARCH}
+PKGNAME=	sun-jdk14-2.16
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 SDK, Standard Edition 1.4.2
@@ -11,10 +10,12 @@ SHORT=		SDK
 
 DEPENDS+=	sun-jre14>=2.9:../../lang/sun-jre14
 
-WRKSRC=		${WRKDIR}/j2sdk1.4.2_14
+WRKSRC=		${WRKDIR}/j2sdk1.4.2_16
 JAVA_WRAPPERS+=	appletviewer extcheck idlj jar jarsigner \
 		javac javadoc javah javap jdb rmic serialver
 
+LICENSE=	sun-jdk14-license
+
 .include "../../lang/sun-jre14/Makefile.common"
 
 # Remove parts that are in common with the JRE
diff --git a/lang/sun-jdk14/distinfo b/lang/sun-jdk14/distinfo
index 363e8cb0d0c..bc6c53f85fc 100644
--- a/lang/sun-jdk14/distinfo
+++ b/lang/sun-jdk14/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.19 2007/04/21 20:40:52 rillig Exp $
+$NetBSD: distinfo,v 1.20 2008/01/21 01:39:01 tnn Exp $
 
-SHA1 (j2sdk-1_4_2_14-linux-i586.bin) = 104a14f94b1ef168498e31bcaab0fb732db2cbca
-RMD160 (j2sdk-1_4_2_14-linux-i586.bin) = 8dfd1755625e50d0b2a3dc25ddcaff17afddca6c
-Size (j2sdk-1_4_2_14-linux-i586.bin) = 36368335 bytes
+SHA1 (j2sdk-1_4_2_16-linux-i586.bin) = d26cbf796b04f67d9d613049b799d2a168f48f98
+RMD160 (j2sdk-1_4_2_16-linux-i586.bin) = 01652579112db12b431940da39bbd4a6ea4748f0
+Size (j2sdk-1_4_2_16-linux-i586.bin) = 36397216 bytes
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index f9a55458c3d..9bec991eded 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.45 2007/08/27 21:51:22 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2008/01/21 01:39:01 tnn Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
-DISTNAME=	j2re-1_4_2_14-linux-${DIST_ARCH}
-PKGNAME=	sun-jre14-2.14
-PKGREVISION=	3
+DISTNAME=	j2re-1_4_2_16-linux-${DIST_ARCH}
+PKGNAME=	sun-jre14-2.16
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 Runtime Environment 1.4.2
 
 SHORT=		JRE
 
-WRKSRC=		${WRKDIR}/j2re1.4.2_14
+WRKSRC=		${WRKDIR}/j2re1.4.2_16
 JAVA_WRAPPERS=	java keytool orbd policytool rmid rmiregistry \
 		servertool tnameserv
 
+LICENSE=	sun-jre14-license
+
 .include "../../lang/sun-jre14/Makefile.common"
 
 REQD_DIRS=	${JAVA_HOME}
diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common
index d75a4b76c0f..fff2b1438fc 100644
--- a/lang/sun-jre14/Makefile.common
+++ b/lang/sun-jre14/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2008/01/09 02:54:39 ghen Exp $
+# $NetBSD: Makefile.common,v 1.39 2008/01/21 01:39:02 tnn Exp $
 
 CATEGORIES=	lang java
 EXTRACT_SUFX=	.bin
@@ -8,7 +8,6 @@ HOMEPAGE=	http://java.sun.com/
 DOWNLOAD=	http://java.sun.com/j2se/1.4.2/download.html
 ARCHIVE=	http://java.sun.com/products/archive/index.html
 
-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-jre14/distinfo b/lang/sun-jre14/distinfo
index 8858a866e74..9909dd2a262 100644
--- a/lang/sun-jre14/distinfo
+++ b/lang/sun-jre14/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.23 2007/04/21 20:40:52 rillig Exp $
+$NetBSD: distinfo,v 1.24 2008/01/21 01:39:02 tnn Exp $
 
-SHA1 (j2re-1_4_2_14-linux-i586.bin) = 28704686d1200cc1830a03c48452731f04603888
-RMD160 (j2re-1_4_2_14-linux-i586.bin) = 7054f23ae3a4fd304dfbb7e9c73da8462507c720
-Size (j2re-1_4_2_14-linux-i586.bin) = 14373288 bytes
+SHA1 (j2re-1_4_2_16-linux-i586.bin) = 7abc5f9354bc00109766f8f6302e39c4da938bcb
+RMD160 (j2re-1_4_2_16-linux-i586.bin) = 46885501b413a73a08f50695c335e11291389376
+Size (j2re-1_4_2_16-linux-i586.bin) = 14388621 bytes
+SHA1 (jce_policy-1_4_2.zip) = ea17b649ebcaaf4246e9dd28dbc77926176c64ee
+RMD160 (jce_policy-1_4_2.zip) = 323340fa8a96f315a35b0ebc918731e6fe56c370
+Size (jce_policy-1_4_2.zip) = 12195 bytes