diff options
| -rw-r--r-- | lang/sun-jdk14/Makefile | 11 | ||||
| -rw-r--r-- | lang/sun-jdk14/distinfo | 6 | ||||
| -rw-r--r-- | lang/sun-jre14/Makefile | 9 | ||||
| -rw-r--r-- | lang/sun-jre14/Makefile.common | 7 | ||||
| -rw-r--r-- | lang/sun-jre14/PLIST | 13 | ||||
| -rw-r--r-- | lang/sun-jre14/distinfo | 6 |
6 files changed, 29 insertions, 23 deletions
diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile index ab0c8f5b5fa..75b57dacf1c 100644 --- a/lang/sun-jdk14/Makefile +++ b/lang/sun-jdk14/Makefile @@ -1,17 +1,16 @@ -# $NetBSD: Makefile,v 1.18 2004/05/22 21:32:34 jmmv Exp $ +# $NetBSD: Makefile,v 1.19 2004/07/02 14:40:21 jschauma Exp $ -DISTNAME= j2sdk-1_4_2_04-linux-i586 -PKGNAME= sun-jdk14-2.4 -PKGREVISION= 1 +DISTNAME= j2sdk-1_4_2_05-linux-i586 +PKGNAME= sun-jdk14-2.5 MASTER_SITES= # empty COMMENT= Sun's Java(tm) 2 SDK, Standard Edition 1.4.2 SHORT= SDK -DEPENDS= sun-jre14>=2.4nb1:../../lang/sun-jre14 +DEPENDS= sun-jre14>=2.5:../../lang/sun-jre14 -WRKSRC= ${WRKDIR}/j2sdk1.4.2_04 +WRKSRC= ${WRKDIR}/j2sdk1.4.2_05 JAVA_WRAPPERS= appletviewer jar javac javadoc javah javap # Remove parts that are in common with the JRE diff --git a/lang/sun-jdk14/distinfo b/lang/sun-jdk14/distinfo index bab83b411dc..2a9f322746d 100644 --- a/lang/sun-jdk14/distinfo +++ b/lang/sun-jdk14/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2004/03/17 22:01:43 jschauma Exp $ +$NetBSD: distinfo,v 1.11 2004/07/02 14:40:21 jschauma Exp $ -SHA1 (j2sdk-1_4_2_04-linux-i586.bin) = 7b9900c750d9aff43b7b25314ec70baf711e2b1d -Size (j2sdk-1_4_2_04-linux-i586.bin) = 35829260 bytes +SHA1 (j2sdk-1_4_2_05-linux-i586.bin) = d7961739360721cc801382b71364acbb78babbd4 +Size (j2sdk-1_4_2_05-linux-i586.bin) = 36384457 bytes diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile index 5d8c97421b8..764e367db93 100644 --- a/lang/sun-jre14/Makefile +++ b/lang/sun-jre14/Makefile @@ -1,15 +1,14 @@ -# $NetBSD: Makefile,v 1.17 2004/05/22 21:32:34 jmmv Exp $ +# $NetBSD: Makefile,v 1.18 2004/07/02 14:40:21 jschauma Exp $ -DISTNAME= j2re-1_4_2_04-linux-i586 -PKGNAME= sun-jre14-2.4 -PKGREVISION= 1 +DISTNAME= j2re-1_4_2_05-linux-i586 +PKGNAME= sun-jre14-2.5 MASTER_SITES= # empty COMMENT= Sun's Java(tm) 2 Runtime Environment 1.4.2 SHORT= JRE -WRKSRC= ${WRKDIR}/j2re1.4.2_04 +WRKSRC= ${WRKDIR}/j2re1.4.2_05 USE_PKGINSTALL= yes JAVA_WRAPPERS= java OWN_DIRS= ${JAVA_HOME} diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common index 4c5ab89cb31..6418dc93aae 100644 --- a/lang/sun-jre14/Makefile.common +++ b/lang/sun-jre14/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2004/06/15 12:00:09 abs Exp $ +# $NetBSD: Makefile.common,v 1.21 2004/07/02 14:40:21 jschauma Exp $ CATEGORIES= lang java EXTRACT_SUFX= .bin @@ -50,9 +50,8 @@ _FETCH_MESSAGE= \ ${ECHO} " ${DOWNLOAD}"; \ ${ECHO} " or ${ARCHIVE}"; \ ${ECHO} ; \ - ${ECHO} " Choose '32-bit/64-bit for Windows/Linux/Solaris SPARC' from"; \ - ${ECHO} " the '${SHORT}' column, accept the license, then choose 'Linux ";\ - ${ECHO} " self-extracting file'."; \ + ${ECHO} " Click 'Download J2SE ${SHORT}', read and accept the"; \ + ${ECHO} " license, then choose 'Linux self-extracting file'."; \ ${ECHO} ; \ ${ECHO} "======================================================================" diff --git a/lang/sun-jre14/PLIST b/lang/sun-jre14/PLIST index beda0f3bd5f..70ae217572f 100644 --- a/lang/sun-jre14/PLIST +++ b/lang/sun-jre14/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2004/05/22 21:32:34 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.13 2004/07/02 14:40:21 jschauma Exp $ bin/sun14-java java/sun-1.4/.systemPrefs/.system.lock java/sun-1.4/.systemPrefs/.systemRootModFile @@ -67,12 +67,21 @@ java/sun-1.4/lib/ext/localedata.jar java/sun-1.4/lib/ext/sunjce_provider.jar java/sun-1.4/lib/flavormap.properties.default java/sun-1.4/lib/font.properties.default -java/sun-1.4/lib/font.properties.ja.Sun +java/sun-1.4/lib/font.properties.ja_JP.Sun +java/sun-1.4/lib/font.properties.ja_JP.Sun2003 +java/sun-1.4/lib/font.properties.ja_JP_UTF8.Sun2003 +java/sun-1.4/lib/font.properties.ko_KR.Sun +java/sun-1.4/lib/font.properties.ko_KR_UTF8.Sun +java/sun-1.4/lib/font.properties.ko_KR_UTF8.Sun2003 java/sun-1.4/lib/font.properties.ja_JP_UTF8.Sun java/sun-1.4/lib/font.properties.zh_CN.Sun java/sun-1.4/lib/font.properties.zh_CN_UTF8.Sun +java/sun-1.4/lib/font.properties.zh_HK.Sun +java/sun-1.4/lib/font.properties.zh_HK_UTF8.Sun +java/sun-1.4/lib/font.properties.zh_HK_UTF8.Sun2003 java/sun-1.4/lib/font.properties.zh_TW.Sun 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.Redhat6.1.default diff --git a/lang/sun-jre14/distinfo b/lang/sun-jre14/distinfo index 9c491488d70..f78a66ae80e 100644 --- a/lang/sun-jre14/distinfo +++ b/lang/sun-jre14/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2004/03/17 22:01:43 jschauma Exp $ +$NetBSD: distinfo,v 1.11 2004/07/02 14:40:21 jschauma Exp $ -SHA1 (j2re-1_4_2_04-linux-i586.bin) = 7b789583a09c1ca4037b5d1427ee1b3ec7a55b80 -Size (j2re-1_4_2_04-linux-i586.bin) = 14173427 bytes +SHA1 (j2re-1_4_2_05-linux-i586.bin) = 326a50523fbedb449596f2c502c2572d9b88114c +Size (j2re-1_4_2_05-linux-i586.bin) = 14381383 bytes |