Update to JRuby 9.0.0.0

Bump jdk dependency to 1.8.0

Help and OK jasper@

lang/jruby/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.51 2015/07/15 22:19:23 jeremy Exp $
+# $OpenBSD: Makefile,v 1.52 2015/07/26 04:40:16 jeremy Exp $
 
 SHARED_ONLY =	Yes
 
 COMMENT =	pure-Java implementation of the Ruby language
 
-V =		1.7.21
+V =		9.0.0.0
 DISTNAME =	jruby-bin-${V}
 PKGNAME =	jruby-${V}
 CATEGORIES =	lang lang/ruby
@@ -24,7 +24,7 @@ MASTER_SITES0 =	http://www.distfiles.nl/
 MASTER_SITES1 =	${MASTER_SITE_RUBYGEMS}
 
 MODULES =	java
-MODJAVA_VER =	1.7+
+MODJAVA_VER =	1.8+
 MODJAVA_JRERUN = Yes
 USE_GMAKE =	Yes
 
@@ -47,8 +47,8 @@ JFFI_ARCH =	${MACHINE_ARCH:S/amd64/x86_64/}-OpenBSD
 FFI_ARCH =	${JFFI_ARCH:L}
 RAKE_V =	10.1.0
 RDOC_V =	4.0.1
-JRUBY_LAUNCHER_GEM = jruby-launcher-1.0.19-java.gem
-SUBST_VARS =	JRUBY_HOME JFFI_ARCH FFI_ARCH RAKE_V RDOC_V
+JRUBY_LAUNCHER_GEM = jruby-launcher-1.1.1-java.gem
+SUBST_VARS =	JRUBY_HOME JFFI_ARCH FFI_ARCH RAKE_V RDOC_V JAVA_HOME
 
 post-extract:
 	mv ${WRKDIR}/jnr-jffi* ${JFFI_HOME}
@@ -73,7 +73,7 @@ do-build:
 	mkdir -p ${WRKSRC}/lib/jni/${JFFI_ARCH}
 	cp ${JFFI_HOME}/build/jni/libjffi-1.2.so \
 		${WRKSRC}/lib/jni/${JFFI_ARCH}
-	cd ${WRKSRC}/lib/ruby/shared/ffi/platform && \
+	cd ${WRKSRC}/lib/ruby/stdlib/ffi/platform && \
 		rm -r !(${FFI_ARCH}|*.ffi)
 	cd ${WRKSRC}/jruby-launcher/ && gmake && mv jruby ../bin
 

lang/jruby/distinfo

@@ -1,6 +1,6 @@
 SHA256 (jnr-jffi-1.2.2-0-g4c196bb.tar.gz) = xK/m48Z/YA+fg4yFJqcRxceFnT0F98y255Ju9eSE7b0=
-SHA256 (jruby-bin-1.7.21.tar.gz) = n+VuoXOvRR7yYvqu5vuQRkACWE26zCUjFH+Anp06HIs=
-SHA256 (jruby-launcher-1.0.19-java.gem) = Hgd9U6dYh1HV85FrIy5WUoy0nehO8sQD74QRhhJuqWI=
+SHA256 (jruby-bin-9.0.0.0.tar.gz) = ZVZl2zodwEYsupnUVTKrV9hBa18WjYoAgb3pt6k6OU4=
+SHA256 (jruby-launcher-1.1.1-java.gem) = 0iJ3vtg6aMTK/AIJdpLChL3TSVYqpbp89chB4ywVlOE=
 SIZE (jnr-jffi-1.2.2-0-g4c196bb.tar.gz) = 1759433
-SIZE (jruby-bin-1.7.21.tar.gz) = 29590783
-SIZE (jruby-launcher-1.0.19-java.gem) = 55296
+SIZE (jruby-bin-9.0.0.0.tar.gz) = 37095913
+SIZE (jruby-launcher-1.1.1-java.gem) = 56832

lang/jruby/patches/patch-jruby-launcher_extconf_rb

@@ -1,10 +1,10 @@
-$OpenBSD: patch-jruby-launcher_extconf_rb,v 1.1 2013/03/19 23:43:06 jeremy Exp $
+$OpenBSD: patch-jruby-launcher_extconf_rb,v 1.2 2015/07/26 04:40:16 jeremy Exp $
 --- jruby-launcher/extconf.rb.orig	Tue May 22 10:27:56 2012
 +++ jruby-launcher/extconf.rb	Tue May 22 10:29:07 2012
 @@ -3,5 +3,6 @@ require 'rbconfig'
  mf = File.read('Makefile')
  mf = mf.gsub(/^BINDIR\s*=.*$/, "BINDIR = #{Config::CONFIG['bindir']}")
  mf = mf.gsub(/^PREFIX\s*=.*$/, "PREFIX = #{File.dirname(Config::CONFIG['libdir'])}")
-+mf = mf.gsub(/^INSTALLDIR\s*=.*$/, "INSTALLDIR = #{File.dirname(Config::CONFIG['libdir'])}/lib/ruby/shared/rubygems/defaults")
++mf = mf.gsub(/^INSTALLDIR\s*=.*$/, "INSTALLDIR = #{File.dirname(Config::CONFIG['libdir'])}/lib/ruby/stdlib/rubygems/defaults")
  puts mf
  File.open('Makefile', 'wb') {|f| f << mf}

lang/jruby/patches/patch-jruby-launcher_unixlauncher_cpp

@@ -1,4 +1,4 @@
-$OpenBSD: patch-jruby-launcher_unixlauncher_cpp,v 1.3 2013/03/19 23:43:06 jeremy Exp $
+$OpenBSD: patch-jruby-launcher_unixlauncher_cpp,v 1.4 2015/07/26 04:40:16 jeremy Exp $
 
 Attempt to replicate the following shell code:
 
@@ -28,9 +28,9 @@ defined, bin/jruby will segfault when run.
 +
 +      path = getenv("PATH");
 +      if (path == NULL || strlen(path) == 0) {
-+        setenv("PATH", "/usr/bin:${LOCALBASE}/bin:${LOCALBASE}/jdk-1.7.0/bin", 1);
++        setenv("PATH", "/usr/bin:${LOCALBASE}/bin:${JAVA_HOME}/bin", 1);
 +      } else {
-+        char *paths[3] = {(char *)"/usr/bin", (char *)"${LOCALBASE}/bin", (char *)"${LOCALBASE}/jdk-1.7.0/bin"};
++        char *paths[3] = {(char *)"/usr/bin", (char *)"${LOCALBASE}/bin", (char *)"${JAVA_HOME}/bin"};
 +        int modified = 0;
 +        int i;
 +

lang/jruby/patches/patch-lib_ruby_stdlib_ffi_library_rb

@@ -1,6 +1,6 @@
-$OpenBSD: patch-lib_ruby_shared_ffi_library_rb,v 1.3 2014/09/27 20:37:04 jasper Exp $
---- lib/ruby/shared/ffi/library.rb.orig	Thu Sep 25 21:32:50 2014
-+++ lib/ruby/shared/ffi/library.rb	Sat Sep 27 23:32:09 2014
+$OpenBSD: patch-lib_ruby_stdlib_ffi_library_rb,v 1.1 2015/07/26 04:40:16 jeremy Exp $
+--- lib/ruby/stdlib/ffi/library.rb.orig	Thu Sep 25 21:32:50 2014
++++ lib/ruby/stdlib/ffi/library.rb	Sat Sep 27 23:32:09 2014
 @@ -81,6 +81,7 @@ module FFI
        raise LoadError.new("library names list must not be empty") if names.empty?