From 0d8d008967a20bc3fed87067b2bac43af5c8d414 Mon Sep 17 00:00:00 2001
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Mon, 30 Aug 2010 11:27:36 +0000
Subject: Upgrade to version 1.2.0.

PR:		ports/149833
Submitted by:	olgeni
Approved by:	maintainer
---
 lang/clojure/Makefile             | 12 +++++++-----
 lang/clojure/distinfo             |  6 +++---
 lang/clojure/files/clojure-bin.in |  2 +-
 lang/clojure/pkg-plist            |  2 --
 4 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 lang/clojure/pkg-plist

diff --git a/lang/clojure/Makefile b/lang/clojure/Makefile
index 26f1b63f4558..10fadbbdbe30 100644
--- a/lang/clojure/Makefile
+++ b/lang/clojure/Makefile
@@ -7,11 +7,10 @@
 #
 
 PORTNAME=	clojure
-PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 PORTEPOCH=	2
 CATEGORIES=	lang lisp java
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	http://cloud.github.com/downloads/clojure/clojure/
 
 MAINTAINER=	peter.schuller@infidyne.com
 COMMENT=	A dynamic programming language for the JVM
@@ -23,6 +22,9 @@ NO_BUILD=	yes
 SUB_FILES=	clojure-bin
 OPTIONS=	JLINE "Enable jline support for the REPL" on
 
+PLIST_FILES=	bin/clojure \
+		%%JAVAJARDIR%%/clojure-1.2.0.jar
+
 .include <bsd.port.pre.mk>
 
 .ifdef(WITH_JLINE)
@@ -33,7 +35,7 @@ CLOJURE_JLINE_RUNNER=jline.ConsoleRunner
 SUB_LIST+=	CLOJURE_JLINE_RUNNER=${CLOJURE_JLINE_RUNNER}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/clojure-bin ${PREFIX}/bin/clojure
-	${INSTALL_DATA} ${WRKSRC}/clojure.jar ${JAVAJARDIR}/clojure.jar
+	@${INSTALL_SCRIPT} ${WRKDIR}/clojure-bin ${PREFIX}/bin/clojure
+	@${INSTALL_DATA} ${WRKSRC}/clojure.jar ${JAVAJARDIR}/clojure-1.2.0.jar
 
 .include <bsd.port.post.mk>
diff --git a/lang/clojure/distinfo b/lang/clojure/distinfo
index dcaf7ba3e179..4a7d270bb465 100644
--- a/lang/clojure/distinfo
+++ b/lang/clojure/distinfo
@@ -1,3 +1,3 @@
-MD5 (clojure-1.1.0.zip) = 9c9e92f85351721b76f40578f5c1a94a
-SHA256 (clojure-1.1.0.zip) = 7ce6c86ccabf38ed9893861e38bc4ab4df31570827659f6cef6466116c999118
-SIZE (clojure-1.1.0.zip) = 2135400
+MD5 (clojure-1.2.0.zip) = da0cc71378f56491d6ee70dee356831f
+SHA256 (clojure-1.2.0.zip) = 1334773cb13793bdc0588de0fe5b5aec602bb98ca84858d7374b4e063864d207
+SIZE (clojure-1.2.0.zip) = 3586231
diff --git a/lang/clojure/files/clojure-bin.in b/lang/clojure/files/clojure-bin.in
index 43464b2c92d0..729ff8580393 100644
--- a/lang/clojure/files/clojure-bin.in
+++ b/lang/clojure/files/clojure-bin.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="1.5+" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/jline.jar:%%JAVAJARDIR%%/clojure.jar:%%JAVAJARDIR%%/clojure-contrib.jar:%%JAVAJARDIR%%/swank-clojure.jar:$CLASSPATH" %%CLOJURE_JLINE_RUNNER%% clojure.main "$@"
+JAVA_VERSION="1.5+" "%%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.0.jar:$CLASSPATH" %%CLOJURE_JLINE_RUNNER%% clojure.main "$@"
diff --git a/lang/clojure/pkg-plist b/lang/clojure/pkg-plist
deleted file mode 100644
index fdde9b635d40..000000000000
--- a/lang/clojure/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/clojure
-%%JAVAJARDIR%%/clojure.jar
-- 
cgit v1.2.3