Sorry, revert previous, already fixed on HEAD (still broken on 2014Q4).

2 files changed, 1 insertions, 19 deletions

diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index 2fd5abddc1d..b790f7341e9 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.59 2015/01/06 11:19:19 jperkin Exp $
+$NetBSD: distinfo,v 1.60 2015/01/06 11:24:02 jperkin Exp $
 
 SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306
 RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260
@@ -131,7 +131,6 @@ SHA1 (patch-jdk_make_sun_rmi_rmi_Makefile) = ef42db5c61e940b66dfead0e9fcf328d125
 SHA1 (patch-jdk_make_sun_security_ec_Makefile) = 30e35128a763b8d70e02e302f2e3ae5b7a24a99b
 SHA1 (patch-jdk_make_sun_splashscreen_Makefile) = fa6e9a60c1e0908c9c31761608a25bffc8093a60
 SHA1 (patch-jdk_make_sun_xawt_Makefile) = 735cf251798c2b6a638fc57dc90fe0750433f26d
-SHA1 (patch-jdk_make_tools_src_build_tools_generatecurrencydata_GenerateCurrencyData.java) = 0108475d2d57668afe963485ac46cdb88294e5e6
 SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java) = 9e9c0254740742cd103c0cb33d3aa564ad7de01f
 SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java) = 85ddae5aa955ef951b2a9964b5f475f559c3c335
 SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java) = d8327c56a99ef6af8b3dfaf31e20bdebab5d6d44
diff --git a/lang/openjdk7/patches/patch-jdk_make_tools_src_build_tools_generatecurrencydata_GenerateCurrencyData.java b/lang/openjdk7/patches/patch-jdk_make_tools_src_build_tools_generatecurrencydata_GenerateCurrencyData.java
deleted file mode 100644
index 4412b5e09f2..00000000000
--- a/lang/openjdk7/patches/patch-jdk_make_tools_src_build_tools_generatecurrencydata_GenerateCurrencyData.java
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-jdk_make_tools_src_build_tools_generatecurrencydata_GenerateCurrencyData.java,v 1.1 2015/01/06 11:19:19 jperkin Exp $
-
-Extend valid currency data to 15 years to avoid lag in upstream updates.
-
---- jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java.orig	2014-11-02 07:18:20.000000000 +0000
-+++ jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
-@@ -281,8 +281,8 @@ public class GenerateCurrencyData {
-             checkCurrencyCode(newCurrency);
-             String timeString = currencyInfo.substring(4, length - 4);
-             long time = format.parse(timeString).getTime();
--            if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
--                throw new RuntimeException("time is more than 10 years from present: " + time);
-+            if (Math.abs(time - System.currentTimeMillis()) > ((long) 15) * 365 * 24 * 60 * 60 * 1000) {
-+                throw new RuntimeException("time is more than 15 years from present: " + time);
-             }
-             specialCaseCutOverTimes[specialCaseCount] = time;
-             specialCaseOldCurrencies[specialCaseCount] = oldCurrency;