diff options
| -rw-r--r-- | lang/clojure/Makefile | 14 | ||||
| -rw-r--r-- | lang/clojure/files/clojure-bin.in | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/lang/clojure/Makefile b/lang/clojure/Makefile index fe2029c533b1..e74551154e5f 100644 --- a/lang/clojure/Makefile +++ b/lang/clojure/Makefile @@ -8,7 +8,7 @@ PORTNAME= clojure PORTVERSION= 20081217 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang lisp java MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -22,6 +22,16 @@ JAVA_VERSION= 1.5+ NO_WRKSUBDIR= yes NO_BUILD= yes SUB_FILES= clojure-bin +OPTIONS= JLINE "Enable jline support for the REPL" on + +.include <bsd.port.pre.mk> + +.ifdef(WITH_JLINE) +RUN_DEPENDS+= jline>=0.9.91:${PORTSDIR}/devel/jline +CLOJURE_JLINE_RUNNER=jline.ConsoleRunner +.endif + +SUB_LIST+= CLOJURE_JLINE_RUNNER=${CLOJURE_JLINE_RUNNER} do-install: ${INSTALL_SCRIPT} ${WRKDIR}/clojure-bin ${PREFIX}/bin/clojure @@ -29,4 +39,4 @@ do-install: @${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKDIR}/clojure/src/clj/clojure/main.clj ${DATADIR} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/lang/clojure/files/clojure-bin.in b/lang/clojure/files/clojure-bin.in index b48a2dd34ff7..7fd5334dd580 100644 --- a/lang/clojure/files/clojure-bin.in +++ b/lang/clojure/files/clojure-bin.in @@ -4,7 +4,7 @@ if [ -z "$1" ] then - JAVA_VERSION="1.5+" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/clojure.jar:$CLASSPATH" clojure.lang.Repl + JAVA_VERSION="1.5+" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/jline.jar:%%JAVAJARDIR%%/clojure.jar:$CLASSPATH" %%CLOJURE_JLINE_RUNNER%% clojure.lang.Repl else SCRIPT="$1" shift 1 |