[62262] trunk/dports/lang/clojure

[macsforever2000 at macports.org]

Revision: 62262
          http://trac.macports.org/changeset/62262
Author:   macsforever2000 at macports.org
Date:     2010-01-02 11:08:16 -0800 (Sat, 02 Jan 2010)
Log Message:
-----------
Update to version 1.1. (#23081)

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

Modified: trunk/dports/lang/clojure/Portfile
===================================================================
--- trunk/dports/lang/clojure/Portfile	2010-01-02 19:03:38 UTC (rev 62261)
+++ trunk/dports/lang/clojure/Portfile	2010-01-02 19:08:16 UTC (rev 62262)
@@ -4,9 +4,8 @@
 
 name                clojure
 conflicts           clojure-devel
-version             1.0.0
-epoch               20090504
-revision            1
+version             1.1.0
+epoch               20091231
 categories          lang java
 maintainers         gmail.com:mdippery
 description         The Clojure programming language
@@ -20,10 +19,10 @@
 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,13 +37,12 @@
 }
 
 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,16 +52,16 @@
         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
 }

Modified: trunk/dports/lang/clojure/files/clj-jline.sh
===================================================================
--- trunk/dports/lang/clojure/files/clj-jline.sh	2010-01-02 19:03:38 UTC (rev 62261)
+++ trunk/dports/lang/clojure/files/clj-jline.sh	2010-01-02 19:08:16 UTC (rev 62262)
@@ -4,8 +4,7 @@
 
 
 cljjar='lib/clojure.jar'
-cljclass='clojure.lang.Repl'
-cljscript='clojure.lang.Script'
+cljclass='clojure.main'
 jlineclass='jline.ConsoleRunner'
 
 dir=$0
@@ -36,5 +35,5 @@
   exec java -classpath $cp $jlineclass $cljclass
 else
   scriptname=$1
-  exec java -classpath $cp $jlineclass $cljscript $scriptname --$*
+  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-01-02 19:03:38 UTC (rev 62261)
+++ trunk/dports/lang/clojure/files/clj-rlwrap.sh	2010-01-02 19:08:16 UTC (rev 62262)
@@ -5,8 +5,7 @@
 BREAK_CHARS="\(\){}[],^%$#@\"\";:''|\\"
 
 cljjar='lib/clojure.jar'
-cljclass='clojure.lang.Repl'
-cljscript='clojure.lang.Script'
+cljclass='clojure.main'
 cljcompletions='.clj_completions'
 
 dir=$0
@@ -37,6 +36,6 @@
   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
 

Modified: trunk/dports/lang/clojure/files/clj.sh
===================================================================
--- trunk/dports/lang/clojure/files/clj.sh	2010-01-02 19:03:38 UTC (rev 62261)
+++ trunk/dports/lang/clojure/files/clj.sh	2010-01-02 19:08:16 UTC (rev 62262)
@@ -4,8 +4,7 @@
 
 
 cljjar='lib/clojure.jar'
-cljclass='clojure.lang.Repl'
-cljscript='clojure.lang.Script'
+cljclass='clojure.main'
 
 dir=$0
 while [ -h "$dir" ]; do
@@ -34,5 +33,5 @@
   exec java -classpath $cp $cljclass
 else
   scriptname=$1
-  exec java -classpath $cp $cljscript $scriptname --$*
+  exec java -classpath $cp $cljclass $scriptname -- $*
 fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100102/f6cfee49/attachment.html>