From aa7a89a6fe75962f670a1664def6856f41e486af Mon Sep 17 00:00:00 2001
From: Tong LIU <nemoliu@FreeBSD.org>
Date: Tue, 21 Aug 2007 11:18:13 +0000
Subject: - add bash to RUN_DEPENDS - change bash declare in patch
Approved by: delphij (mentor)
---
lang/jruby/Makefile | 2 ++
lang/jruby/files/patch-jruby | 2 +-
lang/jruby/files/patch-jrubyc | 18 ++++++++++++------
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/lang/jruby/Makefile b/lang/jruby/Makefile
index 15e4238f04a3..0554f6a2dcf9 100644
--- a/lang/jruby/Makefile
+++ b/lang/jruby/Makefile
@@ -18,6 +18,8 @@ DISTNAME= ${PORTNAME}-bin-${PORTVERSION}
MAINTAINER= nemoliu@FreeBSD.org
COMMENT= An implementation of Ruby Interpreter in Pure Java
+RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
+
NO_BUILD= yes
USE_JAVA= yes
JAVA_VERSION= 1.3+
diff --git a/lang/jruby/files/patch-jruby b/lang/jruby/files/patch-jruby
index 566f3425310d..4831309b1383 100644
--- a/lang/jruby/files/patch-jruby
+++ b/lang/jruby/files/patch-jruby
@@ -2,7 +2,7 @@
+++ bin/jruby Fri Apr 6 14:00:13 2007
@@ -1,4 +1,4 @@
-#!/bin/bash
-+#!/bin/sh
++#!/usr/bin/env bash
# -----------------------------------------------------------------------------
# jruby.sh - Start Script for the JRuby interpreter
#
diff --git a/lang/jruby/files/patch-jrubyc b/lang/jruby/files/patch-jrubyc
index 63d356dca4b1..1ff862d24cfa 100644
--- a/lang/jruby/files/patch-jrubyc
+++ b/lang/jruby/files/patch-jrubyc
@@ -1,12 +1,18 @@
---- bin/jrubyc.orig Fri Apr 6 13:58:12 2007
-+++ bin/jrubyc Fri Apr 6 14:00:36 2007
-@@ -26,6 +26,9 @@
- esac
+--- bin/jrubyc.orig 2007-08-21 19:06:20.355621590 +0800
++++ bin/jrubyc 2007-08-21 19:08:23.020781206 +0800
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ # -----------------------------------------------------------------------------
+ # jruby.sh - Start Script for the JRuby interpreter
+ #
+@@ -27,6 +27,9 @@
# ----- Verify and Set Required Environment Variables -------------------------
+
+JAVA_HOME=%%JAVA_HOME%%
-+JRUBY_HOME=%%JRUBY_HOME%
++JRUBY_HOME=%%JRUBY_HOME%%
+
-
if [ -z "$JRUBY_HOME" ] ; then
## resolve links - $0 may be a link to home
+ PRG=$0
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0