- update to 1.1.1

Approved by:	delphij (mentor,implicit)

lang/jruby/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jruby
-PORTVERSION=	1.0.3
+PORTVERSION=	1.1.1
 CATEGORIES=	lang ruby java
 MASTER_SITES=	http://dist.codehaus.org/jruby/ \
 		http://repo2.maven.org/maven/jruby/ \
@@ -27,9 +27,7 @@ WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 JRUBY_HOME?=	${PREFIX}/share/${PORTNAME}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 REPLACE_FILES=	${WRKSRC}/bin/jruby \
-		${WRKSRC}/bin/jrubyc \
-		${WRKSRC}/bin/jrubycli \
-		${WRKSRC}/bin/jrubysrv
+		${WRKSRC}/bin/jrubyc
 REPLACE_LIST=	JRUBY_HOME=${JRUBY_HOME} \
 		JAVA_HOME=${JAVA_HOME}
 REPLACE_LIST_TEMP=	${REPLACE_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
@@ -55,8 +53,6 @@ do-install:
 	@${ECHO_MSG} -n ">> Installation JRuby files..."
 	@${INSTALL_SCRIPT} ${WRKDIR}/jruby ${PREFIX}/bin/jruby
 	@${INSTALL_SCRIPT} ${WRKDIR}/jrubyc ${PREFIX}/bin/jrubyc
-	@${INSTALL_SCRIPT} ${WRKDIR}/jrubycli ${PREFIX}/bin/jrubycli
-	@${INSTALL_SCRIPT} ${WRKDIR}/jrubysrv ${PREFIX}/bin/jrubysrv
 	@cd ${WRKSRC}/lib \
 	  && ${FIND} . -type d -exec ${MKDIR} ${JRUBY_HOME}/lib/{} \; \
 	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${JRUBY_HOME}/lib/{} \;

lang/jruby/distinfo

@@ -1,3 +1,3 @@
-MD5 (jruby-bin-1.0.3.tar.gz) = 47ae8e2251a84cf4d6b7d20a6835a1e9
-SHA256 (jruby-bin-1.0.3.tar.gz) = ef1561f1faac090d05bb3aac5073f442892ba9c5bf92c295ef6d88ce56560f86
-SIZE (jruby-bin-1.0.3.tar.gz) = 4864020
+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

lang/jruby/files/patch-jruby

@@ -1,18 +1,18 @@
---- bin/jruby.orig	Fri Apr  6 13:57:54 2007
-+++ bin/jruby	Fri Apr  6 14:00:13 2007
+--- ./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
  #
-@@ -26,6 +26,9 @@
- esac
+@@ -37,6 +37,9 @@
+ JRUBY_HOME_1=`dirname "$PRG"`           # the ./bin dir
+ JRUBY_HOME=`dirname "$JRUBY_HOME_1"`  # the . dir
  
- # ----- Verify and Set Required Environment Variables -------------------------
 +JAVA_HOME=%%JAVA_HOME%%
 +JRUBY_HOME=%%JRUBY_HOME%%
 +
- 
- if [ -z "$JRUBY_HOME" ] ; then
-   ## resolve links - $0 may be a link to  home
+ if [ -z "$JRUBY_OPTS" ] ; then
+   JRUBY_OPTS=""
+ fi