Update to 1.5.0_10. Changes are in the release notes:

http://java.sun.com/j2se/1.5.0/ReleaseNotes.html

Update includes amd64 update as well for sun-jre15 (amd64 is not yet
supported in sun-jdk15).

5 files changed, 22 insertions, 19 deletions

diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile
index e8888ddf412..fc61d808a98 100644
--- a/lang/sun-jre15/Makefile
+++ b/lang/sun-jre15/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2006/12/03 00:51:21 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2007/01/12 18:23:38 tv Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
-DISTNAME=	jre-1_5_0_09-linux-${DIST_ARCH}
-PKGNAME=	sun-jre15-5.0.9
-PKGREVISION=	1
+DISTNAME=	jre-1_5_0_10-linux-${DIST_ARCH}
+PKGNAME=	sun-jre15-5.0.10
 MASTER_SITES=	# empty
 
 SHORT_NAME=	JRE
@@ -81,6 +80,6 @@ makesfiles:
 	cd ${WRKSRC}/lib && ${FIND} * -name fontconfig.\* -o		\
 		-name \*.properties -o -name \*.properties.\?\? -o	\
 		-name \*.cfg -o -name \*.security |			\
-	${SED} 's/^/SFILES+=	/' >>${PKGDIR}/sfiles.mk
+	${SED} 's/^/SFILES+=	/' >>${PKGDIR}/sfiles-${MACHINE_ARCH}.mk
 
 .include "../../lang/sun-jre15/Makefile.common"
diff --git a/lang/sun-jre15/Makefile.common b/lang/sun-jre15/Makefile.common
index b339c647d73..10eb5835238 100644
--- a/lang/sun-jre15/Makefile.common
+++ b/lang/sun-jre15/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2006/12/03 00:51:21 wiz Exp $
+# $NetBSD: Makefile.common,v 1.17 2007/01/12 18:23:39 tv Exp $
 
 CATEGORIES=	lang java
 COMMENT=	Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
@@ -6,9 +6,9 @@ EXTRACT_SUFX=	.bin
 
 MAINTAINER=	tv@NetBSD.org
 HOMEPAGE=	http://java.sun.com/
-DOWNLOAD=	http://java.sun.com/javase/downloads/index.jsp
+DOWNLOAD=	http://java.sun.com/javase/downloads/index_jdk5.jsp
 DOWNLOAD_NAME=	${SHORT_NAME} 5.0 Update ${PKGNAME_NOREV:C/^.*\.//}
-ARCHIVE=	http://java.sun.com/products/archive/index.html
+ARCHIVE=	http://java.sun.com/products/archive/
 
 LICENSE=	jdk13-license
 RESTRICTED=	Redistribution of repackaged binaries not permitted
diff --git a/lang/sun-jre15/PLIST.i386 b/lang/sun-jre15/PLIST.i386
index 9ae39514ea6..1ccca61f0d2 100644
--- a/lang/sun-jre15/PLIST.i386
+++ b/lang/sun-jre15/PLIST.i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.i386,v 1.1 2006/12/03 00:51:22 wiz Exp $
+@comment $NetBSD: PLIST.i386,v 1.2 2007/01/12 18:23:39 tv Exp $
 bin/sun15-java
 bin/sun15-javaws
 bin/sun15-keytool
@@ -260,10 +260,12 @@ java/sun-1.5/lib/zi/America/Argentina/Tucuman
 java/sun-1.5/lib/zi/America/Argentina/Ushuaia
 java/sun-1.5/lib/zi/America/Aruba
 java/sun-1.5/lib/zi/America/Asuncion
+java/sun-1.5/lib/zi/America/Atikokan
 java/sun-1.5/lib/zi/America/Bahia
 java/sun-1.5/lib/zi/America/Barbados
 java/sun-1.5/lib/zi/America/Belem
 java/sun-1.5/lib/zi/America/Belize
+java/sun-1.5/lib/zi/America/Blanc-Sablon
 java/sun-1.5/lib/zi/America/Boa_Vista
 java/sun-1.5/lib/zi/America/Bogota
 java/sun-1.5/lib/zi/America/Boise
@@ -275,7 +277,6 @@ java/sun-1.5/lib/zi/America/Cayenne
 java/sun-1.5/lib/zi/America/Cayman
 java/sun-1.5/lib/zi/America/Chicago
 java/sun-1.5/lib/zi/America/Chihuahua
-java/sun-1.5/lib/zi/America/Coral_Harbour
 java/sun-1.5/lib/zi/America/Costa_Rica
 java/sun-1.5/lib/zi/America/Cuiaba
 java/sun-1.5/lib/zi/America/Curacao
@@ -552,6 +553,7 @@ java/sun-1.5/lib/zi/Europe/Uzhgorod
 java/sun-1.5/lib/zi/Europe/Vaduz
 java/sun-1.5/lib/zi/Europe/Vienna
 java/sun-1.5/lib/zi/Europe/Vilnius
+java/sun-1.5/lib/zi/Europe/Volgograd
 java/sun-1.5/lib/zi/Europe/Warsaw
 java/sun-1.5/lib/zi/Europe/Zaporozhye
 java/sun-1.5/lib/zi/Europe/Zurich
diff --git a/lang/sun-jre15/PLIST.x86_64 b/lang/sun-jre15/PLIST.x86_64
index f6be6337c79..8272f252a9b 100644
--- a/lang/sun-jre15/PLIST.x86_64
+++ b/lang/sun-jre15/PLIST.x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.x86_64,v 1.1 2006/12/03 00:51:22 wiz Exp $
+@comment $NetBSD: PLIST.x86_64,v 1.2 2007/01/12 18:23:39 tv Exp $
 bin/sun15-java
 bin/sun15-javaws
 bin/sun15-keytool
@@ -211,10 +211,12 @@ java/sun-1.5/lib/zi/America/Argentina/Tucuman
 java/sun-1.5/lib/zi/America/Argentina/Ushuaia
 java/sun-1.5/lib/zi/America/Aruba
 java/sun-1.5/lib/zi/America/Asuncion
+java/sun-1.5/lib/zi/America/Atikokan
 java/sun-1.5/lib/zi/America/Bahia
 java/sun-1.5/lib/zi/America/Barbados
 java/sun-1.5/lib/zi/America/Belem
 java/sun-1.5/lib/zi/America/Belize
+java/sun-1.5/lib/zi/America/Blanc-Sablon
 java/sun-1.5/lib/zi/America/Boa_Vista
 java/sun-1.5/lib/zi/America/Bogota
 java/sun-1.5/lib/zi/America/Boise
@@ -226,7 +228,6 @@ java/sun-1.5/lib/zi/America/Cayenne
 java/sun-1.5/lib/zi/America/Cayman
 java/sun-1.5/lib/zi/America/Chicago
 java/sun-1.5/lib/zi/America/Chihuahua
-java/sun-1.5/lib/zi/America/Coral_Harbour
 java/sun-1.5/lib/zi/America/Costa_Rica
 java/sun-1.5/lib/zi/America/Cuiaba
 java/sun-1.5/lib/zi/America/Curacao
@@ -503,6 +504,7 @@ java/sun-1.5/lib/zi/Europe/Uzhgorod
 java/sun-1.5/lib/zi/Europe/Vaduz
 java/sun-1.5/lib/zi/Europe/Vienna
 java/sun-1.5/lib/zi/Europe/Vilnius
+java/sun-1.5/lib/zi/Europe/Volgograd
 java/sun-1.5/lib/zi/Europe/Warsaw
 java/sun-1.5/lib/zi/Europe/Zaporozhye
 java/sun-1.5/lib/zi/Europe/Zurich
diff --git a/lang/sun-jre15/distinfo b/lang/sun-jre15/distinfo
index 857dfe8d027..f1be6259562 100644
--- a/lang/sun-jre15/distinfo
+++ b/lang/sun-jre15/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.13 2006/12/03 00:51:22 wiz Exp $
+$NetBSD: distinfo,v 1.14 2007/01/12 18:23:39 tv Exp $
 
 SHA1 (jce_policy-1_5_0.zip) = f0e887b91b4499142285633e65c5710c3a133a16
 RMD160 (jce_policy-1_5_0.zip) = eb12d0333c3ddbbba57a0e825a6891a75ec485c0
 Size (jce_policy-1_5_0.zip) = 8826 bytes
-SHA1 (jre-1_5_0_09-linux-amd64.bin) = ebea66fad03bb722ffedcecd958e567d637b1fc6
-RMD160 (jre-1_5_0_09-linux-amd64.bin) = ab4353c18d8d44e8be81767c1d6189a5f668abb6
-Size (jre-1_5_0_09-linux-amd64.bin) = 16555949 bytes
-SHA1 (jre-1_5_0_09-linux-i586.bin) = cba95dc4107d8217ccc0dedf5ff7e337efc7f3c3
-RMD160 (jre-1_5_0_09-linux-i586.bin) = 0b50f027e64c0ce0119bf3c2cf85873691868adb
-Size (jre-1_5_0_09-linux-i586.bin) = 17059194 bytes
+SHA1 (jre-1_5_0_10-linux-amd64.bin) = d4c8876e6ea453b3d4b2c34adfc68016c8ef004b
+RMD160 (jre-1_5_0_10-linux-amd64.bin) = f92eb60f082c4ef950e0fb0f3a20b8aa90bda787
+Size (jre-1_5_0_10-linux-amd64.bin) = 16567287 bytes
+SHA1 (jre-1_5_0_10-linux-i586.bin) = ffc8d602c0d298b54228f04e49d914af91f4af53
+RMD160 (jre-1_5_0_10-linux-i586.bin) = bb26adac42505ffc08af9588f239655e0cbf4d1e
+Size (jre-1_5_0_10-linux-i586.bin) = 17075579 bytes