summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/openjdk7/Makefile7
-rw-r--r--lang/openjdk7/PLIST3
-rw-r--r--lang/openjdk7/distinfo35
-rw-r--r--lang/openjdk7/options.mk4
4 files changed, 11 insertions, 38 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index 753bed8d37e..f783f11ffd6 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2014/06/03 03:20:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.68 2014/06/14 22:44:53 ryoon Exp $
-DISTNAME= openjdk-1.7.55-20140501
-PKGNAME= openjdk7-1.7.55
-PKGREVISION= 2
+DISTNAME= openjdk-1.7.60-20140614
+PKGNAME= openjdk7-1.7.60
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
EXTRACT_SUFX= .tar.bz2
diff --git a/lang/openjdk7/PLIST b/lang/openjdk7/PLIST
index 6faa4ecb58c..529023fcf46 100644
--- a/lang/openjdk7/PLIST
+++ b/lang/openjdk7/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2014/05/02 10:48:13 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.16 2014/06/14 22:44:53 ryoon Exp $
bin/openjdk7-jar
bin/openjdk7-java
bin/openjdk7-javac
@@ -649,6 +649,7 @@ java/openjdk7/jre/lib/zi/Antarctica/Mawson
java/openjdk7/jre/lib/zi/Antarctica/Palmer
java/openjdk7/jre/lib/zi/Antarctica/Rothera
java/openjdk7/jre/lib/zi/Antarctica/Syowa
+java/openjdk7/jre/lib/zi/Antarctica/Troll
java/openjdk7/jre/lib/zi/Antarctica/Vostok
java/openjdk7/jre/lib/zi/Asia/Aden
java/openjdk7/jre/lib/zi/Asia/Almaty
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index 3d3ab696887..4575993a92a 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2014/06/03 03:20:15 ryoon Exp $
+$NetBSD: distinfo,v 1.48 2014/06/14 22:44:53 ryoon Exp $
SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
@@ -9,36 +9,9 @@ Size (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = 4257152 bytes
SHA1 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 6b3d887dfe3283a28f950bc3f87482200cfe78e2
RMD160 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 7c6c2067322a4909c306f9a5049fe75f9244bab7
Size (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 22390959 bytes
-SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = fa383b2c7d5060a689dcbc5fcdd9f08908270ea4
-RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = a914780d3c1c0a53f68c07d39a5af36535282efe
-Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = 3208572 bytes
-SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 08d0003078162c038ed67bb3d59cd2e4073cf4dd
-RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 4ea4bd473635d99d9740c10bb815e019f7ad09d5
-Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz) = 3422188 bytes
-SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = f7578bfdfc7a952cd83306c97fa87ebf921a0461
-RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = 74c570fa6ab6e175871229acc45edbb1e9c759ce
-Size (openjdk7/bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2) = 3837091 bytes
-SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = e9153bab724d415b30b42e320a878aeceb71ed64
-RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = 8d9742b9288ed5eb965bc7fd50fe709f047665af
-Size (openjdk7/bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2) = 3486566 bytes
SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = 60ff45ed4c027209fc855919227bb175c60ede08
RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = e98c534a6804ecd794d1ffd8975e0c705cf8938c
Size (openjdk7/bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2) = 4082640 bytes
-SHA1 (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = baa7e0b2010c1cf918a88654b36db39935e532a4
-RMD160 (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = 791f8db986905f2477adcb1784fea957cd9501d2
-Size (openjdk7/bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2) = 3622007 bytes
-SHA1 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = e18704c72646ef4f66e37ea7a2feb8dad9008079
-RMD160 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = b661b7a434d7d3c27614a2527b0fb2ed065d1f05
-Size (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = 20011172 bytes
-SHA1 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = d7994e2a485c3e4eca44e81f4215bb4c35b54d04
-RMD160 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = bb9ba4fc83ec276c5e8decd53a6523eca1f6b819
-Size (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = 21142004 bytes
-SHA1 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = b9445fa4cc4674ba8b9330e45ae65c597f5fca10
-RMD160 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = aa2443fa202f3ed8694b6d0e4031622b5da52283
-Size (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = 20874080 bytes
-SHA1 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = aa44be237fac1b7c9b4044ea32cab9a0c2fb3ab2
-RMD160 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = 5422564d6a5ba590b0906fdbb9de20091d7dabf2
-Size (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz) = 21676584 bytes
SHA1 (openjdk7/cacerts-20091013.tar.bz2) = 905e88e6e2ccdbfe1f36c1dace7cc687fba78890
RMD160 (openjdk7/cacerts-20091013.tar.bz2) = 0f4e14197016201ff65272a944eafecc6f2d5770
Size (openjdk7/cacerts-20091013.tar.bz2) = 55894 bytes
@@ -57,9 +30,9 @@ Size (openjdk7/jdk7-jaf-2010_08_19.zip) = 70613 bytes
SHA1 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 539bcf80b9a86c97406a3c79e7d10684b213a4be
RMD160 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 49273489651c1950376966955f28e4069165e818
Size (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 6046353 bytes
-SHA1 (openjdk7/openjdk-1.7.55-20140501.tar.bz2) = de0327fa8ee64178f17bb8e856aed467ee744185
-RMD160 (openjdk7/openjdk-1.7.55-20140501.tar.bz2) = b54ef0dc82bc543edfc84725eaa8d757942c393b
-Size (openjdk7/openjdk-1.7.55-20140501.tar.bz2) = 51867898 bytes
+SHA1 (openjdk7/openjdk-1.7.60-20140614.tar.bz2) = f3ebc1e58d81479d9295998d79723a6b6ac24da5
+RMD160 (openjdk7/openjdk-1.7.60-20140614.tar.bz2) = b8e213f85b171ae8a1bf2f9b0b6a0394311c5458
+Size (openjdk7/openjdk-1.7.60-20140614.tar.bz2) = 51944908 bytes
SHA1 (openjdk7/rhino1_7R3.zip) = 81f39d6e24529d62b23a6a92a1a09af95495d7c1
RMD160 (openjdk7/rhino1_7R3.zip) = 3fdc3e1540d0fa35ba7dec1bf34a70b0d41cedd0
Size (openjdk7/rhino1_7R3.zip) = 4651597 bytes
diff --git a/lang/openjdk7/options.mk b/lang/openjdk7/options.mk
index a22a3da348c..6ceef2708f3 100644
--- a/lang/openjdk7/options.mk
+++ b/lang/openjdk7/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2014/01/14 17:24:42 abs Exp $
+# $NetBSD: options.mk,v 1.5 2014/06/14 22:44:53 ryoon Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openjdk7
PKG_SUPPORTED_OPTIONS= sun-jre-jce # jdk-zero-vm
@@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS= #
###
### Java(TM) Cryptography Extension (JCE)
###
-.if !empty(PKG_OPTIONS:Msun-jre-jce)
+.if !empty(PKG_OPTIONS:Msun-jre-jce) || make(distinfo) || make(mdi)
JCE_DISTFILE= UnlimitedJCEPolicyJDK7.zip
DISTFILES+= ${JCE_DISTFILE}
EXTRACT_ONLY+= ${JCE_DISTFILE}