Index: head/deskutils/freeplane/Makefile
===================================================================
--- head/deskutils/freeplane/Makefile
+++ head/deskutils/freeplane/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freeplane
-DISTVERSION=	1.7.12
+DISTVERSION=	1.8.5
 CATEGORIES=	deskutils editors java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20stable/archive/${PORTVERSION}
 DISTNAME=	${PORTNAME}_bin-${PORTVERSION}
Index: head/deskutils/freeplane/distinfo
===================================================================
--- head/deskutils/freeplane/distinfo
+++ head/deskutils/freeplane/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580908043
-SHA256 (freeplane_bin-1.7.12.zip) = 2284bb1a886723395d446d9d28fb95ac2e6005d188cafd518244b7f150c9ebcb
-SIZE (freeplane_bin-1.7.12.zip) = 36716768
+TIMESTAMP = 1590477128
+SHA256 (freeplane_bin-1.8.5.zip) = 647304f66011739f367e555015cca928d5f5df705b1f863ca69eb5ab258a69a9
+SIZE (freeplane_bin-1.8.5.zip) = 43383580
Index: head/deskutils/freeplane/pkg-plist
===================================================================
--- head/deskutils/freeplane/pkg-plist
+++ head/deskutils/freeplane/pkg-plist
@@ -1,18 +1,25 @@
 bin/freeplane
 %%DATADIR%%/core/org.freeplane.core/META-INF/MANIFEST.MF
-%%DATADIR%%/core/org.freeplane.core/lib/SimplyHTML-0.17.3.jar
+%%DATADIR%%/core/org.freeplane.core/lib/SimplyHTML-0.17.6.jar
 %%DATADIR%%/core/org.freeplane.core/lib/annotations-16.0.1.jar
-%%DATADIR%%/core/org.freeplane.core/lib/commons-codec-1.13.jar
+%%DATADIR%%/core/org.freeplane.core/lib/common-image-3.5.jar
+%%DATADIR%%/core/org.freeplane.core/lib/common-io-3.5.jar
+%%DATADIR%%/core/org.freeplane.core/lib/common-lang-3.5.jar
+%%DATADIR%%/core/org.freeplane.core/lib/commons-codec-1.14.jar
 %%DATADIR%%/core/org.freeplane.core/lib/commons-io-2.6.jar
 %%DATADIR%%/core/org.freeplane.core/lib/commons-lang-2.6.jar
 %%DATADIR%%/core/org.freeplane.core/lib/darcula-2018.2.jar
 %%DATADIR%%/core/org.freeplane.core/lib/data-url-1.0.1.jar
+%%DATADIR%%/core/org.freeplane.core/lib/emoji-12.1.4.jar
 %%DATADIR%%/core/org.freeplane.core/lib/freeplane_mac-%%PORTVERSION%%.jar
 %%DATADIR%%/core/org.freeplane.core/lib/freeplaneapi_viewer.jar
 %%DATADIR%%/core/org.freeplane.core/lib/freeplaneeditor-%%PORTVERSION%%.jar
 %%DATADIR%%/core/org.freeplane.core/lib/freeplaneosgi-%%PORTVERSION%%.jar
 %%DATADIR%%/core/org.freeplane.core/lib/freeplaneviewer.jar
 %%DATADIR%%/core/org.freeplane.core/lib/idw-gpl-1.6.1.jar
+%%DATADIR%%/core/org.freeplane.core/lib/imageio-core-3.5.jar
+%%DATADIR%%/core/org.freeplane.core/lib/imageio-jpeg-3.5.jar
+%%DATADIR%%/core/org.freeplane.core/lib/imageio-metadata-3.5.jar
 %%DATADIR%%/core/org.freeplane.core/lib/jgoodies-common-1.8.1.jar
 %%DATADIR%%/core/org.freeplane.core/lib/jgoodies-forms-1.9.0.jar
 %%DATADIR%%/core/org.freeplane.core/lib/jortho-%%PORTVERSION%%.jar
@@ -115,6 +122,7 @@
 %%DATADIR%%/doc/api/org/freeplane/api/package-frame.html
 %%DATADIR%%/doc/api/org/freeplane/api/package-summary.html
 %%DATADIR%%/doc/api/org/freeplane/api/package-tree.html
+%%DATADIR%%/doc/api/org/freeplane/core/ui/components/UITools.Defaults.html
 %%DATADIR%%/doc/api/org/freeplane/core/ui/components/UITools.InsertEolAction.html
 %%DATADIR%%/doc/api/org/freeplane/core/ui/components/UITools.html
 %%DATADIR%%/doc/api/org/freeplane/core/ui/components/package-frame.html
@@ -228,21 +236,21 @@
 %%DATADIR%%/plugins/org.freeplane.plugin.openmaps/lib/jmapviewer-2.9.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.openmaps/lib/plugin-%%PORTVERSION%%.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.script/META-INF/MANIFEST.MF
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-2.5.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-console-2.5.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-datetime-2.5.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-dateutil-2.5.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-groovysh-2.5.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-jmx-2.5.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-json-2.5.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-jsr223-2.5.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-macro-2.5.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-nio-2.5.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-servlet-2.5.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-sql-2.5.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-swing-2.5.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-templates-2.5.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-xml-2.5.8.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-3.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-console-3.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-datetime-3.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-dateutil-3.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-groovysh-3.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-jmx-3.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-json-3.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-jsr223-3.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-macro-3.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-nio-3.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-servlet-3.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-sql-3.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-swing-3.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-templates-3.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-xml-3.0.1.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.script/lib/ivy-2.5.0.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.script/lib/jline-2.14.6.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.script/lib/plugin-%%PORTVERSION%%.jar
@@ -319,5 +327,3 @@
 %%DATADIR%%/scripts/apiGenerator.groovy
 %%DATADIR%%/scripts/installScriptAddOn.groovy
 @dir %%DATADIR%%/doc/Images/other/workspace/output
-@dir %%DATADIR%%/fwdir/condperm
-@dir %%DATADIR%%/fwdir/perms