Keep sun-jre6 and sun-jdk6 versions in sync. Noted by veego@

6 files changed, 18 insertions, 14 deletions

diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index c645933772a..4eb97a00881 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.7 2008/01/20 02:31:47 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2008/01/20 09:21:35 tnn Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
-DISTNAME=	jre-6u3-linux-${DIST_ARCH}
-PKGNAME=	sun-jre6-6.0.3
+DISTNAME=	jre-6u4-linux-${DIST_ARCH}
+PKGNAME=	sun-jre6-6.0.4
 MASTER_SITES=	# empty
 
 DOWNLOAD_NAME=	Java Runtime Environment (JRE) 6u1
 SHORT_NAME=	JRE
 
-WRKSRC=		${WRKDIR}/jre1.6.0_03
+WRKSRC=		${WRKDIR}/jre1.6.0_04
 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 e62561cbddc..11f2ce26157 100644
--- a/lang/sun-jre6/Makefile.common
+++ b/lang/sun-jre6/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2008/01/20 02:31:47 tnn Exp $
+# $NetBSD: Makefile.common,v 1.7 2008/01/20 09:21:35 tnn Exp $
 
 CATEGORIES=	lang java
 COMMENT=	Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
@@ -6,7 +6,7 @@ EXTRACT_SUFX=	.bin
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://java.sun.com/
-DOWNLOAD=	http://www.java.com/en/download/manual.jsp
+DOWNLOAD=	http://java.sun.com/javase/downloads/index.jsp
 ARCHIVE=	http://java.sun.com/products/archive/
 
 RESTRICTED=	Redistribution of repackaged binaries not permitted
diff --git a/lang/sun-jre6/PLIST.linux-i386 b/lang/sun-jre6/PLIST.linux-i386
index 2da32acd70a..526d2fac029 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.4 2008/01/20 02:31:47 tnn Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.5 2008/01/20 09:21:35 tnn Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -118,6 +118,8 @@ java/sun-6/lib/fontconfig.RedHat.2.1.bfc.default
 java/sun-6/lib/fontconfig.RedHat.2.1.properties.src.default
 java/sun-6/lib/fontconfig.RedHat.3.bfc.default
 java/sun-6/lib/fontconfig.RedHat.3.properties.src.default
+java/sun-6/lib/fontconfig.RedHat.4.bfc.default
+java/sun-6/lib/fontconfig.RedHat.4.properties.src.default
 java/sun-6/lib/fontconfig.RedHat.bfc.default
 java/sun-6/lib/fontconfig.RedHat.properties.src.default
 java/sun-6/lib/fontconfig.SuSE.bfc.default
diff --git a/lang/sun-jre6/buildlink3.mk b/lang/sun-jre6/buildlink3.mk
index e7d47c129fd..0c0431965d2 100644
--- a/lang/sun-jre6/buildlink3.mk
+++ b/lang/sun-jre6/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/01/20 02:31:47 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2008/01/20 09:21:35 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.3
+BUILDLINK_ABI_DEPENDS.sun-jre6?=		sun-jre6>=6.0.4
 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 f92e066827d..4612eba2a1a 100644
--- a/lang/sun-jre6/distinfo
+++ b/lang/sun-jre6/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2008/01/20 02:31:47 tnn Exp $
+$NetBSD: distinfo,v 1.4 2008/01/20 09:21:35 tnn Exp $
 
 SHA1 (jce_policy-6.zip) = 7b1b021bd63152b93a16c96bb3a64f0e685fc425
 RMD160 (jce_policy-6.zip) = 6f45ce5f3c067e186554f79b3f1a61e4d7d22aae
 Size (jce_policy-6.zip) = 9101 bytes
-SHA1 (jre-6u3-linux-i586.bin) = 6d729efc48b2539ffcc216a7fadf8fb1d9294410
-RMD160 (jre-6u3-linux-i586.bin) = 817bb20a878924a309dc22960f5a353fc26e76fc
-Size (jre-6u3-linux-i586.bin) = 19119599 bytes
+SHA1 (jre-6u4-linux-i586.bin) = d777dade892b4ecff1da871c3730b0fdecb8cc26
+RMD160 (jre-6u4-linux-i586.bin) = 1c403a3e3cdc2e3ae225d97798a23c8155cdebde
+Size (jre-6u4-linux-i586.bin) = 19661668 bytes
diff --git a/lang/sun-jre6/sfiles-i386.mk b/lang/sun-jre6/sfiles-i386.mk
index cd68536c869..06095da539c 100644
--- a/lang/sun-jre6/sfiles-i386.mk
+++ b/lang/sun-jre6/sfiles-i386.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: sfiles-i386.mk,v 1.1 2007/02/18 19:11:28 tv Exp $
+#	$NetBSD: sfiles-i386.mk,v 1.2 2008/01/20 09:21:35 tnn Exp $
 #
 # Created with "make makesfiles"
 # Do not edit this file manually!
@@ -21,6 +21,8 @@ SFILES+=	fontconfig.RedHat.2.1.bfc
 SFILES+=	fontconfig.RedHat.2.1.properties.src
 SFILES+=	fontconfig.RedHat.3.bfc
 SFILES+=	fontconfig.RedHat.3.properties.src
+SFILES+=	fontconfig.RedHat.4.bfc
+SFILES+=	fontconfig.RedHat.4.properties.src
 SFILES+=	fontconfig.RedHat.bfc
 SFILES+=	fontconfig.RedHat.properties.src
 SFILES+=	fontconfig.SuSE.bfc