Ticket #23366: clj.2.patch

File clj.2.patch, 3.0 KB (added by mdippery@…, 15 years ago)

New Clojure patch: Fixes issues and removes readline variant (in favor of rlwrap)

  • Portfile

    old new  
    66conflicts           clojure-devel
    77version             1.1.0
    88epoch               20091231
     9revision            1
    910categories          lang java
    1011maintainers         gmail.com:mdippery
    1112description         The Clojure programming language
    … …  
    2728use_configure       no
    2829build               {}
    2930
    30 variant readline conflicts rlwrap description {Use readline support} {
    31     depends_run-append port:jline
    32 }
    33 
    3431variant rlwrap conflicts readline description {Use rlwrap support for tab completion, parenthesis matching} {
    3532    depends_run-append port:rlwrap
    3633}
    … …  
    4340    set clojurebin ${clojurebindir}/clj
    4441    set clojuresh clj.sh
    4542   
    46     if {[variant_isset readline]} {
    47         set clojuresh clj-jline.sh
    48     }
    49    
    5043    if {[variant_isset rlwrap]} {
    5144        set clojuresh clj-rlwrap.sh
    5245    }

  • deleted file files/clj-jline.sh

    + -  
    1 #!/bin/sh
    2 
    3 # clj - Clojure launcher script
    4 
    5 
    6 cljjar='lib/clojure.jar'
    7 cljclass='clojure.main'
    8 jlineclass='jline.ConsoleRunner'
    9 
    10 dir=$0
    11 while [ -h "$dir" ]; do
    12   ls=`ls -ld "$dir"`
    13   link=`expr "$ls" : '.*-> \(.*\)$'`
    14 
    15   if expr "$link" : '/.*' > /dev/null; then
    16     dir="$link"
    17   else
    18     dir=`dirname "$dir"`"/$link"
    19   fi
    20 done
    21 
    22 dir=`dirname $dir`
    23 dir=`cd "$dir" > /dev/null && pwd`
    24 cljjar="$dir/../$cljjar"
    25 jlinejar="$dir/../../jline.jar"
    26 cp="${PWD}:${jlinejar}:${cljjar}"
    27 
    28 # Add extra jars as specified by `.clojure` file
    29 # Borrowed from <http://github.com/mreid/clojure-framework>
    30 if [ -f .clojure ]; then
    31   cp=$cp:`cat .clojure`
    32 fi
    33 
    34 if [ -z "$1" ]; then
    35   exec java -classpath $cp $jlineclass $cljclass
    36 else
    37   scriptname=$1
    38   exec java -classpath $cp $jlineclass $cljclass $scriptname -- $*
    39 fi

  • files/clj.sh

    old new  
    3232if [ -z "$1" ]; then
    3333  exec java -classpath $cp $cljclass
    3434else
    35   scriptname=$1
    36   exec java -classpath $cp $cljclass $scriptname -- $*
     35  exec java -classpath $cp $cljclass $*
    3736fi

  • files/clj-rlwrap.sh

    old new  
    1010
    1111dir=$0
    1212while [ -h "$dir" ]; do
    13     ls=`ls -ld "$dir"`
    14     link=`expr "$ls" : '.*-> \(.*\)$'`
     13  ls=`ls -ld "$dir"`
     14  link=`expr "$ls" : '.*-> \(.*\)$'`
    1515
    16     if expr "$link" : '/.*' > /dev/null; then
    17         dir="$link"
    18     else
    19         dir=`dirname "$dir"`"/$link"
    20     fi
     16  if expr "$link" : '/.*' > /dev/null; then
     17    dir="$link"
     18  else
     19    dir=`dirname "$dir"`"/$link"
     20  fi
    2121done
    2222
    2323dir=`dirname $dir`
    … …  
    3535if [ $# -eq 0 ]; then
    3636  rlwrap --remember -c -b $BREAK_CHARS -f $cljcompletions java -cp $cp $cljclass
    3737else
    38   scriptname=$1
    39   exec java -classpath $cp $cljclass $scriptname -- $*
     38  exec java -classpath $cp $cljclass $*
    4039fi
    4140