Previous version update worked on i386 but broke on amd64. This should
fix it for both. Version bumping for safety even though it didn't
previously build on amd64, because the i386 package could have possibly
changed.
These updated files have already been sent upstream, so they should no
longer be needed when JRuby 1.6 is released.
Tested on amd64. Looking for OKs.
Jeremy
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/jruby/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 19 Nov 2010 15:57:43 -0000 1.13
+++ Makefile 21 Nov 2010 17:26:47 -0000
@@ -7,6 +7,7 @@ COMMENT = pure-Java implementation of th
V = 1.5.5
DISTNAME = jruby-src-${V}
PKGNAME = jruby-${V}
+REVISION = 0
CATEGORIES = lang lang/ruby
DISTFILES = ${DISTNAME}.tar.gz \
wmeissner-jffi-1.0.2-0-ge0d10e9.tar.gz:0 \
@@ -49,7 +50,8 @@ SUBST_VARS = JRUBY_HOME JFFI_ARCH FFI_AR
post-extract:
mv ${WRKDIR}/wmeissner-jffi-e0d10e9 ${JFFI_HOME}
- mv
${WRKDIR}/jruby-1.5.3/lib/ruby/site_ruby/shared/ffi/platform/${FFI_ARCH}/*.rb \
+ mkdir -p ${WRKSRC}/lib/ruby/site_ruby/shared/ffi/platform/${FFI_ARCH}
+ mv
${WRKDIR}/jruby-1.5.3/lib/ruby/site_ruby/shared/ffi/platform/${FFI_ARCH}/* \
${WRKSRC}/lib/ruby/site_ruby/shared/ffi/platform/${FFI_ARCH}/
do-build: