deskutils/freeplane: Update to 1.10.3

- Update freeplane.sh patch
- Change MASTER_SITES

Release notes: https://www.freeplane.org/info/history/history_en.txt

4 files changed, 90 insertions, 68 deletions

diff --git a/deskutils/freeplane/Makefile b/deskutils/freeplane/Makefile
index 5c27da51e00c..8c81e3ac4226 100644
--- a/deskutils/freeplane/Makefile
+++ b/deskutils/freeplane/Makefile
@@ -1,10 +1,9 @@
 # Created by: Loïc Bartoletti <lbartoletti@FreeBSD.org>
 
 PORTNAME=	freeplane
-DISTVERSION=	1.9.12
-PORTREVISION=	1
+DISTVERSION=	1.10.3
 CATEGORIES=	deskutils editors java
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20stable/archive/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20stable
 DISTNAME=	${PORTNAME}_bin-${PORTVERSION}
 
 MAINTAINER=	lbartoletti@FreeBSD.org
diff --git a/deskutils/freeplane/distinfo b/deskutils/freeplane/distinfo
index 21d0ef16da2f..f935e9bbde7d 100644
--- a/deskutils/freeplane/distinfo
+++ b/deskutils/freeplane/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1640201937
-SHA256 (freeplane_bin-1.9.12.zip) = 4056a33a3c152b0d136f12f9ecfd46a49b12a12daf45fba6b53eed47d6d0f3bd
-SIZE (freeplane_bin-1.9.12.zip) = 45951842
+TIMESTAMP = 1656913220
+SHA256 (freeplane_bin-1.10.3.zip) = d40b276493f6c72ccf74c2dbb6cf7aa016a08ba5fa1fb2dea10c44a0ecd26da5
+SIZE (freeplane_bin-1.10.3.zip) = 52296889
diff --git a/deskutils/freeplane/files/patch-freeplane.sh b/deskutils/freeplane/files/patch-freeplane.sh
index 02e1cf4c65a2..946d90da0874 100644
--- a/deskutils/freeplane/files/patch-freeplane.sh
+++ b/deskutils/freeplane/files/patch-freeplane.sh
@@ -1,4 +1,4 @@
---- freeplane.sh.orig	2022-01-05 06:17:27 UTC
+--- freeplane.sh.orig	2022-07-04 06:07:42 UTC
 +++ freeplane.sh
 @@ -57,7 +57,7 @@ findjava() {
  		fi
@@ -6,8 +6,8 @@
  
 -	JAVA_VERSION=$(${JAVACMD} -version |& grep -E "[[:alnum:]]+ version" | awk '{print $3}' | tr -d '"')
 +	JAVA_VERSION=$(${JAVACMD} -version | grep -E "[[:alnum:]]+ version" | awk '{print $3}' | tr -d '"')
- 	JAVA_MAJOR_VERSION=$(echo $JAVA_VERSION | awk -F. '{print $1}')
- 	if [ $JAVA_MAJOR_VERSION -ge 16 ]; then
+ 	JAVA_MAJOR_VERSION=$(echo $JAVA_VERSION | sed -e 's/^1\.//' | awk -F. '{print $1}')
+ 	if [ $JAVA_MAJOR_VERSION -lt 8 ] || [ $JAVA_MAJOR_VERSION -gt 17 ] || [ $JAVA_MAJOR_VERSION -eq 10 ]; then
  		if [ -z "${FREEPLANE_USE_UNSUPPORTED_JAVA_VERSION}" ]; then
 @@ -142,15 +142,7 @@ fi
  
diff --git a/deskutils/freeplane/pkg-plist b/deskutils/freeplane/pkg-plist
index 3fe28020a61b..90ebfc1613b4 100644
--- a/deskutils/freeplane/pkg-plist
+++ b/deskutils/freeplane/pkg-plist
@@ -1,29 +1,28 @@
 bin/freeplane
 %%DATADIR%%/core/org.freeplane.core/META-INF/MANIFEST.MF
-%%DATADIR%%/core/org.freeplane.core/lib/annotations-16.0.1.jar
-%%DATADIR%%/core/org.freeplane.core/lib/common-image-3.6.4.jar
-%%DATADIR%%/core/org.freeplane.core/lib/common-io-3.6.4.jar
-%%DATADIR%%/core/org.freeplane.core/lib/common-lang-3.6.4.jar
+%%DATADIR%%/core/org.freeplane.core/lib/common-image-3.8.2.jar
+%%DATADIR%%/core/org.freeplane.core/lib/common-io-3.8.2.jar
+%%DATADIR%%/core/org.freeplane.core/lib/common-lang-3.8.2.jar
 %%DATADIR%%/core/org.freeplane.core/lib/commons-codec-1.15.jar
-%%DATADIR%%/core/org.freeplane.core/lib/commons-io-2.8.0.jar
+%%DATADIR%%/core/org.freeplane.core/lib/commons-io-2.11.0.jar
 %%DATADIR%%/core/org.freeplane.core/lib/commons-lang-2.6.jar
-%%DATADIR%%/core/org.freeplane.core/lib/darcula-2021.7.jar
 %%DATADIR%%/core/org.freeplane.core/lib/data-url-2.0.jar
-%%DATADIR%%/core/org.freeplane.core/lib/emoji-12.1.4.jar
+%%DATADIR%%/core/org.freeplane.core/lib/flatlaf-2.2.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.6.4.jar
-%%DATADIR%%/core/org.freeplane.core/lib/imageio-jpeg-3.6.4.jar
-%%DATADIR%%/core/org.freeplane.core/lib/imageio-metadata-3.6.4.jar
+%%DATADIR%%/core/org.freeplane.core/lib/imageio-core-3.8.2.jar
+%%DATADIR%%/core/org.freeplane.core/lib/imageio-jpeg-3.8.2.jar
+%%DATADIR%%/core/org.freeplane.core/lib/imageio-metadata-3.8.2.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
 %%DATADIR%%/core/org.freeplane.core/lib/kitfox-svg-salamander-1.1.1-p1.jar
-%%DATADIR%%/core/org.freeplane.core/lib/simplyhtml-0.18.7.jar
+%%DATADIR%%/core/org.freeplane.core/lib/simplyhtml-0.18.9.jar
+%%DATADIR%%/core/org.freeplane.core/lib/twemoji-12.1.4.jar
 %%DATADIR%%/doc/Freeplane_LaTeX.mm
 %%DATADIR%%/doc/Images/Preferences_Joining nodes.png
 %%DATADIR%%/doc/Images/doc/BackgroundContextMenu.png
@@ -66,7 +65,6 @@ bin/freeplane
 %%DATADIR%%/doc/Images/other/workspace/view - view settings.png
 %%DATADIR%%/doc/Images/properties toolbar - collapsed.png
 %%DATADIR%%/doc/api/allclasses-index.html
-%%DATADIR%%/doc/api/allclasses.html
 %%DATADIR%%/doc/api/allpackages-index.html
 %%DATADIR%%/doc/api/constant-values.html
 %%DATADIR%%/doc/api/deprecated-list.html
@@ -74,33 +72,14 @@ bin/freeplane
 %%DATADIR%%/doc/api/help-doc.html
 %%DATADIR%%/doc/api/index-all.html
 %%DATADIR%%/doc/api/index.html
-%%DATADIR%%/doc/api/jquery/external/jquery/jquery.js
-%%DATADIR%%/doc/api/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
-%%DATADIR%%/doc/api/jquery/images/ui-bg_glass_65_dadada_1x400.png
-%%DATADIR%%/doc/api/jquery/images/ui-bg_glass_75_dadada_1x400.png
-%%DATADIR%%/doc/api/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
-%%DATADIR%%/doc/api/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
-%%DATADIR%%/doc/api/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-%%DATADIR%%/doc/api/jquery/images/ui-icons_222222_256x240.png
-%%DATADIR%%/doc/api/jquery/images/ui-icons_2e83ff_256x240.png
-%%DATADIR%%/doc/api/jquery/images/ui-icons_454545_256x240.png
-%%DATADIR%%/doc/api/jquery/images/ui-icons_888888_256x240.png
-%%DATADIR%%/doc/api/jquery/images/ui-icons_cd0a0a_256x240.png
-%%DATADIR%%/doc/api/jquery/jquery-3.5.1.js
-%%DATADIR%%/doc/api/jquery/jquery-ui.css
-%%DATADIR%%/doc/api/jquery/jquery-ui.js
-%%DATADIR%%/doc/api/jquery/jquery-ui.min.css
-%%DATADIR%%/doc/api/jquery/jquery-ui.min.js
-%%DATADIR%%/doc/api/jquery/jquery-ui.structure.css
-%%DATADIR%%/doc/api/jquery/jquery-ui.structure.min.css
-%%DATADIR%%/doc/api/jquery/jszip-utils/dist/jszip-utils-ie.js
-%%DATADIR%%/doc/api/jquery/jszip-utils/dist/jszip-utils-ie.min.js
-%%DATADIR%%/doc/api/jquery/jszip-utils/dist/jszip-utils.js
-%%DATADIR%%/doc/api/jquery/jszip-utils/dist/jszip-utils.min.js
-%%DATADIR%%/doc/api/jquery/jszip/dist/jszip.js
-%%DATADIR%%/doc/api/jquery/jszip/dist/jszip.min.js
+%%DATADIR%%/doc/api/jquery-ui.overrides.css
+%%DATADIR%%/doc/api/legal/ADDITIONAL_LICENSE_INFO
+%%DATADIR%%/doc/api/legal/ASSEMBLY_EXCEPTION
+%%DATADIR%%/doc/api/legal/LICENSE
+%%DATADIR%%/doc/api/legal/jquery.md
+%%DATADIR%%/doc/api/legal/jqueryUI.md
 %%DATADIR%%/doc/api/member-search-index.js
-%%DATADIR%%/doc/api/member-search-index.zip
+%%DATADIR%%/doc/api/module-search-index.js
 %%DATADIR%%/doc/api/org/freeplane/api/AttributeCondition.html
 %%DATADIR%%/doc/api/org/freeplane/api/AttributeValueSerializer.html
 %%DATADIR%%/doc/api/org/freeplane/api/Attributes.html
@@ -218,15 +197,29 @@ bin/freeplane
 %%DATADIR%%/doc/api/overview-summary.html
 %%DATADIR%%/doc/api/overview-tree.html
 %%DATADIR%%/doc/api/package-search-index.js
-%%DATADIR%%/doc/api/package-search-index.zip
 %%DATADIR%%/doc/api/resources/glass.png
 %%DATADIR%%/doc/api/resources/x.png
+%%DATADIR%%/doc/api/script-dir/images/ui-bg_glass_55_fbf9ee_1x400.png
+%%DATADIR%%/doc/api/script-dir/images/ui-bg_glass_65_dadada_1x400.png
+%%DATADIR%%/doc/api/script-dir/images/ui-bg_glass_75_dadada_1x400.png
+%%DATADIR%%/doc/api/script-dir/images/ui-bg_glass_75_e6e6e6_1x400.png
+%%DATADIR%%/doc/api/script-dir/images/ui-bg_glass_95_fef1ec_1x400.png
+%%DATADIR%%/doc/api/script-dir/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+%%DATADIR%%/doc/api/script-dir/images/ui-icons_222222_256x240.png
+%%DATADIR%%/doc/api/script-dir/images/ui-icons_2e83ff_256x240.png
+%%DATADIR%%/doc/api/script-dir/images/ui-icons_454545_256x240.png
+%%DATADIR%%/doc/api/script-dir/images/ui-icons_888888_256x240.png
+%%DATADIR%%/doc/api/script-dir/images/ui-icons_cd0a0a_256x240.png
+%%DATADIR%%/doc/api/script-dir/jquery-3.5.1.min.js
+%%DATADIR%%/doc/api/script-dir/jquery-ui.min.css
+%%DATADIR%%/doc/api/script-dir/jquery-ui.min.js
+%%DATADIR%%/doc/api/script-dir/jquery-ui.structure.min.css
 %%DATADIR%%/doc/api/script.js
 %%DATADIR%%/doc/api/search.js
 %%DATADIR%%/doc/api/serialized-form.html
 %%DATADIR%%/doc/api/stylesheet.css
+%%DATADIR%%/doc/api/tag-search-index.js
 %%DATADIR%%/doc/api/type-search-index.js
-%%DATADIR%%/doc/api/type-search-index.zip
 %%DATADIR%%/doc/examplepicture_nl.JPG
 %%DATADIR%%/doc/freeplane.jpg
 %%DATADIR%%/doc/freeplaneApplications.mm
@@ -261,7 +254,7 @@ bin/freeplane
 %%DATADIR%%/plugins/org.freeplane.plugin.formula/lib/plugin-%%PORTVERSION%%.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.jsyntaxpane/META-INF/MANIFEST.MF
 %%DATADIR%%/plugins/org.freeplane.plugin.jsyntaxpane/lib/plugin-%%PORTVERSION%%.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.jsyntaxpane/lib/syntaxpane-1.2.0.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.jsyntaxpane/lib/syntaxpane-1.2.1.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.latex/META-INF/MANIFEST.MF
 %%DATADIR%%/plugins/org.freeplane.plugin.latex/lib/jlatexmath-1.0.7.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.latex/lib/jlatexmath-font-cyrillic-1.0.7.jar
@@ -272,28 +265,59 @@ bin/freeplane
 %%DATADIR%%/plugins/org.freeplane.plugin.markdown/lib/markedj-1.0.16.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.markdown/lib/plugin-%%PORTVERSION%%.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.openmaps/META-INF/MANIFEST.MF
-%%DATADIR%%/plugins/org.freeplane.plugin.openmaps/lib/jmapviewer-2.15.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.openmaps/lib/jmapviewer-2.16.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-3.0.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-astbuilder-3.0.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-console-3.0.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-datetime-3.0.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-dateutil-3.0.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-groovysh-3.0.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-jmx-3.0.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-json-3.0.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-jsr223-3.0.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-macro-3.0.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-nio-3.0.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-servlet-3.0.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-sql-3.0.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-swing-3.0.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-templates-3.0.8.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-xml-3.0.8.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/ant-1.10.12.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/ant-antlr-1.10.12.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/ant-junit-1.10.12.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/ant-launcher-1.10.12.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/asm-9.2.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/asm-analysis-9.2.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/asm-tree-9.2.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/asm-util-9.2.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-ant-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-cli-picocli-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-console-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-datetime-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-dateutil-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-docgenerator-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-groovydoc-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-groovysh-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-jmx-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-json-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-jsr223-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-macro-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-nio-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-servlet-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-sql-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-swing-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-templates-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-test-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-test-junit5-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-xml-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/groovy-yaml-4.0.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/hamcrest-core-1.3.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.script/lib/ivy-2.5.0.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/jackson-annotations-2.13.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/jackson-core-2.13.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/jackson-databind-2.13.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/jackson-dataformat-yaml-2.13.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/javaparser-core-3.24.0.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.script/lib/jline-2.14.6.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/junit-4.13.2.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/junit-jupiter-api-5.8.2.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/junit-jupiter-engine-5.8.2.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/junit-platform-commons-1.8.2.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/junit-platform-engine-1.8.2.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/junit-platform-launcher-1.8.2.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/opentest4j-1.2.0.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/org.abego.treelayout.core-1.0.3.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/picocli-4.6.3.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.script/lib/plugin-%%PORTVERSION%%.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/qdox-1.12.1.jar
+%%DATADIR%%/plugins/org.freeplane.plugin.script/lib/snakeyaml-1.28.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.svg/META-INF/MANIFEST.MF
 %%DATADIR%%/plugins/org.freeplane.plugin.svg/lib/batik-anim-1.14.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.svg/lib/batik-awt-util-1.14.jar
@@ -322,7 +346,6 @@ bin/freeplane
 %%DATADIR%%/plugins/org.freeplane.plugin.svg/lib/fop-events-2.6.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.svg/lib/fop-util-2.6.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.svg/lib/plugin-%%PORTVERSION%%.jar
-%%DATADIR%%/plugins/org.freeplane.plugin.svg/lib/xml-apis-1.4.01.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.svg/lib/xml-apis-ext-1.3.04.jar
 %%DATADIR%%/plugins/org.freeplane.plugin.svg/lib/xmlgraphics-commons-2.6.jar
 %%DATADIR%%/props.xargs