Update to 1.7.65 (7u65)

* Use openjdk7-1.7.60 based bootstrap kits to avoid headlessawt related errors.
  Confirmed under NetBSD/{amd64,i386} 5.2.2, NetBSD/{amd64,i386} 6.1.1,
  NetBSD/{amd64,i386} 6.99.47, and DragonFly/amd64 {3.6.1,3.8.1}.
* Drop pre-3.6 DragonFly support.
* Drop unused distfiles from icedtea-extra.mk.

Changelog: for Oracle Java 7u65
From: http://www.oracle.com/technetwork/java/javase/7u65-relnotes-2229169.html

Java™ SE Development Kit 7, Update 65 (JDK 7u65)

The full version string for this update release is 1.7.0_65-b17 (where "b" means "build"), except for Windows, where the version string is 1.7.0_65-b20. The version number is 7u65.
Highlights

This update release contains the following enhancements and changes:

    New Features and Changes

IANA Data 2014c

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

The security baselines for the Java Runtime Environment (JRE) at the time of the release of JDK 7u65 are specified in the following table:
JRE Family Version 	JRE Security Baseline
(Full Version String)
7 	1.7.0_65
6 	1.6.0_81
5.0 	1.5.0_71

For more information about security baselines, see Deploying Java Applets With Family JRE Versions in Java Plug-in for Internet Explorer.
JRE Expiration Date

The JRE expires whenever a new release with security vulnerability fixes becomes available. Critical patch updates, which contain security vulnerability fixes, are announced one year in advance on Critical Patch Updates, Security Alerts and Third Party Bulletin. This JRE (version 7u65) will expire with the release of the next critical patch update scheduled for October 14, 2014.

For systems unable to reach the Oracle Servers, a secondary mechanism expires this JRE (version 7u65) on November 15, 2014. After either condition is met (new release becoming available or expiration date reached), the JRE will provide additional warnings and reminders to users to update to the newer version. For more information, see JRE Expiration Date.
JavaFX Release Notes

This JDK release includes JavaFX version 2.2.65.
New Features and Changes

New Java Control Panel option to disable sponsors

Currently, to disable sponsor offers at the time of installation, the user can de-select the option during installation or can pass SPONSORS=0 as a commandline option.

In this release, a new Java Control Panel(JCP) option to disable sponsors is available. To use this option, go to JCP's "Advanced" tab, and check or uncheck "Suppress sponsor offers when updating Java".

This option is applicable to 32 and 64 bit Windows operating systems.
New JAXP processing limit property - maxElementDepth

A new property, maxElementDepth, is added to provide applications the ability to set limit on maximum element depth in an xml file that they parse. This may be helpful for applications that may use too much resources when processing an xml file with excessive element depth.

    Name: http://java.sun.com/xml/jaxp/properties/maxElementDepth
    Definition: Limit the maximum element depth
    Value: A positive integer. 0 is treated as no limit. Negative numbers are treated as 0.
    Defaule value: 0
    System property: jdk.xml.maxElementDepth

For more details, see Processing Limits from JAXP tutorial trail.

See 8031541 (not public).
Bug Fixes

This release contains fixes for security vulnerabilities. For more information, see Oracle Critical Patch Update Advisory.

For a list of bug fixes included in this release, see JDK 7u65 Bug Fixes page.

The following are some of the notable bug fixes in this release:

Area: client-libs/AWT
Synopsis: Using RMI from a restricted environment may cause a NullPointerException.

If an application uses RMI and runs in a restricted environment (ie. Java Plugin, Java Web Start), it may not work. In particular, if you run a UI from an RMI callback, a NullPointerException is likely to be thrown.

See 8019274.

Area: other-libs/corba
Synopsis: org.omg.CORBA.ORBSingletonClass loading no longer uses context class loader

The system property org.omg.CORBA.ORBSingletonClass is used to configure the system-wide/singleton ORB. The handling of this system property was changed in the 7u55 release to require that the system wide/singleton ORB be visible to the system class loader.

In this release, the handling of this system property has been reverted to match the behavior found in JDK versions prior to 7u55 release, i.e. the singleton ORB is once again located using the thread context class loader of the first thread, to call the no-argument ORB.init method. The change is made to support applications which depend on this behavior.

Note that this change is applicable to 8u20, 7u65, 6u85 and 5.0u75 releases. For JDK 9, the new behavior, where the system wide/singleton ORB needs to be visible to the system class loader, will continue.

See 8046603.
Known Issues

Area: xml/jax-ws
Synopsis: JAF initialization in SAAJ clashing with the one in javax.mail

After initialization of SAAJ components, the javax.mail library may fail to work under certain circumstances, which in turn could break the javax.mail's JAF setup.

A possible workaround is to re-add the javax.mail handler before using javax.mail API:
MailcapCommandMap mailMap = (MailcapCommandMap) CommandMap.getDefaultCommandMap();
mailMap.addMailcap("multipart/mixed;;x-java-content-handler=com.sun.mail.handlers.multipart_mixed");

See 8043129.

4 files changed, 70 insertions, 154 deletions

diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index 61c81ac2367..9fa61dc5b11 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2014/07/25 20:35:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.73 2014/07/25 23:24:13 ryoon Exp $
 
-DISTNAME=	openjdk-1.7.60-20140614
-PKGNAME=	openjdk7-1.7.60
-PKGREVISION=	3
+DISTNAME=	openjdk-1.7.65-20140719
+PKGNAME=	openjdk7-1.7.65
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/lang/openjdk7/bootstrap.mk b/lang/openjdk7/bootstrap.mk
index ce4293d3851..fdf631d0458 100644
--- a/lang/openjdk7/bootstrap.mk
+++ b/lang/openjdk7/bootstrap.mk
@@ -1,32 +1,16 @@
-# $NetBSD: bootstrap.mk,v 1.11 2014/07/25 20:35:14 ryoon Exp $
+# $NetBSD: bootstrap.mk,v 1.12 2014/07/25 23:24:13 ryoon Exp $
 
 ONLY_FOR_PLATFORM=	NetBSD-[56].*-i386 NetBSD-[56].*-x86_64
 ONLY_FOR_PLATFORM+=	DragonFly-[23].*-* SunOS-*-*
 
-BOOT.nb5-i386=		bootstrap-jdk7-bin-netbsd-5-i386-20110811.tar.bz2
-BOOT.nb5-amd64=		bootstrap-jdk7-bin-netbsd-5-amd64-20110811.tar.bz2
-BOOT.nb6-i386=		bootstrap-jdk7-bin-netbsd-6-i386-20110811.tar.bz2
-BOOT.nb6-amd64=		bootstrap-jdk7-bin-netbsd-6-amd64-20110811.tar.bz2
-BOOT.df213-i386=	bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz
-# 1.7 partial bootstrap:
-BOOT.df213-amd64=	bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz
-BOOT.df33prebump-i386=	bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz
-BOOT.df33prebump-amd64=	bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz
-BOOT.df35-i386=		bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz
-BOOT.df35-amd64=	bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz
-BOOT.df35a-i386=	bootstrap-openjdk-7.25.15.dfly-3.5-i386.tar.xz
-BOOT.df35a-amd64=	bootstrap-openjdk-7.25.15.dfly-3.5-amd64.tar.xz
-BOOT.common-20110811=	bootstrap-jdk7-bin-common-20110811.tar.bz2
-
-DFBSDBOOTSTRAPSITE=	http://dl.wolfpond.org/openjdk7/
-SITES.bootstrap-jdk7-bin-dragonfly-2.13-i386-20110811A.tar.xz=	${DFBSDBOOTSTRAPSITE}
-SITES.bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz=	${DFBSDBOOTSTRAPSITE}
-SITES.bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz=	${DFBSDBOOTSTRAPSITE}
-SITES.bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz=	${DFBSDBOOTSTRAPSITE}
-SITES.bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz=	${DFBSDBOOTSTRAPSITE}
-SITES.bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz=	${DFBSDBOOTSTRAPSITE}
-SITES.bootstrap-openjdk-7.25.15.dfly-3.5-i386.tar.xz=	${DFBSDBOOTSTRAPSITE}
-SITES.bootstrap-openjdk-7.25.15.dfly-3.5-amd64.tar.xz=	${DFBSDBOOTSTRAPSITE}
+BOOT.nb5-i386=		bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2
+BOOT.nb5-amd64=		bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2
+BOOT.nb6-i386=		bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2
+BOOT.nb6-amd64=		bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2
+BOOT.nb7-i386=		bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2
+BOOT.nb7-amd64=		bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2
+BOOT.dfly3.6-amd64=	bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2
+BOOT.dfly3.8-amd64=	bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-i386) || make(distinfo)
 DISTFILES+=		${BOOT.nb5-i386}
@@ -38,65 +22,34 @@ DISTFILES+=		${BOOT.nb5-amd64}
 EXTRACT_ONLY+=		${BOOT.nb5-amd64}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-6.[0-8]*-i386) || make(distinfo) || \
-    !empty(MACHINE_PLATFORM:MNetBSD-5.99.*-i386) || \
-    !empty(MACHINE_PLATFORM:MNetBSD-6.99.*-i386)
+.if !empty(MACHINE_PLATFORM:MNetBSD-6.[0-8]*-i386) || make(distinfo)
 DISTFILES+=		${BOOT.nb6-i386}
 EXTRACT_ONLY+=		${BOOT.nb6-i386}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-6.[0-8]*-x86_64) || make(distinfo) || \
-    !empty(MACHINE_PLATFORM:MNetBSD-5.99.*-x86_64) || \
-    !empty(MACHINE_PLATFORM:MNetBSD-6.99.*-x86_64)
+.if !empty(MACHINE_PLATFORM:MNetBSD-6.[0-8]*-x86_64) || make(distinfo)
 DISTFILES+=		${BOOT.nb6-amd64}
 EXTRACT_ONLY+=		${BOOT.nb6-amd64}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MDragonFly-2.[0-9]*-i386) || \
-    !empty(MACHINE_PLATFORM:MDragonFly-3.[0-2]*-i386) || make(distinfo)
-DISTFILES+=		${BOOT.df213-i386}
-EXTRACT_ONLY+=		${BOOT.df213-i386}
-.endif
-
-.if !empty(MACHINE_PLATFORM:MDragonFly-2.[0-9]*-x86_64) || \
-    !empty(MACHINE_PLATFORM:MDragonFly-3.[0-2]*-x86_64) || make(distinfo)
-DISTFILES+=		${BOOT.df213-amd64}
-EXTRACT_ONLY+=		${BOOT.df213-amd64}
-.endif
-
-.if !empty(MACHINE_PLATFORM:MDragonFly-3.[3-4]*-i386) || make(distinfo)
-DISTFILES+=		${BOOT.df33prebump-i386}
-EXTRACT_ONLY+=		${BOOT.df33prebump-i386}
-.endif
-
-.if !empty(MACHINE_PLATFORM:MDragonFly-3.[3-4]*-x86_64) || make(distinfo)
-DISTFILES+=		${BOOT.df33prebump-amd64}
-EXTRACT_ONLY+=		${BOOT.df33prebump-amd64}
-.endif
-
-.if !empty(MACHINE_PLATFORM:MDragonFly-3.5*-i386) || make(distinfo)
-DISTFILES+=		${BOOT.df35-i386}
-EXTRACT_ONLY+=		${BOOT.df35-i386}
-.endif
-
-.if !empty(MACHINE_PLATFORM:MDragonFly-3.5*-x86_64) || make(distinfo)
-DISTFILES+=		${BOOT.df35-amd64}
-EXTRACT_ONLY+=		${BOOT.df35-amd64}
+.if !empty(MACHINE_PLATFORM:MNetBSD-6.99*-i386) || make(distinfo)
+DISTFILES+=		${BOOT.nb7-i386}
+EXTRACT_ONLY+=		${BOOT.nb7-i386}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MDragonFly-3.[6-9]*-i386) || make(distinfo)
-DISTFILES+=		${BOOT.df35a-i386}
-EXTRACT_ONLY+=		${BOOT.df35a-i386}
+.if !empty(MACHINE_PLATFORM:MNetBSD-6.99*-x86_64) || make(distinfo)
+DISTFILES+=		${BOOT.nb7-amd64}
+EXTRACT_ONLY+=		${BOOT.nb7-amd64}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MDragonFly-3.[6-9]*-x86_64) || make(distinfo)
-DISTFILES+=		${BOOT.df35a-amd64}
-EXTRACT_ONLY+=		${BOOT.df35a-amd64}
+.if !empty(MACHINE_PLATFORM:MDragonFly-3.6*-x86_64) || make(distinfo)
+DISTFILES+=		${BOOT.dfly3.6-amd64}
+EXTRACT_ONLY+=		${BOOT.dfly3.6-amd64}
 .endif
 
-.if !empty(DISTFILES:M*20110811*) || make(distinfo)
-DISTFILES+=		${BOOT.common-20110811}
-EXTRACT_ONLY+=		${BOOT.common-20110811}
+.if !empty(MACHINE_PLATFORM:MDragonFly-3.[8-9]*-x86_64) || make(distinfo)
+DISTFILES+=		${BOOT.dfly3.8-amd64}
+EXTRACT_ONLY+=		${BOOT.dfly3.8-amd64}
 .endif
 
 .if ${OPSYS} == "SunOS"
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index dd8010727b8..2cf2eeaf137 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,74 +1,50 @@
-$NetBSD: distinfo,v 1.51 2014/07/25 20:35:14 ryoon Exp $
+$NetBSD: distinfo,v 1.52 2014/07/25 23:24:13 ryoon Exp $
 
 SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
 RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
 Size (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7426 bytes
-SHA1 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = d9e3e83dd9664cfe1dcd4841c082db3f559af922
-RMD160 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = a23e122b76b3dfed5be7bef3388041649df0b346
-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.25.15.dfly-3.5-amd64.tar.xz) = 5b5945c90c8c6cb3470e46cea287b8218c635b84
-RMD160 (openjdk7/bootstrap-openjdk-7.25.15.dfly-3.5-amd64.tar.xz) = 0c84a617bcfd3deff381ee9dce381223ee6225a4
-Size (openjdk7/bootstrap-openjdk-7.25.15.dfly-3.5-amd64.tar.xz) = 20036896 bytes
-SHA1 (openjdk7/bootstrap-openjdk-7.25.15.dfly-3.5-i386.tar.xz) = 5fdc2fd0eab6b5c3af805feaea0e50ebf8e4c266
-RMD160 (openjdk7/bootstrap-openjdk-7.25.15.dfly-3.5-i386.tar.xz) = be7c12ea9d5e6a5553733d25ee8deca7df9a403a
-Size (openjdk7/bootstrap-openjdk-7.25.15.dfly-3.5-i386.tar.xz) = 21561488 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/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/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/icedtea7-02bbff3d71ff.tar.bz2) = ada3415834bfac083a84658157f7031a9ebc64fe
-RMD160 (openjdk7/icedtea7-02bbff3d71ff.tar.bz2) = 7b3d6f34bf1b20acd44bd8bd2094d3f2c6f576f5
-Size (openjdk7/icedtea7-02bbff3d71ff.tar.bz2) = 3796898 bytes
-SHA1 (openjdk7/jaxp145_01.zip) = 106db88c8e53abb1a064e83d41cc7acd16b7713c
-RMD160 (openjdk7/jaxp145_01.zip) = af91b95e7eb7a68fc62f450dc7b5fe5c2be4a228
-Size (openjdk7/jaxp145_01.zip) = 6389175 bytes
-SHA1 (openjdk7/jdk7-jaf-2010_08_19.zip) = 63ea970dcf129fbbba39a132d8f71add19fbf1f0
-RMD160 (openjdk7/jdk7-jaf-2010_08_19.zip) = fbadfbb781dc2aa8cfa384b8d5cd618522e55128
-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.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
+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/rhino1_7R4.zip) = 483e097cb575c724c745edd80c9512f073bd510a
+RMD160 (openjdk7/rhino1_7R4.zip) = fba5ce71edd396a241991fb7b3ce43628b891035
+Size (openjdk7/rhino1_7R4.zip) = 6481918 bytes
 SHA1 (patch-Makefile) = a9e415d19c2a8edb96a60ffdf81c804476a8e2f6
 SHA1 (patch-aa) = d47738b934304ee0921fe56b036fc0483faa328b
 SHA1 (patch-ab) = 35d5a4a4aa32f8b92ba82f583a2d31f2b7af7998
diff --git a/lang/openjdk7/icedtea-extras.mk b/lang/openjdk7/icedtea-extras.mk
index 1cca8900339..0a744a0e76a 100644
--- a/lang/openjdk7/icedtea-extras.mk
+++ b/lang/openjdk7/icedtea-extras.mk
@@ -1,13 +1,13 @@
-# $NetBSD: icedtea-extras.mk,v 1.12 2013/12/31 17:11:36 abs Exp $
+# $NetBSD: icedtea-extras.mk,v 1.13 2014/07/25 23:24:13 ryoon Exp $
 
 # Needed to extract icedtea
 EXTRACT_USING=			bsdtar
 
 DIST_SUBDIR=			openjdk7
 
-ICEDTEA=			icedtea7-02bbff3d71ff
-ICEDTEA_TGZ=			icedtea7-02bbff3d71ff.tar.bz2
-SITES.${ICEDTEA_TGZ}=		-http://icedtea.classpath.org/hg/icedtea7/archive/02bbff3d71ff.tar.bz2
+ICEDTEA=			icedtea-2.5.1
+ICEDTEA_TGZ=			${ICEDTEA}.tar.xz
+SITES.${ICEDTEA_TGZ}=		http://icedtea.wildebeest.org/download/source/
 DISTFILES+=			${ICEDTEA_TGZ}
 EXTRACT_ONLY+=			${ICEDTEA_TGZ}
 
@@ -18,29 +18,17 @@ SITES.${ICEDTEA_WEB_TGZ}=	-http://icedtea.classpath.org/hg/icedtea-web/archive/8
 DISTFILES+=			${ICEDTEA_WEB_TGZ}
 EXTRACT_ONLY+=			${ICEDTEA_WEB_TGZ}
 
-RHINO=				rhino1_7R3
+RHINO=				rhino1_7R4
 RHINO_TGZ=			${RHINO}.zip
-SITES.${RHINO_TGZ}=		${MASTER_SITE_MOZILLA:=js/}
+SITES.${RHINO_TGZ}=		https://github.com/downloads/mozilla/rhino/
 DISTFILES+=			${RHINO_TGZ}
 EXTRACT_ONLY+=			${RHINO_TGZ}
 
 # fixme: Should depend on devel/apache-ant?
-ANT=				apache-ant-1.8.4
+ANT=				apache-ant-1.9.4
 ANT_TGZ=			${ANT}-bin.tar.bz2
 SITES.${ANT_TGZ}=		http://archive.apache.org/dist/ant/binaries/
 DISTFILES+=			${ANT_TGZ}
 EXTRACT_ONLY+=			${ANT_TGZ}
 ANT_BIN=			${WRKDIR}/${ANT}/bin
 PREPEND_PATH+=			${ANT_BIN}
-
-JAXP_TGZ=			jaxp145_01.zip
-SITES.${JAXP_TGZ}=		http://icedtea.classpath.org/download/drops/
-DISTFILES+=			${JAXP_TGZ}
-
-JAXWS_TGZ=			jdk7-jaxws2_2_4-b03-2011_05_27.zip
-SITES.${JAXWS_TGZ}=		http://icedtea.classpath.org/download/drops/
-DISTFILES+=			${JAXWS_TGZ}
-
-JAF_TGZ=			jdk7-jaf-2010_08_19.zip
-SITES.${JAF_TGZ}=		http://icedtea.classpath.org/download/drops/
-DISTFILES+=			${JAF_TGZ}