Bump PKGREVISION

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

2 files changed, 12 insertions, 22 deletions

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;