I updated the port lang/clojure to use the current version 1.4.0 instead of the old 1.2.0. Here is the diff: <---snip---> --- clojure.old/Makefile 2012-06-02 13:10:18.000000000 +0200 +++ clojure/Makefile 2012-06-02 13:27:15.000000000 +0200 @@ -7,11 +7,11 @@ # PORTNAME= clojure -PORTVERSION= 1.2.0 +PORTVERSION= 1.4.0 PORTREVISION= 1 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/1.4.0/ MAINTAINER= peter.schuller@infidyne.com COMMENT= A dynamic programming language for the JVM @@ -24,7 +24,7 @@ OPTIONS= JLINE "Enable jline support for the REPL" on PLIST_FILES= bin/clojure \ - %%JAVAJARDIR%%/clojure-1.2.0.jar + %%JAVAJARDIR%%/clojure-1.4.0.jar .include <bsd.port.pre.mk> @@ -37,6 +37,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-1.4.0.jar ${JAVAJARDIR}/clojure-1.4.0.jar .include <bsd.port.post.mk> diff -naur clojure.old/distinfo clojure/distinfo --- clojure.old/distinfo 2012-06-02 13:10:18.000000000 +0200 +++ clojure/distinfo 2012-06-02 13:18:59.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 -naur clojure.old/files/clojure-bin.in clojure/files/clojure-bin.in --- clojure.old/files/clojure-bin.in 2012-06-02 13:10:18.000000000 +0200 +++ clojure/files/clojure-bin.in 2012-06-02 13:17:01.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-1.4.0.jar:%%JAVAJARDIR%%/swank-clojure-1.4.2.jar:$CLASSPATH" %%CLOJURE_JLINE_RUNNER%% clojure.main "$@" <---snip---> Fix: Patch attached with submission follows:
State Changed From-To: open->feedback Update Synopsis
your attachment did not make it through 'clean'. it seems to be munged (a ports committer can't click on the 'patch' link and download the patch. best they can do is copy/paste, and this leaves strange white space problems) also don't attach a 'shar' on a patch. shars are only for new ports. Please try to attach the patch (a patch created by diff -ruN) so a ports committer can examine and test it. if you cannot figure out how to do this, please ask that this pr be closed, and a new one opened. note: please use the category/portname in the subject line, (lang/clojure) Synopsis so that automated processes can assign the pr to the correct person. -- Michael Scheidell, CTO >*| * SECNAP Network Security Corporation d: +1.561.948.2259 w: http://people.freebsd.org/~scheidell
attachment still didn't make its way to GNATS so I am forwarding it. -------- Original Message -------- Subject: Re: ports/168559: Updated lang/clojure to version 1.4.0 Date: Mon, 4 Jun 2012 06:27:21 +0200 From: Jens Jahnke <jan0sch@gmx.net> To: <scheidell@FreeBSD.org> CC: <freebsd-ports-bugs@FreeBSD.org> Hi, I attached the correct patch to this email. Regards, Jens
On Mon, Jun 04, 2012 at 10:40:13AM +0000, Michael Scheidell wrote: > The following reply was made to PR ports/168559; it has been noted by GNATS. > > From: Michael Scheidell <scheidell@FreeBSD.org> > To: <bug-followup@FreeBSD.org> > Cc: > Subject: Fwd: Re: ports/168559: Updated lang/clojure to version 1.4.0 > Date: Mon, 4 Jun 2012 06:39:15 -0400 > > diff -ruN clojure.old/Makefile clojure/Makefile > --- clojure.old/Makefile 2012-06-04 06:18:16.000000000 +0200 > +++ clojure/Makefile 2012-06-04 06:18:58.000000000 +0200 > @@ -7,11 +7,11 @@ > # > > PORTNAME= clojure > -PORTVERSION= 1.2.0 > +PORTVERSION= 1.4.0 > PORTREVISION= 1 PORTREVISION should be removed. > 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/1.4.0/ It would make sense to embed ${PORTVERSION} here instead of hardcoding 1.4.0 everywhere. > MAINTAINER= peter.schuller@infidyne.com > COMMENT= A dynamic programming language for the JVM > @@ -24,7 +24,7 @@ > OPTIONS= JLINE "Enable jline support for the REPL" on > > PLIST_FILES= bin/clojure \ > - %%JAVAJARDIR%%/clojure-1.2.0.jar > + %%JAVAJARDIR%%/clojure-1.4.0.jar Same comment here. > .include <bsd.port.pre.mk> > > @@ -37,6 +37,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-1.4.0.jar ${JAVAJARDIR}/clojure-1.4.0.jar And again here (all of which would make the next upgrade easier). > .include <bsd.port.post.mk> > diff -ruN clojure.old/distinfo clojure/distinfo > --- clojure.old/distinfo 2012-06-04 06:18:16.000000000 +0200 > +++ clojure/distinfo 2012-06-04 06:18:58.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-04 06:18:16.000000000 +0200 > +++ clojure/files/clojure-bin.in 2012-06-04 06:18:58.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-1.4.0.jar:%%JAVAJARDIR%%/swank-clojure-1.4.2.jar:$CLASSPATH" %%CLOJURE_JLINE_RUNNER%% clojure.main "$@" -- Greg Lewis Email : glewis@eyesbeyond.com Eyes Beyond Web : http://www.eyesbeyond.com Information Technology FreeBSD : glewis@FreeBSD.org
On Mon, Jun 04, 2012 at 06:48:21PM +0200, Jens Jahnke wrote: > Hi, > > I reworked the patch according to the comments. > > Regards, > > Jens Thanks Jens! One final comment below: > 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 "$@" Here it should be %%PORTVERSION%% since ${PORTVERSION} won't be defined. When the port is installed the ports infrastructure will take care of expanding %%PORTVERSION%% to the correct value. -- Greg Lewis Email : glewis@eyesbeyond.com Eyes Beyond Web : http://www.eyesbeyond.com Information Technology FreeBSD : glewis@FreeBSD.org
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.)
Hi, I just didn't test the last patch. I'm sorry. In the clojure-bin.in neither ${PORTVERSION} nor %%PORTVERSION%% did work. Therefore I changed the port to use clojure.jar. Regards, Jens -- 06. Brachet 2012, 19:19 Homepage : http://www.jan0sch.de You may already be a loser. -- Form letter received by Rodney Dangerfield
On Wed, Jun 06, 2012 at 07:21:16PM +0200, Jens Jahnke wrote: > Hi, > > I just didn't test the last patch. I'm sorry. > In the clojure-bin.in neither ${PORTVERSION} nor %%PORTVERSION%% did > work. Therefore I changed the port to use clojure.jar. > > Regards, > > Jens Thanks Jens, I think that's a reasonable thing to do anyway. Looks like I incorrectly recalled PORTVERSION as being automatically added to SUB_LIST. Manually adding it would do the trick as well, but having just clojure.jar makes more sense to me. -- Greg Lewis Email : glewis@eyesbeyond.com Eyes Beyond Web : http://www.eyesbeyond.com Information Technology FreeBSD : glewis@FreeBSD.org
State Changed From-To: feedback->open Requester has responded with an updated patch.
Responsible Changed From-To: freebsd-ports-bugs->glewis I'll take this.
There is a minor problem with the latest patch. PLIST_FILES needs to be updated so it just has "clojure.jar" (since that is where it's now installed) rather than clojure-1.4.0.jar. I've made that change locally. Maintainer (Peter), do you have any objection to this patch being committed? -- Greg Lewis Email : glewis@eyesbeyond.com Eyes Beyond Web : http://www.eyesbeyond.com Information Technology FreeBSD : glewis@FreeBSD.org
> There is a minor problem with the latest patch. =C2=A0PLIST_FILES needs t= o be > updated so it just has "clojure.jar" (since that is where it's now > installed) rather than clojure-1.4.0.jar. > > I've made that change locally. > > Maintainer (Peter), do you have any objection to this patch being > committed? No, but I have not been able to look at it / test it. Feel free to de-maintainer me. Unfortunately I have not had the time to maintain any ports in a while, nor do I have a FreeBSD system to test on anymore. --=20 / Peter Schuller (@scode, http://worldmodscode.wordpress.com)
On Sun, Jun 17, 2012 at 07:30:32PM +0000, Peter Schuller wrote: > No, but I have not been able to look at it / test it. Feel free to > de-maintainer me. Unfortunately I have not had the time to maintain > any ports in a while, nor do I have a FreeBSD system to test on > anymore. Thanks Peter! Jens, do you have any interest in taking over the maintainership? -- Greg Lewis Email : glewis@eyesbeyond.com Eyes Beyond Web : http://www.eyesbeyond.com Information Technology FreeBSD : glewis@FreeBSD.org
On Sun, 17 Jun 2012 13:41:22 -0700 Greg Lewis <glewis@eyesbeyond.com> wrote: GL> On Sun, Jun 17, 2012 at 07:30:32PM +0000, Peter Schuller wrote: GL> > No, but I have not been able to look at it / test it. Feel free GL> > to de-maintainer me. Unfortunately I have not had the time to GL> > maintain any ports in a while, nor do I have a FreeBSD system to GL> > test on anymore. GL> GL> Thanks Peter! GL> GL> Jens, do you have any interest in taking over the maintainership? GL> I'm also short on time but I guess I can maintain the port because the release cycle is not too fast. So count me in. :-) -- 18. Brachet 2012, 18:46 Homepage : http://www.jan0sch.de Better hope you get what you want before you stop wanting it.
glewis 2012-06-19 05:38:12 UTC FreeBSD ports repository Modified files: lang/clojure Makefile distinfo lang/clojure/files clojure-bin.in Log: . Update to 1.4.0. . Switch maintainership to the submitter (with the previous maintainer's permission). PR: 168559 Submitted by: Jens Jahnke <jan0sch@gmx.net> Revision Changes Path 1.14 +5 -6 ports/lang/clojure/Makefile 1.10 +2 -2 ports/lang/clojure/distinfo 1.9 +2 -2 ports/lang/clojure/files/clojure-bin.in _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!