diff options
author | ryoon <ryoon@pkgsrc.org> | 2015-01-27 12:31:06 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2015-01-27 12:31:06 +0000 |
commit | 26301388e48594ba93286dcece7247a73e9d6515 (patch) | |
tree | bd7ce88671587a145723c32b6577cf5845c1e8a1 /lang/openjdk7 | |
parent | 7d8cd19d81e3a8c4f9c843944231fadca382906a (diff) | |
download | pkgsrc-26301388e48594ba93286dcece7247a73e9d6515.tar.gz |
Update to 1.7.76
* Disable SCTP support under NetBSD.
Changelog:
From: http://www.oracle.com/technetwork/java/javase/7u76-relnotes-2389087.html
IANA Data 2014j
JDK 7u76 contains IANA time zone data version 2014j. For more information, refer to Timezone Data Versions in the JRE Software.
New Features and Changes
SSLv3 is disabled by default
Starting with JDK 7u75 release, the SSLv3 protocol (Secure Socket Layer) has been deactivated and is not available by default. See the java.security.Security property jdk.tls.disabledAlgorithms in <JRE_HOME>/lib/security/java.security file.
If SSLv3 is absolutely required, the protocol can be reactivated by removing "SSLv3" from the jdk.tls.disabledAlgorithms property in the java.security file or by dynamically setting this Security property to "true" before JSSE is initialized.
It should be noted that SSLv3 is obsolete and should no longer be used.
Changes to Java Control Panel
Starting with 7u75 release, SSLv3 protocol is removed from Java Control Panel Advanced options.
If the user needs to use SSLv3 for applications, re-enable it manually as follows:
Enable SSLv3 protocol on JRE level: as described in the previous section.
Enable SSLv3 protocol on deploy level: edit the deployment.properties file and add the following:
deployment.security.SSLv3=true
Diffstat (limited to 'lang/openjdk7')
-rw-r--r-- | lang/openjdk7/Makefile | 11 | ||||
-rw-r--r-- | lang/openjdk7/PLIST | 52 | ||||
-rw-r--r-- | lang/openjdk7/distinfo | 38 | ||||
-rw-r--r-- | lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make | 8 | ||||
-rw-r--r-- | lang/openjdk7/patches/patch-jdk_make_com_sun_nio_Makefile | 19 |
5 files changed, 39 insertions, 89 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 08de8dedc27..43e678b6fb0 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.82 2015/01/09 16:29:04 rumko Exp $ +# $NetBSD: Makefile,v 1.83 2015/01/27 12:31:06 ryoon Exp $ -DISTNAME= openjdk-1.7.71-20141102 -PKGNAME= openjdk7-1.7.71 -PKGREVISION= 2 +DISTNAME= openjdk-1.7.76-20150127 +PKGNAME= openjdk7-1.7.76 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} EXTRACT_SUFX= .tar.bz2 @@ -22,10 +21,6 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} #PATCH_DIST_STRIP= -p1 #PATCHFILES+= jdk-7u21-20130526.diff #PATCH_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/} -PATCH_DIST_STRIP= -p1 -PATCHFILES+= patches-74a70385c21d -PATCH_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/} - CACERTS= cacerts-20091013.tar.bz2 DISTFILES+= ${CACERTS} diff --git a/lang/openjdk7/PLIST b/lang/openjdk7/PLIST index f468badc15b..2bed77850e4 100644 --- a/lang/openjdk7/PLIST +++ b/lang/openjdk7/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2015/01/09 16:29:04 rumko Exp $ +@comment $NetBSD: PLIST,v 1.18 2015/01/27 12:31:06 ryoon Exp $ bin/openjdk7-jar bin/openjdk7-java bin/openjdk7-javac @@ -340,8 +340,8 @@ java/openjdk7/include/jni.h java/openjdk7/include/jni_md.h java/openjdk7/include/jvmti.h java/openjdk7/include/jvmticmlr.h -java/openjdk7/include/${LOWER_OPSYS}/jawt_md.h -java/openjdk7/include/${LOWER_OPSYS}/jni_md.h +java/openjdk7/include/netbsd/jawt_md.h +java/openjdk7/include/netbsd/jni_md.h java/openjdk7/jre/ASSEMBLY_EXCEPTION java/openjdk7/jre/LICENSE java/openjdk7/jre/THIRD_PARTY_README @@ -462,52 +462,19 @@ java/openjdk7/jre/lib/security/local_policy.jar java/openjdk7/jre/lib/sound.properties java/openjdk7/jre/lib/zi/Africa/Abidjan java/openjdk7/jre/lib/zi/Africa/Accra -java/openjdk7/jre/lib/zi/Africa/Addis_Ababa java/openjdk7/jre/lib/zi/Africa/Algiers -java/openjdk7/jre/lib/zi/Africa/Asmara -java/openjdk7/jre/lib/zi/Africa/Bamako -java/openjdk7/jre/lib/zi/Africa/Bangui -java/openjdk7/jre/lib/zi/Africa/Banjul java/openjdk7/jre/lib/zi/Africa/Bissau -java/openjdk7/jre/lib/zi/Africa/Blantyre -java/openjdk7/jre/lib/zi/Africa/Brazzaville -java/openjdk7/jre/lib/zi/Africa/Bujumbura java/openjdk7/jre/lib/zi/Africa/Cairo java/openjdk7/jre/lib/zi/Africa/Casablanca java/openjdk7/jre/lib/zi/Africa/Ceuta -java/openjdk7/jre/lib/zi/Africa/Conakry -java/openjdk7/jre/lib/zi/Africa/Dakar -java/openjdk7/jre/lib/zi/Africa/Dar_es_Salaam -java/openjdk7/jre/lib/zi/Africa/Djibouti -java/openjdk7/jre/lib/zi/Africa/Douala java/openjdk7/jre/lib/zi/Africa/El_Aaiun -java/openjdk7/jre/lib/zi/Africa/Freetown -java/openjdk7/jre/lib/zi/Africa/Gaborone -java/openjdk7/jre/lib/zi/Africa/Harare java/openjdk7/jre/lib/zi/Africa/Johannesburg -java/openjdk7/jre/lib/zi/Africa/Kampala java/openjdk7/jre/lib/zi/Africa/Khartoum -java/openjdk7/jre/lib/zi/Africa/Kigali -java/openjdk7/jre/lib/zi/Africa/Kinshasa java/openjdk7/jre/lib/zi/Africa/Lagos -java/openjdk7/jre/lib/zi/Africa/Libreville -java/openjdk7/jre/lib/zi/Africa/Lome -java/openjdk7/jre/lib/zi/Africa/Luanda -java/openjdk7/jre/lib/zi/Africa/Lubumbashi -java/openjdk7/jre/lib/zi/Africa/Lusaka -java/openjdk7/jre/lib/zi/Africa/Malabo java/openjdk7/jre/lib/zi/Africa/Maputo -java/openjdk7/jre/lib/zi/Africa/Maseru -java/openjdk7/jre/lib/zi/Africa/Mbabane -java/openjdk7/jre/lib/zi/Africa/Mogadishu java/openjdk7/jre/lib/zi/Africa/Monrovia java/openjdk7/jre/lib/zi/Africa/Nairobi java/openjdk7/jre/lib/zi/Africa/Ndjamena -java/openjdk7/jre/lib/zi/Africa/Niamey -java/openjdk7/jre/lib/zi/Africa/Nouakchott -java/openjdk7/jre/lib/zi/Africa/Ouagadougou -java/openjdk7/jre/lib/zi/Africa/Porto-Novo -java/openjdk7/jre/lib/zi/Africa/Sao_Tome java/openjdk7/jre/lib/zi/Africa/Tripoli java/openjdk7/jre/lib/zi/Africa/Tunis java/openjdk7/jre/lib/zi/Africa/Windhoek @@ -667,8 +634,8 @@ java/openjdk7/jre/lib/zi/Asia/Bangkok java/openjdk7/jre/lib/zi/Asia/Beirut java/openjdk7/jre/lib/zi/Asia/Bishkek java/openjdk7/jre/lib/zi/Asia/Brunei +java/openjdk7/jre/lib/zi/Asia/Chita java/openjdk7/jre/lib/zi/Asia/Choibalsan -java/openjdk7/jre/lib/zi/Asia/Chongqing java/openjdk7/jre/lib/zi/Asia/Colombo java/openjdk7/jre/lib/zi/Asia/Damascus java/openjdk7/jre/lib/zi/Asia/Dhaka @@ -676,7 +643,6 @@ java/openjdk7/jre/lib/zi/Asia/Dili java/openjdk7/jre/lib/zi/Asia/Dubai java/openjdk7/jre/lib/zi/Asia/Dushanbe java/openjdk7/jre/lib/zi/Asia/Gaza -java/openjdk7/jre/lib/zi/Asia/Harbin java/openjdk7/jre/lib/zi/Asia/Hebron java/openjdk7/jre/lib/zi/Asia/Ho_Chi_Minh java/openjdk7/jre/lib/zi/Asia/Hong_Kong @@ -688,7 +654,6 @@ java/openjdk7/jre/lib/zi/Asia/Jerusalem java/openjdk7/jre/lib/zi/Asia/Kabul java/openjdk7/jre/lib/zi/Asia/Kamchatka java/openjdk7/jre/lib/zi/Asia/Karachi -java/openjdk7/jre/lib/zi/Asia/Kashgar java/openjdk7/jre/lib/zi/Asia/Kathmandu java/openjdk7/jre/lib/zi/Asia/Khandyga java/openjdk7/jre/lib/zi/Asia/Kolkata @@ -706,7 +671,6 @@ java/openjdk7/jre/lib/zi/Asia/Novokuznetsk java/openjdk7/jre/lib/zi/Asia/Novosibirsk java/openjdk7/jre/lib/zi/Asia/Omsk java/openjdk7/jre/lib/zi/Asia/Oral -java/openjdk7/jre/lib/zi/Asia/Phnom_Penh java/openjdk7/jre/lib/zi/Asia/Pontianak java/openjdk7/jre/lib/zi/Asia/Pyongyang java/openjdk7/jre/lib/zi/Asia/Qatar @@ -721,6 +685,7 @@ java/openjdk7/jre/lib/zi/Asia/Samarkand java/openjdk7/jre/lib/zi/Asia/Seoul java/openjdk7/jre/lib/zi/Asia/Shanghai java/openjdk7/jre/lib/zi/Asia/Singapore +java/openjdk7/jre/lib/zi/Asia/Srednekolymsk java/openjdk7/jre/lib/zi/Asia/Taipei java/openjdk7/jre/lib/zi/Asia/Tashkent java/openjdk7/jre/lib/zi/Asia/Tbilisi @@ -730,7 +695,6 @@ java/openjdk7/jre/lib/zi/Asia/Tokyo java/openjdk7/jre/lib/zi/Asia/Ulaanbaatar java/openjdk7/jre/lib/zi/Asia/Urumqi java/openjdk7/jre/lib/zi/Asia/Ust-Nera -java/openjdk7/jre/lib/zi/Asia/Vientiane java/openjdk7/jre/lib/zi/Asia/Vladivostok java/openjdk7/jre/lib/zi/Asia/Yakutsk java/openjdk7/jre/lib/zi/Asia/Yekaterinburg @@ -743,7 +707,6 @@ java/openjdk7/jre/lib/zi/Atlantic/Faroe java/openjdk7/jre/lib/zi/Atlantic/Madeira java/openjdk7/jre/lib/zi/Atlantic/Reykjavik java/openjdk7/jre/lib/zi/Atlantic/South_Georgia -java/openjdk7/jre/lib/zi/Atlantic/St_Helena java/openjdk7/jre/lib/zi/Atlantic/Stanley java/openjdk7/jre/lib/zi/Australia/Adelaide java/openjdk7/jre/lib/zi/Australia/Brisbane @@ -835,16 +798,13 @@ java/openjdk7/jre/lib/zi/Europe/Zaporozhye java/openjdk7/jre/lib/zi/Europe/Zurich java/openjdk7/jre/lib/zi/GMT java/openjdk7/jre/lib/zi/HST -java/openjdk7/jre/lib/zi/Indian/Antananarivo java/openjdk7/jre/lib/zi/Indian/Chagos java/openjdk7/jre/lib/zi/Indian/Christmas java/openjdk7/jre/lib/zi/Indian/Cocos -java/openjdk7/jre/lib/zi/Indian/Comoro java/openjdk7/jre/lib/zi/Indian/Kerguelen java/openjdk7/jre/lib/zi/Indian/Mahe java/openjdk7/jre/lib/zi/Indian/Maldives java/openjdk7/jre/lib/zi/Indian/Mauritius -java/openjdk7/jre/lib/zi/Indian/Mayotte java/openjdk7/jre/lib/zi/Indian/Reunion java/openjdk7/jre/lib/zi/MET java/openjdk7/jre/lib/zi/MST @@ -852,6 +812,7 @@ java/openjdk7/jre/lib/zi/MST7MDT java/openjdk7/jre/lib/zi/PST8PDT java/openjdk7/jre/lib/zi/Pacific/Apia java/openjdk7/jre/lib/zi/Pacific/Auckland +java/openjdk7/jre/lib/zi/Pacific/Bougainville java/openjdk7/jre/lib/zi/Pacific/Chatham java/openjdk7/jre/lib/zi/Pacific/Chuuk java/openjdk7/jre/lib/zi/Pacific/Easter @@ -908,6 +869,7 @@ java/openjdk7/lib/jconsole.jar java/openjdk7/lib/orb.idl java/openjdk7/lib/sa-jdi.jar java/openjdk7/lib/tools.jar +java/openjdk7/man/ja ${PLIST.manja}java/openjdk7/man/ja java/openjdk7/man/ja_JP.UTF-8/man1/appletviewer.1 java/openjdk7/man/ja_JP.UTF-8/man1/apt.1 diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo index 2d7553d2442..0db0c2aeb77 100644 --- a/lang/openjdk7/distinfo +++ b/lang/openjdk7/distinfo @@ -1,35 +1,11 @@ -$NetBSD: distinfo,v 1.62 2015/01/23 15:43:45 joerg Exp $ +$NetBSD: distinfo,v 1.63 2015/01/27 12:31:06 ryoon Exp $ SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306 RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260 Size (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 4351965 bytes -SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337 -RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157 -Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes -SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29bd7aa925941933b2da671340e1d325d9603e5d -RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140 -Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes -SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = fba2e61d9b6dfa3d582259aa60125762fd3c8931 -RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = 7a164227b077d9e86a2dd2410e83463d6d3360aa -Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = 37211292 bytes -SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2) = dece32461eaab72d3e2327106b5136461d82bd0e -RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2) = d5ab48cd9a2cf0ac554b3fd37a7ace1e5420e3c4 -Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2) = 39051642 bytes -SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2) = 4fac0ed96cfe1b366b50c1b88aabb8d41281f893 -RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2) = ada7af827e2e47e93f1813f0531b697125d1f44b -Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2) = 37567181 bytes -SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2) = 76906b91e8412fefdae5ecb15e01ddbcd586d2ad -RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2) = 068fb6ad180e8b8d9c4f2cc158c40b3047d8e015 -Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2) = 39347597 bytes SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2) = 8a782d9cb2297b1cb24dfb022b139363d8695616 RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2) = 607c25a81ae073fb282e5a81169b93d6818e5122 Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2) = 37593509 bytes -SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2) = 261eb3bf84b6ac60d30a704523efb27e7a7c715a -RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2) = 1d26ee7f6443e1f4389e38d20134fb8e2969254e -Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2) = 40161195 bytes -SHA1 (openjdk7/bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2) = 7e85c42f75f014e88eb62580979f6a0fc9b6e957 -RMD160 (openjdk7/bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2) = d84d7b82205f23827ef9ce672602d0ba8a9a9c72 -Size (openjdk7/bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2) = 37448005 bytes SHA1 (openjdk7/cacerts-20091013.tar.bz2) = 905e88e6e2ccdbfe1f36c1dace7cc687fba78890 RMD160 (openjdk7/cacerts-20091013.tar.bz2) = 0f4e14197016201ff65272a944eafecc6f2d5770 Size (openjdk7/cacerts-20091013.tar.bz2) = 55894 bytes @@ -39,12 +15,9 @@ Size (openjdk7/icedtea-2.5.3.tar.xz) = 2021560 bytes SHA1 (openjdk7/icedtea-web-1.5.1.tar.gz) = 5daedcc1e962eb952e5ea4b5c9698bb9d6ef700e RMD160 (openjdk7/icedtea-web-1.5.1.tar.gz) = a2d0ad55919a8ff5d786b56ed26c8a34ed4b259e Size (openjdk7/icedtea-web-1.5.1.tar.gz) = 1616344 bytes -SHA1 (openjdk7/openjdk-1.7.71-20141102.tar.bz2) = 11ebaf7cc59ea92ba03d6fba491e136a7aab5f28 -RMD160 (openjdk7/openjdk-1.7.71-20141102.tar.bz2) = 04df0741dc19f6536287b8f6657394620b5c37b2 -Size (openjdk7/openjdk-1.7.71-20141102.tar.bz2) = 52222297 bytes -SHA1 (openjdk7/patches-74a70385c21d) = e711f9af4b8f63e70246aa631191004ff9e94435 -RMD160 (openjdk7/patches-74a70385c21d) = 6aecd6b8b7a8033ab742f0d32dd0a974751051ed -Size (openjdk7/patches-74a70385c21d) = 14814 bytes +SHA1 (openjdk7/openjdk-1.7.76-20150127.tar.bz2) = 3210d939b5ac92f2a13c43f3616788c114958451 +RMD160 (openjdk7/openjdk-1.7.76-20150127.tar.bz2) = 683ce69d0cf0854c3ff38dd058338066e448bd62 +Size (openjdk7/openjdk-1.7.76-20150127.tar.bz2) = 52843102 bytes SHA1 (openjdk7/rhino1_7R4.zip) = 483e097cb575c724c745edd80c9512f073bd510a RMD160 (openjdk7/rhino1_7R4.zip) = fba5ce71edd396a241991fb7b3ce43628b891035 Size (openjdk7/rhino1_7R4.zip) = 6481918 bytes @@ -78,7 +51,7 @@ SHA1 (patch-corba_make_common_shared_Platform.gmk) = 057af9ea52ca257750267289e4f SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = e2cca3e2d6a81ca077d23c49a55b228a65f20b58 SHA1 (patch-hotspot_make_bsd_makefiles_buildtree.make) = 2605e4f684abb026be91b4993bb2f741822cf169 SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 85eda2125ef39c5fe5fcfbc072bd8a3591d5c4bf -SHA1 (patch-hotspot_make_bsd_makefiles_rules.make) = 1b89ef4ac8bd6a1b5cf3f35935976d85b4f9dbb1 +SHA1 (patch-hotspot_make_bsd_makefiles_rules.make) = ba5bbe69d44143105bc74641bc55f3814d55abb0 SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14 SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239 SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 5d3003a2b98501cb17695d11f8d3bfc7737657bd @@ -113,6 +86,7 @@ SHA1 (patch-jaxws_make_Makefile) = 4f2181844246441a930daa80b2dc892fede6e6c3 SHA1 (patch-jdk_make_com_sun_Makefile) = 5826c64eb1971d69e8b874d6b8a60d25e0d02c5b SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46 SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 65fa2d6191311766cdb5d9933d760cae7955f664 +SHA1 (patch-jdk_make_com_sun_nio_Makefile) = ab2ce3fd1a1a8ad6009d81025cc07077abe9a048 SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3 SHA1 (patch-jdk_make_common_Defs-solaris-gcc.gmk) = 32c0bbd91ec0c85eb725cd721ed759c6d6499f50 SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadaed202ba70 diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make index f59d2b3fda8..5ad1f5ca818 100644 --- a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make +++ b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make @@ -1,6 +1,6 @@ -$NetBSD: patch-hotspot_make_bsd_makefiles_rules.make,v 1.1 2014/09/13 14:35:25 joerg Exp $ +$NetBSD: patch-hotspot_make_bsd_makefiles_rules.make,v 1.2 2015/01/27 12:31:06 ryoon Exp $ ---- hotspot/make/bsd/makefiles/rules.make.orig 2014-09-12 17:24:02.000000000 +0000 +--- hotspot/make/bsd/makefiles/rules.make.orig 2015-01-26 15:21:52.000000000 +0000 +++ hotspot/make/bsd/makefiles/rules.make @@ -68,12 +68,12 @@ REMOVE_TARGET = rm -f $@ @@ -10,12 +10,12 @@ $NetBSD: patch-hotspot_make_bsd_makefiles_rules.make,v 1.1 2014/09/13 14:35:25 j -RUN.JAVAP = $(ALT_BOOTDIR)/bin/javap -RUN.JAVAH = $(ALT_BOOTDIR)/bin/javah -RUN.JAR = $(ALT_BOOTDIR)/bin/jar +-COMPILE.JAVAC = $(ALT_BOOTDIR)/bin/javac +-COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic +RUN.JAVA = $(ALT_BOOTDIR)/bin/java -XX:+UseSerialGC -mx1024m +RUN.JAVAP = $(ALT_BOOTDIR)/bin/javap -J-XX:+UseSerialGC -J-mx1024m +RUN.JAVAH = $(ALT_BOOTDIR)/bin/javah -J-XX:+UseSerialGC -J-mx1024m +RUN.JAR = $(ALT_BOOTDIR)/bin/jar -J-XX:+UseSerialGC -J-mx1024m --COMPILE.JAVAC = $(ALT_BOOTDIR)/bin/javac --COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic +COMPILE.JAVAC = $(ALT_BOOTDIR)/bin/javac -J-XX:+UseSerialGC -J-mx1024m +COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic -J-XX:+UseSerialGC -J-mx1024m BOOT_JAVA_HOME = $(ALT_BOOTDIR) diff --git a/lang/openjdk7/patches/patch-jdk_make_com_sun_nio_Makefile b/lang/openjdk7/patches/patch-jdk_make_com_sun_nio_Makefile new file mode 100644 index 00000000000..9798afbf30a --- /dev/null +++ b/lang/openjdk7/patches/patch-jdk_make_com_sun_nio_Makefile @@ -0,0 +1,19 @@ +$NetBSD: patch-jdk_make_com_sun_nio_Makefile,v 1.1 2015/01/27 12:31:06 ryoon Exp $ + +* NetBSD has no SCTP support. + +--- jdk/make/com/sun/nio/Makefile.orig 2015-01-26 15:20:56.000000000 +0000 ++++ jdk/make/com/sun/nio/Makefile +@@ -29,8 +29,12 @@ + + BUILDDIR = ../../.. + include $(BUILDDIR)/common/Defs.gmk ++ ++# disable for NetBSD ++ifneq ($(OS_VENDOR), NetBSD) + include $(BUILDDIR)/common/Subdirs.gmk + SUBDIRS = sctp ++endif + + all build clean clobber:: + $(SUBDIRS-loop) |