- Update to 0.24.0

PR:		ports/154258
Submitted by:	Wen Heping (myself)
Approved by:	maintainer(timeout, >3 weeks)

4 files changed, 10 insertions, 69 deletions

diff --git a/lang/abcl/Makefile b/lang/abcl/Makefile
index 0eac452412e0..a78d737e86af 100644
--- a/lang/abcl/Makefile
+++ b/lang/abcl/Makefile
@@ -6,73 +6,21 @@
 #
 
 PORTNAME=	abcl
-DISTVERSION=	0.0.10
-PORTREVISION=	3
+PORTVERSION=	0.24.0
 CATEGORIES=	lang lisp java
-MASTER_SITES=	http://armedbear.org/
+MASTER_SITES=	http://common-lisp.net/project/armedbear/releases/${PORTVERSION}/
+DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	fischer.frank@gmail.com
 COMMENT=	An implementation of ANSI Common Lisp in Java
 
-SUB_FILES=	abcl
-SUB_LIST=	JAVA=${JAVA} ABCL_JAR=${JAVAJARDIR}/abcl.jar
+PLIST_FILES=	share/java/classes/abcl.jar
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
-USE_LDCONFIG=	yes
-
-do-build: ${WRKSRC}/abcl-src.jar ${WRKSRC}/libabcl.so
+JAVA_VERSION=	1.5
+USE_ANT=	yes
 
 do-install:
-	@${INSTALL_SCRIPT} -v ${WRKDIR}/abcl ${PREFIX}/bin
-	@${INSTALL_DATA} -v ${WRKSRC}/abcl.jar ${JAVAJARDIR}
-	@${INSTALL_DATA} -v ${WRKSRC}/abcl-src.jar ${JAVAJARDIR}
-	@${INSTALL_DATA} -v ${WRKSRC}/libabcl.so ${LOCALBASE}/lib
-
-.include <bsd.port.pre.mk>
-
-${WRKSRC}/libabcl.so:
-	cd ${WRKSRC}/src && \
-	${JAVAH} -o org/armedbear/lisp/native.h org.armedbear.lisp.Native && \
-	${CC} -shared -o ../libabcl.so -O -D_REENTRANT -fpic -I${JAVA_HOME}/include \-I${JAVA_HOME}/include/freebsd org/armedbear/lisp/native.c
-${WRKSRC}/abcl-src.jar: ${WRKSRC}/abcl.jar
-	cd ${WRKSRC}/src && \
-	${JAR} cmf manifest-abcl ../abcl-src.jar org/armedbear/lisp/*.java && \
-	${JAR} uf ../abcl-src.jar org/armedbear/lisp/java/awt/*.java && \
-	${JAR} uf ../abcl-src.jar org/armedbear/lisp/LICENSE && \
-	${JAR} uf ../abcl-src.jar org/armedbear/lisp/*.lisp
-
-${WRKSRC}/abcl.jar: ${WRKSRC}/src/org/armedbear/lisp/describe-1.cls
-	cd ${WRKSRC}/src && \
-	${JAR} cmf manifest-abcl ../abcl.jar org/armedbear/lisp/*.class && \
-	${JAR} uf ../abcl.jar org/armedbear/lisp/java/awt/*.class && \
-	${JAR} uf ../abcl.jar org/armedbear/lisp/LICENSE && \
-	${JAR} uf ../abcl.jar org/armedbear/lisp/*.lisp && \
-	${JAR} uf ../abcl.jar org/armedbear/lisp/*.abcl && \
-	${FIND} . -name '*.cls' | ${XARGS} ${JAR} uf ../abcl.jar
-
-${WRKSRC}/src/org/armedbear/lisp/describe-1.cls: ${WRKSRC}/src/org/armedbear/lisp/Main.class
-	cd ${WRKSRC} && \
-	${JAVA} -classpath ./src org.armedbear.lisp.Main --eval "(compile-system :zip nil :quit t)"
-
-${WRKSRC}/src/org/armedbear/lisp/Main.class:
-	cd ${WRKSRC} && \
-	${JAVAC} -verbose -classpath ./src ${WRKSRC}/src/org/armedbear/lisp/*.java && \
-	${JAVAC} -verbose -classpath ./src ${WRKSRC}/src/org/armedbear/lisp/java/awt/*.java
-
-delete-build-artifacts:
-	${FIND} ${WRKSRC} -name "*.class" -delete
-	${FIND} ${WRKSRC} -name "*.abcl" -delete
-	${FIND} ${WRKSRC} -name "*.cls" -delete
-	${FIND} ${WRKSRC} -name "native.h" -delete
-	${FIND} ${WRKSRC} -name "libabcl.so" -delete
-	${FIND} ${WRKSRC} -name "build" -delete
-list-build-artifacts:
-	${FIND} ${WRKSRC} -name "*.class" -print
-	${FIND} ${WRKSRC} -name "*.abcl" -print
-	${FIND} ${WRKSRC} -name "*.cls" -print
-	${FIND} ${WRKSRC} -name "native.h" -print
-	${FIND} ${WRKSRC} -name "libabcl.so" -print
-	${FIND} ${WRKSRC} -name "build" -print
+	@${INSTALL_DATA} -v ${WRKSRC}/dist/abcl.jar ${JAVAJARDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/abcl/distinfo b/lang/abcl/distinfo
index 26a36b03eb9a..26290ceb1b11 100644
--- a/lang/abcl/distinfo
+++ b/lang/abcl/distinfo
@@ -1,3 +1,2 @@
-MD5 (abcl-0.0.10.tar.gz) = 25adac03eb8b23c6dc27350d0b4bde51
-SHA256 (abcl-0.0.10.tar.gz) = 4139f38ba1a156f49f72f50e0621b2bbd421aa000c7da90ce27c54a1ed4d55f6
-SIZE (abcl-0.0.10.tar.gz) = 632987
+SHA256 (abcl-src-0.24.0.tar.gz) = d6b7769067f11846cc8121cac7d6bc0bf751cce6660ef4116bbdb2ab79d633a5
+SIZE (abcl-src-0.24.0.tar.gz) = 804263
diff --git a/lang/abcl/files/abcl.in b/lang/abcl/files/abcl.in
deleted file mode 100644
index 641455b9f203..000000000000
--- a/lang/abcl/files/abcl.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec %%JAVA%% -Xmx256M -cp %%ABCL_JAR%% org.armedbear.lisp.Main "$@"
diff --git a/lang/abcl/pkg-plist b/lang/abcl/pkg-plist
deleted file mode 100644
index d8d0b9668aad..000000000000
--- a/lang/abcl/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/abcl
-lib/libabcl.so
-share/java/classes/abcl-src.jar
-share/java/classes/abcl.jar