Ticket #23081: clojure-1.1.0.patch

File clojure-1.1.0.patch, 4.4 KB (added by schlosna@…, 11 years ago)
  • files/clj-jline.sh

     
    44
    55
    66cljjar='lib/clojure.jar'
    7 cljclass='clojure.lang.Repl'
    8 cljscript='clojure.lang.Script'
     7cljclass='clojure.main'
    98jlineclass='jline.ConsoleRunner'
    109
    1110dir=$0
     
    3635  exec java -classpath $cp $jlineclass $cljclass
    3736else
    3837  scriptname=$1
    39   exec java -classpath $cp $jlineclass $cljscript $scriptname --$*
     38  exec java -classpath $cp $jlineclass $cljclass $scriptname -- $*
    4039fi
  • files/clj.sh

     
    44
    55
    66cljjar='lib/clojure.jar'
    7 cljclass='clojure.lang.Repl'
    8 cljscript='clojure.lang.Script'
     7cljclass='clojure.main'
    98
    109dir=$0
    1110while [ -h "$dir" ]; do
     
    3433  exec java -classpath $cp $cljclass
    3534else
    3635  scriptname=$1
    37   exec java -classpath $cp $cljscript $scriptname --$*
     36  exec java -classpath $cp $cljclass $scriptname -- $*
    3837fi
  • files/clj-rlwrap.sh

     
    55BREAK_CHARS="\(\){}[],^%$#@\"\";:''|\\"
    66
    77cljjar='lib/clojure.jar'
    8 cljclass='clojure.lang.Repl'
    9 cljscript='clojure.lang.Script'
     8cljclass='clojure.main'
    109cljcompletions='.clj_completions'
    1110
    1211dir=$0
     
    3736  rlwrap --remember -c -b $BREAK_CHARS -f $cljcompletions java -cp $cp $cljclass
    3837else
    3938  scriptname=$1
    40   exec java -classpath $cp $cljscript $scriptname --$*
     39  exec java -classpath $cp $cljclass $scriptname -- $*
    4140fi
    4241
  • Portfile

     
    44
    55name                clojure
    66conflicts           clojure-devel
    7 version             1.0.0
    8 epoch               20090504
     7version             1.1.0
     8epoch               20091231
    99revision            1
    1010categories          lang java
    1111maintainers         gmail.com:mdippery
     
    2020distname            clojure_${version}
    2121master_sites        googlecode:clojure
    2222
    23 checksums           md5 e7a50129040df7fe52287006988ecbb2 \
    24                     sha1 fa7c03be9b30e9462b71aead03ea4487c6b9aeac \
    25                     rmd160 cb4533bf24c96613cfa3a1643cafa2b689c32f83
    26 distname            ${name}_${version}
     23checksums           md5 9c9e92f85351721b76f40578f5c1a94a \
     24                    sha1 c253dd52734a008321a1db34439744a6d02587ea \
     25                    rmd160 8cb486181edf2a8e8d9ea061602d396304e503c4
     26distname            ${name}-${version}
    2727use_zip             yes
    2828
    2929use_configure       no
     
    3838}
    3939
    4040destroot {
    41     set javadir ${destroot}${prefix}/share/java
     41    set javadir ${prefix}/share/java
    4242    set clojuredir ${javadir}/clojure
    43     set clojurejar ${clojuredir}/lib/clojure.jar
    44     set clojurebin ${clojuredir}/bin/clj
    45     set clojurelink ${prefix}/share/java/clojure/bin/clj
     43    set clojurelibdir ${clojuredir}/lib
     44    set clojurebindir ${clojuredir}/bin
     45    set clojurebin ${clojurebindir}/clj
    4646    set clojuresh clj.sh
    47     set bindir ${destroot}${prefix}/bin
    4847   
    4948    if {[variant_isset readline]} {
    5049        set clojuresh clj-jline.sh
     
    5453        set clojuresh clj-rlwrap.sh
    5554    }
    5655   
    57     xinstall -m 0755 -d ${javadir}
    58     xinstall -m 0755 -d ${clojuredir}
    59     xinstall -m 0755 -d ${clojuredir}/lib
    60     xinstall -m 0755 -d ${clojuredir}/bin
    61     xinstall -m 0644 -W ${workpath} clojure-${version}.jar ${clojurejar}
    62     xinstall -m 0755 -W ${filespath} ${clojuresh} ${clojurebin}
     56    xinstall -m 0755 -d ${destroot}${javadir}
     57    xinstall -m 0755 -d ${destroot}${clojuredir}
     58    xinstall -m 0755 -d ${destroot}${clojurelibdir}
     59    xinstall -m 0755 -d ${destroot}${clojurebindir}
     60    xinstall -m 0644 -W ${workpath} clojure-${version}/clojure.jar ${destroot}${clojurelibdir}/clojure.jar
     61    xinstall -m 0755 -W ${filespath} ${clojuresh} ${destroot}${clojurebin}
    6362   
    6463    if {[variant_isset rlwrap]} {
    65         xinstall -m 0644 -W ${filespath} .clj_completions  ${clojuredir}/.clj_completions
     64        xinstall -m 0644 -W ${filespath} .clj_completions  ${destroot}${clojuredir}/.clj_completions
    6665    }
    6766   
    68     ln -s ${clojurelink} ${bindir}/clj
     67    ln -s ${clojurebin} ${destroot}${prefix}/bin/clj
    6968}