- Update to 1.1.3

PR:		125937
Submitted by:	Geoff The <geoff2k@gmail.com>

lang/jruby/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jruby
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.3
 PORTREVISION=	1
 CATEGORIES=	lang ruby java
 MASTER_SITES=	http://dist.codehaus.org/jruby/ \
@@ -25,13 +25,14 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.3+
 
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
-JRUBY_HOME?=	${PREFIX}/share/${PORTNAME}
+JRUBY_HOME?=	${PREFIX}/share/${PORTNAME}-${PORTVERSION}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-REPLACE_FILES=	${WRKSRC}/bin/jruby \
-		${WRKSRC}/bin/jrubyc
-REPLACE_LIST=	JRUBY_HOME=${JRUBY_HOME} \
-		JAVA_HOME=${JAVA_HOME}
+REPLACE_FILES=	${WRKSRC}/bin/jruby
+REPLACE_LIST=	JAVA_HOME=${JAVA_HOME}
 REPLACE_LIST_TEMP=	${REPLACE_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
+SHEBANG_FILES=	rake spec spec_translator Rakefile '*.rb'
+
+PLIST_SUB+=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
@@ -41,26 +42,50 @@ pre-patch:
 	@${ECHO_MSG} "   JAVA_HOME:     ${JAVA_HOME}"
 
 post-patch:
+	@${ECHO_MSG} -n ">> Adjusting shebangs to use /usr/bin/env ..."
+	@${FIND} ${WRKSRC}/bin -type f -exec ${GREP} -q '^#!/bin/bash' {} \; -exec ${REINPLACE_CMD} -e 's|^#!/bin/bash|#!/usr/bin/env bash|' {} \;
+	@${FIND} ${WRKSRC} -type f -name '*.rb' -exec ${GREP} -q '^#!/usr/local/bin/ruby' {} \; -exec ${REINPLACE_CMD} -e 's|^#!/usr/local/bin/ruby|#!/usr/bin/env jruby|' {} \;
+.for target in ${SHEBANG_FILES}
+	@${FIND} ${WRKSRC} -type f -name ${target} -exec ${GREP} -q '^#!/usr/bin/env ruby' {} \; -exec ${REINPLACE_CMD} -e 's|^#!/usr/bin/env ruby|#!/usr/bin/env jruby|' {} \;
+.endfor
+	@${ECHO_MSG} " [ DONE ]"
+
 	@${ECHO_MSG} -n ">> Removing unneeded files..."
-	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
+	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'` `${FIND} ${WRKSRC} -name '*.bak'`
 	@${ECHO_MSG} " [ DONE ]"
-.for file in ${REPLACE_FILES}
-	@${ECHO_MSG} -n ">> Customizing `basename ${file}`..."
-	@${SED} ${REPLACE_LIST_TEMP} ${file} > ${WRKDIR}/`basename ${file}`
+
+.for target in ${REPLACE_FILES}
+	@${ECHO_MSG} -n ">> Customizing `basename ${target}`..."
+	@${SED} ${REPLACE_LIST_TEMP} ${target} > ${WRKDIR}/`basename ${target}`
 	@${ECHO_MSG} " [ DONE ]"
+	@${MV} ${WRKDIR}/`basename ${target}` ${target}
 .endfor
 
 do-install:
-	@${ECHO_MSG} -n ">> Installation JRuby files..."
-	@${INSTALL_SCRIPT} ${WRKDIR}/jruby ${PREFIX}/bin/jruby
-	@${INSTALL_SCRIPT} ${WRKDIR}/jrubyc ${PREFIX}/bin/jrubyc
+	@${ECHO_MSG} -n ">> Installing JRuby files..."
+
+	@cd ${WRKSRC}/bin \
+	  && ${FIND} . -type d -exec ${MKDIR} ${JRUBY_HOME}/bin/{} \; \
+	  && ${FIND} . -type f -exec ${INSTALL_SCRIPT} {} ${JRUBY_HOME}/bin/{} \;
 	@cd ${WRKSRC}/lib \
 	  && ${FIND} . -type d -exec ${MKDIR} ${JRUBY_HOME}/lib/{} \; \
 	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${JRUBY_HOME}/lib/{} \;
+	@cd ${WRKSRC}/share \
+	  && ${FIND} . -type d -exec ${MKDIR} ${JRUBY_HOME}/share/{} \; \
+	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${JRUBY_HOME}/share/{} \;
+
 	@${ECHO_MSG} " [ DONE ]"
+
+	@${ECHO_MSG} -n ">> Installing symlinks in ${PREFIX}/bin..."
+	@${LN} -s ${JRUBY_HOME}/bin/jruby ${PREFIX}/bin/jruby
+	@${LN} -s ${JRUBY_HOME}/bin/jirb ${PREFIX}/bin/jirb
+	@${ECHO_MSG} " [ DONE ]"
+
 .if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installation Documents files..."
+	@${ECHO_MSG} -n ">> Installing Documents files..."
 	@${MKDIR} ${DOCSDIR}
+	@(cd ${WRKSRC}/ \
+	  && ${COPYTREE_SHARE} [A-Z]\* ${DOCSDIR})
 	@(cd ${WRKSRC}/docs \
 	  && ${COPYTREE_SHARE} \* ${DOCSDIR})
 	@${MKDIR} ${EXAMPLESDIR}

lang/jruby/distinfo

@@ -1,3 +1,3 @@
-MD5 (jruby-bin-1.1.1.tar.gz) = ebc88b30876a93d63f9b51d5e4ed62e5
-SHA256 (jruby-bin-1.1.1.tar.gz) = 81faea2d8adba4ce5b83ed365a67e895e175b40312d758f2167087f4a02464a6
-SIZE (jruby-bin-1.1.1.tar.gz) = 8806776
+MD5 (jruby-bin-1.1.3.tar.gz) = 0258f92cae0c85355df495cfdc65058e
+SHA256 (jruby-bin-1.1.3.tar.gz) = 59838e9bbfe39e072af9cb9ed1c5050f2bbc84978c1a5a67ccf68f81d5bfcffb
+SIZE (jruby-bin-1.1.3.tar.gz) = 7698717

lang/jruby/files/patch-jruby

@@ -1,17 +1,11 @@
 --- ./bin/jruby.old	2008-04-23 11:36:44.368716680 +0800
 +++ ./bin/jruby	2008-04-23 11:40:04.632441243 +0800
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- # -----------------------------------------------------------------------------
- # jruby.sh - Start Script for the JRuby interpreter
- #
 @@ -37,6 +37,9 @@
  JRUBY_HOME_1=`dirname "$PRG"`           # the ./bin dir
  JRUBY_HOME=`dirname "$JRUBY_HOME_1"`  # the . dir
- 
+
++# Set JAVA_HOME to the value the port was built with
 +JAVA_HOME=%%JAVA_HOME%%
-+JRUBY_HOME=%%JRUBY_HOME%%
 +
  if [ -z "$JRUBY_OPTS" ] ; then
    JRUBY_OPTS=""

lang/jruby/pkg-descr

@@ -1,5 +1,5 @@
 JRuby is an 100% pure-Java implementation of the Ruby programming language.
-    *  A 1.8.4 compatible Ruby interpreter written in 100% pure Java
+    *  A 1.8.6 compatible Ruby interpreter written in 100% pure Java
     * Most builtin Ruby classes provided
     * Support for interacting with and defining java classes from within
       ruby