summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/sun-jdk14/Makefile11
-rw-r--r--lang/sun-jdk14/distinfo6
-rw-r--r--lang/sun-jre14/Makefile9
-rw-r--r--lang/sun-jre14/Makefile.common10
-rw-r--r--lang/sun-jre14/PLIST5
-rw-r--r--lang/sun-jre14/distinfo6
6 files changed, 27 insertions, 20 deletions
diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile
index b3241624048..bdb6cb52aee 100644
--- a/lang/sun-jdk14/Makefile
+++ b/lang/sun-jdk14/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.21 2004/10/11 14:07:38 tv Exp $
+# $NetBSD: Makefile,v 1.22 2004/10/14 14:32:32 jschauma Exp $
-DISTNAME= j2sdk-1_4_2_05-linux-i586
-PKGNAME= sun-jdk14-2.5
-PKGREVISION= 2
+DISTNAME= j2sdk-1_4_2_06-linux-i586
+PKGNAME= sun-jdk14-2.6
MASTER_SITES= # empty
COMMENT= Sun's Java(tm) 2 SDK, Standard Edition 1.4.2
SHORT= SDK
-DEPENDS= sun-jre14>=2.5:../../lang/sun-jre14
+DEPENDS= sun-jre14>=2.6:../../lang/sun-jre14
-WRKSRC= ${WRKDIR}/j2sdk1.4.2_05
+WRKSRC= ${WRKDIR}/j2sdk1.4.2_06
JAVA_WRAPPERS= appletviewer extcheck idlj jar jarsigner \
javac javadoc javah javap jdb rmic serialver
diff --git a/lang/sun-jdk14/distinfo b/lang/sun-jdk14/distinfo
index 2a9f322746d..d5b9e94e462 100644
--- a/lang/sun-jdk14/distinfo
+++ b/lang/sun-jdk14/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2004/07/02 14:40:21 jschauma Exp $
+$NetBSD: distinfo,v 1.12 2004/10/14 14:32:32 jschauma Exp $
-SHA1 (j2sdk-1_4_2_05-linux-i586.bin) = d7961739360721cc801382b71364acbb78babbd4
-Size (j2sdk-1_4_2_05-linux-i586.bin) = 36384457 bytes
+SHA1 (j2sdk-1_4_2_06-linux-i586.bin) = fa02d491e26700c14817585c1f970669c9e885c6
+Size (j2sdk-1_4_2_06-linux-i586.bin) = 36417364 bytes
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index dd82d2dc1d4..5af0b79ff0a 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.20 2004/10/05 22:09:23 tv Exp $
+# $NetBSD: Makefile,v 1.21 2004/10/14 14:32:32 jschauma Exp $
# Note: Regen distinfo with SUN_JRE14_USE_JCE=YES
-DISTNAME= j2re-1_4_2_05-linux-i586
-PKGNAME= sun-jre14-2.5
-PKGREVISION= 1
+DISTNAME= j2re-1_4_2_06-linux-i586
+PKGNAME= sun-jre14-2.6
MASTER_SITES= # empty
COMMENT= Sun's Java(tm) 2 Runtime Environment 1.4.2
SHORT= JRE
-WRKSRC= ${WRKDIR}/j2re1.4.2_05
+WRKSRC= ${WRKDIR}/j2re1.4.2_06
USE_PKGINSTALL= yes
JAVA_WRAPPERS= java keytool orbd policytool rmid rmiregistry \
servertool tnameserv
diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common
index 80276d3afa2..db8034b015f 100644
--- a/lang/sun-jre14/Makefile.common
+++ b/lang/sun-jre14/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2004/07/06 11:32:49 abs Exp $
+# $NetBSD: Makefile.common,v 1.23 2004/10/14 14:32:32 jschauma Exp $
CATEGORIES= lang java
EXTRACT_SUFX= .bin
@@ -50,9 +50,15 @@ _FETCH_MESSAGE= \
${ECHO} ; \
${ECHO} " Click 'Download J2SE ${SHORT}', read and accept the"; \
${ECHO} " license, then choose 'Linux self-extracting file'."; \
- ${ECHO} ; \
+ ${ECHO} -e ${END_MESSAGE}; \
${ECHO} "======================================================================"
+.if !empty(SUN_JRE14_USE_JCE:M[Yy][Ee][Ss])
+END_MESSAGE="\n The file jce_policy-1_4_2.zip must be fetched into:\n" \
+ " ${DISTDIR}/jce_policy-1_4_2.zip\n\n" \
+ "Under 'Other Downloads' / 'Java Cryptography Extension'\n" \
+ "click 'Download' and choose the .zip file.\n"
+.endif
post-fetch:
@if [ ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
diff --git a/lang/sun-jre14/PLIST b/lang/sun-jre14/PLIST
index a65e50e2e63..7bb48068a50 100644
--- a/lang/sun-jre14/PLIST
+++ b/lang/sun-jre14/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2004/10/05 22:09:23 tv Exp $
+@comment $NetBSD: PLIST,v 1.16 2004/10/14 14:32:32 jschauma Exp $
bin/sun14-java
bin/sun14-keytool
bin/sun14-orbd
@@ -91,6 +91,7 @@ java/sun-1.4/lib/font.properties.zh_TW_UTF8.Sun
java/sun-1.4/lib/font.properties.zh_TW_UTF8.Sun2003
java/sun-1.4/lib/font.properties.Redhat6.1.default
java/sun-1.4/lib/font.properties.ja.default
+java/sun-1.4/lib/font.properties.ja.Redhat3
java/sun-1.4/lib/font.properties.ja.Redhat6.1.default
java/sun-1.4/lib/font.properties.ja.Redhat6.2.default
java/sun-1.4/lib/font.properties.Redhat8.0
@@ -99,9 +100,11 @@ java/sun-1.4/lib/font.properties.ja.Redhat7.2
java/sun-1.4/lib/font.properties.ja.Redhat7.3
java/sun-1.4/lib/font.properties.ja.Redhat8.0
java/sun-1.4/lib/font.properties.ko.Redhat
+java/sun-1.4/lib/font.properties.ko.Redhat2.1
java/sun-1.4/lib/font.properties.zh_CN.Redhat
java/sun-1.4/lib/font.properties.zh_CN.Redhat2.1
java/sun-1.4/lib/font.properties.zh_TW.Redhat
+java/sun-1.4/lib/font.properties.zh_TW.Redhat2.1
java/sun-1.4/lib/font.properties.ja.Turbo.default
java/sun-1.4/lib/font.properties.ja.Turbo6.0.default
java/sun-1.4/lib/font.properties.zh.Turbo.default
diff --git a/lang/sun-jre14/distinfo b/lang/sun-jre14/distinfo
index 74d45aa0f57..cdb750a7b5d 100644
--- a/lang/sun-jre14/distinfo
+++ b/lang/sun-jre14/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2004/07/06 11:32:49 abs Exp $
+$NetBSD: distinfo,v 1.13 2004/10/14 14:32:32 jschauma Exp $
-SHA1 (j2re-1_4_2_05-linux-i586.bin) = 326a50523fbedb449596f2c502c2572d9b88114c
-Size (j2re-1_4_2_05-linux-i586.bin) = 14381383 bytes
+SHA1 (j2re-1_4_2_06-linux-i586.bin) = d86aca7f4c8e61ca9460f313ae853fad5d34c59c
+Size (j2re-1_4_2_06-linux-i586.bin) = 14396068 bytes
SHA1 (jce_policy-1_4_2.zip) = ea17b649ebcaaf4246e9dd28dbc77926176c64ee
Size (jce_policy-1_4_2.zip) = 12195 bytes