Simple Update to JRuby 1.6.5, changes at
http://jruby.org/2011/10/25/jruby-1-6-5.html
1.6.5 actually has a broken build on OpenBSD, so I've pulled a patch
from the upstream git repo to fix it. This removes the patches that
force creation of the .require_paths file, since they won't be needed
any more.
This fixes building of C extensions that require external libraries.
This was working in earlier versions of the 1.6 series, but I think it
was broken in 1.6.4. To detect such breakage in the future, I'd like to
build the jruby FLAVOR of databases/ruby-sqlite3 by default.
Tested on amd64 and i386. Will be committing after ruby 1.9.3 is
committed.
Thanks,
Jeremy
Index: lang/jruby/Makefile
===================================================================
RCS file: /cvs/ports/lang/jruby/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- lang/jruby/Makefile 16 Sep 2011 10:31:21 -0000 1.25
+++ lang/jruby/Makefile 1 Nov 2011 22:34:04 -0000
@@ -4,11 +4,10 @@ SHARED_ONLY = Yes
COMMENT = pure-Java implementation of the Ruby language
-V = 1.6.4
+V = 1.6.5
DISTNAME = jruby-src-${V}
PKGNAME = jruby-${V}
CATEGORIES = lang lang/ruby
-REVISION = 1
DISTFILES = ${DISTNAME}.tar.gz \
wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz:0
Index: lang/jruby/distinfo
===================================================================
RCS file: /cvs/ports/lang/jruby/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- lang/jruby/distinfo 26 Aug 2011 22:11:47 -0000 1.12
+++ lang/jruby/distinfo 26 Oct 2011 15:45:28 -0000
@@ -1,10 +1,10 @@
-MD5 (jruby-src-1.6.4.tar.gz) = /l84hnscFbbJ2xP/l/+pig==
+MD5 (jruby-src-1.6.5.tar.gz) = N4l6j8w/KFtuBsofAmP0Jw==
MD5 (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = mOyRmYChedDeeXyUmTVBog==
-RMD160 (jruby-src-1.6.4.tar.gz) = 23IFN7IuH35LMduMMl7LBRFQw5g=
+RMD160 (jruby-src-1.6.5.tar.gz) = a2LH5GLe7m0gk6MvNfZIS3eZeUE=
RMD160 (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = lTBayILxwHuGltkNqDMvfjn0+kM=
-SHA1 (jruby-src-1.6.4.tar.gz) = cz9Vpk4uuBMd3TGnJJGLeF6wTTY=
+SHA1 (jruby-src-1.6.5.tar.gz) = NUnh6vh6WHFo+IaI1lWTCs4viE4=
SHA1 (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = ocUg1SbvOliOtPrMEBIY0sOEK90=
-SHA256 (jruby-src-1.6.4.tar.gz) = ehmv5mEKugLLM0GeCJ1hIaSk28GC23twQ+jyQTvgJQs=
+SHA256 (jruby-src-1.6.5.tar.gz) = ZY1wE8HOEbb35ce3KftD9vDdhOK1JmFV8unxyf+8JHA=
SHA256 (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) =
ybtb8CunJ/jql9zzBZnz2eYWXc08etMsiuWso0nas1c=
-SIZE (jruby-src-1.6.4.tar.gz) = 13939963
+SIZE (jruby-src-1.6.5.tar.gz) = 14282074
SIZE (wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz) = 1728176
Index: lang/jruby/patches/patch-build_xml
===================================================================
RCS file: lang/jruby/patches/patch-build_xml
diff -N lang/jruby/patches/patch-build_xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/jruby/patches/patch-build_xml 31 Oct 2011 04:01:56 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Fix build, backported from git commit
+a760b4aea4b5aa9b38da4bd3334d8355a83f60fa.
+
+--- build.xml.orig Sun Oct 30 20:59:44 2011
++++ build.xml Sun Oct 30 21:01:00 2011
+@@ -379,7 +379,6 @@
+ </jar>
+
+ <antcall target="add-emma-jars"/>
+- <antcall target="generate-ri-cache"/>
+
+ <property name="jar-jruby.hasrun" value="true"/>
+ </target>
+@@ -484,7 +483,6 @@
+ <param name="bar.wrap" value="${lib.dir}/jruby.bar" />
+ </antcall>
+
+- <antcall target="generate-ri-cache"/>
+ </target>
+ <target name="jarjar" depends="jar-jruby-dist"/>
+
Index: lang/jruby/patches/patch-lib_ruby_site_ruby_1_8_rubygems_installer_rb
===================================================================
RCS file: lang/jruby/patches/patch-lib_ruby_site_ruby_1_8_rubygems_installer_rb
diff -N lang/jruby/patches/patch-lib_ruby_site_ruby_1_8_rubygems_installer_rb
--- lang/jruby/patches/patch-lib_ruby_site_ruby_1_8_rubygems_installer_rb
18 Mar 2011 23:01:22 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-lib_ruby_site_ruby_1_8_rubygems_installer_rb,v 1.1 2011/03/18
23:01:22 jeremy Exp $
---- lib/ruby/site_ruby/1.8/rubygems/installer.rb.orig Tue Feb 8 09:30:23 2011
-+++ lib/ruby/site_ruby/1.8/rubygems/installer.rb Tue Feb 8 15:12:26 2011
-@@ -39,7 +39,7 @@ class Gem::Installer
-
- include Gem::UserInteraction
-
-- include Gem::RequirePathsBuilder if Gem::QUICKLOADER_SUCKAGE
-+ include Gem::RequirePathsBuilder
-
- ##
- # The directory a gem's executables will be installed into
-@@ -171,7 +171,7 @@ class Gem::Installer
- generate_bin
- write_spec
-
-- write_require_paths_file_if_needed if Gem::QUICKLOADER_SUCKAGE
-+ write_require_paths_file_if_needed
-
- # HACK remove? Isn't this done in multiple places?
- cached_gem = File.join @gem_home, "cache", @gem.split(/\//).pop
Index:
lang/jruby/patches/patch-lib_ruby_site_ruby_1_8_rubygems_require_paths_builder_rb
===================================================================
RCS file:
lang/jruby/patches/patch-lib_ruby_site_ruby_1_8_rubygems_require_paths_builder_rb
diff -N
lang/jruby/patches/patch-lib_ruby_site_ruby_1_8_rubygems_require_paths_builder_rb
---
lang/jruby/patches/patch-lib_ruby_site_ruby_1_8_rubygems_require_paths_builder_rb
18 Mar 2011 23:01:22 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-$OpenBSD: patch-lib_ruby_site_ruby_1_8_rubygems_require_paths_builder_rb,v 1.1
2011/03/18 23:01:22 jeremy Exp $
---- lib/ruby/site_ruby/1.8/rubygems/require_paths_builder.rb.orig Tue Feb
8 15:12:05 2011
-+++ lib/ruby/site_ruby/1.8/rubygems/require_paths_builder.rb Tue Feb 8
15:12:43 2011
-@@ -14,5 +14,5 @@ module Gem::RequirePathsBuilder
- file.puts spec.bindir if spec.bindir
- end
- end
--end if Gem::QUICKLOADER_SUCKAGE
-+end
-
Index: lang/jruby/patches/patch-lib_ruby_site_ruby_shared_mkmf_rb
===================================================================
RCS file:
/cvs/ports/lang/jruby/patches/patch-lib_ruby_site_ruby_shared_mkmf_rb,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lib_ruby_site_ruby_shared_mkmf_rb
--- lang/jruby/patches/patch-lib_ruby_site_ruby_shared_mkmf_rb 19 Jul 2011
17:57:47 -0000 1.2
+++ lang/jruby/patches/patch-lib_ruby_site_ruby_shared_mkmf_rb 31 Oct 2011
04:09:34 -0000
@@ -1,17 +1,14 @@
$OpenBSD: patch-lib_ruby_site_ruby_shared_mkmf_rb,v 1.2 2011/07/19 17:57:47
jeremy Exp $
---- lib/ruby/site_ruby/shared/mkmf.rb.orig Thu Jul 7 11:19:34 2011
-+++ lib/ruby/site_ruby/shared/mkmf.rb Mon Jul 11 21:32:16 2011
-@@ -1372,11 +1372,11 @@ LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC
-
- RUBY_EXTCONF_H = #{$extconf_h}
- CFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS #$ARCH_FLAG
--INCFLAGS = -I. #$INCFLAGS
-+INCFLAGS = -I. -I${LOCALBASE}/include #$INCFLAGS
- DEFS = #{CONFIG['DEFS']}
- CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
- CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']}
--ldflags = #{$LDFLAGS}
-+ldflags = -L${LOCALBASE}/lib #{$LDFLAGS}
- dldflags = #{$DLDFLAGS}
- archflag = #{$ARCH_FLAG}
- DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+--- lib/ruby/site_ruby/shared/mkmf.rb.orig Tue Oct 25 08:07:12 2011
++++ lib/ruby/site_ruby/shared/mkmf.rb Sun Oct 30 21:08:59 2011
+@@ -1764,8 +1764,8 @@ def init_mkmf(config = CONFIG)
+ $CFLAGS = with_config("cflags", arg_config("CFLAGS", config["CFLAGS"])).dup
+ $ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG",
config["ARCH_FLAG"])).dup
+ $CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS",
config["CPPFLAGS"])).dup
+- $LDFLAGS = with_config("ldflags", arg_config("LDFLAGS",
config["LDFLAGS"])).dup
+- $INCFLAGS = "-I$(topdir) -I$(hdrdir) -I$(srcdir)"
++ $LDFLAGS = with_config("ldflags", arg_config("LDFLAGS",
config["LDFLAGS"])).dup + " -L${LOCALBASE}/lib"
++ $INCFLAGS = "-I$(topdir) -I$(hdrdir) -I$(srcdir) -I${LOCALBASE}/include"
+ $DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS",
config["DLDFLAGS"])).dup
+ $LIBEXT = config['LIBEXT'].dup
+ $OBJEXT = config["OBJEXT"].dup
Index: lang/jruby/pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/jruby/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- lang/jruby/pkg/PLIST 26 Aug 2011 22:11:47 -0000 1.11
+++ lang/jruby/pkg/PLIST 31 Oct 2011 04:17:01 -0000
@@ -1504,6 +1504,7 @@ jruby/lib/ruby/site_ruby/1.8/rubygems/de
jruby/lib/ruby/site_ruby/1.8/rubygems/dependency.rb
jruby/lib/ruby/site_ruby/1.8/rubygems/dependency_installer.rb
jruby/lib/ruby/site_ruby/1.8/rubygems/dependency_list.rb
+jruby/lib/ruby/site_ruby/1.8/rubygems/deprecate.rb
jruby/lib/ruby/site_ruby/1.8/rubygems/doc_manager.rb
jruby/lib/ruby/site_ruby/1.8/rubygems/errors.rb
jruby/lib/ruby/site_ruby/1.8/rubygems/exceptions.rb
@@ -1539,6 +1540,7 @@ jruby/lib/ruby/site_ruby/1.8/rubygems/pa
jruby/lib/ruby/site_ruby/1.8/rubygems/package/tar_test_case.rb
jruby/lib/ruby/site_ruby/1.8/rubygems/package/tar_writer.rb
jruby/lib/ruby/site_ruby/1.8/rubygems/package_task.rb
+jruby/lib/ruby/site_ruby/1.8/rubygems/path_support.rb
jruby/lib/ruby/site_ruby/1.8/rubygems/platform.rb
jruby/lib/ruby/site_ruby/1.8/rubygems/remote_fetcher.rb
jruby/lib/ruby/site_ruby/1.8/rubygems/require_paths_builder.rb
@@ -1663,6 +1665,7 @@ jruby/lib/ruby/site_ruby/shared/jruby/op
jruby/lib/ruby/site_ruby/shared/jruby/profiler/
jruby/lib/ruby/site_ruby/shared/jruby/profiler.rb
jruby/lib/ruby/site_ruby/shared/jruby/profiler/shutdown_hook.rb
+jruby/lib/ruby/site_ruby/shared/jruby/thread_dump.rb
jruby/lib/ruby/site_ruby/shared/jruby/vm.rb
jruby/lib/ruby/site_ruby/shared/jruby/win32ole/
jruby/lib/ruby/site_ruby/shared/jruby/win32ole/stub.rb
@@ -12149,4 +12152,3 @@ jruby/share/ri/1.8/system/Zlib/zlib_vers
jruby/share/ri/1.8/system/created.rid
jruby/share/ri/1.8/system/fatal/
jruby/share/ri/1.8/system/fatal/cdesc-fatal.yaml
-jruby/share/ri_cache.bin.gz
