summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/swank-clojure/Makefile18
-rw-r--r--devel/swank-clojure/distinfo6
-rw-r--r--lang/clojure-contrib/Makefile10
-rw-r--r--lang/clojure-contrib/distinfo6
-rw-r--r--lang/clojure-contrib/pkg-plist1
5 files changed, 21 insertions, 20 deletions
diff --git a/devel/swank-clojure/Makefile b/devel/swank-clojure/Makefile
index 6702c203a308..70143bc594af 100644
--- a/devel/swank-clojure/Makefile
+++ b/devel/swank-clojure/Makefile
@@ -6,24 +6,26 @@
#
PORTNAME= swank-clojure
-PORTVERSION= 1.1.0
+PORTVERSION= 1.2.0
CATEGORIES= devel lisp java
-MASTER_SITES= http://repo.technomancy.us/
-EXTRACT_SUFX= .jar
-EXTRACT_ONLY=
+MASTER_SITES= http://download.github.com/
+DISTFILES= technomancy-${DISTNAME}-0-ga0c9a2c.zip
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Swank/SLIME support for Clojure
USE_JAVA= yes
+USE_ZIP= yes
JAVA_VERSION= 1.5+
-NO_BUILD= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}/technomancy-swank-clojure-a0c9a2c
-PLIST_FILES= %%JAVAJARDIR%%/swank-clojure.jar
+PLIST_FILES= %%JAVAJARDIR%%/swank-clojure-1.2.0.jar
+
+do-build:
+ @cd ${WRKSRC} && ${JAR} cf ${PORTNAME}-${PORTVERSION}.jar -C src swank
do-install:
- @${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${JAVAJARDIR}/swank-clojure.jar
+ @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${JAVAJARDIR}
.include <bsd.port.mk>
diff --git a/devel/swank-clojure/distinfo b/devel/swank-clojure/distinfo
index a99b065e3ca6..ce64b742de1b 100644
--- a/devel/swank-clojure/distinfo
+++ b/devel/swank-clojure/distinfo
@@ -1,3 +1,3 @@
-MD5 (swank-clojure-1.1.0.jar) = 41a73429e976229fcded8baa011f0924
-SHA256 (swank-clojure-1.1.0.jar) = efce07cdaecc4dfa09546ff5862afaf1ff5202ed035193fcebca22bfb2398021
-SIZE (swank-clojure-1.1.0.jar) = 37290
+MD5 (technomancy-swank-clojure-1.2.0-0-ga0c9a2c.zip) = aeb1bc850f5b7c18b2fd435d5fa7ef46
+SHA256 (technomancy-swank-clojure-1.2.0-0-ga0c9a2c.zip) = 23015416c570cc16c082d649461ef335d0311b78bf30684a3f530a315276ec63
+SIZE (technomancy-swank-clojure-1.2.0-0-ga0c9a2c.zip) = 63529
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