[pkgsrc/trunk]: pkgsrc Keep sun-jre6 and sun-jdk6 versions in sync. Noted by ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Keep sun-jre6 and sun-jdk6 versions in sync. Noted by ...
From: tnn <tnn%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:43:40 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bdc015825772
branches:  trunk
changeset: 537900:bdc015825772
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Jan 20 09:21:35 2008 +0000

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

diffstat:

 doc/CHANGES-2008               |  4 ++--
 lang/sun-jdk6/Makefile         |  5 ++---
 lang/sun-jre6/Makefile         |  8 ++++----
 lang/sun-jre6/Makefile.common  |  4 ++--
 lang/sun-jre6/PLIST.linux-i386 |  4 +++-
 lang/sun-jre6/buildlink3.mk    |  4 ++--
 lang/sun-jre6/distinfo         |  8 ++++----
 lang/sun-jre6/sfiles-i386.mk   |  4 +++-
 8 files changed, 22 insertions(+), 19 deletions(-)

diffs (147 lines):

diff -r 5976104a8e84 -r bdc015825772 doc/CHANGES-2008
--- a/doc/CHANGES-2008  Sun Jan 20 08:13:25 2008 +0000
+++ b/doc/CHANGES-2008  Sun Jan 20 09:21:35 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2008,v 1.145 2008/01/20 08:12:50 obache Exp $
+$NetBSD: CHANGES-2008,v 1.146 2008/01/20 09:21:35 tnn Exp $
 
 Changes to the packages collection and infrastructure in 2008:
 
@@ -278,6 +278,6 @@
        Removed lang/scsl-jre15 [tnn 2008-01-19]
        Removed lang/scsl-jdk15 [tnn 2008-01-19]
        Updated shells/osh to 20080109 [obache 2008-01-19]
-       Updated lang/sun-jre6 to 6.0.3 [tnn 2008-01-20]
+       Updated lang/sun-jre6 to 6.0.4 [tnn 2008-01-20]
        Updated lang/sun-jdk6 to 6.0.4 [tnn 2008-01-20]
        Updated chat/bsflite to 0.83 [obache 2008-01-20]
diff -r 5976104a8e84 -r bdc015825772 lang/sun-jdk6/Makefile
--- a/lang/sun-jdk6/Makefile    Sun Jan 20 08:13:25 2008 +0000
+++ b/lang/sun-jdk6/Makefile    Sun Jan 20 09:21:35 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/01/20 02:31:47 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2008/01/20 09:21:35 tnn Exp $
 
 DISTNAME=      jdk-6u4-linux-${DIST_ARCH}
 PKGNAME=       sun-jdk6-6.0.4
@@ -7,8 +7,7 @@
 DOWNLOAD_NAME= JDK 6u4
 SHORT_NAME=    JDK
 
-DEPENDS+=      sun-jre6-6.0.3:../../lang/sun-jre6
-#DEPENDS+=     ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6
+DEPENDS+=      ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6
 
 WRKSRC=                ${WRKDIR}/jdk1.6.0_04
 JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \
diff -r 5976104a8e84 -r bdc015825772 lang/sun-jre6/Makefile
--- a/lang/sun-jre6/Makefile    Sun Jan 20 08:13:25 2008 +0000
+++ b/lang/sun-jre6/Makefile    Sun Jan 20 09:21:35 2008 +0000
@@ -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 -r 5976104a8e84 -r bdc015825772 lang/sun-jre6/Makefile.common
--- a/lang/sun-jre6/Makefile.common     Sun Jan 20 08:13:25 2008 +0000
+++ b/lang/sun-jre6/Makefile.common     Sun Jan 20 09:21:35 2008 +0000
@@ -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 @@
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 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 -r 5976104a8e84 -r bdc015825772 lang/sun-jre6/PLIST.linux-i386
--- a/lang/sun-jre6/PLIST.linux-i386    Sun Jan 20 08:13:25 2008 +0000
+++ b/lang/sun-jre6/PLIST.linux-i386    Sun Jan 20 09:21:35 2008 +0000
@@ -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.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 -r 5976104a8e84 -r bdc015825772 lang/sun-jre6/buildlink3.mk
--- a/lang/sun-jre6/buildlink3.mk       Sun Jan 20 08:13:25 2008 +0000
+++ b/lang/sun-jre6/buildlink3.mk       Sun Jan 20 09:21:35 2008 +0000
@@ -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 @@
 
 .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 -r 5976104a8e84 -r bdc015825772 lang/sun-jre6/distinfo
--- a/lang/sun-jre6/distinfo    Sun Jan 20 08:13:25 2008 +0000
+++ b/lang/sun-jre6/distinfo    Sun Jan 20 09:21:35 2008 +0000
@@ -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 -r 5976104a8e84 -r bdc015825772 lang/sun-jre6/sfiles-i386.mk
--- a/lang/sun-jre6/sfiles-i386.mk      Sun Jan 20 08:13:25 2008 +0000
+++ b/lang/sun-jre6/sfiles-i386.mk      Sun Jan 20 09:21:35 2008 +0000
@@ -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.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

Prev by Date: [pkgsrc/trunk]: pkgsrc/www/zope Don't print replaced name by pax(1). It was ...
Next by Date: [pkgsrc/trunk]: pkgsrc/lang 1.5 uses the 6.x license, not the 1.3 license.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/www/zope Don't print replaced name by pax(1). It was ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang 1.5 uses the 6.x license, not the 1.3 license.
Indexes:

Home | Main Index | Thread Index | Old Index