Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Jun 2012 18:48:21 +0200
From:      Jens Jahnke <jan0sch@gmx.net>
To:        scheidell@FreeBSD.org
Cc:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/168559: Updated lang/clojure to version 1.4.0
Message-ID:  <20120604184821.65cdb089.jan0sch@gmx.net>
In-Reply-To: <201206032153.q53LrFon077891@freefall.freebsd.org>
References:  <201206032153.q53LrFon077891@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.

--Multipart=_Mon__4_Jun_2012_18_48_21_+0200_eIhJS9xeUvxusBd1
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

Hi,

I reworked the patch according to the comments.

Regards,

Jens

--Multipart=_Mon__4_Jun_2012_18_48_21_+0200_eIhJS9xeUvxusBd1
Content-Type: text/plain;
 name="clojure-port-patch.txt"
Content-Disposition: attachment;
 filename="clojure-port-patch.txt"
Content-Transfer-Encoding: 7bit

diff -ruN clojure.old/Makefile clojure/Makefile
--- clojure.old/Makefile	2012-06-04 18:37:17.000000000 +0200
+++ clojure/Makefile	2012-06-04 18:39:15.000000000 +0200
@@ -7,11 +7,10 @@
 #
 
 PORTNAME=	clojure
-PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTVERSION=	1.4.0
 PORTEPOCH=	2
 CATEGORIES=	lang lisp java
-MASTER_SITES=	http://cloud.github.com/downloads/clojure/clojure/
+MASTER_SITES=	http://repo1.maven.org/maven2/org/clojure/clojure/${PORTVERSION}/
 
 MAINTAINER=	peter.schuller@infidyne.com
 COMMENT=	A dynamic programming language for the JVM
@@ -24,7 +23,7 @@
 OPTIONS=	JLINE "Enable jline support for the REPL" on
 
 PLIST_FILES=	bin/clojure \
-		%%JAVAJARDIR%%/clojure-1.2.0.jar
+		%%JAVAJARDIR%%/clojure-${PORTVERSION}.jar
 
 .include <bsd.port.pre.mk>
 
@@ -37,6 +36,6 @@
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/clojure-bin ${PREFIX}/bin/clojure
-	@${INSTALL_DATA} ${WRKSRC}/clojure.jar ${JAVAJARDIR}/clojure-1.2.0.jar
+	@${INSTALL_DATA} ${WRKSRC}/clojure.jar ${JAVAJARDIR}/clojure-${PORTVERSION}.jar
 
 .include <bsd.port.post.mk>
diff -ruN clojure.old/files/clojure-bin.in clojure/files/clojure-bin.in
--- clojure.old/files/clojure-bin.in	2012-06-04 18:37:17.000000000 +0200
+++ clojure/files/clojure-bin.in	2012-06-04 18:40:02.000000000 +0200
@@ -2,4 +2,4 @@
 #
 # $FreeBSD: ports/lang/clojure/files/clojure-bin.in,v 1.8 2011/07/21 05:02:48 linimon Exp $
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/jline.jar:%%JAVAJARDIR%%/clojure-1.2.0.jar:%%JAVAJARDIR%%/clojure-contrib-1.2.0.jar:%%JAVAJARDIR%%/swank-clojure-1.2.1.jar:$CLASSPATH" %%CLOJURE_JLINE_RUNNER%% clojure.main "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/jline.jar:%%JAVAJARDIR%%/clojure-${PORTVERSION}.jar:%%JAVAJARDIR%%/swank-clojure-1.4.2.jar:$CLASSPATH" %%CLOJURE_JLINE_RUNNER%% clojure.main "$@"

--Multipart=_Mon__4_Jun_2012_18_48_21_+0200_eIhJS9xeUvxusBd1--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120604184821.65cdb089.jan0sch>