diff options
| -rw-r--r-- | lang/sun-jdk14/Makefile | 10 | ||||
| -rw-r--r-- | lang/sun-jdk14/PLIST | 5 | ||||
| -rw-r--r-- | lang/sun-jdk14/buildlink3.mk | 5 | ||||
| -rw-r--r-- | lang/sun-jdk14/distinfo | 8 | ||||
| -rw-r--r-- | lang/sun-jdk14/files/common | 3 | ||||
| -rw-r--r-- | lang/sun-jre14/Makefile | 8 | ||||
| -rw-r--r-- | lang/sun-jre14/PLIST | 74 | ||||
| -rw-r--r-- | lang/sun-jre14/buildlink3.mk | 3 | ||||
| -rw-r--r-- | lang/sun-jre14/distinfo | 8 |
9 files changed, 69 insertions, 55 deletions
diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile index 064366c6cb5..70becd42d47 100644 --- a/lang/sun-jdk14/Makefile +++ b/lang/sun-jdk14/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:27 rillig Exp $ +# $NetBSD: Makefile,v 1.28.2.1 2006/03/15 13:27:25 salo Exp $ -DISTNAME= j2sdk-1_4_2_09-linux-i586 -PKGNAME= sun-jdk14-2.9 +DISTNAME= j2sdk-1_4_2_11-linux-i586 +PKGNAME= sun-jdk14-2.11 MASTER_SITES= # empty COMMENT= Sun's Java(tm) 2 SDK, Standard Edition 1.4.2 @@ -10,8 +10,8 @@ SHORT= SDK DEPENDS+= sun-jre14>=2.9:../../lang/sun-jre14 -WRKSRC= ${WRKDIR}/j2sdk1.4.2_09 -JAVA_WRAPPERS= appletviewer extcheck idlj jar jarsigner \ +WRKSRC= ${WRKDIR}/j2sdk1.4.2_11 +JAVA_WRAPPERS+= appletviewer extcheck idlj jar jarsigner \ javac javadoc javah javap jdb rmic serialver # Remove parts that are in common with the JRE diff --git a/lang/sun-jdk14/PLIST b/lang/sun-jdk14/PLIST index 5adce7af1b9..dd33d125595 100644 --- a/lang/sun-jdk14/PLIST +++ b/lang/sun-jdk14/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2005/09/17 16:44:54 dillo Exp $ +@comment $NetBSD: PLIST,v 1.9.4.1 2006/03/15 13:27:25 salo Exp $ bin/sun14-appletviewer bin/sun14-extcheck bin/sun14-idlj @@ -12,7 +12,6 @@ bin/sun14-jdb bin/sun14-rmic bin/sun14-serialver java/sun-1.4/README.html -java/sun-1.4/THIRDPARTYLICENSEREADME.txt java/sun-1.4/bin/HtmlConverter java/sun-1.4/bin/appletviewer java/sun-1.4/bin/extcheck @@ -916,6 +915,8 @@ java/sun-1.4/man/man1/native2ascii.1 java/sun-1.4/man/man1/rmic.1 java/sun-1.4/man/man1/serialver.1 java/sun-1.4/src.zip +@dirrm java/sun-1.4/include/linux +@dirrm java/sun-1.4/include @dirrm java/sun-1.4/demo/plugin/jfc/TableExample/src @dirrm java/sun-1.4/demo/plugin/jfc/TableExample @dirrm java/sun-1.4/demo/plugin/jfc/SwingSet2/src diff --git a/lang/sun-jdk14/buildlink3.mk b/lang/sun-jdk14/buildlink3.mk index cad043f6a50..aca3dc2a8d2 100644 --- a/lang/sun-jdk14/buildlink3.mk +++ b/lang/sun-jdk14/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/07/02 12:51:57 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2.12.1 2006/03/15 13:27:25 salo Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SUN_JDK14_BUILDLINK3_MK:= ${SUN_JDK14_BUILDLINK3_MK}+ @@ -13,12 +13,13 @@ BUILDLINK_PACKAGES+= sun-jdk14 .if !empty(SUN_JDK14_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.sun-jdk14+= sun-jdk14-[0-9]* +BUILDLINK_RECOMMENDED.sun-jdk14?= sun-jdk14>=2.11 BUILDLINK_PKGSRCDIR.sun-jdk14?= ../../lang/sun-jdk14 BUILDLINK_DEPMETHOD.sun-jdk14?= build BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_JAVA_PREFIX.sun-jre14} -BUILDLINK_CPPFLAGS.sun-jdk14= \ +BUILDLINK_CPPFLAGS.sun-jdk14+= \ -I${BUILDLINK_JAVA_PREFIX.sun-jre14}/include \ -I${BUILDLINK_JAVA_PREFIX.sun-jre14}/include/linux diff --git a/lang/sun-jdk14/distinfo b/lang/sun-jdk14/distinfo index bc604eb0d38..2ef99a09565 100644 --- a/lang/sun-jdk14/distinfo +++ b/lang/sun-jdk14/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.15 2005/09/17 16:44:54 dillo Exp $ +$NetBSD: distinfo,v 1.15.4.1 2006/03/15 13:27:25 salo Exp $ -SHA1 (j2sdk-1_4_2_09-linux-i586.bin) = f43f5c23f8e9ac0a53b499d39671a2de1f1fd8c6 -RMD160 (j2sdk-1_4_2_09-linux-i586.bin) = 1cbd84957230ab54e6ad2d98f85e857af3550639 -Size (j2sdk-1_4_2_09-linux-i586.bin) = 36429599 bytes +SHA1 (j2sdk-1_4_2_11-linux-i586.bin) = 58ab733b0d9110263ba3b4ef0e0915d2562a4ac9 +RMD160 (j2sdk-1_4_2_11-linux-i586.bin) = e63124fdb66c798d1db87b3eeb37037ea4cfb7df +Size (j2sdk-1_4_2_11-linux-i586.bin) = 36307574 bytes diff --git a/lang/sun-jdk14/files/common b/lang/sun-jdk14/files/common index c4d57148e7a..5a205bc1aa6 100644 --- a/lang/sun-jdk14/files/common +++ b/lang/sun-jdk14/files/common @@ -1,9 +1,10 @@ -# $NetBSD: common,v 1.2 2003/12/12 15:17:56 adam Exp $ +# $NetBSD: common,v 1.2.16.1 2006/03/15 13:27:25 salo Exp $ .systemPrefs COPYRIGHT LICENSE README +THIRDPARTYLICENSEREADME.txt bin/ControlPanel bin/java bin/keytool diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile index 1a26342cce0..4a4421e6e9f 100644 --- a/lang/sun-jre14/Makefile +++ b/lang/sun-jre14/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:27 rillig Exp $ +# $NetBSD: Makefile,v 1.32.2.1 2006/03/15 13:27:25 salo Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce -DISTNAME= j2re-1_4_2_09-linux-i586 -PKGNAME= sun-jre14-2.9 +DISTNAME= j2re-1_4_2_11-linux-i586 +PKGNAME= sun-jre14-2.11 MASTER_SITES= # empty COMMENT= Sun's Java(tm) 2 Runtime Environment 1.4.2 SHORT= JRE -WRKSRC= ${WRKDIR}/j2re1.4.2_09 +WRKSRC= ${WRKDIR}/j2re1.4.2_11 USE_PKGINSTALL= yes JAVA_WRAPPERS= java keytool orbd policytool rmid rmiregistry \ servertool tnameserv diff --git a/lang/sun-jre14/PLIST b/lang/sun-jre14/PLIST index 7bb48068a50..10056d827cc 100644 --- a/lang/sun-jre14/PLIST +++ b/lang/sun-jre14/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2004/10/14 14:32:32 jschauma Exp $ +@comment $NetBSD: PLIST,v 1.16.10.1 2006/03/15 13:27:25 salo Exp $ bin/sun14-java bin/sun14-keytool bin/sun14-orbd @@ -73,41 +73,43 @@ java/sun-1.4/lib/ext/ldapsec.jar 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.Redhat6.1.default +java/sun-1.4/lib/font.properties.Redhat8.0 +java/sun-1.4/lib/font.properties.SuSE8.0 java/sun-1.4/lib/font.properties.default +java/sun-1.4/lib/font.properties.ja.Redhat3 +java/sun-1.4/lib/font.properties.ja.Redhat4 +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.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.ja.Turbo.default +java/sun-1.4/lib/font.properties.ja.Turbo6.0.default +java/sun-1.4/lib/font.properties.ja.default 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.Sun java/sun-1.4/lib/font.properties.ja_JP_UTF8.Sun2003 +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.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.Turbo.default +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_CN.Redhat4 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.Redhat +java/sun-1.4/lib/font.properties.zh_TW.Redhat2.1 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.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 -java/sun-1.4/lib/font.properties.SuSE8.0 -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 java/sun-1.4/lib/fonts/LucidaBrightDemiBold.ttf java/sun-1.4/lib/fonts/LucidaBrightDemiItalic.ttf java/sun-1.4/lib/fonts/LucidaBrightItalic.ttf @@ -242,7 +244,6 @@ java/sun-1.4/lib/zi/Africa/Nouakchott java/sun-1.4/lib/zi/Africa/Ouagadougou java/sun-1.4/lib/zi/Africa/Porto-Novo java/sun-1.4/lib/zi/Africa/Sao_Tome -java/sun-1.4/lib/zi/Africa/Timbuktu java/sun-1.4/lib/zi/Africa/Tripoli java/sun-1.4/lib/zi/Africa/Tunis java/sun-1.4/lib/zi/Africa/Windhoek @@ -251,24 +252,34 @@ java/sun-1.4/lib/zi/America/Anchorage java/sun-1.4/lib/zi/America/Anguilla java/sun-1.4/lib/zi/America/Antigua java/sun-1.4/lib/zi/America/Araguaina +java/sun-1.4/lib/zi/America/Argentina/Buenos_Aires +java/sun-1.4/lib/zi/America/Argentina/Catamarca +java/sun-1.4/lib/zi/America/Argentina/Cordoba +java/sun-1.4/lib/zi/America/Argentina/Jujuy +java/sun-1.4/lib/zi/America/Argentina/La_Rioja +java/sun-1.4/lib/zi/America/Argentina/Mendoza +java/sun-1.4/lib/zi/America/Argentina/Rio_Gallegos +java/sun-1.4/lib/zi/America/Argentina/San_Juan +java/sun-1.4/lib/zi/America/Argentina/Tucuman +java/sun-1.4/lib/zi/America/Argentina/Ushuaia java/sun-1.4/lib/zi/America/Aruba java/sun-1.4/lib/zi/America/Asuncion +java/sun-1.4/lib/zi/America/Bahia java/sun-1.4/lib/zi/America/Barbados java/sun-1.4/lib/zi/America/Belem java/sun-1.4/lib/zi/America/Belize java/sun-1.4/lib/zi/America/Boa_Vista java/sun-1.4/lib/zi/America/Bogota java/sun-1.4/lib/zi/America/Boise -java/sun-1.4/lib/zi/America/Buenos_Aires java/sun-1.4/lib/zi/America/Cambridge_Bay +java/sun-1.4/lib/zi/America/Campo_Grande java/sun-1.4/lib/zi/America/Cancun java/sun-1.4/lib/zi/America/Caracas -java/sun-1.4/lib/zi/America/Catamarca java/sun-1.4/lib/zi/America/Cayenne java/sun-1.4/lib/zi/America/Cayman java/sun-1.4/lib/zi/America/Chicago java/sun-1.4/lib/zi/America/Chihuahua -java/sun-1.4/lib/zi/America/Cordoba +java/sun-1.4/lib/zi/America/Coral_Harbour java/sun-1.4/lib/zi/America/Costa_Rica java/sun-1.4/lib/zi/America/Cuiaba java/sun-1.4/lib/zi/America/Curacao @@ -294,26 +305,24 @@ java/sun-1.4/lib/zi/America/Guyana java/sun-1.4/lib/zi/America/Halifax java/sun-1.4/lib/zi/America/Havana java/sun-1.4/lib/zi/America/Hermosillo +java/sun-1.4/lib/zi/America/Indiana/Indianapolis java/sun-1.4/lib/zi/America/Indiana/Knox java/sun-1.4/lib/zi/America/Indiana/Marengo java/sun-1.4/lib/zi/America/Indiana/Vevay -java/sun-1.4/lib/zi/America/Indianapolis java/sun-1.4/lib/zi/America/Inuvik java/sun-1.4/lib/zi/America/Iqaluit java/sun-1.4/lib/zi/America/Jamaica -java/sun-1.4/lib/zi/America/Jujuy java/sun-1.4/lib/zi/America/Juneau +java/sun-1.4/lib/zi/America/Kentucky/Louisville java/sun-1.4/lib/zi/America/Kentucky/Monticello java/sun-1.4/lib/zi/America/La_Paz java/sun-1.4/lib/zi/America/Lima java/sun-1.4/lib/zi/America/Los_Angeles -java/sun-1.4/lib/zi/America/Louisville java/sun-1.4/lib/zi/America/Maceio java/sun-1.4/lib/zi/America/Managua java/sun-1.4/lib/zi/America/Manaus java/sun-1.4/lib/zi/America/Martinique java/sun-1.4/lib/zi/America/Mazatlan -java/sun-1.4/lib/zi/America/Mendoza java/sun-1.4/lib/zi/America/Menominee java/sun-1.4/lib/zi/America/Merida java/sun-1.4/lib/zi/America/Mexico_City @@ -355,6 +364,7 @@ java/sun-1.4/lib/zi/America/Tegucigalpa java/sun-1.4/lib/zi/America/Thule java/sun-1.4/lib/zi/America/Thunder_Bay java/sun-1.4/lib/zi/America/Tijuana +java/sun-1.4/lib/zi/America/Toronto java/sun-1.4/lib/zi/America/Tortola java/sun-1.4/lib/zi/America/Vancouver java/sun-1.4/lib/zi/America/Whitehorse @@ -461,6 +471,7 @@ java/sun-1.4/lib/zi/Atlantic/Stanley java/sun-1.4/lib/zi/Australia/Adelaide java/sun-1.4/lib/zi/Australia/Brisbane java/sun-1.4/lib/zi/Australia/Broken_Hill +java/sun-1.4/lib/zi/Australia/Currie java/sun-1.4/lib/zi/Australia/Darwin java/sun-1.4/lib/zi/Australia/Hobart java/sun-1.4/lib/zi/Australia/Lindeman @@ -502,7 +513,6 @@ java/sun-1.4/lib/zi/Etc/UTC java/sun-1.4/lib/zi/Europe/Amsterdam java/sun-1.4/lib/zi/Europe/Andorra java/sun-1.4/lib/zi/Europe/Athens -java/sun-1.4/lib/zi/Europe/Belfast java/sun-1.4/lib/zi/Europe/Belgrade java/sun-1.4/lib/zi/Europe/Berlin java/sun-1.4/lib/zi/Europe/Brussels @@ -593,7 +603,6 @@ java/sun-1.4/lib/zi/Pacific/Tongatapu java/sun-1.4/lib/zi/Pacific/Truk java/sun-1.4/lib/zi/Pacific/Wake java/sun-1.4/lib/zi/Pacific/Wallis -java/sun-1.4/lib/zi/Pacific/Yap java/sun-1.4/lib/zi/WET java/sun-1.4/lib/zi/ZoneInfoMappings java/sun-1.4/man/ja @@ -624,8 +633,8 @@ java/sun-1.4/man/man1/tnameserv.1 java/sun-1.4/plugin/desktop/sun_java.desktop java/sun-1.4/plugin/desktop/sun_java.png java/sun-1.4/plugin/i386/ns4/libjavaplugin.so -java/sun-1.4/plugin/i386/ns610/libjavaplugin_oji.so java/sun-1.4/plugin/i386/ns610-gcc32/libjavaplugin_oji.so +java/sun-1.4/plugin/i386/ns610/libjavaplugin_oji.so @dirrm java/sun-1.4/plugin/i386/ns610-gcc32 @dirrm java/sun-1.4/plugin/i386/ns610 @dirrm java/sun-1.4/plugin/i386/ns4 @@ -647,6 +656,7 @@ java/sun-1.4/plugin/i386/ns610-gcc32/libjavaplugin_oji.so @dirrm java/sun-1.4/lib/zi/America/North_Dakota @dirrm java/sun-1.4/lib/zi/America/Kentucky @dirrm java/sun-1.4/lib/zi/America/Indiana +@dirrm java/sun-1.4/lib/zi/America/Argentina @dirrm java/sun-1.4/lib/zi/America @dirrm java/sun-1.4/lib/zi/Africa @dirrm java/sun-1.4/lib/zi diff --git a/lang/sun-jre14/buildlink3.mk b/lang/sun-jre14/buildlink3.mk index 427a88b1e8d..3aaf3a77664 100644 --- a/lang/sun-jre14/buildlink3.mk +++ b/lang/sun-jre14/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/06/05 16:33:52 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2.14.1 2006/03/15 13:27:25 salo Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SUN_JRE14_BUILDLINK3_MK:= ${SUN_JRE14_BUILDLINK3_MK}+ @@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+= sun-jre14 .if !empty(SUN_JRE14_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.sun-jre14+= sun-jre14-[0-9]* +BUILDLINK_RECOMMENDED.sun-jre14?= sun-jre14>=2.11 BUILDLINK_PKGSRCDIR.sun-jre14?= ../../lang/sun-jre14 BUILDLINK_JAVA_PREFIX.sun-jre14= ${PREFIX}/java/sun-1.4 .endif # SUN_JRE14_BUILDLINK3_MK diff --git a/lang/sun-jre14/distinfo b/lang/sun-jre14/distinfo index 83b5995d911..836268485eb 100644 --- a/lang/sun-jre14/distinfo +++ b/lang/sun-jre14/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.19 2005/09/17 16:44:54 dillo Exp $ +$NetBSD: distinfo,v 1.19.4.1 2006/03/15 13:27:25 salo Exp $ -SHA1 (j2re-1_4_2_09-linux-i586.bin) = dfd56fc4715da10a2b5ad0e4e2938c05914049cb -RMD160 (j2re-1_4_2_09-linux-i586.bin) = abdc9fcc593e4b00151f3bbbcde9e88842f78c8f -Size (j2re-1_4_2_09-linux-i586.bin) = 14411078 bytes +SHA1 (j2re-1_4_2_11-linux-i586.bin) = 5374084faae50042ad9af5f5fd31c6ea6e8ed5a1 +RMD160 (j2re-1_4_2_11-linux-i586.bin) = 123f9dbcabe4325e06e84a8b45fda0f3e49f3a87 +Size (j2re-1_4_2_11-linux-i586.bin) = 14309559 bytes SHA1 (jce_policy-1_4_2.zip) = ea17b649ebcaaf4246e9dd28dbc77926176c64ee RMD160 (jce_policy-1_4_2.zip) = 323340fa8a96f315a35b0ebc918731e6fe56c370 Size (jce_policy-1_4_2.zip) = 12195 bytes |