From bc7e18a441b563600240a6ba3d055d33d87509ff Mon Sep 17 00:00:00 2001
From: olgeni <olgeni@FreeBSD.org>
Date: Mon, 30 Aug 2010 11:47:35 +0000
Subject: Upgrade to version 1.2.0.

---
 lang/clojure-contrib/Makefile  | 10 +++++-----
 lang/clojure-contrib/distinfo  |  6 +++---
 lang/clojure-contrib/pkg-plist |  1 -
 3 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 lang/clojure-contrib/pkg-plist

(limited to 'lang')

diff --git a/lang/clojure-contrib/Makefile b/lang/clojure-contrib/Makefile
index 9f7441649b08..ea8f4dd5b8e7 100644
--- a/lang/clojure-contrib/Makefile
+++ b/lang/clojure-contrib/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	clojure-contrib
-PORTVERSION=	1.1.0
+PORTVERSION=	1.2.0
 CATEGORIES=	lang lisp java
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	http://cloud.github.com/downloads/clojure/clojure-contrib/
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Extensions and enhancements to the Clojure libraries
@@ -17,13 +17,13 @@ COMMENT=	Extensions and enhancements to the Clojure libraries
 BUILD_DEPENDS=	${LOCALBASE}/bin/clojure:${PORTSDIR}/lang/clojure
 
 USE_ZIP=	yes
-USE_ANT=	yes
 USE_JAVA=	yes
+NO_BUILD=	yes
 JAVA_VERSION=	1.5+
 
-MAKE_ARGS+=	-Dclojure.jar=${JAVAJARDIR}/clojure.jar
+PLIST_FILES=	%%JAVAJARDIR%%/clojure-contrib-1.2.0.jar
 
 do-install:
-	@${INSTALL_DATA} ${WRKSRC}/clojure-contrib.jar ${JAVAJARDIR}/clojure-contrib.jar
+	@${INSTALL_DATA} ${WRKSRC}/target/clojure-contrib-1.2.0.jar ${JAVAJARDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/clojure-contrib/distinfo b/lang/clojure-contrib/distinfo
index d05ee5f21209..46575d8cb0fb 100644
--- a/lang/clojure-contrib/distinfo
+++ b/lang/clojure-contrib/distinfo
@@ -1,3 +1,3 @@
-MD5 (clojure-contrib-1.1.0.zip) = ffaa8d5ea72abd9547186ec38f37c198
-SHA256 (clojure-contrib-1.1.0.zip) = 0aab7c3f289f1de21b66330b9f148ae28655f05b245896b4d4c5902d1891773f
-SIZE (clojure-contrib-1.1.0.zip) = 3631433
+MD5 (clojure-contrib-1.2.0.zip) = 83cc86fd2929ca417a9ab9f2a0dedadb
+SHA256 (clojure-contrib-1.2.0.zip) = edc370d90d19f46e1e4b974f99418bf90809471e7baf0ef8d78189d0d2415447
+SIZE (clojure-contrib-1.2.0.zip) = 884268
diff --git a/lang/clojure-contrib/pkg-plist b/lang/clojure-contrib/pkg-plist
deleted file mode 100644
index 8e9739fcfe30..000000000000
--- a/lang/clojure-contrib/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%JAVAJARDIR%%/clojure-contrib.jar
-- 
cgit