[84906] trunk/dports/devel/leiningen
and.damore at macports.org
and.damore at macports.org
Tue Oct 4 07:39:08 PDT 2011
Revision: 84906
http://trac.macports.org/changeset/84906
Author: and.damore at macports.org
Date: 2011-10-04 07:39:08 -0700 (Tue, 04 Oct 2011)
Log Message:
-----------
port leiningen update to 1.6.1.1, removed patchfile, maintainer timeout, closes #31453
Modified Paths:
--------------
trunk/dports/devel/leiningen/Portfile
Removed Paths:
-------------
trunk/dports/devel/leiningen/files/patch-bin-lein.diff
Modified: trunk/dports/devel/leiningen/Portfile
===================================================================
--- trunk/dports/devel/leiningen/Portfile 2011-10-04 14:37:44 UTC (rev 84905)
+++ trunk/dports/devel/leiningen/Portfile 2011-10-04 14:39:08 UTC (rev 84906)
@@ -3,23 +3,21 @@
PortSystem 1.0
name leiningen
-version 1.3.1
-revision 0
+version 1.6.1.1
categories devel java
-maintainers gmail.com:ian.eure
+maintainers ieure
platforms darwin
description A build tool for Clojure designed to not set your hair on fire.
long_description ${description}
homepage http://github.com/technomancy/${name}
-master_sites http://download.github.com/
+master_sites https://nodeload.github.com/technomancy/leiningen/tarball
+distfiles ${version}
+worksrcdir technomancy-${name}-0e43e4d
+checksums md5 dbd6ac1df529e1e3b84814b8c44265ed \
+ sha1 0c0a0f5ce680c508b4cc3422ec32904cac16fade \
+ rmd160 513a7a42df88ab0658e3c33115432e74f161a917
-distname technomancy-${name}-${version}-0-g2ea4b63
-worksrcdir technomancy-${name}-2ea4b63
-checksums md5 707fb0da7b89b44d9d37a9bac2bf3b3f \
- sha1 dc8d681f72f325f3b75e8c477bffc2cea52976d8 \
- rmd160 e38ee084d46c09f8b622703e04a9e41acadbf531
-
depends_build port:clojure \
port:clojure-contrib \
port:apache-ant \
@@ -27,9 +25,6 @@
port:maven-ant-tasks
depends_run port:jline
-patchfiles patch-bin-lein.diff
-patch.pre_args -p1
-
post-patch {
copy ${filespath}/build.xml ${worksrcpath}
reinplace "s|__PREFIX__|${prefix}/share/java|" ${worksrcpath}/build.xml
Deleted: trunk/dports/devel/leiningen/files/patch-bin-lein.diff
===================================================================
--- trunk/dports/devel/leiningen/files/patch-bin-lein.diff 2011-10-04 14:37:44 UTC (rev 84905)
+++ trunk/dports/devel/leiningen/files/patch-bin-lein.diff 2011-10-04 14:39:08 UTC (rev 84906)
@@ -1,142 +0,0 @@
-diff --git a/bin/lein b/bin/lein
-index 21eef64..26f655e 100755
---- a/bin/lein
-+++ b/bin/lein
-@@ -1,5 +1,6 @@
- #!/bin/sh
-
-+PREFIX=__PREFIX__
- export LEIN_VERSION="1.3.1"
-
- case $LEIN_VERSION in
-@@ -31,14 +32,15 @@ do
- done
-
- if [ "$LEIN_HOME" = "" ]; then
-- LEIN_HOME="$HOME/.lein"
-+ LEIN_HOME="$PREFIX/share/java/leiningen"
- fi
-
-+CLASSPATH="$(find -H $PREFIX -name \*.jar 2> /dev/null -print0 | tr \\0 \:)"
- LEIN_PLUGINS="$(ls -1 lib/dev/*jar 2> /dev/null | tr \\n \:)"
- LEIN_USER_PLUGINS="$(ls -1 $LEIN_HOME/plugins/*jar 2> /dev/null | tr \\n \:)"
- CLASSPATH=$LEIN_USER_PLUGINS:$LEIN_PLUGINS:src/:$CLASSPATH
- LEIN_JAR="$HOME/.m2/repository/leiningen/leiningen/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.jar"
--CLOJURE_JAR="$HOME/.m2/repository/org/clojure/clojure/1.2.0/clojure-1.2.0.jar"
-+CLOJURE_JAR="$PREFIX/share/java/clojure/lib/clojure.jar"
- NULL_DEVICE=/dev/null
-
- # normalize $0 on certain BSDs
-@@ -87,82 +89,38 @@ fi
-
- JAVA_CMD=${JAVA_CMD:-"java"}
-
--# If you're packaging this for a package manager (.deb, homebrew, etc)
--# you need to remove the self-install and upgrade functionality.
--if [ "$1" = "self-install" ]; then
-- echo "Downloading Leiningen now..."
-- LEIN_DIR=`dirname "$LEIN_JAR"`
-- mkdir -p "$LEIN_DIR"
-- LEIN_URL="http://github.com/downloads/technomancy/leiningen/leiningen-$LEIN_VERSION-standalone.jar"
-- $HTTP_CLIENT "$LEIN_JAR" "$LEIN_URL"
-- if [ $? != 0 ]; then
-- echo "Failed to download $LEIN_URL"
-- if [ $SNAPSHOT = "YES" ]; then
-- echo "See README.md for SNAPSHOT build instructions."
-- fi
-- rm $LEIN_JAR
-- exit 1
-- fi
--elif [ "$1" = "upgrade" ]; then
-- if [ $SNAPSHOT = "YES" ]; then
-- echo "The upgrade task is only meant for stable releases."
-- echo "See the \"Hacking\" section of the README."
-- exit 1
-- fi
-- if [ ! -w "$SCRIPT" ]; then
-- echo "You do not have permission to upgrade the installation in $SCRIPT"
-- exit 1
-- else
-- echo "The script at $SCRIPT will be upgraded to the latest stable version."
-- echo -n "Do you want to continue [Y/n]? "
-- read RESP
-- case "$RESP" in
-- y|Y|"")
-- echo
-- echo "Upgrading..."
-- LEIN_SCRIPT_URL="http://github.com/technomancy/leiningen/raw/stable/bin/lein"
-- $HTTP_CLIENT "$SCRIPT" "$LEIN_SCRIPT_URL" \
-- && chmod +x "$SCRIPT" \
-- && echo && $SCRIPT self-install && echo && echo "Now running" `$SCRIPT version`
-- exit $?;;
-- *)
-- echo "Aborted."
-- exit 1;;
-- esac
-- fi
--else
-- if [ "$OSTYPE" = "cygwin" ]; then
-- # When running on Cygwin, use Windows-style paths for java
-- CLOJURE_JAR=`cygpath -w "$CLOJURE_JAR"`
-- CLASSPATH=`cygpath -wp "$CLASSPATH"`
-- NULL_DEVICE=NUL
-- fi
-+if [ "$OSTYPE" = "cygwin" ]; then
-+ # When running on Cygwin, use Windows-style paths for java
-+ CLOJURE_JAR=`cygpath -w "$CLOJURE_JAR"`
-+ CLASSPATH=`cygpath -wp "$CLASSPATH"`
-+ NULL_DEVICE=NUL
-+fi
-
-- if [ $DEBUG ]; then
-- echo $CLASSPATH
-- echo $CLOJURE_JAR
-- fi
-+if [ $DEBUG ]; then
-+ echo $CLASSPATH
-+ echo $CLOJURE_JAR
-+fi
-
-- if ([ "$1" = "repl" ] || [ "$1" = "interactive" ] || [ "$1" = "int" ]) &&
-- [ -z $INSIDE_EMACS ] && [ "$TERM" != "dumb" ]; then
-- # Use rlwrap if it's available, otherwise fall back to JLine
-- RLWRAP=`which rlwrap`
-- if [ $? -eq 1 ]; then
-- JLINE=jline.ConsoleRunner
-- if [ "$OSTYPE" = "cygwin" ]; then
-- JLINE="-Djline.terminal=jline.UnixTerminal jline.ConsoleRunner"
-- CYGWIN_JLINE=y
-- fi
-+if ([ "$1" = "repl" ] || [ "$1" = "interactive" ] || [ "$1" = "int" ]) &&
-+ [ -z $INSIDE_EMACS ] && [ "$TERM" != "dumb" ]; then
-+ # Use rlwrap if it's available, otherwise fall back to JLine
-+ RLWRAP=`which rlwrap`
-+ if [ $? -eq 1 ]; then
-+ JLINE=jline.ConsoleRunner
-+ if [ "$OSTYPE" = "cygwin" ]; then
-+ JLINE="-Djline.terminal=jline.UnixTerminal jline.ConsoleRunner"
-+ CYGWIN_JLINE=y
- fi
- fi
--
-- # The -Xbootclasspath argument is optional here: if the jar
-- # doesn't exist everything will still work, it will just have a
-- # slower JVM boot.
-- # TODO: add more to the boot classpath
-- test $CYGWIN_JLINE && stty -icanon min 1 -echo
-- exec $RLWRAP $JAVA_CMD -Xbootclasspath/a:"$CLOJURE_JAR" -client $JAVA_OPTS \
-- -cp "$CLASSPATH" $JLINE clojure.main -e "(use 'leiningen.core)(-main)" \
-- $NULL_DEVICE $@
-- test $CYGWIN_JLINE && stty icanon echo
- fi
-+
-+# The -Xbootclasspath argument is optional here: if the jar
-+# doesn't exist everything will still work, it will just have a
-+# slower JVM boot.
-+# TODO: add more to the boot classpath
-+test $CYGWIN_JLINE && stty -icanon min 1 -echo
-+exec $RLWRAP $JAVA_CMD -Xbootclasspath/a:"$CLOJURE_JAR" -client $JAVA_OPTS \
-+ -cp "$CLASSPATH" $JLINE clojure.main -e "(use 'leiningen.core)(-main)" \
-+ $NULL_DEVICE $@
-+test $CYGWIN_JLINE && stty icanon echo
-+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111004/4073be2b/attachment-0001.html>
More information about the macports-changes
mailing list