4 files changed, 99 insertions, 28 deletions

diff --git a/deskutils/freemind/Makefile b/deskutils/freemind/Makefile
index f2b65d65cd03..0a88bf0018db 100644
--- a/deskutils/freemind/Makefile
+++ b/deskutils/freemind/Makefile
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	freemind
-PORTVERSION=	0.7.1
+PORTVERSION=	0.8.0b
 CATEGORIES=	deskutils editors java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	freemind
-DISTNAME=	${PORTNAME}-bin-${PORTVERSION:S/./_/g}
+DISTNAME=	${PORTNAME}-bin-max-${PORTVERSION:S/./_/g:S/b/_rc2/}
 
 MAINTAINER=	cartola@openit.com.br
 COMMENT=	Free mind-mapping software written in Java
 
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
+
 .if !exists(/usr/bin/unzip)
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 .endif
@@ -27,28 +29,24 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 USE_REINPLACE=	yes
 
-PLIST_SUB=	VER=${PORTVERSION}
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}-${PORTVERSION}
+DATAFILES=	accessories doc lib license patterns.xml plugins user.properties
 
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 ZIP_CMD=	zip
 
+SUB_FILES=	freemind.sh
+
 do-build:
 	(cd ${WRKSRC}; \
 	${UNZIP_CMD} lib/freemind.jar freemind.properties; \
-	${REINPLACE_CMD} -e '/^properties_folder/ s/freemind/.&/; s|./doc/freemind.mm|${PREFIX}/${PORTNAME}-${PORTVERSION}/doc/freemind.mm|' freemind.properties; \
+	${REINPLACE_CMD} -e '/^properties_folder/ s/freemind/.&/; s|./doc/freemind.mm|file:${DATADIR}/doc/freemind.mm|' freemind.properties; \
 	${ZIP_CMD} -u lib/freemind.jar freemind.properties)
 
 do-install:
-	${MKDIR} ${PREFIX}/${PORTNAME}-${PORTVERSION}/accessories
-	${MKDIR} ${PREFIX}/${PORTNAME}-${PORTVERSION}/doc
-	${MKDIR} ${PREFIX}/${PORTNAME}-${PORTVERSION}/lib
-	${INSTALL_DATA} ${WRKSRC}/user.properties ${PREFIX}/${PORTNAME}-${PORTVERSION}
-	${INSTALL_DATA} ${WRKSRC}/license ${PREFIX}/${PORTNAME}-${PORTVERSION}
-	${INSTALL_DATA} ${WRKSRC}/patterns.xml ${PREFIX}/${PORTNAME}-${PORTVERSION}
-	${INSTALL_DATA} ${WRKSRC}/accessories/* ${PREFIX}/${PORTNAME}-${PORTVERSION}/accessories
-	${INSTALL_DATA} ${WRKSRC}/doc/freemind.mm ${PREFIX}/${PORTNAME}-${PORTVERSION}/doc
-	${INSTALL_DATA} ${WRKSRC}/lib/freemind.jar ${PREFIX}/${PORTNAME}-${PORTVERSION}/lib
-	@(${ECHO} "#\!/bin/sh"; ${ECHO} "${JAVA_HOME}/bin/java -jar ${PREFIX}/${PORTNAME}-${PORTVERSION}/lib/freemind.jar \$*") > ${WRKDIR}/freemind
-	${INSTALL_SCRIPT} ${WRKDIR}/freemind ${PREFIX}/bin
+	cd ${WRKSRC} \
+	  && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${DATADIR}/{} \; \
+	  && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
+	${INSTALL_SCRIPT} ${WRKDIR}/freemind.sh ${PREFIX}/bin/freemind
 
 .include <bsd.port.mk>
diff --git a/deskutils/freemind/distinfo b/deskutils/freemind/distinfo
index e8626fb0f4cc..dde625b79f6f 100644
--- a/deskutils/freemind/distinfo
+++ b/deskutils/freemind/distinfo
@@ -1,2 +1,2 @@
-MD5 (freemind-bin-0_7_1.zip) = f2f928c860ba45fd5206e54392cd12c8
-SIZE (freemind-bin-0_7_1.zip) = 402336
+MD5 (freemind-bin-max-0_8_0_rc2.zip) = 18575ba9af3db863685d9fe45e30ebc0
+SIZE (freemind-bin-max-0_8_0_rc2.zip) = 7478503
diff --git a/deskutils/freemind/files/freemind.sh.in b/deskutils/freemind/files/freemind.sh.in
new file mode 100644
index 000000000000..7f3549135d2b
--- /dev/null
+++ b/deskutils/freemind/files/freemind.sh.in
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+CLASSPATH="${ADD_JARS}:${CLASSPATH}:`find "%%DATADIR%%/lib" -name \*.jar | tr "\n" ":"`"
+FILE="`realpath "$1"`"
+
+cd "%%DATADIR%%"
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "${CLASSPATH}" freemind.main.FreeMind "${FILE}"
diff --git a/deskutils/freemind/pkg-plist b/deskutils/freemind/pkg-plist
index a8ebc44adedb..59fdabda6888 100644
--- a/deskutils/freemind/pkg-plist
+++ b/deskutils/freemind/pkg-plist
@@ -1,12 +1,76 @@
+@comment $FreeBSD$
 bin/freemind
-freemind-%%VER%%/accessories/mm2xbel.xsl
-freemind-%%VER%%/accessories/xbel2mm.xsl
-freemind-%%VER%%/doc/freemind.mm
-freemind-%%VER%%/lib/freemind.jar
-freemind-%%VER%%/license
-freemind-%%VER%%/patterns.xml
-freemind-%%VER%%/user.properties
-@dirrm freemind-%%VER%%/accessories
-@dirrm freemind-%%VER%%/doc
-@dirrm freemind-%%VER%%/lib
-@dirrm freemind-%%VER%%
+%%DATADIR%%/accessories/freemind2html.css
+%%DATADIR%%/accessories/freemind2html.xsl
+%%DATADIR%%/accessories/hide.png
+%%DATADIR%%/accessories/ilink.png
+%%DATADIR%%/accessories/leaf.png
+%%DATADIR%%/accessories/marktree.js
+%%DATADIR%%/accessories/minus.png
+%%DATADIR%%/accessories/mm2html.xsl
+%%DATADIR%%/accessories/mm2latexartcl.xsl
+%%DATADIR%%/accessories/mm2latexbook.xsl
+%%DATADIR%%/accessories/mm2opml.xsl
+%%DATADIR%%/accessories/mm2text.xsl
+%%DATADIR%%/accessories/mm2xbel.xsl
+%%DATADIR%%/accessories/opml2mm.xsl
+%%DATADIR%%/accessories/plus.png
+%%DATADIR%%/accessories/show.png
+%%DATADIR%%/accessories/tohtml.xsl
+%%DATADIR%%/accessories/toxhtml.xsl
+%%DATADIR%%/accessories/treestyles.css
+%%DATADIR%%/accessories/xbel2mm.xsl
+%%DATADIR%%/doc/freemind.mm
+%%DATADIR%%/lib/ant/lib/dom.jar
+%%DATADIR%%/lib/ant/lib/jax-qname.jar
+%%DATADIR%%/lib/ant/lib/jaxb-api.jar
+%%DATADIR%%/lib/ant/lib/jaxb-impl.jar
+%%DATADIR%%/lib/ant/lib/jaxb-libs.jar
+%%DATADIR%%/lib/ant/lib/namespace.jar
+%%DATADIR%%/lib/ant/lib/relaxngDatatype.jar
+%%DATADIR%%/lib/ant/lib/sax.jar
+%%DATADIR%%/lib/ant/lib/xsdlib.jar
+%%DATADIR%%/lib/commons-lang-2.0.jar
+%%DATADIR%%/lib/freemind.jar
+%%DATADIR%%/license
+%%DATADIR%%/patterns.xml
+%%DATADIR%%/plugins/ExportSvg.xml
+%%DATADIR%%/plugins/FreemindHelp.xml
+%%DATADIR%%/plugins/TimeManagement.xml
+%%DATADIR%%/plugins/help/help_plugin.jar
+%%DATADIR%%/plugins/help/jhall.jar
+%%DATADIR%%/plugins/svg/batik-awt-util.jar
+%%DATADIR%%/plugins/svg/batik-bridge.jar
+%%DATADIR%%/plugins/svg/batik-css.jar
+%%DATADIR%%/plugins/svg/batik-dom.jar
+%%DATADIR%%/plugins/svg/batik-ext.jar
+%%DATADIR%%/plugins/svg/batik-extension.jar
+%%DATADIR%%/plugins/svg/batik-gui-util.jar
+%%DATADIR%%/plugins/svg/batik-gvt.jar
+%%DATADIR%%/plugins/svg/batik-parser.jar
+%%DATADIR%%/plugins/svg/batik-script.jar
+%%DATADIR%%/plugins/svg/batik-squiggle.jar
+%%DATADIR%%/plugins/svg/batik-svg-dom.jar
+%%DATADIR%%/plugins/svg/batik-svggen.jar
+%%DATADIR%%/plugins/svg/batik-swing.jar
+%%DATADIR%%/plugins/svg/batik-transcoder.jar
+%%DATADIR%%/plugins/svg/batik-util.jar
+%%DATADIR%%/plugins/svg/batik-xml.jar
+%%DATADIR%%/plugins/svg/js.jar
+%%DATADIR%%/plugins/svg/pdf-transcoder.jar
+%%DATADIR%%/plugins/svg/svg_plugin.jar
+%%DATADIR%%/plugins/svg/xerces_2_5_0.jar
+%%DATADIR%%/plugins/svg/xml-apis.jar
+%%DATADIR%%/plugins/time/jcalendar.jar
+%%DATADIR%%/plugins/time/time_plugin.jar
+%%DATADIR%%/user.properties
+@dirrm %%DATADIR%%/accessories
+@dirrm %%DATADIR%%/doc
+@dirrm %%DATADIR%%/lib/ant/lib
+@dirrm %%DATADIR%%/lib/ant
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/plugins/help
+@dirrm %%DATADIR%%/plugins/svg
+@dirrm %%DATADIR%%/plugins/time
+@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%