- Update to 2.2.9

- Remove dependency on rake, and switch to built-in rake, and thus
  unbreaking it
- Build in UTF-8 locale to fix issue with building
- Add dependency on execinfo

lang/rubinius/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rubinius
-PORTVERSION=	2.2.5
+PORTVERSION=	2.2.9
 CATEGORIES=	lang
 MASTER_SITES=	http://releases.rubini.us/
 
@@ -12,14 +12,11 @@ COMMENT=	LLVM based ruby language implementation
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		Fails to build
-
 BUILD_DEPENDS=	${LOCALBASE}/bin/bundle:${PORTSDIR}/sysutils/rubygem-bundler \
 		${LOCALBASE}/bin/llvm-config34:${PORTSDIR}/devel/llvm34 \
 		${LOCALBASE}/bin/bison:${PORTSDIR}/devel/bison
 
 HAS_CONFIGURE=	yes
-#execinfo is broken for unknow reason
 CONFIGURE_ARGS=	-P "${PREFIX}" \
 		-I "${PREFIX}/include/rubinius" \
 		-L "${PREFIX}/lib/ruby/rubinius" \
@@ -32,26 +29,38 @@ CONFIGURE_ARGS=	-P "${PREFIX}" \
 		--llvm-config ${LOCALBASE}/bin/llvm-config34 \
 		--sitedir "${PREFIX}/lib/ruby/site_ruby/rubinius" \
 		--vendordir "${PREFIX}/lib/ruby/vendor_ruby/rubinius" \
-		--stagingdir "${STAGEDIR}${PREFIX}"
+		--stagingdir "${STAGEDIR}${PREFIX}" --with-execinfo
 
 USE_BZIP2=	yes
 USES=		perl5 gmake
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=	yes
-USE_RAKE=	yes
 USE_PERL5=	build
 NO_INSTALL=	yes
 PLIST_SUB+=	FREEBSD_DIR=${FREEBSD_DIR}
+GEM_PATH=	${WRKSRC}/gems/ruby/${RUBY_VER}
+RAKE_BIN=	${GEM_PATH}/bin/rake
 
 # Hack to prevent rbx from creating $HOME/.rbx during compilation of gems
 MAKE_ENV+=	HOME=${WRKSRC}
 
+# Hack to switch to a local gem path so locally activated rake can be used
+MAKE_ENV+=	GEM_PATH=${GEM_PATH}
+
+# Hack to build under a UTF-8 locale
+MAKE_ENV+=	LANG=en_US.UTF-8
+
 F_OS=		${OPSYS:tl}
 F_MAJOR=	${OSREL:C/\..*$//}
 FREEBSD_DIR=	${F_ARCH}-${F_OS}-${F_MAJOR}
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 1000000
+LIB_DEPENDS+=		libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+CONFIGURE_ARGS+=	--with-opt-dir "${LOCALBASE}"
+.endif
+
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .elif ${ARCH} == "amd64"
@@ -64,7 +73,7 @@ post-patch:
 	@${GREP} -Rl '#!.*ruby$$'  ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -e '/^#!.*ruby$$/s/ruby$$/${RUBY_NAME}/g'
 
 pre-configure:
-	cd ${WRKSRC} && ${MKDIR} gems && ${LOCALBASE}/bin/bundle install --local --path=${WRKSRC}/gems
+	@cd ${WRKSRC} && ${MKDIR} gems && ${LOCALBASE}/bin/bundle install --local --path=${WRKSRC}/gems
 
 do-build:
 	# "build" target here installs into ${STAGEDIR}${PREFIX}
@@ -73,9 +82,10 @@ do-build:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ruby/vendor_ruby/rubinius
 	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/ruby/site_ruby/rubinius/.keep_me
 	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/ruby/vendor_ruby/rubinius/.keep_me
+	@${MV} ${STAGEDIR}${PREFIX}/bin/testrb ${STAGEDIR}${PREFIX}/bin/testrbx
 
 plist:
-	truncate -s0 pkg-plist
+	@truncate -s0 pkg-plist
 	@${ECHO_CMD} "bin/rbx" >> pkg-plist
 #
 # Includes

lang/rubinius/distinfo

@@ -1,4 +1,2 @@
-SHA256 (rubinius-2.2.5.tar.bz2) = 42cfae89d481dfa5e0ccb53a67720f109fc6c2e1b6ca68a8ae9676be6d0457de
-SIZE (rubinius-2.2.5.tar.bz2) = 11495013
-SHA256 (llvm-2.8.tgz) = 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b
-SIZE (llvm-2.8.tgz) = 9112527
+SHA256 (rubinius-2.2.9.tar.bz2) = 7b01a7f2508167e73b5273b4e55e6616fc7fd975e79c84c4d2e3ef83d849d2ce
+SIZE (rubinius-2.2.9.tar.bz2) = 11409258