5 files changed, 34 insertions, 20 deletions

diff --git a/finance/moneydance/Makefile b/finance/moneydance/Makefile
index 33261b871675..2e89d658ef91 100644
--- a/finance/moneydance/Makefile
+++ b/finance/moneydance/Makefile
@@ -6,28 +6,33 @@
 #
 
 PORTNAME=	moneydance
-PORTVERSION=	2.0.4
+PORTVERSION=	3.2
 CATEGORIES=	deskutils
-MASTER_SITES=	ftp://ftp.moneydance.net/pub/packages/
+MASTER_SITES=	http://moneydance.com/download/3/Unix/
+DISTNAME=	${PORTNAME}_other
+EXTRACT_ONLY=
 
 MAINTAINER=	sreilly@seanreilly.com
 
-RUN_DEPENDS=	${LOCALBASE}/jdk1.1.8/bin/java:${PORTSDIR}/java/jdk11
+USE_JAVA=	1.3+
+NO_CDROM=	Strict license
+NO_PACKAGE=	${NO_CDROM}
+
+# Since the vendor's file has not version information in its name:
+DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
-WRKSRC=		${WRKDIR}/moneydance
 NO_BUILD=	YES
-MDSUBDIR=	moneydance
+MDSUBDIR=	share/java/moneydance
 PLIST_SUB=	MDSUBDIR=${MDSUBDIR}
 
-JDIR=		${PREFIX}/jdk1.1.8
 MDDIR=		${PREFIX}/${MDSUBDIR}
 
 do-install:
-	${MKDIR} ${PREFIX}/${MDSUBDIR}
-	(cd ${WRKSRC} && tar -c -f - .) \
-		| (cd ${PREFIX}/${MDSUBDIR} && tar fx -)
-	${ECHO} "#!/bin/sh" > ${PREFIX}/bin/moneydance
-	${ECHO} "exec ${JDIR}/bin/java -classpath ${JDIR}/lib/classes.zip:${MDDIR}/moneydance.jar:${MDDIR}/license.jar:${MDDIR}/swingall.jar Moneydance" >> ${PREFIX}/bin/moneydance
+	${TAR} -C ${PREFIX}/${MDSUBDIR:H} -xvzpf ${_DISTDIR}/${DISTFILES} \
+		--exclude moneydance/swingall.jar \
+		--exclude moneydance/moneydance
+	${SED} -e 's,%%MDDIR%%,${MDDIR},g' -e 's,%%PREFIX%%,${PREFIX},g' \
+		< ${FILESDIR}/moneydance.sh > ${PREFIX}/bin/moneydance
 	${CHMOD} 755 ${PREFIX}/bin/moneydance
 
 .include <bsd.port.mk>
diff --git a/finance/moneydance/distinfo b/finance/moneydance/distinfo
index 628b86dc4a53..b6e53b261da9 100644
--- a/finance/moneydance/distinfo
+++ b/finance/moneydance/distinfo
@@ -1 +1 @@
-MD5 (moneydance-2.0.4.tar.gz) = d2675aa0f3bfb4020eace41a147e4303
+MD5 (moneydance-3.2/moneydance_other.tar.gz) = fdc081b54778e33ae4616d03d6fbbcba
diff --git a/finance/moneydance/files/moneydance.sh b/finance/moneydance/files/moneydance.sh
new file mode 100644
index 000000000000..a0951f581278
--- /dev/null
+++ b/finance/moneydance/files/moneydance.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+MDDIR=%%MDDIR%%
+
+for j in $MDDIR/*.jar
+do
+	cp=$cp:$j
+done
+
+exec %%PREFIX%%/bin/javavm -cp ${cp#:} Moneydance
diff --git a/finance/moneydance/pkg-descr b/finance/moneydance/pkg-descr
index e479ba4c78fa..2c2b48dcca3d 100644
--- a/finance/moneydance/pkg-descr
+++ b/finance/moneydance/pkg-descr
@@ -2,9 +2,10 @@ Moneydance Personal Finance Manager
 
 Moneydance is a personal finance management application written
 in Java.  Features include transaction auto-completion, reporting,
-graphing, check printing, scheduled transactions, and much more.
+graphing, check printing, scheduled transactions, on-line banking
+(with some financial institutions) and much more.
 
-Moneydance is shareware but unregistered copies are not feature-
-limited and do not time out in any way.
+Moneydance is shareware and unregistered copies may be feature-
+limited.
 
 WWW:  http://www.moneydance.net/
diff --git a/finance/moneydance/pkg-plist b/finance/moneydance/pkg-plist
index a330e7ac1625..8a77a03fa8cc 100644
--- a/finance/moneydance/pkg-plist
+++ b/finance/moneydance/pkg-plist
@@ -1,10 +1,9 @@
 bin/moneydance
-%%MDSUBDIR%%/README.txt
-%%MDSUBDIR%%/license.jar
+%%MDSUBDIR%%/jce-1.1.jar
+%%MDSUBDIR%%/jcert.jar
+%%MDSUBDIR%%/jnet.jar
+%%MDSUBDIR%%/jsse.jar
 %%MDSUBDIR%%/license.txt
-%%MDSUBDIR%%/moneydance
-%%MDSUBDIR%%/moneydance.cmd
 %%MDSUBDIR%%/moneydance.jar
 %%MDSUBDIR%%/moneydance.xpm
-%%MDSUBDIR%%/swingall.jar
 @dirrm %%MDSUBDIR%%