Date: Tue, 5 Jun 2012 21:41:59 +0200 From: Jens Jahnke <jan0sch@gmx.net> To: Greg Lewis <glewis@eyesbeyond.com> Cc: scheidell@freebsd.org, bug-followup@freebsd.org, freebsd-ports-bugs@freebsd.org Subject: Re: ports/168559: Updated lang/clojure to version 1.4.0 Message-ID: <20120605214159.4bd48936.jan0sch@gmx.net> In-Reply-To: <20120605155632.GA9796@misty.eyesbeyond.com> References: <201206032153.q53LrFon077891@freefall.freebsd.org> <20120604184821.65cdb089.jan0sch@gmx.net> <20120605155632.GA9796@misty.eyesbeyond.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--Multipart=_Tue__5_Jun_2012_21_41_59_+0200_cPtTicxo9DUyQLof
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Hi,
On Tue, 5 Jun 2012 08:56:32 -0700
Greg Lewis <glewis@eyesbeyond.com> wrote:
GL> Here it should be %%PORTVERSION%% since ${PORTVERSION} won't be
GL> defined. When the port is installed the ports infrastructure will
GL> take care of expanding %%PORTVERSION%% to the correct value.
okay, done. :-)
Greetings,
Jens
--
05. Brachet 2012, 21:41
Homepage : http://www.jan0sch.de
Truth will be out this morning. (Which may really mess things up.)
--Multipart=_Tue__5_Jun_2012_21_41_59_+0200_cPtTicxo9DUyQLof
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-05 21:35:52.000000000 +0200
+++ clojure/Makefile 2012-06-05 21:36:09.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/distinfo clojure/distinfo
--- clojure.old/distinfo 2012-06-05 21:35:52.000000000 +0200
+++ clojure/distinfo 2012-06-05 21:40:30.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (clojure-1.2.0.zip) = 1334773cb13793bdc0588de0fe5b5aec602bb98ca84858d7374b4e063864d207
-SIZE (clojure-1.2.0.zip) = 3586231
+SHA256 (clojure-1.4.0.zip) = 27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171
+SIZE (clojure-1.4.0.zip) = 4553941
diff -ruN clojure.old/files/clojure-bin.in clojure/files/clojure-bin.in
--- clojure.old/files/clojure-bin.in 2012-06-05 21:35:52.000000000 +0200
+++ clojure/files/clojure-bin.in 2012-06-05 21:37:25.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=_Tue__5_Jun_2012_21_41_59_+0200_cPtTicxo9DUyQLof--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120605214159.4bd48936.jan0sch>