ports/142208: [MAINTAINER] lang/clojure: update to 1.1.0

[Peter Schuller]

>Number:         142208
>Category:       ports
>Synopsis:       [MAINTAINER] lang/clojure: update to 1.1.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 31 23:10:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     peter.schuller at infidyne.com
>Release:        FreeBSD 8.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD prometheus.scode.org 8.0-RELEASE FreeBSD 8.0-RELEASE #0: Sat Nov 21 15:02:08 UTC 2009
>Description:
- Update to 1.1.0
- Clojure 'main' invocation slightly changed upstream; our wrapper no longer
  needs to differentiate between the script and repl cases.
- Distfile now unpacks with subdir.

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

--- clojure-1.1.0,2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/lang/clojure.orig/Makefile /usr/ports/lang/clojure/Makefile
--- /usr/ports/lang/clojure.orig/Makefile	2009-05-10 20:31:47.000000000 +0200
+++ /usr/ports/lang/clojure/Makefile	2009-12-31 23:57:12.828798505 +0100
@@ -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 at infidyne.com
 COMMENT=	A dynamic programming language for the JVM
@@ -19,7 +18,6 @@
 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 @@
 
 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 -ruN --exclude=CVS /usr/ports/lang/clojure.orig/distinfo /usr/ports/lang/clojure/distinfo
--- /usr/ports/lang/clojure.orig/distinfo	2009-05-10 20:31:47.000000000 +0200
+++ /usr/ports/lang/clojure/distinfo	2009-12-31 23:50:20.737036629 +0100
@@ -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 -ruN --exclude=CVS /usr/ports/lang/clojure.orig/files/clojure-bin.in /usr/ports/lang/clojure/files/clojure-bin.in
--- /usr/ports/lang/clojure.orig/files/clojure-bin.in	2009-01-23 10:15:23.000000000 +0100
+++ /usr/ports/lang/clojure/files/clojure-bin.in	2009-12-31 23:53:43.220413388 +0100
@@ -2,11 +2,5 @@
 #
 # $FreeBSD: ports/lang/clojure/files/clojure-bin.in,v 1.3 2009/01/23 09:15:23 rafan Exp $
 
-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 -ruN --exclude=CVS /usr/ports/lang/clojure.orig/pkg-plist /usr/ports/lang/clojure/pkg-plist
--- /usr/ports/lang/clojure.orig/pkg-plist	2008-12-23 21:31:41.000000000 +0100
+++ /usr/ports/lang/clojure/pkg-plist	2009-12-31 23:55:54.519999565 +0100
@@ -1,4 +1,2 @@
 bin/clojure
 %%JAVAJARDIR%%/clojure.jar
-%%DATADIR%%/main.clj
- at dirrm %%DATADIR%%
--- clojure-1.1.0,2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: