Now that Java works again on i386 (thanks kurt@), here's an update to JRuby.
Full release notes at http://jruby.org/news, here are the highlights: * 115 issues fixed * Accidental SNAPSHOT dependency fixed * A couple of Marshalling bugs involving encoding fixed. * Miscellaneous encoding fixes * Several fiber edge cases fixed * Fiber thread pool reinstated * More Ruby-friendly Java backtraces * Mostly small 1.9.3 compatibility fixes * Fixed a small leak if throwing lots of X509Errors * Improved loading speed of Ruby files from jar files. Portswise, the only change is a bugfix for trailing whitespace in the Makefile, which caused the RDOC_V variable to not be substituted in the PLIST. Tested on i386 and amd64. Will be committing this weekend unless I hear objections. Thanks, Jeremy Index: Makefile =================================================================== RCS file: /cvs/ports/lang/jruby/Makefile,v retrieving revision 1.41 diff -u -p -r1.41 Makefile --- Makefile 19 Dec 2013 21:39:50 -0000 1.41 +++ Makefile 15 May 2014 18:56:16 -0000 @@ -4,7 +4,7 @@ SHARED_ONLY = Yes COMMENT = pure-Java implementation of the Ruby language -V = 1.7.9 +V = 1.7.12 DISTNAME = jruby-bin-${V} PKGNAME = jruby-${V} CATEGORIES = lang lang/ruby @@ -50,7 +50,7 @@ JFFI_HOME = ${WRKDIST}/jffi JFFI_ARCH = ${MACHINE_ARCH:S/amd64/x86_64/}-OpenBSD FFI_ARCH = ${JFFI_ARCH:L} RAKE_V = 10.1.0 -RDOC_V = 4.0.1 +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 Index: distinfo =================================================================== RCS file: /cvs/ports/lang/jruby/distinfo,v retrieving revision 1.23 diff -u -p -r1.23 distinfo --- distinfo 19 Dec 2013 21:39:50 -0000 1.23 +++ distinfo 15 May 2014 18:26:36 -0000 @@ -1,8 +1,8 @@ SHA256 (jnr-jffi-1.2.2-0-g4c196bb.tar.gz) = xK/m48Z/YA+fg4yFJqcRxceFnT0F98y255Ju9eSE7b0= SHA256 (jnr-posix.20130822.tar.gz) = kXV0idWCYw/iRsDSwJdvAL3IjU9L/gEvuD9b9Rt2UYk= -SHA256 (jruby-bin-1.7.9.tar.gz) = x6zQnJMpQfBOIx1D9HYG6ytqLWiYrj3JfdQy3PFQGCQ= +SHA256 (jruby-bin-1.7.12.tar.gz) = LBWFjbwG1jRqMHBPttzHefLmcFNWbJwhlz+W4wnqxgk= SHA256 (jruby-launcher-1.0.19-java.gem) = Hgd9U6dYh1HV85FrIy5WUoy0nehO8sQD74QRhhJuqWI= SIZE (jnr-jffi-1.2.2-0-g4c196bb.tar.gz) = 1759433 SIZE (jnr-posix.20130822.tar.gz) = 141316 -SIZE (jruby-bin-1.7.9.tar.gz) = 19791385 +SIZE (jruby-bin-1.7.12.tar.gz) = 21981488 SIZE (jruby-launcher-1.0.19-java.gem) = 55296 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/jruby/pkg/PLIST,v retrieving revision 1.21 diff -u -p -r1.21 PLIST --- pkg/PLIST 19 Dec 2013 21:39:50 -0000 1.21 +++ pkg/PLIST 15 May 2014 18:56:35 -0000 @@ -750,33 +750,6 @@ jruby/lib/ruby/1.9/irb/version.rb jruby/lib/ruby/1.9/irb/workspace.rb jruby/lib/ruby/1.9/irb/ws-for-case-2.rb jruby/lib/ruby/1.9/irb/xmp.rb -jruby/lib/ruby/1.9/json/ -jruby/lib/ruby/1.9/json.rb -jruby/lib/ruby/1.9/json/add/ -jruby/lib/ruby/1.9/json/add/bigdecimal.rb -jruby/lib/ruby/1.9/json/add/complex.rb -jruby/lib/ruby/1.9/json/add/core.rb -jruby/lib/ruby/1.9/json/add/date.rb -jruby/lib/ruby/1.9/json/add/date_time.rb -jruby/lib/ruby/1.9/json/add/exception.rb -jruby/lib/ruby/1.9/json/add/ostruct.rb -jruby/lib/ruby/1.9/json/add/range.rb -jruby/lib/ruby/1.9/json/add/rational.rb -jruby/lib/ruby/1.9/json/add/regexp.rb -jruby/lib/ruby/1.9/json/add/struct.rb -jruby/lib/ruby/1.9/json/add/symbol.rb -jruby/lib/ruby/1.9/json/add/time.rb -jruby/lib/ruby/1.9/json/common.rb -jruby/lib/ruby/1.9/json/ext/ -jruby/lib/ruby/1.9/json/ext.rb -jruby/lib/ruby/1.9/json/ext/generator.jar -jruby/lib/ruby/1.9/json/ext/parser.jar -jruby/lib/ruby/1.9/json/generic_object.rb -jruby/lib/ruby/1.9/json/pure/ -jruby/lib/ruby/1.9/json/pure.rb -jruby/lib/ruby/1.9/json/pure/generator.rb -jruby/lib/ruby/1.9/json/pure/parser.rb -jruby/lib/ruby/1.9/json/version.rb jruby/lib/ruby/1.9/kconv.rb jruby/lib/ruby/1.9/logger.rb jruby/lib/ruby/1.9/mathn.rb @@ -1840,10 +1813,20 @@ jruby/lib/ruby/gems/1.8/gems/ jruby/lib/ruby/gems/1.8/gems/rake-${RAKE_V}/ jruby/lib/ruby/gems/1.8/gems/rake-${RAKE_V}/bin/ jruby/lib/ruby/gems/1.8/gems/rake-${RAKE_V}/bin/rake -jruby/lib/ruby/gems/1.8/gems/rdoc-4.0.1/ -jruby/lib/ruby/gems/1.8/gems/rdoc-4.0.1/bin/ -jruby/lib/ruby/gems/1.8/gems/rdoc-4.0.1/bin/rdoc -jruby/lib/ruby/gems/1.8/gems/rdoc-4.0.1/bin/ri +jruby/lib/ruby/gems/1.8/gems/rdoc-${RDOC_V}/ +jruby/lib/ruby/gems/1.8/gems/rdoc-${RDOC_V}/bin/ +jruby/lib/ruby/gems/1.8/gems/rdoc-${RDOC_V}/bin/rdoc +jruby/lib/ruby/gems/1.8/gems/rdoc-${RDOC_V}/bin/ri +jruby/lib/ruby/gems/1.8/specifications/ +jruby/lib/ruby/gems/1.8/specifications/default/ +jruby/lib/ruby/gems/1.8/specifications/default/bouncy-castle-java-1.5.0147.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/jruby-openssl-0.9.3.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/json-1.8.0-java.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/krypt-0.0.2.rc1.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/krypt-core-0.0.2.rc1-universal-java.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/krypt-provider-jdk-0.0.2.rc1.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/rake-${RAKE_V}.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/rdoc-${RDOC_V}.gemspec jruby/lib/ruby/gems/shared jruby/lib/ruby/shared/ jruby/lib/ruby/shared/Win32API.rb @@ -1857,7 +1840,9 @@ jruby/lib/ruby/shared/ant/target.rb jruby/lib/ruby/shared/ant/tasks/ jruby/lib/ruby/shared/ant/tasks/raketasks.rb jruby/lib/ruby/shared/bcpkix-jdk15on-1.47.jar +jruby/lib/ruby/shared/bcpkix-jdk15on-147.jar jruby/lib/ruby/shared/bcprov-jdk15on-1.47.jar +jruby/lib/ruby/shared/bcprov-jdk15on-147.jar jruby/lib/ruby/shared/bouncy-castle-java.rb jruby/lib/ruby/shared/ffi/ jruby/lib/ruby/shared/ffi.rb @@ -1976,6 +1961,33 @@ jruby/lib/ruby/shared/jruby/thread_dump. jruby/lib/ruby/shared/jruby/vm.rb jruby/lib/ruby/shared/jruby/win32ole/ jruby/lib/ruby/shared/jruby/win32ole/stub.rb +jruby/lib/ruby/shared/json/ +jruby/lib/ruby/shared/json.rb +jruby/lib/ruby/shared/json/add/ +jruby/lib/ruby/shared/json/add/bigdecimal.rb +jruby/lib/ruby/shared/json/add/complex.rb +jruby/lib/ruby/shared/json/add/core.rb +jruby/lib/ruby/shared/json/add/date.rb +jruby/lib/ruby/shared/json/add/date_time.rb +jruby/lib/ruby/shared/json/add/exception.rb +jruby/lib/ruby/shared/json/add/ostruct.rb +jruby/lib/ruby/shared/json/add/range.rb +jruby/lib/ruby/shared/json/add/rational.rb +jruby/lib/ruby/shared/json/add/regexp.rb +jruby/lib/ruby/shared/json/add/struct.rb +jruby/lib/ruby/shared/json/add/symbol.rb +jruby/lib/ruby/shared/json/add/time.rb +jruby/lib/ruby/shared/json/common.rb +jruby/lib/ruby/shared/json/ext/ +jruby/lib/ruby/shared/json/ext.rb +jruby/lib/ruby/shared/json/ext/generator.jar +jruby/lib/ruby/shared/json/ext/parser.jar +jruby/lib/ruby/shared/json/generic_object.rb +jruby/lib/ruby/shared/json/pure/ +jruby/lib/ruby/shared/json/pure.rb +jruby/lib/ruby/shared/json/pure/generator.rb +jruby/lib/ruby/shared/json/pure/parser.rb +jruby/lib/ruby/shared/json/version.rb jruby/lib/ruby/shared/krypt/ jruby/lib/ruby/shared/krypt-core.rb jruby/lib/ruby/shared/krypt-provider-jdk.rb @@ -1989,8 +2001,7 @@ jruby/lib/ruby/shared/krypt/codec.rb jruby/lib/ruby/shared/krypt/codec/base64.rb jruby/lib/ruby/shared/krypt/codec/base_codec.rb jruby/lib/ruby/shared/krypt/codec/hex.rb -jruby/lib/ruby/shared/krypt/core/ -jruby/lib/ruby/shared/krypt/core/version.rb +jruby/lib/ruby/shared/krypt/core.rb jruby/lib/ruby/shared/krypt/digest.rb jruby/lib/ruby/shared/krypt/hmac.rb jruby/lib/ruby/shared/krypt/ossl/ @@ -1999,7 +2010,17 @@ jruby/lib/ruby/shared/krypt/ossl/pkcs5.r jruby/lib/ruby/shared/krypt/pkcs5/ jruby/lib/ruby/shared/krypt/pkcs5.rb jruby/lib/ruby/shared/krypt/pkcs5/pbkdf2.rb +jruby/lib/ruby/shared/krypt/provider/ jruby/lib/ruby/shared/krypt/provider.rb +jruby/lib/ruby/shared/krypt/provider/ffi/ +jruby/lib/ruby/shared/krypt/provider/ffi.rb +jruby/lib/ruby/shared/krypt/provider/ffi/digest.rb +jruby/lib/ruby/shared/krypt/provider/ffi/ffi_helper.rb +jruby/lib/ruby/shared/krypt/provider/ffi/provider.rb +jruby/lib/ruby/shared/krypt/provider/ffi/provider_api.rb +jruby/lib/ruby/shared/krypt/provider/jdk.rb +jruby/lib/ruby/shared/krypt/provider/provider.rb +jruby/lib/ruby/shared/krypt/version.rb jruby/lib/ruby/shared/krypt/x509/ jruby/lib/ruby/shared/krypt/x509.rb jruby/lib/ruby/shared/krypt/x509/certificate.rb