Update to new upstream beta6 version.

ChangeLog:    http://www.docear.org/software/history-changelog/
Feature safe: yes

3 files changed, 73 insertions, 44 deletions

diff --git a/deskutils/docear/Makefile b/deskutils/docear/Makefile
index 3d9049d99ce0..a15300b2fdbf 100644
--- a/deskutils/docear/Makefile
+++ b/deskutils/docear/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	docear
-PORTVERSION=	1.0.0.b04
+PORTVERSION=	1.0.0.b06
 CATEGORIES=	deskutils java
 MASTER_SITES=	SF/docear/1.x/${PORTVERSION:S/.b/_beta/}
 DISTNAME=	docear_linux
+DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Mind Mapping tool with Reference, Library, and PDF Management
@@ -27,7 +28,7 @@ NO_BUILD=	yes
 JDATADIR=	${JAVASHAREDIR}/${PORTNAME}
 icon=		${DATADIR}/${PORTNAME}-icon48x48.png
 
-WRKSRC=		${WRKDIR}/docear-1.0.0.4_beta_build90
+WRKSRC=		${WRKDIR}/docear-1.0.0.6_beta_build123
 SUB_FILES=	docear.desktop
 
 post-patch:
diff --git a/deskutils/docear/distinfo b/deskutils/docear/distinfo
index 714131faa556..6ef7eabfe7b8 100644
--- a/deskutils/docear/distinfo
+++ b/deskutils/docear/distinfo
@@ -1,2 +1,2 @@
-SHA256 (docear_linux.tar.gz) = 2907cc1523791a98a8174d8e1f7b18f1874ae5e9b07026fdfea6ffd7eea47aa8
-SIZE (docear_linux.tar.gz) = 34648045
+SHA256 (docear-1.0.0.b06/docear_linux.tar.gz) = e889f733491962164ef2a07e7ef4408ebc84f47885a19ae8b9fc7a73730dcdf0
+SIZE (docear-1.0.0.b06/docear_linux.tar.gz) = 42470217
diff --git a/deskutils/docear/pkg-plist b/deskutils/docear/pkg-plist
index c5c47d1a9c70..0b6b983ff9ed 100644
--- a/deskutils/docear/pkg-plist
+++ b/deskutils/docear/pkg-plist
@@ -6,6 +6,8 @@ share/docear/docear-icon48x48.png
 @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/META-INF/MANIFEST.MF
+share/java/docear/core/org.freeplane.core/lib/SimplyHTML.jar
 share/java/docear/core/org.freeplane.core/lib/commons-lang-2.0.jar
 share/java/docear/core/org.freeplane.core/lib/forms-1.2.1.jar
 share/java/docear/core/org.freeplane.core/lib/freeplaneeditor.jar
@@ -13,14 +15,49 @@ 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/SimplyHTML.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
+share/java/docear/core/org.freeplane.core/lib/platform.jar
 share/java/docear/doc/FilterConsumer.jpg
 share/java/docear/doc/FilterConsumerEnd.jpg
 share/java/docear/doc/FilterConsumerUnfold.jpg
+share/java/docear/doc/Images/doc/BackgroundContextMenu.png
+share/java/docear/doc/Images/doc/BackgroundContextMenu_nl.png
+share/java/docear/doc/Images/doc/HotKeysTable.png
+share/java/docear/doc/Images/doc/HotKeysTable_nl.png
+share/java/docear/doc/Images/doc/In-lineEditContextMenu.png
+share/java/docear/doc/Images/doc/MenusPropertiesPanel.png
+share/java/docear/doc/Images/doc/MenusPropertiesPanel_nl.png
+share/java/docear/doc/Images/doc/NodeContextMenu.png
+share/java/docear/doc/Images/doc/freeplaneApplications.png
+share/java/docear/doc/Images/key/F1.png
+share/java/docear/doc/Images/key/F2.png
+share/java/docear/doc/Images/key/Ins.png
+share/java/docear/doc/Images/key/alt.png
+share/java/docear/doc/Images/key/ctrl.png
+share/java/docear/doc/Images/key/delete.png
+share/java/docear/doc/Images/key/down.png
+share/java/docear/doc/Images/key/end.png
+share/java/docear/doc/Images/key/enter.png
+share/java/docear/doc/Images/key/esc.png
+share/java/docear/doc/Images/key/home.png
+share/java/docear/doc/Images/key/insert.png
+share/java/docear/doc/Images/key/left.png
+share/java/docear/doc/Images/key/pgdn.png
+share/java/docear/doc/Images/key/pgup.png
+share/java/docear/doc/Images/key/right.png
+share/java/docear/doc/Images/key/shift.png
+share/java/docear/doc/Images/key/space.png
+share/java/docear/doc/Images/key/tab.png
+share/java/docear/doc/Images/key/up.png
+share/java/docear/doc/Images/mouse/mouse.png
+share/java/docear/doc/Images/mouse/mouse_LB.png
+share/java/docear/doc/Images/mouse/mouse_LB_2x.png
+share/java/docear/doc/Images/mouse/mouse_RB.png
+share/java/docear/doc/Images/mouse/mouse_SB_click.png
+share/java/docear/doc/Images/mouse/mouse_SB_scroll.png
+share/java/docear/doc/docear-welcome.mm
+share/java/docear/doc/examplepicture_nl.JPG
 share/java/docear/doc/freeplane.jpg
 share/java/docear/doc/freeplane.mm
 share/java/docear/doc/freeplaneApplications.mm
@@ -51,21 +88,12 @@ share/java/docear/doc/freeplane_nl.jpg
 share/java/docear/doc/freeplane_ru.mm
 share/java/docear/doc/freeplane_vi.mm
 share/java/docear/doc/history_en.txt
-share/java/docear/doc/Images/doc/BackgroundContextMenu.png
-share/java/docear/doc/Images/doc/BackgroundContextMenu_nl.png
-share/java/docear/doc/Images/doc/freeplaneApplications.png
-share/java/docear/doc/Images/doc/HotKeysTable.png
-share/java/docear/doc/Images/doc/HotKeysTable_nl.png
-share/java/docear/doc/Images/doc/In-lineEditContextMenu.png
-share/java/docear/doc/Images/doc/MenusPropertiesPanel.png
-share/java/docear/doc/Images/doc/MenusPropertiesPanel_nl.png
-share/java/docear/doc/Images/doc/NodeContextMenu.png
-share/java/docear/doc/Images/mouse/mouse_RB.png
 share/java/docear/docear.png
 share/java/docear/docear.sh
 share/java/docear/framework.jar
 share/java/docear/init.xargs
 share/java/docear/license.txt
+share/java/docear/plugins/org.docear.plugin.bibtex/META-INF/MANIFEST.MF
 share/java/docear/plugins/org.docear.plugin.bibtex/lib/JabRef-2.7.1.jar
 share/java/docear/plugins/org.docear.plugin.bibtex/lib/lib/plugins/net.sf.jabref.core/plugin.xml
 share/java/docear/plugins/org.docear.plugin.bibtex/lib/lib/plugins/net.sf.jabref.export.misq/build.xml
@@ -78,49 +106,49 @@ 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/net.sf.jabref.export.misq/templates/readme.txt
 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.communications/lib/jersey-client-1.1.5.1.jar
-share/java/docear/plugins/org.docear.plugin.communications/lib/jersey-core-1.1.5.1.jar
-share/java/docear/plugins/org.docear.plugin.communications/lib/jersey-multipart-1.1.5.1.jar
-share/java/docear/plugins/org.docear.plugin.communications/lib/jsr311-api-1.1.1.jar
-share/java/docear/plugins/org.docear.plugin.communications/lib/mimepull-1.3.jar
-share/java/docear/plugins/org.docear.plugin.communications/lib/plugin.jar
-share/java/docear/plugins/org.docear.plugin.communications/META-INF/MANIFEST.MF
+share/java/docear/plugins/org.docear.plugin.core/META-INF/MANIFEST.MF
 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
+share/java/docear/plugins/org.docear.plugin.core/lib/platform.jar
 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/jna/jna.jar
-share/java/docear/plugins/org.docear.plugin.pdfutilities/lib/jna/platform.jar
+share/java/docear/plugins/org.docear.plugin.optionpane/lib/plugin.jar
+share/java/docear/plugins/org.docear.plugin.pdfutilities/META-INF/MANIFEST.MF
 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
 share/java/docear/plugins/org.docear.plugin.pdfutilities/lib/jpod/jPod.jar
+share/java/docear/plugins/org.docear.plugin.pdfutilities/lib/jpod/jbig2.jar
 share/java/docear/plugins/org.docear.plugin.pdfutilities/lib/plugin.jar
-share/java/docear/plugins/org.docear.plugin.pdfutilities/META-INF/MANIFEST.MF
-share/java/docear/plugins/org.docear.plugin.services/lib/plugin.jar
 share/java/docear/plugins/org.docear.plugin.services/META-INF/MANIFEST.MF
-share/java/docear/plugins/org.freeplane.plugin.accountmanager/lib/plugin.jar
-share/java/docear/plugins/org.freeplane.plugin.accountmanager/META-INF/MANIFEST.MF
-share/java/docear/plugins/org.freeplane.plugin.bugreport/lib/plugin.jar
+share/java/docear/plugins/org.docear.plugin.services/lib/commons-codec-1.6.jar
+share/java/docear/plugins/org.docear.plugin.services/lib/commons-httpclient-3.1.jar
+share/java/docear/plugins/org.docear.plugin.services/lib/commons-logging-1.1.1.jar
+share/java/docear/plugins/org.docear.plugin.services/lib/jersey-apache-client-1.12.jar
+share/java/docear/plugins/org.docear.plugin.services/lib/jersey-client-1.12.jar
+share/java/docear/plugins/org.docear.plugin.services/lib/jersey-core-1.12.jar
+share/java/docear/plugins/org.docear.plugin.services/lib/jersey-multipart-1.12.jar
+share/java/docear/plugins/org.docear.plugin.services/lib/mimepull-1.3.jar
+share/java/docear/plugins/org.docear.plugin.services/lib/plugin.jar
 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.bugreport/lib/plugin.jar
 share/java/docear/plugins/org.freeplane.plugin.formula/META-INF/MANIFEST.MF
+share/java/docear/plugins/org.freeplane.plugin.formula/lib/plugin.jar
+share/java/docear/plugins/org.freeplane.plugin.latex/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/LICENSE
+share/java/docear/plugins/org.freeplane.plugin.latex/lib/jlatexmath-0.9.7.jar
 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.script/lib/groovy-all-1.8.2-LICENSE.txt
-share/java/docear/plugins/org.freeplane.plugin.script/lib/groovy-all-1.8.2.jar
+share/java/docear/plugins/org.freeplane.plugin.script/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/plugin.jar
-share/java/docear/plugins/org.freeplane.plugin.script/META-INF/MANIFEST.MF
+share/java/docear/plugins/org.freeplane.plugin.svg/META-INF/MANIFEST.MF
 share/java/docear/plugins/org.freeplane.plugin.svg/lib/batik-anim.jar
 share/java/docear/plugins/org.freeplane.plugin.svg/lib/batik-awt-util.jar
 share/java/docear/plugins/org.freeplane.plugin.svg/lib/batik-bridge.jar
@@ -145,10 +173,9 @@ share/java/docear/plugins/org.freeplane.plugin.svg/lib/plugin.jar
 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/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/ortho/dictionary_de.ortho
@@ -245,5 +272,6 @@ share/mime/text/x-docear.xml
 @dirrm share/java/docear/core/org.freeplane.core
 @dirrm share/java/docear/core
 @dirrm share/java/docear
+@dirrm %%DOCSDIR%%
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || :
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime