summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/sun-jdk14/Makefile10
-rw-r--r--lang/sun-jdk14/distinfo6
-rw-r--r--lang/sun-jre14/Makefile16
-rw-r--r--lang/sun-jre14/PLIST9
-rw-r--r--lang/sun-jre14/distinfo6
5 files changed, 24 insertions, 23 deletions
diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile
index 3bea37d78e0..474e0792d05 100644
--- a/lang/sun-jdk14/Makefile
+++ b/lang/sun-jdk14/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.16 2004/01/20 12:19:17 agc Exp $
+# $NetBSD: Makefile,v 1.17 2004/03/17 22:01:43 jschauma Exp $
-DISTNAME= j2sdk-1_4_2_03-linux-i586
-PKGNAME= sun-jdk14-2.3
+DISTNAME= j2sdk-1_4_2_04-linux-i586
+PKGNAME= sun-jdk14-2.4
MASTER_SITES= # empty
COMMENT= Sun's Java(tm) 2 SDK, Standard Edition 1.4.2
SHORT= SDK
-DEPENDS= sun-jre14>=2.0:../../lang/sun-jre14
+DEPENDS= sun-jre14>=2.4:../../lang/sun-jre14
-WRKSRC= ${WRKDIR}/j2sdk1.4.2_03
+WRKSRC= ${WRKDIR}/j2sdk1.4.2_04
# Remove parts that are in common with the JRE
#
diff --git a/lang/sun-jdk14/distinfo b/lang/sun-jdk14/distinfo
index 6b447f30f6b..bab83b411dc 100644
--- a/lang/sun-jdk14/distinfo
+++ b/lang/sun-jdk14/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2003/12/12 15:17:56 adam Exp $
+$NetBSD: distinfo,v 1.10 2004/03/17 22:01:43 jschauma Exp $
-SHA1 (j2sdk-1_4_2_03-linux-i586.bin) = 0fba318bc2808a51f035e6140a65c564588dba62
-Size (j2sdk-1_4_2_03-linux-i586.bin) = 35818038 bytes
+SHA1 (j2sdk-1_4_2_04-linux-i586.bin) = 7b9900c750d9aff43b7b25314ec70baf711e2b1d
+Size (j2sdk-1_4_2_04-linux-i586.bin) = 35829260 bytes
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index 615ebd4d8f2..fa8d63f3580 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.15 2004/01/20 12:19:18 agc Exp $
+# $NetBSD: Makefile,v 1.16 2004/03/17 22:01:43 jschauma Exp $
-DISTNAME= j2re-1_4_2_03-linux-i586
-PKGNAME= sun-jre14-2.3
+DISTNAME= j2re-1_4_2_04-linux-i586
+PKGNAME= sun-jre14-2.4
MASTER_SITES= # empty
COMMENT= Sun's Java(tm) 2 Runtime Environment 1.4.2
SHORT= JRE
-WRKSRC= ${WRKDIR}/j2re1.4.2_03
+WRKSRC= ${WRKDIR}/j2re1.4.2_04
USE_PKGINSTALL= yes
OWN_DIRS= ${PREFIX}
OWN_DIRS+= ${PREFIX}/lib
@@ -17,10 +17,10 @@ OWN_DIRS+= ${PREFIX}/lib/images
OWN_DIRS+= ${PREFIX}/lib/images/cursors
OWN_DIRS+= ${PREFIX}/lib/security
SFILES= content-types.properties flavormap.properties
-SFILES+= font.properties font.properties.Redhat6.1
-SFILES+= font.properties.ja font.properties.ja.Redhat6.1
-SFILES+= font.properties.ja.Redhat6.2 font.properties.ja.Turbo
-SFILES+= font.properties.ja.Turbo6.0 font.properties.zh.Turbo
+SFILES+= font.properties.Redhat6.1 font.properties
+SFILES+= font.properties.ja.Redhat6.1 font.properties.ja.Redhat6.2
+SFILES+= font.properties.ja.Turbo font.properties.ja.Turbo6.0
+SFILES+= font.properties.ja font.properties.zh.Turbo
SFILES+= images/cursors/cursors.properties i386/jvm.cfg
SFILES+= logging.properties psfont.properties.ja
SFILES+= psfontj2d.properties security/java.security
diff --git a/lang/sun-jre14/PLIST b/lang/sun-jre14/PLIST
index 7e13e44f350..be920a2e171 100644
--- a/lang/sun-jre14/PLIST
+++ b/lang/sun-jre14/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2003/08/26 21:02:53 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.11 2004/03/17 22:01:43 jschauma Exp $
.systemPrefs/.system.lock
.systemPrefs/.systemRootModFile
CHANGES
@@ -81,9 +81,10 @@ lib/font.properties.SuSE8.0
lib/font.properties.ja.Redhat7.2
lib/font.properties.ja.Redhat7.3
lib/font.properties.ja.Redhat8.0
-lib/font.properties.ko.Redhat8.0
-lib/font.properties.zh_CN.Redhat8.0
-lib/font.properties.zh_TW.Redhat8.0
+lib/font.properties.ko.Redhat
+lib/font.properties.zh_CN.Redhat
+lib/font.properties.zh_CN.Redhat2.1
+lib/font.properties.zh_TW.Redhat
lib/font.properties.ja.Turbo.default
lib/font.properties.ja.Turbo6.0.default
lib/font.properties.zh.Turbo.default
diff --git a/lang/sun-jre14/distinfo b/lang/sun-jre14/distinfo
index 37f072b9ecd..9c491488d70 100644
--- a/lang/sun-jre14/distinfo
+++ b/lang/sun-jre14/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2003/12/12 15:16:49 adam Exp $
+$NetBSD: distinfo,v 1.10 2004/03/17 22:01:43 jschauma Exp $
-SHA1 (j2re-1_4_2_03-linux-i586.bin) = a9771a3315f0920ec23c83cf1a2b166a6e00b995
-Size (j2re-1_4_2_03-linux-i586.bin) = 14167409 bytes
+SHA1 (j2re-1_4_2_04-linux-i586.bin) = 7b789583a09c1ca4037b5d1427ee1b3ec7a55b80
+Size (j2re-1_4_2_04-linux-i586.bin) = 14173427 bytes