[97665] trunk/dports/lang

[ciserlohn at macports.org]

Revision: 97665
          https://trac.macports.org/changeset/97665
Author:   ciserlohn at macports.org
Date:     2012-09-11 01:25:41 -0700 (Tue, 11 Sep 2012)
Log Message:
-----------
jruby, jruby-devel: fix usage of 'expr' utility in startup script on mountain lion (see #36036)

Modified Paths:
--------------
    trunk/dports/lang/jruby/Portfile
    trunk/dports/lang/jruby-devel/Portfile

Added Paths:
-----------
    trunk/dports/lang/jruby/files/
    trunk/dports/lang/jruby/files/patch-bin-jruby-bash-expr-regex.diff
    trunk/dports/lang/jruby/files/patch-bin-jruby-sh-expr-regex.diff
    trunk/dports/lang/jruby-devel/files/
    trunk/dports/lang/jruby-devel/files/patch-bin-jruby-bash-expr-regex.diff
    trunk/dports/lang/jruby-devel/files/patch-bin-jruby-sh-expr-regex.diff

Modified: trunk/dports/lang/jruby/Portfile
===================================================================
--- trunk/dports/lang/jruby/Portfile	2012-09-11 06:12:00 UTC (rev 97664)
+++ trunk/dports/lang/jruby/Portfile	2012-09-11 08:25:41 UTC (rev 97665)
@@ -52,6 +52,12 @@
 
 variant default_ruby description "build without j prefix" {}
 
+platform darwin 12 {
+    # see https://trac.macports.org/ticket/36036
+    patchfiles-append   patch-bin-jruby-sh-expr-regex.diff
+    patchfiles-append   patch-bin-jruby-bash-expr-regex.diff
+}
+
 destroot {
     # Create the target java directory exists
     xinstall -m 755 -d ${destroot}${prefix}/share/java/${name}

Added: trunk/dports/lang/jruby/files/patch-bin-jruby-bash-expr-regex.diff
===================================================================
--- trunk/dports/lang/jruby/files/patch-bin-jruby-bash-expr-regex.diff	                        (rev 0)
+++ trunk/dports/lang/jruby/files/patch-bin-jruby-bash-expr-regex.diff	2012-09-11 08:25:41 UTC (rev 97665)
@@ -0,0 +1,11 @@
+--- bin/jruby.bash.orig	2012-09-07 14:22:01.000000000 +0900
++++ bin/jruby.bash	2012-09-08 01:10:44.000000000 +0900
+@@ -33,7 +33,7 @@
+   ls=`ls -ld "$PRG"`
+   link=`expr "$ls" : '.*-> \(.*\)$'`
+   if expr "$link" : '.*/.*' > /dev/null; then
+-    if expr "$link" : '/' > /dev/null; then
++    if expr "$link" : '\/' > /dev/null; then
+       PRG="$link"
+     else
+       PRG="`dirname ${PRG}`/${link}"

Added: trunk/dports/lang/jruby/files/patch-bin-jruby-sh-expr-regex.diff
===================================================================
--- trunk/dports/lang/jruby/files/patch-bin-jruby-sh-expr-regex.diff	                        (rev 0)
+++ trunk/dports/lang/jruby/files/patch-bin-jruby-sh-expr-regex.diff	2012-09-11 08:25:41 UTC (rev 97665)
@@ -0,0 +1,11 @@
+--- bin/jruby.sh.orig	2012-09-07 14:22:01.000000000 +0900
++++ bin/jruby.sh	2012-09-08 01:10:44.000000000 +0900
+@@ -33,7 +33,7 @@
+   ls=`ls -ld "$PRG"`
+   link=`expr "$ls" : '.*-> \(.*\)$'`
+   if expr "$link" : '.*/.*' > /dev/null; then
+-    if expr "$link" : '/' > /dev/null; then
++    if expr "$link" : '\/' > /dev/null; then
+       PRG="$link"
+     else
+       PRG="`dirname ${PRG}`/${link}"

Modified: trunk/dports/lang/jruby-devel/Portfile
===================================================================
--- trunk/dports/lang/jruby-devel/Portfile	2012-09-11 06:12:00 UTC (rev 97664)
+++ trunk/dports/lang/jruby-devel/Portfile	2012-09-11 08:25:41 UTC (rev 97665)
@@ -54,6 +54,12 @@
 
 variant default_ruby description "build without j prefix" {}
 
+platform darwin 12 {
+    # see https://trac.macports.org/ticket/36036
+    patchfiles-append   patch-bin-jruby-sh-expr-regex.diff
+    patchfiles-append   patch-bin-jruby-bash-expr-regex.diff
+}
+
 destroot {
     # Create the target java directory exists
     xinstall -m 755 -d ${destroot}${prefix}/share/java/${name}

Added: trunk/dports/lang/jruby-devel/files/patch-bin-jruby-bash-expr-regex.diff
===================================================================
--- trunk/dports/lang/jruby-devel/files/patch-bin-jruby-bash-expr-regex.diff	                        (rev 0)
+++ trunk/dports/lang/jruby-devel/files/patch-bin-jruby-bash-expr-regex.diff	2012-09-11 08:25:41 UTC (rev 97665)
@@ -0,0 +1,11 @@
+--- bin/jruby.bash.orig	2012-09-07 14:22:01.000000000 +0900
++++ bin/jruby.bash	2012-09-08 01:10:44.000000000 +0900
+@@ -33,7 +33,7 @@
+   ls=`ls -ld "$PRG"`
+   link=`expr "$ls" : '.*-> \(.*\)$'`
+   if expr "$link" : '.*/.*' > /dev/null; then
+-    if expr "$link" : '/' > /dev/null; then
++    if expr "$link" : '\/' > /dev/null; then
+       PRG="$link"
+     else
+       PRG="`dirname ${PRG}`/${link}"

Added: trunk/dports/lang/jruby-devel/files/patch-bin-jruby-sh-expr-regex.diff
===================================================================
--- trunk/dports/lang/jruby-devel/files/patch-bin-jruby-sh-expr-regex.diff	                        (rev 0)
+++ trunk/dports/lang/jruby-devel/files/patch-bin-jruby-sh-expr-regex.diff	2012-09-11 08:25:41 UTC (rev 97665)
@@ -0,0 +1,11 @@
+--- bin/jruby.sh.orig	2012-09-07 14:22:01.000000000 +0900
++++ bin/jruby.sh	2012-09-08 01:10:44.000000000 +0900
+@@ -33,7 +33,7 @@
+   ls=`ls -ld "$PRG"`
+   link=`expr "$ls" : '.*-> \(.*\)$'`
+   if expr "$link" : '.*/.*' > /dev/null; then
+-    if expr "$link" : '/' > /dev/null; then
++    if expr "$link" : '\/' > /dev/null; then
+       PRG="$link"
+     else
+       PRG="`dirname ${PRG}`/${link}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120911/ec50167d/attachment.html>