- Update to 0.71beta

- Patch for Jython 2.5.1 update

4 files changed, 14 insertions, 76 deletions

diff --git a/finance/venice/Makefile b/finance/venice/Makefile
index f44a1d7fa35b..3feabc94a8ca 100644
--- a/finance/venice/Makefile
+++ b/finance/venice/Makefile
@@ -6,66 +6,38 @@
 #
 
 PORTNAME=	venice
-PORTVERSION=	0.5.1.a
-PORTREVISION=	3
-DISTVERSION=	0.51alpha
+DISTVERSION=	0.71beta
 CATEGORIES=	finance java
-MASTER_SITES=	SF/mov/${PORTNAME}/0.51%20alpha
+MASTER_SITES=	SF/mov/${PORTNAME}/0.71%20beta
 DISTNAME=	${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Merchant Of Venice, a stock market trading program
 
-BUILD_DEPENDS=	${JYTHON_PREFIX}/jython.jar:${PORTSDIR}/lang/jython
-
+NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_EXTRACT=	yes
 JAVA_RUN=	yes
 JAVA_VERSION=	1.4+
-USE_ANT=	yes
-ALL_TARGET=	build jar
-
-BUILD_WRKSRC=	${WRKDIR}/${DISTNAME}/build
 
 JARFILE=	${PORTNAME}.jar
 
-PLIST_FILES=	\
-		bin/${PKGNAMEPREFIX}${PORTNAME} \
+PLIST_FILES=	bin/venice \
 		%%JAVAJARDIR%%/${JARFILE}
 
 # docs
-DOC_FILES=	\
-		doc/manual.txt \
+DOC_FILES=	doc/manual.txt \
+		doc/manual.html \
 		changelog.txt \
 		readme.txt
 
 .ifndef(NOPORTDOCS)
-PORTDOCS=	\
-		*
+PORTDOCS=	*
 .endif
 
-# jython
-JYTHON_PREFIX=	${LOCALBASE}/lib/jython22
-JYTHON_JAR=	${JYTHON_PREFIX}/jython.jar
-
-post-extract:
-# extract docs
-	@cd ${BUILD_WRKSRC}/src && ${JAR} -xf ${WRKSRC}/venice.jar org/mov/help/doc
-	@cd ${BUILD_WRKSRC}/src && ${JAR} -xf ${WRKSRC}/venice.jar org/mov/quote/samples
-	@cd ${BUILD_WRKSRC} && ${JAR} -xf ${WRKSRC}/venice.jar META-INF
-	@${MV} ${BUILD_WRKSRC}/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/src
+.include <bsd.port.pre.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -E \
-		-e 's|(build),[[:space:]]*doc|\1|' \
-		-e 's|%%CLASSPATH%%|${CLASSPATH}|' \
-		${BUILD_WRKSRC}/build.xml
-	@${SED} -E \
-		-e "s|%%JAVAVM%%|${LOCALBASE}/bin/java|" \
-		-e "s|%%JAVA_VERSION%%|${JAVA_VERSION}|" \
-		-e "s|%%JAVAJARDIR%%|${JAVAJARDIR}|" \
-		-e "s|%%JARFILE%%|${JARFILE}|" \
-		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
+	${REINPLACE_CMD} -e s,venice.jar,${JAVAJARDIR}/${JARFILE}, ${WRKSRC}/venice
 
 do-install:
 # docs
@@ -76,14 +48,9 @@ do-install:
 .endfor
 .endif
 # wrapper
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh \
-		${PREFIX}/bin/${PORTNAME}
+	@${INSTALL_SCRIPT} ${WRKSRC}/venice ${PREFIX}/bin/
 # jar
 	@${MKDIR} ${JAVAJARDIR}
-	@${INSTALL_DATA} ${BUILD_WRKSRC}/${JARFILE} ${JAVAJARDIR}/${JARFILE}
-
-.include <bsd.port.pre.mk>
-
-CLASSPATH+=	${JYTHON_JAR}
+	@${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${JAVAJARDIR}/
 
 .include <bsd.port.post.mk>
diff --git a/finance/venice/distinfo b/finance/venice/distinfo
index 0036216a5712..f58f6b60bdf1 100644
--- a/finance/venice/distinfo
+++ b/finance/venice/distinfo
@@ -1,3 +1,3 @@
-MD5 (venice-0.51alpha.tar.gz) = 1fc2a5539023e88d719e4e8974566932
-SHA256 (venice-0.51alpha.tar.gz) = b5bec834a9bef895aa513bed00a19b8184eea6bb37abb006b1a727c42ec93373
-SIZE (venice-0.51alpha.tar.gz) = 3089031
+MD5 (venice-0.71beta.tar.gz) = 22f7562920aa6a7da4803c253bce3d49
+SHA256 (venice-0.71beta.tar.gz) = fd5e1dfc069d194b27c9566c3fd3a627a4f839589390b7426ad5255341d40ca5
+SIZE (venice-0.71beta.tar.gz) = 3553122
diff --git a/finance/venice/files/patch-build::build.xml b/finance/venice/files/patch-build::build.xml
deleted file mode 100644
index 1b0d70d1f44d..000000000000
--- a/finance/venice/files/patch-build::build.xml
+++ /dev/null
@@ -1,13 +0,0 @@
---- build/build.xml.orig	Tue Mar 29 23:57:53 2005
-+++ build/build.xml	Tue Mar 29 23:59:21 2005
-@@ -49,7 +49,9 @@
-   	   optimize="on"
- 	   source="1.4"
- 	   includes="**/*.java"
--           excludes="org/mov/tools/*"/>
-+           excludes="org/mov/tools/*">
-+      <classpath path="%%CLASSPATH%%"/>
-+    </javac>
-   </target>
- 
-   <!-- Remove all built files -->
diff --git a/finance/venice/files/wrapper.sh b/finance/venice/files/wrapper.sh
deleted file mode 100644
index 6424008ae15f..000000000000
--- a/finance/venice/files/wrapper.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# Under a BSDL license. Copyright by Mario S F Ferreira <lioux@FreeBSD.org>
-# $FreeBSD$
-
-export JAVA_VERSION
-
-# java
-JAVAVM="%%JAVAVM%%"
-JAVA_VERSION="%%JAVA_VERSION%%"
-JAVAJARDIR="%%JAVAJARDIR%%"
-JARFILE="%%JARFILE%%"
-
-exec ${JAVAVM} \
-	-jar ${JAVAJARDIR}/${JARFILE} \
-	"${@}"