diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2010-01-02 14:14:00 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2010-01-02 14:14:00 +0000 |
| commit | 9c136351f29eb15d8c2c4b318b68a6c636e01afd (patch) | |
| tree | e6b261753d9f6d0ccfbc0dec4087e9acf55be5a0 /lang | |
| parent | cc8b16163f3d36ed0d04cfa165b84b9c717e79c1 (diff) | |
| download | ports-9c136351f29eb15d8c2c4b318b68a6c636e01afd.tar.gz ports-9c136351f29eb15d8c2c4b318b68a6c636e01afd.zip | |
Notes
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/clojure/Makefile | 8 | ||||
| -rw-r--r-- | lang/clojure/distinfo | 6 | ||||
| -rw-r--r-- | lang/clojure/files/clojure-bin.in | 10 | ||||
| -rw-r--r-- | lang/clojure/pkg-plist | 2 |
4 files changed, 7 insertions, 19 deletions
diff --git a/lang/clojure/Makefile b/lang/clojure/Makefile index c38956f069b5..c619b3b37dd1 100644 --- a/lang/clojure/Makefile +++ b/lang/clojure/Makefile @@ -7,11 +7,10 @@ # PORTNAME= clojure -PORTVERSION= 1.0.0 +PORTVERSION= 1.1.0 PORTEPOCH= 2 CATEGORIES= lang lisp java MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} -DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= peter.schuller@infidyne.com COMMENT= A dynamic programming language for the JVM @@ -19,7 +18,6 @@ COMMENT= A dynamic programming language for the JVM USE_ZIP= yes USE_JAVA= yes JAVA_VERSION= 1.5+ -NO_WRKSUBDIR= yes NO_BUILD= yes SUB_FILES= clojure-bin OPTIONS= JLINE "Enable jline support for the REPL" on @@ -35,8 +33,6 @@ SUB_LIST+= CLOJURE_JLINE_RUNNER=${CLOJURE_JLINE_RUNNER} do-install: ${INSTALL_SCRIPT} ${WRKDIR}/clojure-bin ${PREFIX}/bin/clojure - ${INSTALL_DATA} ${WRKSRC}/clojure-${PORTVERSION}.jar ${JAVAJARDIR}/clojure.jar - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/src/clj/clojure/main.clj ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/clojure.jar ${JAVAJARDIR}/clojure.jar .include <bsd.port.post.mk> diff --git a/lang/clojure/distinfo b/lang/clojure/distinfo index afd751dd5734..dcaf7ba3e179 100644 --- a/lang/clojure/distinfo +++ b/lang/clojure/distinfo @@ -1,3 +1,3 @@ -MD5 (clojure_1.0.0.zip) = e7a50129040df7fe52287006988ecbb2 -SHA256 (clojure_1.0.0.zip) = 6b06bc53977ee9e263a3edee33364747f5d181e3cfb44971a1a1ddc16a96bdce -SIZE (clojure_1.0.0.zip) = 1733377 +MD5 (clojure-1.1.0.zip) = 9c9e92f85351721b76f40578f5c1a94a +SHA256 (clojure-1.1.0.zip) = 7ce6c86ccabf38ed9893861e38bc4ab4df31570827659f6cef6466116c999118 +SIZE (clojure-1.1.0.zip) = 2135400 diff --git a/lang/clojure/files/clojure-bin.in b/lang/clojure/files/clojure-bin.in index 7fd5334dd580..88f1829f0861 100644 --- a/lang/clojure/files/clojure-bin.in +++ b/lang/clojure/files/clojure-bin.in @@ -2,11 +2,5 @@ # # $FreeBSD$ -if [ -z "$1" ] -then - 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 - JAVA_VERSION="1.5+" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/clojure.jar:$CLASSPATH" clojure.lang.Script "$SCRIPT" -- "$@" -fi +JAVA_VERSION="1.5+" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/jline.jar:%%JAVAJARDIR%%/clojure.jar:$CLASSPATH" %%CLOJURE_JLINE_RUNNER%% clojure.main "$@" + diff --git a/lang/clojure/pkg-plist b/lang/clojure/pkg-plist index c297ff14dcff..fdde9b635d40 100644 --- a/lang/clojure/pkg-plist +++ b/lang/clojure/pkg-plist @@ -1,4 +1,2 @@ bin/clojure %%JAVAJARDIR%%/clojure.jar -%%DATADIR%%/main.clj -@dirrm %%DATADIR%% |