3 files changed, 40 insertions, 22 deletions

diff --git a/deskutils/docear/Makefile b/deskutils/docear/Makefile
index 46cc139796ae..2254fbdb7c80 100644
--- a/deskutils/docear/Makefile
+++ b/deskutils/docear/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	docear
-PORTVERSION=	1.0.0.b09
+PORTVERSION=	1.0.0.r1
 CATEGORIES=	deskutils java
-MASTER_SITES=	http://downloads.docear.org/${PORTVERSION:S/.b/_beta/}/ \
-		SF/docear/1.x/${PORTVERSION:S/.b/_beta/} \
+MASTER_SITES=	http://downloads.docear.org/${PORTVERSION:S/.r/_rc/}/ \
 		LOCAL/mandree/${DIST_SUBDIR}/
+#		SF/docear/1.x/${PORTVERSION:S/.b/_beta/}
 DISTNAME=	docear_linux
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
@@ -26,7 +26,7 @@ NO_BUILD=	yes
 JDATADIR=	${JAVASHAREDIR}/${PORTNAME}
 icon=		${DATADIR}/${PORTNAME}-icon48x48.png
 
-WRKSRC=		${WRKDIR}/docear-1.0.0.9_beta_build147
+WRKSRC=		${WRKDIR}/docear-1.0.0.12_rc_build183
 SUB_FILES=	docear.desktop
 
 post-patch:
@@ -38,9 +38,9 @@ do-install:
 		@${RM} -f ${WRKSRC}/docear.bat \
 			${WRKSRC}/docear.exe \
 			${WRKSRC}/*.bak
-# We can't install into $DOCSDIR or support NOPORTDOCS
-# since the documentation is an integral part of the
-# installation, as online help via the program menus.
+# We can't install into $DOCSDIR or support disabling a DOCS option
+# since the documentation is an integral part of the installation,
+# such as online help via the program menus.
 		${MKDIR} ${JDATADIR}
 		(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${JDATADIR})
 		${PRINTF} '#!/bin/sh\nset -eu\nexport JAVA_HOME="%s"\ncd "%s"\nexec "%s" "$$@"\n' \
diff --git a/deskutils/docear/distinfo b/deskutils/docear/distinfo
index 4f0b8889481c..42d570fdaab9 100644
--- a/deskutils/docear/distinfo
+++ b/deskutils/docear/distinfo
@@ -1,2 +1,2 @@
-SHA256 (docear-1.0.0.b09/docear_linux.tar.gz) = 3e1ab00093da08fce8086d012ad66bb35172ff8316948b8431a15583182ec122
-SIZE (docear-1.0.0.b09/docear_linux.tar.gz) = 50603364
+SHA256 (docear-1.0.0.r1/docear_linux.tar.gz) = 79769aa25a2059ff4e7fbda2140806d0d26a16d79e1f8d4004b4ef6e02ad5026
+SIZE (docear-1.0.0.r1/docear_linux.tar.gz) = 56317816
diff --git a/deskutils/docear/pkg-plist b/deskutils/docear/pkg-plist
index 6040ec042c2a..06b76b8ac5cb 100644
--- a/deskutils/docear/pkg-plist
+++ b/deskutils/docear/pkg-plist
@@ -5,19 +5,29 @@ share/docear/docear-icon48x48.png
 @dirrm share/docear
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || :
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-share/java/docear/bzrinfo.txt
 share/java/docear/core/org.freeplane.core/lib/commons-io-2.4.jar
 share/java/docear/core/org.freeplane.core/lib/commons-lang-2.0.jar
+share/java/docear/core/org.freeplane.core/lib/flamingo-6.3-javadoc.jar
+share/java/docear/core/org.freeplane.core/lib/flamingo-6.3-sources.jar
+share/java/docear/core/org.freeplane.core/lib/flamingo-6.3.jar
 share/java/docear/core/org.freeplane.core/lib/forms-1.2.1.jar
 share/java/docear/core/org.freeplane.core/lib/freeplaneeditor.jar
 share/java/docear/core/org.freeplane.core/lib/freeplanemac.jar
 share/java/docear/core/org.freeplane.core/lib/freeplaneosgi.jar
 share/java/docear/core/org.freeplane.core/lib/freeplaneviewer.jar
 share/java/docear/core/org.freeplane.core/lib/gnu-regexp-1.1.4.jar
-share/java/docear/core/org.freeplane.core/lib/jna.jar
 share/java/docear/core/org.freeplane.core/lib/jortho.jar
-share/java/docear/core/org.freeplane.core/lib/platform.jar
 share/java/docear/core/org.freeplane.core/lib/SimplyHTML.jar
+share/java/docear/core/org.freeplane.core/lib/substance-6.3-javadoc.jar
+share/java/docear/core/org.freeplane.core/lib/substance-6.3-sources.jar
+share/java/docear/core/org.freeplane.core/lib/substance-6.3.jar
+share/java/docear/core/org.freeplane.core/lib/substance-flamingo-6.3-javadoc.jar
+share/java/docear/core/org.freeplane.core/lib/substance-flamingo-6.3-sources.jar
+share/java/docear/core/org.freeplane.core/lib/substance-flamingo-6.3.jar
+share/java/docear/core/org.freeplane.core/lib/substance-swingx-6.3-javadoc.jar
+share/java/docear/core/org.freeplane.core/lib/substance-swingx-6.3-sources.jar
+share/java/docear/core/org.freeplane.core/lib/substance-swingx-6.3.jar
+share/java/docear/core/org.freeplane.core/lib/trident.jar
 share/java/docear/core/org.freeplane.core/META-INF/MANIFEST.MF
 share/java/docear/doc/docear-welcome.mm
 share/java/docear/doc/examplepicture_nl.JPG
@@ -91,7 +101,10 @@ share/java/docear/doc/Images/mouse/mouse_SB_click.png
 share/java/docear/doc/Images/mouse/mouse_SB_scroll.png
 share/java/docear/docear.png
 share/java/docear/docear.sh
+share/java/docear/docearConsole.exe
 share/java/docear/framework.jar
+share/java/docear/freeplanelauncher.jar
+share/java/docear/gitinfo.txt
 share/java/docear/init.xargs
 share/java/docear/license.txt
 share/java/docear/plugins/org.docear.plugin.bibtex/lib/JabRef-2.7.1.jar
@@ -107,6 +120,8 @@ share/java/docear/plugins/org.docear.plugin.bibtex/lib/lib/plugins/net.sf.jabref
 share/java/docear/plugins/org.docear.plugin.bibtex/lib/lib/plugins/readme.txt
 share/java/docear/plugins/org.docear.plugin.bibtex/lib/plugin.jar
 share/java/docear/plugins/org.docear.plugin.bibtex/META-INF/MANIFEST.MF
+share/java/docear/plugins/org.docear.plugin.core/lib/commons-cli-1.2.jar
+share/java/docear/plugins/org.docear.plugin.core/lib/guava-14.0.1.jar
 share/java/docear/plugins/org.docear.plugin.core/lib/JHyperlink.jar
 share/java/docear/plugins/org.docear.plugin.core/lib/jna.jar
 share/java/docear/plugins/org.docear.plugin.core/lib/jpathwatch.jar
@@ -115,10 +130,7 @@ share/java/docear/plugins/org.docear.plugin.core/lib/plugin.jar
 share/java/docear/plugins/org.docear.plugin.core/lib/swingworker-backport.jar
 share/java/docear/plugins/org.docear.plugin.core/license.txt
 share/java/docear/plugins/org.docear.plugin.core/META-INF/MANIFEST.MF
-share/java/docear/plugins/org.docear.plugin.optionpane/lib/plugin.jar
-share/java/docear/plugins/org.docear.plugin.optionpane/META-INF/MANIFEST.MF
-share/java/docear/plugins/org.docear.plugin.pdfutilities/lib/docear-pdf-utilities.jar
-share/java/docear/plugins/org.docear.plugin.pdfutilities/lib/guava-14.0.1.jar
+share/java/docear/plugins/org.docear.plugin.pdfutilities/lib/docear-pdf-inspector.jar
 share/java/docear/plugins/org.docear.plugin.pdfutilities/lib/jpod/iscwt.jar
 share/java/docear/plugins/org.docear.plugin.pdfutilities/lib/jpod/isrt.jar
 share/java/docear/plugins/org.docear.plugin.pdfutilities/lib/jpod/jbig2.jar
@@ -140,15 +152,19 @@ share/java/docear/plugins/org.freeplane.plugin.bugreport/META-INF/MANIFEST.MF
 share/java/docear/plugins/org.freeplane.plugin.formula/lib/plugin.jar
 share/java/docear/plugins/org.freeplane.plugin.formula/META-INF/MANIFEST.MF
 share/java/docear/plugins/org.freeplane.plugin.latex/lib/COPYING
-share/java/docear/plugins/org.freeplane.plugin.latex/lib/jlatexmath-0.9.7.jar
+share/java/docear/plugins/org.freeplane.plugin.latex/lib/jlatexmath.jar
 share/java/docear/plugins/org.freeplane.plugin.latex/lib/LICENSE
 share/java/docear/plugins/org.freeplane.plugin.latex/lib/plugin.jar
 share/java/docear/plugins/org.freeplane.plugin.latex/META-INF/MANIFEST.MF
+share/java/docear/plugins/org.freeplane.plugin.openmaps/lib/Gpl.txt
+share/java/docear/plugins/org.freeplane.plugin.openmaps/lib/JMapViewer.jar
+share/java/docear/plugins/org.freeplane.plugin.openmaps/lib/JMapViewer_src.jar
+share/java/docear/plugins/org.freeplane.plugin.openmaps/lib/plugin.jar
+share/java/docear/plugins/org.freeplane.plugin.openmaps/lib/Readme.txt
+share/java/docear/plugins/org.freeplane.plugin.openmaps/META-INF/MANIFEST.MF
 share/java/docear/plugins/org.freeplane.plugin.script/lib/groovy-all-LICENSE.txt
 share/java/docear/plugins/org.freeplane.plugin.script/lib/groovy-all.jar
-share/java/docear/plugins/org.freeplane.plugin.script/lib/jsyntaxpane/jsyntaxpane-jdk5.jar
-share/java/docear/plugins/org.freeplane.plugin.script/lib/jsyntaxpane/jsyntaxpane.jar
-share/java/docear/plugins/org.freeplane.plugin.script/lib/jsyntaxpane/nodehighlighter.jar
+share/java/docear/plugins/org.freeplane.plugin.script/lib/jsyntaxpane.jar
 share/java/docear/plugins/org.freeplane.plugin.script/lib/plugin.jar
 share/java/docear/plugins/org.freeplane.plugin.script/META-INF/MANIFEST.MF
 share/java/docear/plugins/org.freeplane.plugin.svg/lib/batik-anim.jar
@@ -176,11 +192,10 @@ share/java/docear/plugins/org.freeplane.plugin.svg/lib/xerces_2_5_0.jar
 share/java/docear/plugins/org.freeplane.plugin.svg/lib/xml-apis-ext.jar
 share/java/docear/plugins/org.freeplane.plugin.svg/lib/xml-apis.jar
 share/java/docear/plugins/org.freeplane.plugin.svg/META-INF/MANIFEST.MF
-share/java/docear/plugins/org.freeplane.plugin.workspace/lib/commons-io-2.0.1.jar
 share/java/docear/plugins/org.freeplane.plugin.workspace/lib/plugin.jar
 share/java/docear/plugins/org.freeplane.plugin.workspace/META-INF/MANIFEST.MF
 share/java/docear/props.xargs
-share/java/docear/resources/bzrinfo.properties
+share/java/docear/resources/gitinfo.properties
 share/java/docear/resources/ortho/dictionary_de.ortho
 share/java/docear/resources/ortho/dictionary_en.ortho
 share/java/docear/resources/ortho/dictionary_fr.ortho
@@ -226,6 +241,9 @@ share/mime/text/x-docear.xml
 @dirrm share/java/docear/plugins/org.freeplane.plugin.script/lib/jsyntaxpane
 @dirrm share/java/docear/plugins/org.freeplane.plugin.script/lib
 @dirrm share/java/docear/plugins/org.freeplane.plugin.script
+@dirrm share/java/docear/plugins/org.freeplane.plugin.openmaps/META-INF
+@dirrm share/java/docear/plugins/org.freeplane.plugin.openmaps/lib
+@dirrm share/java/docear/plugins/org.freeplane.plugin.openmaps
 @dirrm share/java/docear/plugins/org.freeplane.plugin.latex/META-INF
 @dirrm share/java/docear/plugins/org.freeplane.plugin.latex/lib
 @dirrm share/java/docear/plugins/org.freeplane.plugin.latex