Ticket #23081: clojure-1.1.0.patch

files/clj-jline.sh

@@ -4 +4 @@
 
 
 cljjar='lib/clojure.jar'
-cljclass='clojure.lang.Repl'
-cljscript='clojure.lang.Script'
+cljclass='clojure.main'
 jlineclass='jline.ConsoleRunner'
 
 dir=$0
@@ -36 +35 @@
   exec java -classpath $cp $jlineclass $cljclass
 else
   scriptname=$1
-  exec java -classpath $cp $jlineclass $cljscript $scriptname --$*
+  exec java -classpath $cp $jlineclass $cljclass $scriptname -- $*
 fi

files/clj.sh

@@ -4 +4 @@
 
 
 cljjar='lib/clojure.jar'
-cljclass='clojure.lang.Repl'
-cljscript='clojure.lang.Script'
+cljclass='clojure.main'
 
 dir=$0
 while [ -h "$dir" ]; do
@@ -34 +33 @@
   exec java -classpath $cp $cljclass
 else
   scriptname=$1
-  exec java -classpath $cp $cljscript $scriptname --$*
+  exec java -classpath $cp $cljclass $scriptname -- $*
 fi

files/clj-rlwrap.sh

@@ -5 +5 @@
 BREAK_CHARS="\(\){}[],^%$#@\"\";:''|\\"
 
 cljjar='lib/clojure.jar'
-cljclass='clojure.lang.Repl'
-cljscript='clojure.lang.Script'
+cljclass='clojure.main'
 cljcompletions='.clj_completions'
 
 dir=$0
@@ -37 +36 @@
   rlwrap --remember -c -b $BREAK_CHARS -f $cljcompletions java -cp $cp $cljclass
 else
   scriptname=$1
-  exec java -classpath $cp $cljscript $scriptname --$*
+  exec java -classpath $cp $cljclass $scriptname -- $*
 fi
 

Portfile

@@ -4 +4 @@
 
 name                clojure
 conflicts           clojure-devel
-version             1.0.0
-epoch               20090504
+version             1.1.0
+epoch               20091231
 revision            1
 categories          lang java
 maintainers         gmail.com:mdippery
@@ -20 +20 @@
 distname            clojure_${version}
 master_sites        googlecode:clojure
 
-checksums           md5 e7a50129040df7fe52287006988ecbb2 \
-                    sha1 fa7c03be9b30e9462b71aead03ea4487c6b9aeac \
-                    rmd160 cb4533bf24c96613cfa3a1643cafa2b689c32f83
-distname            ${name}_${version}
+checksums           md5 9c9e92f85351721b76f40578f5c1a94a \
+                    sha1 c253dd52734a008321a1db34439744a6d02587ea \
+                    rmd160 8cb486181edf2a8e8d9ea061602d396304e503c4
+distname            ${name}-${version}
 use_zip             yes
 
 use_configure       no
@@ -38 +38 @@
 }
 
 destroot {
-    set javadir ${destroot}${prefix}/share/java
+    set javadir ${prefix}/share/java
     set clojuredir ${javadir}/clojure
-    set clojurejar ${clojuredir}/lib/clojure.jar
-    set clojurebin ${clojuredir}/bin/clj
-    set clojurelink ${prefix}/share/java/clojure/bin/clj
+    set clojurelibdir ${clojuredir}/lib
+    set clojurebindir ${clojuredir}/bin
+    set clojurebin ${clojurebindir}/clj
     set clojuresh clj.sh
-    set bindir ${destroot}${prefix}/bin
     
     if {[variant_isset readline]} {
         set clojuresh clj-jline.sh
@@ -54 +53 @@
         set clojuresh clj-rlwrap.sh
     }
     
-    xinstall -m 0755 -d ${javadir}
-    xinstall -m 0755 -d ${clojuredir}
-    xinstall -m 0755 -d ${clojuredir}/lib
-    xinstall -m 0755 -d ${clojuredir}/bin
-    xinstall -m 0644 -W ${workpath} clojure-${version}.jar ${clojurejar}
-    xinstall -m 0755 -W ${filespath} ${clojuresh} ${clojurebin}
+    xinstall -m 0755 -d ${destroot}${javadir}
+    xinstall -m 0755 -d ${destroot}${clojuredir}
+    xinstall -m 0755 -d ${destroot}${clojurelibdir}
+    xinstall -m 0755 -d ${destroot}${clojurebindir}
+    xinstall -m 0644 -W ${workpath} clojure-${version}/clojure.jar ${destroot}${clojurelibdir}/clojure.jar
+    xinstall -m 0755 -W ${filespath} ${clojuresh} ${destroot}${clojurebin}
     
     if {[variant_isset rlwrap]} {
-        xinstall -m 0644 -W ${filespath} .clj_completions  ${clojuredir}/.clj_completions
+        xinstall -m 0644 -W ${filespath} .clj_completions  ${destroot}${clojuredir}/.clj_completions
     }
     
-    ln -s ${clojurelink} ${bindir}/clj
+    ln -s ${clojurebin} ${destroot}${prefix}/bin/clj
 }