[64045] trunk/dports/devel/leiningen
ieure at macports.org
ieure at macports.org
Sat Feb 20 12:24:27 PST 2010
Revision: 64045
http://trac.macports.org/changeset/64045
Author: ieure at macports.org
Date: 2010-02-20 12:24:26 -0800 (Sat, 20 Feb 2010)
Log Message:
-----------
Update leiningen to 1.0.1, fixes #23012
Modified Paths:
--------------
trunk/dports/devel/leiningen/Portfile
trunk/dports/devel/leiningen/files/patch-bin-lein.diff
Modified: trunk/dports/devel/leiningen/Portfile
===================================================================
--- trunk/dports/devel/leiningen/Portfile 2010-02-20 19:46:43 UTC (rev 64044)
+++ trunk/dports/devel/leiningen/Portfile 2010-02-20 20:24:26 UTC (rev 64045)
@@ -3,7 +3,7 @@
PortSystem 1.0
name leiningen
-version 0.5.0
+version 1.0.1
categories devel java
maintainers gmail.com:ian.eure
platforms darwin
@@ -13,10 +13,10 @@
homepage http://github.com/technomancy/${name}
master_sites http://download.github.com/
-distname technomancy-${name}-f97228f
-checksums md5 9f63981bbcf11272270bdff0747fff2f \
- sha1 e312bbf39e02d9272f6b118addf50f580d9aaa20 \
- rmd160 617285d1941fdc3945112a035512880b59197a5b
+distname technomancy-${name}-fb13db7
+checksums md5 eb287442bb1bcac2de537d00c4d1b1d3 \
+ sha1 ddbd10e24ac2d27ad9e0a92ee1c36e43f629bd58 \
+ rmd160 a1e2c2836753230c0b275cb24eabd22c717f482b
depends_build port:clojure-devel \
port:clojure-contrib-devel \
Modified: trunk/dports/devel/leiningen/files/patch-bin-lein.diff
===================================================================
--- trunk/dports/devel/leiningen/files/patch-bin-lein.diff 2010-02-20 19:46:43 UTC (rev 64044)
+++ trunk/dports/devel/leiningen/files/patch-bin-lein.diff 2010-02-20 20:24:26 UTC (rev 64045)
@@ -1,46 +1,65 @@
-diff --git a/bin/lein b/bin/lein
-index 92546b1..a90c43f 100755
---- a/bin/lein
-+++ b/bin/lein
-@@ -2,23 +2,13 @@
+--- a/bin/lein 2009-12-23 21:04:30.000000000 -0800
++++ b/bin/lein 2009-12-23 21:12:07.000000000 -0800
+@@ -2,9 +2,9 @@
- # TODO: this gives us a trailing colon
- VERSION=0.5.0
--LIBS="$(find -H lib/ -mindepth 2> /dev/null 1 -maxdepth 1 -print0 | tr \\0 \:)"
+ VERSION="1.0.1"
+
+-CLASSPATH="$(find -H lib/ -mindepth 2> /dev/null 1 -maxdepth 1 -print0 | tr \\0 \:)"
+-LEIN_JAR="$HOME/.m2/repository/leiningen/leiningen/$VERSION/leiningen-$VERSION-standalone.jar"
+-CLOJURE_JAR="$HOME/.m2/repository/org/clojure/clojure/1.1.0-master-SNAPSHOT/clojure-1.1.0-master-SNAPSHOT.jar"
+PREFIX=__PREFIX__
-+LIBS="$(find -H $PREFIX -name \*.jar -print0 | tr \\0 \:)"
- CLASSPATH="src/:classes/:$LIBS"
--LEIN_JAR=$HOME/.m2/repository/leiningen/leiningen/$VERSION/leiningen-$VERSION.jar
++CLASSPATH="$(find -H $PREFIX -name \*.jar 2> /dev/null -print0 | tr \\0 \:)"
++CLOJURE_JAR="$PREFIX/local/share/java/clojure/lib/clojure.jar"
- # this needs to exist before the JVM is launched apparently
- mkdir -p classes
+ # normalize $0 on certain BSDs
+ if [ "$(dirname $0)" = "." ]; then
+@@ -26,28 +26,6 @@
--# If we are not running from a checkout
--if [ ! -r "bin/lein" ]; then
+ BIN_DIR="$(dirname "$SCRIPT")"
+
+-if [ -r "$BIN_DIR/../src/leiningen/core.clj" ]; then
+- # Running from source checkout
+- LEIN_DIR="$(dirname "$BIN_DIR")"
+- LEIN_LIBS="$(find -H $LEIN_DIR/lib -mindepth 2> /dev/null 1 -maxdepth 1 -print0 | tr \\0 \:)"
+- CLASSPATH="$LEIN_DIR/src:$LEIN_LIBS:$CLASSPATH"
+-
+- if [ "$LEIN_LIBS" = "" -a "$1" != "self-install" ]; then
+- echo "Your Leiningen development checkout is missing its dependencies."
+- echo "Please download a stable version of Leiningen to fetch the deps."
+- echo "See the \"Hacking\" section of the readme for details."
+- exit 1
+- fi
+-else
+- # Not running from a checkout
+- CLASSPATH="$LEIN_JAR:$CLASSPATH"
+-
- if [ ! -r "$LEIN_JAR" -a "$1" != "self-install" ]; then
- echo "Leiningen is not installed. Please run \"lein self-install\"."
- exit 1
- fi
--
-- CLASSPATH="$CLASSPATH:$LEIN_JAR"
-fi
-
- if [ "$1" = "test" ]; then
- CLASSPATH=test/:$CLASSPATH
+ if [ $DEBUG ]; then
+ echo $CLASSPATH
fi
-@@ -37,15 +27,6 @@ fi
+@@ -60,20 +38,6 @@
+
if [ "$1" = "repl" ]; then
- # If repl used leiningen.core then there'd be no way to bootstrap AOT
- java -cp "$CLASSPATH" clojure.main
+ java -client $JAVA_OPTS -cp "src/:classes/:$CLASSPATH" jline.ConsoleRunner clojure.main ${@:2}
-elif [ "$1" = "self-install" ]; then
+- if [[ $VERSION == *SNAPSHOT ]]; then
+- echo "The self-install task is only meant for stable releases."
+- echo "See the \"Hacking\" section of the README."
+- exit 1
+- fi
- echo "Downloading Leiningen now..."
- mkdir -p `dirname "$LEIN_JAR"`
-- LEIN_URL=http://repo.technomancy.us/leiningen-$VERSION.jar
+- LEIN_URL="http://repo.technomancy.us/leiningen-$VERSION-standalone.jar"
- if type -p curl >/dev/null 2>&1; then
- exec curl -o "$LEIN_JAR" "$LEIN_URL"
- else
- exec wget -O "$LEIN_JAR" "$LEIN_URL"
- fi
else
- if [ -z "$1" ]; then
- echo "$0 missing task"
+ exec java -Xbootclasspath/a:"$CLOJURE_JAR" -client $JAVA_OPTS -cp "$CLASSPATH" -Dleiningen.version="$VERSION" clojure.main -e "(use 'leiningen.core)(-main $ESCAPED_ARGS)"
+ fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100220/60354cfb/attachment-0001.html>
More information about the macports-changes
mailing list