o Update to 1.8.5.

o Patch updated mostly to prepare for later use of SLIB.

PR:		ports/58550
Submitted by:	Kimura Fuyuki <fuyuki@nigredo.org>

lang/sisc/Makefile

@@ -6,38 +6,32 @@
 #
 
 PORTNAME=	sisc
-PORTVERSION=	1.7.9
+PORTVERSION=	1.8.5
 CATEGORIES=	lang scheme
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-EXTRACT_SUFX=	.jar
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An extensible Java-based Scheme interpreter
 
-BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant
-
 USE_JAVA=	1.3+
 
-EXTRACT_CMD=	${JAR}
-EXTRACT_BEFORE_ARGS=	-xf
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_REINPLACE=	yes
+NO_BUILD=	yes
 
 post-patch:
-	${REINPLACE_CMD} -e 's|\(SISC_HOME=\).*$$|\1${JAVAJARDIR}|' \
-		-e 's|^java|javavm|' ${WRKSRC}/dist/sisc.sh
-
-do-build:
-	cd ${WRKSRC}; ${SETENV} JAVA_HOME=${JAVA_HOME} ant sisc-lib
+	${REINPLACE_CMD} -e 's|\(SISC_HOME=\).*$$|\1${DATADIR}|' \
+		-e 's|^$$RLWRAP java|$$RLWRAP javavm|' ${WRKSRC}/sisc
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/*.jar ${WRKSRC}/*.shp ${JAVAJARDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/dist/sisc.sh ${PREFIX}/bin/sisc
+	${INSTALL_SCRIPT} ${WRKSRC}/sisc ${PREFIX}/bin
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.jar ${WRKSRC}/*.shp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/scheme-src/*.scm ${DATADIR}
 	${MKDIR} ${DOCSDIR}
 .for i in COPYING README
-	${INSTALL_DATA} ${WRKSRC}/dist/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>

lang/sisc/distinfo

@@ -1 +1 @@
-MD5 (sisc-1.7.9.jar) = 5c6aa63986420aebc1e2692247587876
+MD5 (sisc-1.8.5.tar.gz) = fd25d282df7484f19ff1a6ccc7bbb216

lang/sisc/pkg-plist

@@ -1,8 +1,11 @@
 bin/sisc
-share/java/classes/sisc-lib.jar
-share/java/classes/sisc-opt.jar
-share/java/classes/sisc.jar
-share/java/classes/sisc.shp
+%%DATADIR%%/optional-args.scm
+%%DATADIR%%/sisc-lib.jar
+%%DATADIR%%/sisc-opt.jar
+%%DATADIR%%/sisc.jar
+%%DATADIR%%/sisc.shp
+%%DATADIR%%/slib.scm
+@dirrm %%DATADIR%%
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/README
 @dirrm %%DOCSDIR%%