This updates rubinius to 1.2.0. Among other things, a few of our

patches were accepted upstream.

Rubinius previously installed into a versioned directory, this
update changes it to install into an unversioned directory.
This is going to change the PLIST of all dependent gem ports,
and a commit for them as well as a commit for ruby.port.mk will
be going in shortly.

Minor versions of rubinius do not maintain binary compatibility,
so we'll still need to bump all dependent ports that use C
extensions whenever the minor version of rubinius is updated, but
it is better than bumping all dependent ports.

While here, add some CONFIGURE_ENV stuff to make it possible to
build more ports with C extensions that depend on libraries in
LOCALBASE/lib.

OK landry@

lang/rubinius/Makefile

@@ -1,13 +1,12 @@
-# $OpenBSD: Makefile,v 1.3 2010/12/19 19:27:49 jeremy Exp $
+# $OpenBSD: Makefile,v 1.4 2011/01/06 04:14:10 jeremy Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT =	Ruby virtual machine and core library
 
-V=		1.1.1
-DISTNAME =	rubinius-${V}-20101116
+V=		1.2.0
+DISTNAME =	rubinius-${V}-20101221
 PKGNAME =	rubinius-$V
-REVISION =	1
 
 CATEGORIES =	lang lang/ruby
 
@@ -35,35 +34,40 @@ MODULES =	lang/ruby
 USE_GMAKE =	Yes
 USE_LIBTOOL=	Yes
 
-M=		${V:R}
 RAKE_VER =	0.8.7
 RAKE_COMPILER_VER = 0.6.0
 RDOC_VER =	2.5.1
 RUBY_DEBUG_VER = 0.10.47
-SUBST_VARS=	V M RAKE_VER RAKE_COMPILER_VER RDOC_VER RUBY_DEBUG_VER
+SUBST_VARS=	V RAKE_VER RAKE_COMPILER_VER RDOC_VER RUBY_DEBUG_VER
 
 WRKDIST=	${WRKDIR}/rubinius-${V}
 
+CONFIGURE_ENV +=	LDFLAGS="-L${LOCALBASE}/lib" \
+			CPPFLAGS="-DOPENSSL_NO_STATIC_ENGINE -I${LOCALBASE}/include" \
+			RELEASE=1
+
 do-configure:
-	cd ${WRKSRC} && ${RUBY} configure --prefix=${PREFIX}/lib \
-		--skip-prebuilt --disable-llvm --rake=${RAKE}
+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${RUBY} configure \
+		--prefix=${PREFIX}/lib/rubinius --skip-prebuilt --disable-llvm \
+		--rake=${RAKE}
 
 do-build:
 	cd ${WRKSRC} && ${RAKE} build
 
 do-install:
 	cd ${WRKSRC} && FAKEROOT=${WRKINST} ${RAKE} install
-	ln -s ${TRUEPREFIX}/lib/rubinius/${M}/bin/rbx ${PREFIX}/bin/rbx
-	mkdir ${PREFIX}/lib/rubinius/${M}/gems/1.8/{,cache,doc,gems,specifications}
+	ln -s ${TRUEPREFIX}/lib/rubinius/bin/rbx ${PREFIX}/bin/rbx
+	mkdir ${PREFIX}/lib/rubinius/gems/1.8/{,cache,doc,gems,specifications}
 	for dir in sitelibdir sitearchdir; do \
-		mkdir -p ${WRKINST}/`RBX_RUNTIME=${PREFIX}/lib/rubinius/${M}/runtime \
-		RBX_LIB=${PREFIX}/lib/rubinius/${M}/lib \
-		${PREFIX}/lib/rubinius/${M}/bin/rbx -rrbconfig -e \
+		mkdir -p ${WRKINST}/`RBX_RUNTIME=${PREFIX}/lib/rubinius/runtime \
+		RBX_LIB=${PREFIX}/lib/rubinius/lib \
+		${PREFIX}/lib/rubinius/bin/rbx -rrbconfig -e \
 		"puts RbConfig::CONFIG['$$dir']"`; done
 
+# Some failures and likely infinite loop in mspec ci
 do-regress:
 	cd ${WRKSRC} && ${RAKE} vm:test
-	cd ${WRKSRC} && RUBY=${RUBY} ${RUBY} mspec/bin/mspec
+	cd ${WRKSRC} && RUBY=${RUBY} ${RUBY} mspec/bin/mspec ci --background --agent
 
 REGRESS_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
 

lang/rubinius/distinfo

@@ -1,5 +1,5 @@
-MD5 (rubinius-1.1.1-20101116.tar.gz) = s59hjuujfDr/IV2ovKVf1w==
-RMD160 (rubinius-1.1.1-20101116.tar.gz) = pRoC7onERrFpJwukoQVIoL9jCOE=
-SHA1 (rubinius-1.1.1-20101116.tar.gz) = Fsj6EVHP75hjMqmKqf8umWBM9s0=
-SHA256 (rubinius-1.1.1-20101116.tar.gz) = OElAboWs4Iiw2rjFpA4F54xHCsNhqOyJIr3X1WS6KNI=
-SIZE (rubinius-1.1.1-20101116.tar.gz) = 8057356
+MD5 (rubinius-1.2.0-20101221.tar.gz) = QoTCZg8fZIlC3jXU/IcfcA==
+RMD160 (rubinius-1.2.0-20101221.tar.gz) = dFr2fEJ0ZZ3AJa9wh9xliQVjCn8=
+SHA1 (rubinius-1.2.0-20101221.tar.gz) = F1N7KtPD21qY6dppqW+O3kGFMBk=
+SHA256 (rubinius-1.2.0-20101221.tar.gz) = h0Nd/M19fTWVRf4ezRXhIC7e2QpaQ9mpYQAeKyO7a0c=
+SIZE (rubinius-1.2.0-20101221.tar.gz) = 8585180

lang/rubinius/patches/patch-vm_external_libs_libffi_configure

@@ -1,30 +0,0 @@
-$OpenBSD: patch-vm_external_libs_libffi_configure,v 1.1 2010/11/30 19:32:38 ajacoutot Exp $
---- vm/external_libs/libffi/configure.orig	Tue Nov 16 20:04:30 2010
-+++ vm/external_libs/libffi/configure	Mon Nov 29 21:17:09 2010
-@@ -12167,7 +12167,7 @@ case "$host" in
- 	TARGET=FRV; TARGETDIR=frv
- 	;;
- 
--  hppa*-*-linux* | parisc*-*-linux*)
-+  hppa*-*-linux* | hppa*-*-openbsd* | parisc*-*-linux*)
- 	TARGET=PA_LINUX; TARGETDIR=pa
- 	;;
-   hppa*64-*-hpux*)
-@@ -12210,7 +12210,7 @@ case "$host" in
-   mips-sgi-irix5.* | mips-sgi-irix6.*)
- 	TARGET=MIPS; TARGETDIR=mips
- 	;;
--  mips*-*-linux*)
-+  mips*-*-linux* | mips*-*-openbsd*)
- 	# Support 128-bit long double for NewABI.
- 	HAVE_LONG_DOUBLE='defined(__mips64)'
- 	TARGET=MIPS; TARGETDIR=mips
-@@ -12228,7 +12228,7 @@ case "$host" in
-   powerpc-*-aix* | rs6000-*-aix*)
- 	TARGET=POWERPC_AIX; TARGETDIR=powerpc
- 	;;
--  powerpc-*-freebsd*)
-+  powerpc-*-freebsd* | powerpc-*-openbsd*)
- 	TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
- 	;;
-   powerpc*-*-rtems*)

lang/rubinius/patches/patch-vm_external_libs_libffi_src_arm_sysv_S

@@ -1,74 +0,0 @@
-$OpenBSD: patch-vm_external_libs_libffi_src_arm_sysv_S,v 1.1 2010/11/30 19:32:38 ajacoutot Exp $
---- vm/external_libs/libffi/src/arm/sysv.S.orig	Tue Nov 16 20:04:30 2010
-+++ vm/external_libs/libffi/src/arm/sysv.S	Mon Nov 29 21:17:15 2010
-@@ -90,13 +90,6 @@
- # define call_reg(x)	mov	lr, pc ; mov	pc, x
- #endif
- 
--/* Conditionally compile unwinder directives.  */
--#ifdef __ARM_EABI__
--#define UNWIND
--#else
--#define UNWIND @
--#endif	
--
- 	
- #if defined(__thumb__) && !defined(__THUMB_INTERWORK__)
- .macro	ARM_FUNC_START name
-@@ -108,7 +101,6 @@
- 	bx	pc
- 	nop
- 	.arm
--	UNWIND .fnstart
- /* A hook to tell gdb that we've switched to ARM mode.  Also used to call
-    directly from other local arm routines.  */
- _L__\name:		
-@@ -119,7 +111,6 @@ _L__\name:		
- 	.align 0
- 	.arm
- 	ENTRY(\name)
--	UNWIND .fnstart
- .endm
- #endif
- 
-@@ -152,11 +143,8 @@ _L__\name:		
- ARM_FUNC_START ffi_call_SYSV
- 	@ Save registers
-         stmfd	sp!, {r0-r3, fp, lr}
--	UNWIND .save	{r0-r3, fp, lr}
- 	mov	fp, sp
- 
--	UNWIND .setfp	fp, sp
--
- 	@ Make room for all of the new args.
- 	sub	sp, fp, r2
- 
-@@ -226,7 +214,6 @@ LSYM(Lepilogue):
- 	RETLDM	"r0-r3,fp"
- 
- .ffi_call_SYSV_end:
--	UNWIND .fnend
-         .size    CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV)
- 
- /*
-@@ -238,12 +225,9 @@ LSYM(Lepilogue):
- */
- 
- ARM_FUNC_START ffi_closure_SYSV
--	UNWIND .pad #16
- 	add	ip, sp, #16
- 	stmfd	sp!, {ip, lr}
--	UNWIND .save	{r0, lr}
- 	add	r2, sp, #8
--	.pad #16
- 	sub	sp, sp, #16
- 	str	sp, [sp, #8]
- 	add	r1, sp, #8
-@@ -298,7 +282,6 @@ ARM_FUNC_START ffi_closure_SYSV
- #endif
- 
- .ffi_closure_SYSV_end:
--	UNWIND .fnend
-         .size    CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV)
- 
- #if defined __ELF__ && defined __linux__

lang/rubinius/patches/patch-vm_external_libs_libffi_src_mips_ffi_c

@@ -1,16 +0,0 @@
-$OpenBSD: patch-vm_external_libs_libffi_src_mips_ffi_c,v 1.1 2010/11/30 19:32:38 ajacoutot Exp $
---- vm/external_libs/libffi/src/mips/ffi.c.orig	Tue Nov 16 20:04:30 2010
-+++ vm/external_libs/libffi/src/mips/ffi.c	Mon Nov 29 21:17:24 2010
-@@ -37,7 +37,11 @@
- #endif
- 
- #ifndef USE__BUILTIN___CLEAR_CACHE
--#include <sys/cachectl.h>
-+#  if defined(__OpenBSD__)
-+#    include <mips64/sysarch.h>
-+#  else
-+#    include <sys/cachectl.h>
-+#  endif
- #endif
- 
- #ifdef FFI_DEBUG

lang/rubinius/patches/patch-vm_external_libs_libffi_src_mips_ffitarget_h

@@ -1,12 +0,0 @@
-$OpenBSD: patch-vm_external_libs_libffi_src_mips_ffitarget_h,v 1.1 2010/11/30 19:32:38 ajacoutot Exp $
---- vm/external_libs/libffi/src/mips/ffitarget.h.orig	Tue Nov 16 20:04:30 2010
-+++ vm/external_libs/libffi/src/mips/ffitarget.h	Mon Nov 29 21:17:31 2010
-@@ -29,7 +29,7 @@
- 
- #ifdef linux
- # include <asm/sgidefs.h>
--#else
-+#elif !defined(__OpenBSD__)
- # include <sgidefs.h>
- #endif
- #  ifndef _ABIN32