Bump PKGREVISION

Fix PR pkg/48246 again.
Add rhino.jar to library path.
And remove stale patch

4 files changed, 17 insertions, 26 deletions

diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index e1bd88a00b9..753bed8d37e 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2014/06/01 17:55:33 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2014/06/03 03:20:15 ryoon Exp $
 
 DISTNAME=	openjdk-1.7.55-20140501
 PKGNAME=	openjdk7-1.7.55
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.tar.bz2
@@ -42,7 +42,7 @@ DEPENDS+=		dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
 
 NO_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake pax unzip:run zip:run patch
+USE_TOOLS+=		gmake pax unzip:run zip:run # patch
 UNLIMIT_RESOURCES=	datasize stacksize
 WRKSRC=			${WRKDIR}/openjdk
 
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index d68919857ac..3d3ab696887 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2014/06/01 17:55:33 wiz Exp $
+$NetBSD: distinfo,v 1.47 2014/06/03 03:20:15 ryoon Exp $
 
 SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
 RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
@@ -117,6 +117,7 @@ SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 43ae9934ce7cf477f7968bcf9
 SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47
 SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = ea09ffd080fcf4c12b0b69cb622ee3945000cb68
 SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = 869d8ec9dc6dae6e0b8a23fe44f2583747059553
+SHA1 (patch-hotspot_src_share_vm_runtime_os.cpp) = c7a33e791e3b5fec5cca9a5343c6d1f685e0cd4b
 SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = fe40909864fc561495b1e15a5bc6c7c6373830b2
 SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e
 SHA1 (patch-jdk_make_com_sun_Makefile) = 5826c64eb1971d69e8b874d6b8a60d25e0d02c5b
diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_code_relocInfo.hpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_code_relocInfo.hpp
deleted file mode 100644
index d3aeaeeac53..00000000000
--- a/lang/openjdk7/patches/patch-hotspot_src_share_vm_code_relocInfo.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-hotspot_src_share_vm_code_relocInfo.hpp,v 1.1 2014/01/20 19:25:11 joerg Exp $
-
---- hotspot/src/share/vm/code/relocInfo.hpp.orig	2014-01-05 21:21:58.000000000 +0000
-+++ hotspot/src/share/vm/code/relocInfo.hpp
-@@ -371,7 +371,7 @@ class relocInfo VALUE_OBJ_CLASS_SPEC {
-   // "immediate" in the prefix header word itself.  This optimization
-   // is invisible outside this module.)
- 
--  inline friend relocInfo prefix_relocInfo(int datalen = 0);
-+  inline friend relocInfo prefix_relocInfo(int datalen);
- 
-  protected:
-   // an immediate relocInfo optimizes a prefix with one 10-bit unsigned value
-@@ -455,6 +455,8 @@ class relocInfo VALUE_OBJ_CLASS_SPEC {
-   };
- };
- 
-+relocInfo prefix_relocInfo(int datalen = 0);
-+
- #define FORWARD_DECLARE_EACH_CLASS(name)              \
- class name##_Relocation;
- APPLY_TO_RELOCATIONS(FORWARD_DECLARE_EACH_CLASS)
diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_os.cpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_os.cpp
new file mode 100644
index 00000000000..345c7ce9297
--- /dev/null
+++ b/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_os.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-hotspot_src_share_vm_runtime_os.cpp,v 1.3 2014/06/03 03:20:15 ryoon Exp $
+
+--- hotspot/src/share/vm/runtime/os.cpp.orig	2014-05-01 13:10:09.000000000 +0000
++++ hotspot/src/share/vm/runtime/os.cpp
+@@ -1132,6 +1132,7 @@ bool os::set_boot_path(char fileSep, cha
+         "%/lib/jce.jar:"
+         "%/lib/charsets.jar:"
+         "%/lib/jfr.jar:"
++        "%/lib/rhino.jar:"
+         "%/classes";
+     char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep);
+     if (sysclasspath == NULL) return false;