diff options
| author | jkim <jkim@FreeBSD.org> | 2010-10-14 03:51:32 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2010-10-14 03:51:32 +0800 |
| commit | a61f766ab9244247f2d97bde0aa6193ac8e08bfe (patch) | |
| tree | 51a74f163302dbd36efc799f54c44fe73f36c775 /java/openjdk6 | |
| parent | 7282693eaa4bd70bb538e57ad40ce9f562e22b90 (diff) | |
| download | freebsd-ports-gnome-a61f766ab9244247f2d97bde0aa6193ac8e08bfe.tar.gz freebsd-ports-gnome-a61f766ab9244247f2d97bde0aa6193ac8e08bfe.tar.zst freebsd-ports-gnome-a61f766ab9244247f2d97bde0aa6193ac8e08bfe.zip | |
Update Web Start and Java plugin to IcedTea6 1.9.1.
Diffstat (limited to 'java/openjdk6')
| -rw-r--r-- | java/openjdk6/Makefile | 6 | ||||
| -rw-r--r-- | java/openjdk6/distinfo | 6 | ||||
| -rw-r--r-- | java/openjdk6/files/icedtea.patch | 8 |
3 files changed, 11 insertions, 9 deletions
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index 20e88bc5447d..250cc63ba7cf 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -7,7 +7,7 @@ PORTNAME= openjdk6 PORTVERSION= b20 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk6/promoted/${PORTVERSION}/ \ https://jaxp.dev.java.net/files/documents/913/150648/:jaxp \ @@ -63,7 +63,7 @@ JAXWS_BUILD= b20 JAXWSFILE= jdk6-jaxws-${JAXWS_BUILD}.zip JAF_BUILD= b20 JAFFILE= jdk6-jaf-${JAF_BUILD}.zip -ICEDTEAVERSION= 1.9 +ICEDTEAVERSION= 1.9.1 ICEDTEAFILE= icedtea6-${ICEDTEAVERSION}${EXTRACT_SUFX} JTREGVERSION= b03 JTREGFILE= jtreg-4_0-bin-${JTREGVERSION}-31_mar_2009.zip @@ -299,6 +299,8 @@ post-build: ) @${CP} -Rp ${ICEDTEADIR}/build/lib \ ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre + @${CP} ${ICEDTEADIR}/netx/javaws.1 \ + ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/man/man1/javaws.1 .endif .if defined(WITH_TEST) @${ECHO_MSG} "" diff --git a/java/openjdk6/distinfo b/java/openjdk6/distinfo index 175afd408eeb..2c7ad6723813 100644 --- a/java/openjdk6/distinfo +++ b/java/openjdk6/distinfo @@ -13,9 +13,9 @@ SIZE (jdk6-jaf-b20.zip) = 71243 MD5 (apache-ant-1.7.1-bin.tar.bz2) = 9330447f3763b87570dd1118c49a8efd SHA256 (apache-ant-1.7.1-bin.tar.bz2) = 24e54c9d90b81d1b7342695a8285a969393fd883e99ffbbc04203c106d9c2f97 SIZE (apache-ant-1.7.1-bin.tar.bz2) = 7641928 -MD5 (icedtea6-1.9.tar.gz) = 24191e3974ea58cb2bc410590221486c -SHA256 (icedtea6-1.9.tar.gz) = 829ca9d920b60c62c5568fabf0458a7f8ac25294b07a7befbd82a80fe65da867 -SIZE (icedtea6-1.9.tar.gz) = 6330215 +MD5 (icedtea6-1.9.1.tar.gz) = 8cb71d69a74152b369d3929c5b5badfd +SHA256 (icedtea6-1.9.1.tar.gz) = d773a6eb60f560d291206bfdeb83b1da03b79c7c09b7ae53da1877e57ddb3cea +SIZE (icedtea6-1.9.1.tar.gz) = 6395453 MD5 (jtreg-4_0-bin-b03-31_mar_2009.zip) = 99c4c119c2dd8e7a39c184896a56a00e SHA256 (jtreg-4_0-bin-b03-31_mar_2009.zip) = 919b3da574a8bfb96a53d9550a0cb2482dc08df6ce3e7042235e0e9067c832e6 SIZE (jtreg-4_0-bin-b03-31_mar_2009.zip) = 4824967 diff --git a/java/openjdk6/files/icedtea.patch b/java/openjdk6/files/icedtea.patch index 2e8bad1691a0..f0eaeb68b908 100644 --- a/java/openjdk6/files/icedtea.patch +++ b/java/openjdk6/files/icedtea.patch @@ -18,8 +18,8 @@ fails with EPERM. This is a POSIX requirement. - We must join threads via pthread_join(3) after calling pthread_cancel(3). Otherwise, we may destroy mutex or condition variable in use. ---- icedtea6-1.9/plugin/icedteanp/IcedTeaNPPlugin.cc.orig 2010-08-06 07:05:21.916103000 -0400 -+++ icedtea6-1.9/plugin/icedteanp/IcedTeaNPPlugin.cc 2010-09-23 21:52:17.000000000 -0400 +--- icedtea6-1.9.1/plugin/icedteanp/IcedTeaNPPlugin.cc.orig 2010-10-04 17:26:45.636097000 -0400 ++++ icedtea6-1.9.1/plugin/icedteanp/IcedTeaNPPlugin.cc 2010-10-13 14:23:10.000000000 -0400 @@ -2355,6 +2355,10 @@ NP_Shutdown (void) pthread_cancel(plugin_request_processor_thread2); pthread_cancel(plugin_request_processor_thread3); @@ -31,8 +31,8 @@ Otherwise, we may destroy mutex or condition variable in use. java_to_plugin_bus->unSubscribe(plugin_req_proc); plugin_to_java_bus->unSubscribe(java_req_proc); //internal_bus->unSubscribe(java_req_proc); ---- icedtea6-1.9/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc.orig 2010-08-06 07:05:21.996828000 -0400 -+++ icedtea6-1.9/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2010-09-23 22:01:37.000000000 -0400 +--- icedtea6-1.9.1/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc.orig 2010-08-06 07:05:21.996828000 -0400 ++++ icedtea6-1.9.1/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2010-10-13 14:23:10.000000000 -0400 @@ -63,6 +63,12 @@ PluginRequestProcessor::PluginRequestPro this->pendingRequests = new std::map<pthread_t, uintmax_t>(); |