- Update to 1.45

- Update to bsd.java.mk 2.0
- Move DATADIR to ${JAVASHAREDIR}/${PORTNAME}
- Improve launcher shell script (update to javavmwrapper 2.0)

4 files changed, 15 insertions, 15 deletions

diff --git a/ftp/jftp/Makefile b/ftp/jftp/Makefile
index 8a8fbe15bfc0..0c128ea4b513 100644
--- a/ftp/jftp/Makefile
+++ b/ftp/jftp/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	jftp
-PORTVERSION=	1.41
+PORTVERSION=	1.45
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	j-ftp
@@ -16,19 +16,17 @@ DISTNAME=	j-ftp-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java Network Browser
 
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
+
 WRKSRC=		${WRKDIR}/j-ftp
-USE_JAVA=	1.3+
+USE_JAVA=	yes
+JAVA_VERSION=	1.3+
 NO_BUILD=	yes
-
-JAVAVM=		${LOCALBASE}/bin/javavm
-
-post-patch:
-	@${SED} -e "s,%%DATADIR%%,${DATADIR},; \
-		s,%%JAVAVM%%,${JAVAVM}," \
-		${FILESDIR}/jftp > ${WRKSRC}/jftp
+SUB_FILES=	jftp.sh
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/jftp ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/jftp.sh ${PREFIX}/bin/jftp
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/build/jars/jftp.jar ${DATADIR}
 
diff --git a/ftp/jftp/distinfo b/ftp/jftp/distinfo
index 40e2649c72d9..1c52d3f8a448 100644
--- a/ftp/jftp/distinfo
+++ b/ftp/jftp/distinfo
@@ -1,2 +1,2 @@
-MD5 (j-ftp-1.41.tar.gz) = 7df0b06893a08b868cf309624de71732
-SIZE (j-ftp-1.41.tar.gz) = 1922536
+MD5 (j-ftp-1.45.tar.gz) = a60023218a2516e922bdd0c9acf321f1
+SIZE (j-ftp-1.45.tar.gz) = 2654695
diff --git a/ftp/jftp/files/jftp b/ftp/jftp/files/jftp
deleted file mode 100644
index bec7b24dd02f..000000000000
--- a/ftp/jftp/files/jftp
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-%%JAVAVM%% -jar %%DATADIR%%/jftp.jar
diff --git a/ftp/jftp/files/jftp.sh.in b/ftp/jftp/files/jftp.sh.in
new file mode 100644
index 000000000000..9c2187d2986e
--- /dev/null
+++ b/ftp/jftp/files/jftp.sh.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/jftp.jar"