From root@prometheus.scode.org  Wed Oct 15 21:21:51 2008
Return-Path: <root@prometheus.scode.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 71282106568B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 15 Oct 2008 21:21:51 +0000 (UTC)
	(envelope-from root@prometheus.scode.org)
Received: from proxy1.bredband.net (proxy1.bredband.net [195.54.101.71])
	by mx1.freebsd.org (Postfix) with ESMTP id 3159E8FC17
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 15 Oct 2008 21:21:50 +0000 (UTC)
	(envelope-from root@prometheus.scode.org)
Received: from ironport2.bredband.com (195.54.101.122) by proxy1.bredband.net (7.3.127)
        id 48DC49FD005D454E for FreeBSD-gnats-submit@freebsd.org; Wed, 15 Oct 2008 23:21:49 +0200
Received: from c-1216e555.03-51-73746f3.cust.bredbandsbolaget.se (HELO prometheus.scode.org) ([85.229.22.18])
  by ironport2.bredband.com with ESMTP; 15 Oct 2008 23:21:49 +0200
Received: by prometheus.scode.org (Postfix, from userid 0)
	id 79FCBAFF21; Wed, 15 Oct 2008 23:22:17 +0200 (CEST)
Message-Id: <20081015212217.79FCBAFF21@prometheus.scode.org>
Date: Wed, 15 Oct 2008 23:22:17 +0200 (CEST)
From: peter.schuller@infidyne.com
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] lang/clojure: update to 20080916
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         128131
>Category:       ports
>Synopsis:       [PATCH] lang/clojure: update to 20080916
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 15 21:30:02 UTC 2008
>Closed-Date:    Sat Oct 18 21:38:50 UTC 2008
>Last-Modified:  Sat Oct 18 21:40:01 UTC 2008
>Originator:     peter.schuller@infidyne.com
>Release:        FreeBSD 7.0-RELEASE-p4 amd64
>Organization:
>Environment:
System: FreeBSD prometheus.scode.org 7.0-RELEASE-p4 FreeBSD 7.0-RELEASE-p4 #2: Thu Sep 25 20:45:07 CEST 2008
>Description:
- Update to 20080916
- Fix and/or improve handling of invocation of clojure as an
  interpreter.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- clojure-20080916.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/lang/clojure.orig/Makefile /usr/ports/lang/clojure/Makefile
--- /usr/ports/lang/clojure.orig/Makefile	2008-07-06 17:56:59.000000000 +0200
+++ /usr/ports/lang/clojure/Makefile	2008-10-15 23:00:58.735252943 +0200
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	clojure
-PORTVERSION=	20080612
+PORTVERSION=	20080916
 CATEGORIES=	lang lisp java
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -26,6 +26,6 @@
 	${INSTALL_SCRIPT} ${WRKDIR}/clojure ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/clojure.jar ${JAVAJARDIR}
 	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/src/boot.clj ${DATADIR}
+	${INSTALL_DATA} ${WRKDIR}/src/clj/clojure/boot.clj ${DATADIR}
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/lang/clojure.orig/distinfo /usr/ports/lang/clojure/distinfo
--- /usr/ports/lang/clojure.orig/distinfo	2008-07-06 17:56:59.000000000 +0200
+++ /usr/ports/lang/clojure/distinfo	2008-10-15 22:57:05.810464457 +0200
@@ -1,3 +1,3 @@
-MD5 (clojure_20080612.zip) = 3bc6d59a12331875fa69281760be60d7
-SHA256 (clojure_20080612.zip) = 82a126241d47a547824135c7a963cb8038fdb157e76163fd4345fd36a94a4379
-SIZE (clojure_20080612.zip) = 727073
+MD5 (clojure_20080916.zip) = 289c08f9c8cab51615623704b65048cf
+SHA256 (clojure_20080916.zip) = 68a2b2b5d990b7e36045f0b6f8ff1c9e83a24ceb5056bada2b124efc10caaf77
+SIZE (clojure_20080916.zip) = 771075
diff -ruN --exclude=CVS /usr/ports/lang/clojure.orig/files/clojure.in /usr/ports/lang/clojure/files/clojure.in
--- /usr/ports/lang/clojure.orig/files/clojure.in	2008-07-06 17:56:59.000000000 +0200
+++ /usr/ports/lang/clojure/files/clojure.in	2008-10-15 23:19:43.216226642 +0200
@@ -2,9 +2,11 @@
 #
 # $FreeBSD: ports/lang/clojure/files/clojure.in,v 1.2 2008/07/06 15:56:59 ijliao Exp $
 
-if [ -z "$@" ]
+if [ -z "$1" ]
 then
     JAVA_VERSION="1.5+" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/clojure.jar" clojure.lang.Repl
 else
-    JAVA_VERSION="1.5+" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/clojure.jar" clojure.lang.Script "$@"
+    SCRIPT="$1"
+    shift 1
+    JAVA_VERSION="1.5+" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/clojure.jar" clojure.lang.Script "$SCRIPT" -- "$@"
 fi
--- clojure-20080916.patch ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Fri Oct 17 19:44:14 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128131 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Oct 18 21:38:49 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128131 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/128131: commit references a PR
Date: Sat, 18 Oct 2008 21:38:23 +0000 (UTC)

 miwi        2008-10-18 21:38:07 UTC
 
   FreeBSD ports repository
 
   Modified files:
     lang/clojure         Makefile distinfo 
     lang/clojure/files   clojure.in 
   Log:
   - Update to 20080916
   
   PR:             128131
   Submitted by:   peter.schuller@infidyne.com
   
   Revision  Changes    Path
   1.4       +2 -2      ports/lang/clojure/Makefile
   1.3       +3 -3      ports/lang/clojure/distinfo
   1.3       +5 -3      ports/lang/clojure/files/clojure.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"
 
>Unformatted:
