pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/openjdk7 Update to 1.7.71



details:   https://anonhg.NetBSD.org/pkgsrc/rev/51b3559dbcd5
branches:  trunk
changeset: 641321:51b3559dbcd5
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Mon Nov 03 12:25:36 2014 +0000

description:
Update to 1.7.71

* Update icedtea* to latest
* UTF-8 build patch
These are based on the patches from richard@.

Changelog:
From: http://www.oracle.com/technetwork/java/javase/7u71-relnotes-2296187.html

The full version string for this update release is 1.7.0_71-b14 (where "b" means "build"). The version number is 7u71.
IANA Data 2014c

JDK 7u71 contains IANA time zone data version 2014c. For more information, refer to Timezone Data Versions in the JRE Software.

diffstat:

 lang/openjdk7/Makefile                                |   6 ++--
 lang/openjdk7/distinfo                                |  21 +++++++++---------
 lang/openjdk7/icedtea-extras.mk                       |  10 ++++----
 lang/openjdk7/patches/patch-jdk_make_common_Rules.gmk |  17 +++++++++++++++
 4 files changed, 36 insertions(+), 18 deletions(-)

diffs (106 lines):

diff -r 373b1306bedb -r 51b3559dbcd5 lang/openjdk7/Makefile
--- a/lang/openjdk7/Makefile    Mon Nov 03 12:24:43 2014 +0000
+++ b/lang/openjdk7/Makefile    Mon Nov 03 12:25:36 2014 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2014/09/13 14:35:25 joerg Exp $
+# $NetBSD: Makefile,v 1.78 2014/11/03 12:25:36 ryoon Exp $
 
-DISTNAME=      openjdk-1.7.65-20140719
-PKGNAME=       openjdk7-1.7.65
+DISTNAME=      openjdk-1.7.71-20141102
+PKGNAME=       openjdk7-1.7.71
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 373b1306bedb -r 51b3559dbcd5 lang/openjdk7/distinfo
--- a/lang/openjdk7/distinfo    Mon Nov 03 12:24:43 2014 +0000
+++ b/lang/openjdk7/distinfo    Mon Nov 03 12:25:36 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2014/10/04 22:47:32 joerg Exp $
+$NetBSD: distinfo,v 1.56 2014/11/03 12:25:36 ryoon Exp $
 
 SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
 RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
@@ -33,15 +33,15 @@
 SHA1 (openjdk7/cacerts-20091013.tar.bz2) = 905e88e6e2ccdbfe1f36c1dace7cc687fba78890
 RMD160 (openjdk7/cacerts-20091013.tar.bz2) = 0f4e14197016201ff65272a944eafecc6f2d5770
 Size (openjdk7/cacerts-20091013.tar.bz2) = 55894 bytes
-SHA1 (openjdk7/icedtea-2.5.1.tar.xz) = a41e4b722f782024d6d9dee0d639e77cf64d5ff7
-RMD160 (openjdk7/icedtea-2.5.1.tar.xz) = 3ed48953131dc0a0a71d83e0262c9cba62a76341
-Size (openjdk7/icedtea-2.5.1.tar.xz) = 2012584 bytes
-SHA1 (openjdk7/icedtea-web-81dfc0552a1c.tar.bz2) = e3a00a6a4a18b7c1044e8116f1b86e737c6504de
-RMD160 (openjdk7/icedtea-web-81dfc0552a1c.tar.bz2) = 0c3af827f9c63ba3a7c3f98bb708afd7da8b4b68
-Size (openjdk7/icedtea-web-81dfc0552a1c.tar.bz2) = 1051891 bytes
-SHA1 (openjdk7/openjdk-1.7.65-20140719.tar.bz2) = 0bdfb8ec8d4d8cdfb784bb02686b119f7d605d95
-RMD160 (openjdk7/openjdk-1.7.65-20140719.tar.bz2) = e620156acf5c656248c045981a49ab64f5eaa6df
-Size (openjdk7/openjdk-1.7.65-20140719.tar.bz2) = 51970677 bytes
+SHA1 (openjdk7/icedtea-2.5.3.tar.xz) = c509018b108ec6d8e5c8380c9b42d5fba426c632
+RMD160 (openjdk7/icedtea-2.5.3.tar.xz) = c386237bc07fa535b1cfd0cf95fc0bc50ab067c3
+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/rhino1_7R4.zip) = 483e097cb575c724c745edd80c9512f073bd510a
 RMD160 (openjdk7/rhino1_7R4.zip) = fba5ce71edd396a241991fb7b3ce43628b891035
 Size (openjdk7/rhino1_7R4.zip) = 6481918 bytes
@@ -115,6 +115,7 @@
 SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadaed202ba70
 SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df33901040a7b6
 SHA1 (patch-jdk_make_common_Program.gmk) = 66edaf69cb12c1e024ba1145c98b667d54ea9239
+SHA1 (patch-jdk_make_common_Rules.gmk) = 371fcc33fd44d62d2490bb454abf21815ce2e1ce
 SHA1 (patch-jdk_make_common_shared_Compiler-gcc.gmk) = e180383490d6c0a8bec4626ed96ad1741c8fb3a2
 SHA1 (patch-jdk_make_common_shared_Defs-java.gmk) = f7c11d33da19e9f255fde7cab387c91e0287509c
 SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = d0ae37a032be6bf60da4be11bd38185e89d4ee91
diff -r 373b1306bedb -r 51b3559dbcd5 lang/openjdk7/icedtea-extras.mk
--- a/lang/openjdk7/icedtea-extras.mk   Mon Nov 03 12:24:43 2014 +0000
+++ b/lang/openjdk7/icedtea-extras.mk   Mon Nov 03 12:25:36 2014 +0000
@@ -1,20 +1,20 @@
-# $NetBSD: icedtea-extras.mk,v 1.13 2014/07/25 23:24:13 ryoon Exp $
+# $NetBSD: icedtea-extras.mk,v 1.14 2014/11/03 12:25:36 ryoon Exp $
 
 # Needed to extract icedtea
 EXTRACT_USING=                 bsdtar
 
 DIST_SUBDIR=                   openjdk7
 
-ICEDTEA=                       icedtea-2.5.1
+ICEDTEA=                       icedtea-2.5.3
 ICEDTEA_TGZ=                   ${ICEDTEA}.tar.xz
 SITES.${ICEDTEA_TGZ}=          http://icedtea.wildebeest.org/download/source/
 DISTFILES+=                    ${ICEDTEA_TGZ}
 EXTRACT_ONLY+=                 ${ICEDTEA_TGZ}
 
 # Keep icedtea-web distfile in sync with www/icedtea-web/Makefile
-ICEDTEA_WEB=                   icedtea-web-81dfc0552a1c
-ICEDTEA_WEB_TGZ=               icedtea-web-81dfc0552a1c.tar.bz2
-SITES.${ICEDTEA_WEB_TGZ}=      -http://icedtea.classpath.org/hg/icedtea-web/archive/81dfc0552a1c.tar.bz2
+ICEDTEA_WEB=                   icedtea-web-1.5.1
+ICEDTEA_WEB_TGZ=               icedtea-web-1.5.1.tar.gz
+SITES.${ICEDTEA_WEB_TGZ}=      http://icedtea.wildebeest.org/download/source/
 DISTFILES+=                    ${ICEDTEA_WEB_TGZ}
 EXTRACT_ONLY+=                 ${ICEDTEA_WEB_TGZ}
 
diff -r 373b1306bedb -r 51b3559dbcd5 lang/openjdk7/patches/patch-jdk_make_common_Rules.gmk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/openjdk7/patches/patch-jdk_make_common_Rules.gmk     Mon Nov 03 12:25:36 2014 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-jdk_make_common_Rules.gmk,v 1.1 2014/11/03 12:25:36 ryoon Exp $
+
+* add '-encoding UTF-8' to JAVAC_CMD to support the " ˇ" character string in
+* classes/net/sourceforge/jnlp/security/policyeditor/PolicyEditorPermissions.java
+* avoiding "unmappable character for encoding ascii" error
+
+--- jdk/make/common/Rules.gmk.orig     2014-01-01 05:53:33.000000000 +0000
++++ jdk/make/common/Rules.gmk
+@@ -256,7 +256,7 @@ classes : $(CLASSES_INIT) .delete.classl
+         $(CAT) $<.filtered; \
+         $(ECHO) "# Running javac:"; \
+         $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
+-        $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
++        $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -encoding UTF-8 -d $(CLASSDESTDIR) @$<.filtered; \
+       fi
+       @$(java-vm-cleanup)
+ 


Home | Main Index | Thread Index | Old Index