aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authorrafan <rafan@FreeBSD.org>2009-01-23 17:15:23 +0800
committerrafan <rafan@FreeBSD.org>2009-01-23 17:15:23 +0800
commit7bfc4a365ac005a6ddda602ec36897985dca3902 (patch)
tree264ec5cff79f93839cc6d2396e8956560bd0dbb6 /lang
parent6f68f7f8cd0364e913492c5bde567308b4696f60 (diff)
downloadfreebsd-ports-gnome-7bfc4a365ac005a6ddda602ec36897985dca3902.tar.gz
freebsd-ports-gnome-7bfc4a365ac005a6ddda602ec36897985dca3902.tar.zst
freebsd-ports-gnome-7bfc4a365ac005a6ddda602ec36897985dca3902.zip
- Add support of jline, enabled by default
- Bump PORTREVISION PR: ports/130579 Submitted by: Peter Schuller <peter.schuller at infidyne.com> (maintainer)
Diffstat (limited to 'lang')
-rw-r--r--lang/clojure/Makefile14
-rw-r--r--lang/clojure/files/clojure-bin.in2
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