[69628] trunk/dports/lang/clojure

[raimue at macports.org]

Revision: 69628
          http://trac.macports.org/changeset/69628
Author:   raimue at macports.org
Date:     2010-07-11 08:32:46 -0700 (Sun, 11 Jul 2010)
Log Message:
-----------
lang/clojure:
Maintainer update, closes #23366

Modified Paths:
--------------
    trunk/dports/lang/clojure/Portfile
    trunk/dports/lang/clojure/files/clj-rlwrap.sh
    trunk/dports/lang/clojure/files/clj.sh

Removed Paths:
-------------
    trunk/dports/lang/clojure/files/clj-jline.sh

Modified: trunk/dports/lang/clojure/Portfile
===================================================================
--- trunk/dports/lang/clojure/Portfile	2010-07-11 15:16:55 UTC (rev 69627)
+++ trunk/dports/lang/clojure/Portfile	2010-07-11 15:32:46 UTC (rev 69628)
@@ -6,6 +6,7 @@
 conflicts           clojure-devel
 version             1.1.0
 epoch               20091231
+revision            1
 categories          lang java
 maintainers         gmail.com:mdippery
 description         The Clojure programming language
@@ -27,10 +28,6 @@
 use_configure       no
 build               {}
 
-variant readline conflicts rlwrap description {Use readline support} {
-    depends_run-append port:jline
-}
-
 variant rlwrap conflicts readline description {Use rlwrap support for tab completion, parenthesis matching} {
     depends_run-append port:rlwrap
 }
@@ -43,10 +40,6 @@
     set clojurebin ${clojurebindir}/clj
     set clojuresh clj.sh
     
-    if {[variant_isset readline]} {
-        set clojuresh clj-jline.sh
-    }
-    
     if {[variant_isset rlwrap]} {
         set clojuresh clj-rlwrap.sh
     }

Deleted: trunk/dports/lang/clojure/files/clj-jline.sh
===================================================================
--- trunk/dports/lang/clojure/files/clj-jline.sh	2010-07-11 15:16:55 UTC (rev 69627)
+++ trunk/dports/lang/clojure/files/clj-jline.sh	2010-07-11 15:32:46 UTC (rev 69628)
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# clj - Clojure launcher script
-
-
-cljjar='lib/clojure.jar'
-cljclass='clojure.main'
-jlineclass='jline.ConsoleRunner'
-
-dir=$0
-while [ -h "$dir" ]; do
-  ls=`ls -ld "$dir"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-
-  if expr "$link" : '/.*' > /dev/null; then
-    dir="$link"
-  else
-    dir=`dirname "$dir"`"/$link"
-  fi
-done
-
-dir=`dirname $dir`
-dir=`cd "$dir" > /dev/null && pwd`
-cljjar="$dir/../$cljjar"
-jlinejar="$dir/../../jline.jar"
-cp="${PWD}:${jlinejar}:${cljjar}"
-
-# Add extra jars as specified by `.clojure` file
-# Borrowed from <http://github.com/mreid/clojure-framework>
-if [ -f .clojure ]; then
-  cp=$cp:`cat .clojure`
-fi
-
-if [ -z "$1" ]; then
-  exec java -classpath $cp $jlineclass $cljclass
-else
-  scriptname=$1
-  exec java -classpath $cp $jlineclass $cljclass $scriptname -- $*
-fi

Modified: trunk/dports/lang/clojure/files/clj-rlwrap.sh
===================================================================
--- trunk/dports/lang/clojure/files/clj-rlwrap.sh	2010-07-11 15:16:55 UTC (rev 69627)
+++ trunk/dports/lang/clojure/files/clj-rlwrap.sh	2010-07-11 15:32:46 UTC (rev 69628)
@@ -10,14 +10,14 @@
 
 dir=$0
 while [ -h "$dir" ]; do
-    ls=`ls -ld "$dir"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+  ls=`ls -ld "$dir"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
 
-    if expr "$link" : '/.*' > /dev/null; then
-        dir="$link"
-    else
-        dir=`dirname "$dir"`"/$link"
-    fi
+  if expr "$link" : '/.*' > /dev/null; then
+    dir="$link"
+  else
+    dir=`dirname "$dir"`"/$link"
+  fi
 done
 
 dir=`dirname $dir`
@@ -35,7 +35,6 @@
 if [ $# -eq 0 ]; then
   rlwrap --remember -c -b $BREAK_CHARS -f $cljcompletions java -cp $cp $cljclass
 else
-  scriptname=$1
-  exec java -classpath $cp $cljclass $scriptname -- $*
+  exec java -classpath $cp $cljclass $*
 fi
 

Modified: trunk/dports/lang/clojure/files/clj.sh
===================================================================
--- trunk/dports/lang/clojure/files/clj.sh	2010-07-11 15:16:55 UTC (rev 69627)
+++ trunk/dports/lang/clojure/files/clj.sh	2010-07-11 15:32:46 UTC (rev 69628)
@@ -32,6 +32,5 @@
 if [ -z "$1" ]; then
   exec java -classpath $cp $cljclass
 else
-  scriptname=$1
-  exec java -classpath $cp $cljclass $scriptname -- $*
+  exec java -classpath $cp $cljclass $*
 fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100711/c1c0e940/attachment.html>