4 files changed, 174 insertions, 108 deletions
diff --git a/editors/zim/Makefile b/editors/zim/Makefile
index cf82d8a128e0..c67225aa3f95 100644
--- a/editors/zim/Makefile
+++ b/editors/zim/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	zim
-PORTVERSION=	0.23
-PORTREVISION=	1
+PORTVERSION=	0.28
 CATEGORIES=	editors perl5
-MASTER_SITES=	http://pardus-larus.student.utwente.nl/~pardus/downloads/Zim/
+MASTER_SITES=	http://www.zim-wiki.org/downloads/
 DISTNAME=	Zim-${PORTVERSION}
 
 MAINTAINER=	acm@FreeBSD.org
@@ -20,10 +19,12 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
 		${SITE_PERL}/File/MimeInfo.pm:${PORTSDIR}/devel/p5-File-MimeInfo \
 		${SITE_PERL}/File/DesktopEntry.pm:${PORTSDIR}/devel/p5-File-DesktopEntry
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${BUILD_DEPENDS} \
+		update-mime-database:${PORTSDIR}/misc/shared-mime-info \
+		xdg-icon-resource:${PORTSDIR}/devel/xdg-utils
 
 USE_GNOME=	gtk20 desktopfileutils
-PERL_MODBUILD=	5.8.0+
+PERL_CONFIGURE=	yes
 MAN1=		zim.1
 MAN3=		Gtk2::Ex::DesktopEntryMenu.3 \
 		Gtk2::Ex::HyperTextBuffer.3 \
@@ -31,36 +32,44 @@ MAN3=		Gtk2::Ex::DesktopEntryMenu.3 \
 		Gtk2::Ex::PathBar.3 \
 		Zim.3 \
 		Zim::Events.3 \
-		Zim::File.3 \
+		Zim::FS.3 \
+		Zim::FS::Bazaar.3 \
+		Zim::FS::Subversion.3 \
 		Zim::Formats.3 \
+		Zim::Formats::Html.3 \
+		Zim::Formats::Pod.3 \
 		Zim::Formats::Txt2tags.3 \
-		Zim::GUI::Spell.3 \
-		Zim::Selection.3 \
+		Zim::Formats::Wiki.3 \
+		Zim::GUI.3 \
+		Zim::GUI::Automount.3 \
 		Zim::GUI::Calendar.3 \
 		Zim::GUI::Component.3 \
+		Zim::GUI::Daemon.3 \
+		Zim::GUI::DiagramEditor.3 \
 		Zim::GUI::EquationEditor.3 \
 		Zim::GUI::ExportDialog.3 \
 		Zim::GUI::FindReplaceDialog.3 \
 		Zim::GUI::NotebookDialog.3 \
+		Zim::GUI::PageView.3 \
+		Zim::GUI::PathBar.3 \
 		Zim::GUI::PreferencesDialog.3 \
 		Zim::GUI::PropertiesDialog.3 \
 		Zim::GUI::SearchDialog.3 \
-		Zim::GUI.3 \
-		Zim::GUI::PageView.3 \
+		Zim::GUI::Spell.3 \
+		Zim::GUI::TODOListDialog.3 \
 		Zim::GUI::TrayIcon.3 \
 		Zim::GUI::TreeView.3 \
-		Zim::GUI::PathBar.3 \
-		Zim::Formats::Html.3 \
-		Zim::Formats::Wiki.3 \
+		Zim::GUI::VersionsDialog.3 \
 		Zim::History.3 \
 		Zim::OS::Win32.3 \
 		Zim::Page.3 \
+		Zim::Selection.3 \
 		Zim::Store.3 \
 		Zim::Store::Cached.3 \
 		Zim::Store::Files.3 \
+		Zim::Store::Gjots.3 \
 		Zim::Store::Man.3 \
 		Zim::Template.3 \
-		Zim::TextBuffer.3 \
 		Zim::Utils.3
 
 OPTIONS=	TRAYICON	"Support trayicon"	on \
diff --git a/editors/zim/distinfo b/editors/zim/distinfo
index 7c108b72e79f..135286c66c9b 100644
--- a/editors/zim/distinfo
+++ b/editors/zim/distinfo
@@ -1,3 +1,3 @@
-MD5 (Zim-0.23.tar.gz) = 84197b5d2e45898ddb67746c71cc3b1a
-SHA256 (Zim-0.23.tar.gz) = 8375494d71222ab73865123ef9065be83ddba86e843fa388df21d7d392b14088
-SIZE (Zim-0.23.tar.gz) = 461917
+MD5 (Zim-0.28.tar.gz) = fce152562b57d4753edfcdc635a26e42
+SHA256 (Zim-0.28.tar.gz) = de1f3b476a07b171d884c96fa02e4094cebe36b890c730e6a629f8062db0724c
+SIZE (Zim-0.28.tar.gz) = 897945
diff --git a/editors/zim/pkg-descr b/editors/zim/pkg-descr
index 71aa477afd67..f74c51317c51 100644
--- a/editors/zim/pkg-descr
+++ b/editors/zim/pkg-descr
@@ -8,4 +8,4 @@ a new page is as easy as linking to a non-existing page.
 Pages are ordered in a hierarchical structure that gives it the look and feel
 of an outliner.
 
-WWW:	http://www.pardus.nl/projects/
+WWW:	http://www.zim-wiki.org
diff --git a/editors/zim/pkg-plist b/editors/zim/pkg-plist
index 0fea619d1e99..3d97b8ae95e5 100644
--- a/editors/zim/pkg-plist
+++ b/editors/zim/pkg-plist
@@ -1,125 +1,182 @@
 bin/zim
-%%SITE_PERL%%/Gtk2/Ex/DesktopEntryMenu.pm
 %%SITE_PERL%%/Gtk2/Ex/HyperTextBuffer.pm
 %%SITE_PERL%%/Gtk2/Ex/HyperTextView.pm
+%%SITE_PERL%%/Gtk2/Ex/DesktopEntryMenu.pm
 %%SITE_PERL%%/Gtk2/Ex/PathBar.pm
-%%SITE_PERL%%/Zim.pm
-%%SITE_PERL%%/Zim/Events.pm
-%%SITE_PERL%%/Zim/File.pm
-%%SITE_PERL%%/Zim/Formats.pm
-%%SITE_PERL%%/Zim/Formats/Html.pm
-%%SITE_PERL%%/Zim/Formats/Txt2tags.pm
+%%SITE_PERL%%/Zim/FS/Bazaar.pm
+%%SITE_PERL%%/Zim/FS/Subversion.pm
+%%SITE_PERL%%/Zim/Formats/Pod.pm
 %%SITE_PERL%%/Zim/Formats/Wiki.pm
-%%SITE_PERL%%/Zim/GUI.pm
-%%SITE_PERL%%/Zim/GUI/Calendar.pm
-%%SITE_PERL%%/Zim/GUI/Component.pm
-%%SITE_PERL%%/Zim/GUI/EquationEditor.pm
-%%SITE_PERL%%/Zim/GUI/ExportDialog.pm
-%%SITE_PERL%%/Zim/GUI/FindReplaceDialog.pm
-%%SITE_PERL%%/Zim/GUI/NotebookDialog.pm
-%%SITE_PERL%%/Zim/GUI/PageView.pm
+%%SITE_PERL%%/Zim/Formats/Txt2tags.pm
+%%SITE_PERL%%/Zim/Formats/Html.pm
+%%SITE_PERL%%/Zim/GUI/Spell.pm
 %%SITE_PERL%%/Zim/GUI/PathBar.pm
-%%SITE_PERL%%/Zim/GUI/PreferencesDialog.pm
-%%SITE_PERL%%/Zim/GUI/PropertiesDialog.pm
+%%SITE_PERL%%/Zim/GUI/TODOListDialog.pm
+%%SITE_PERL%%/Zim/GUI/Automount.pm
+%%SITE_PERL%%/Zim/GUI/PageView.pm
+%%SITE_PERL%%/Zim/GUI/TreeView.pm
+%%SITE_PERL%%/Zim/GUI/NotebookDialog.pm
+%%SITE_PERL%%/Zim/GUI/ExportDialog.pm
+%%SITE_PERL%%/Zim/GUI/DiagramEditor.pm
+%%SITE_PERL%%/Zim/GUI/Component.pm
+%%SITE_PERL%%/Zim/GUI/Daemon.pm
 %%SITE_PERL%%/Zim/GUI/SearchDialog.pm
-%%SITE_PERL%%/Zim/GUI/Spell.pm
 %%SITE_PERL%%/Zim/GUI/TrayIcon.pm
-%%SITE_PERL%%/Zim/GUI/TreeView.pm
-%%SITE_PERL%%/Zim/History.pm
+%%SITE_PERL%%/Zim/GUI/PropertiesDialog.pm
+%%SITE_PERL%%/Zim/GUI/FindReplaceDialog.pm
+%%SITE_PERL%%/Zim/GUI/PreferencesDialog.pm
+%%SITE_PERL%%/Zim/GUI/VersionsDialog.pm
+%%SITE_PERL%%/Zim/GUI/EquationEditor.pm
+%%SITE_PERL%%/Zim/GUI/Calendar.pm
 %%SITE_PERL%%/Zim/OS/Win32.pm
-%%SITE_PERL%%/Zim/Page.pm
-%%SITE_PERL%%/Zim/Store.pm
+%%SITE_PERL%%/Zim/Store/Gjots.pm
 %%SITE_PERL%%/Zim/Store/Cached.pm
-%%SITE_PERL%%/Zim/Store/Files.pm
 %%SITE_PERL%%/Zim/Store/Man.pm
-%%SITE_PERL%%/Zim/Selection.pm
-%%SITE_PERL%%/Zim/Template.pm
-%%SITE_PERL%%/Zim/TextBuffer.pm
+%%SITE_PERL%%/Zim/Store/Files.pm
+%%SITE_PERL%%/Zim/Events.pm
+%%SITE_PERL%%/Zim/Formats.pm
+%%SITE_PERL%%/Zim/GUI.pm
+%%SITE_PERL%%/Zim/FS.pm
 %%SITE_PERL%%/Zim/Utils.pm
-%%DATADIR%%/doc/globe_banner.png
-%%DATADIR%%/doc/Zim/About.txt
-%%DATADIR%%/doc/Zim/Install.txt
-%%DATADIR%%/doc/Zim/Translations.txt
-%%DATADIR%%/doc/Zim/Usage.txt
-%%DATADIR%%/doc/Zim/Bugs.txt
-%%DATADIR%%/doc/Zim/Features.txt
-%%DATADIR%%/doc/Zim/FAQ.txt
-%%DATADIR%%/doc/Zim/Contributing.txt
-%%DATADIR%%/doc/Zim/changelog.txt
-%%DATADIR%%/doc/Zim/Usage/strategies.txt
-%%DATADIR%%/doc/Zim/Usage/config.txt
-%%DATADIR%%/doc/Zim/Usage/preferences.txt
-%%DATADIR%%/doc/Zim/Usage/exporting.txt
-%%DATADIR%%/doc/Zim/Usage/styles.txt
-%%DATADIR%%/doc/Zim/Usage/commandline.txt
-%%DATADIR%%/doc/Zim/Usage/plugins.txt
-%%DATADIR%%/doc/Zim/Usage/searching.txt
-%%DATADIR%%/doc/Zim/Usage/notebooks.txt
-%%DATADIR%%/doc/Zim/Usage/autoformat.txt
-%%DATADIR%%/doc/Zim/Usage/properties.txt
-%%DATADIR%%/doc/Zim/Usage/syntax.txt
-%%DATADIR%%/doc/Zim/Usage/html_entities.txt
-%%DATADIR%%/doc/Zim/Usage/templates.txt
-%%DATADIR%%/doc/Zim/Usage/keybindings.txt
-%%DATADIR%%/doc/Zim/Usage/getting_started.txt
-%%DATADIR%%/doc/Zim/Usage/linking.txt
-%%DATADIR%%/doc/Zim/Usage/plugins/EquationEditor.txt
-%%DATADIR%%/doc/Zim/Usage/plugins/equation_01.png
-%%DATADIR%%/doc/Zim/Install/Windows.txt
-%%DATADIR%%/doc/Zim/Install/Unix.txt
-share/applications/zim.desktop
-share/pixmaps/zim.png
-share/pixmaps/zim/gtk-connect.png
+%%SITE_PERL%%/Zim/Page.pm
+%%SITE_PERL%%/Zim/Store.pm
+%%SITE_PERL%%/Zim/Template.pm
+%%SITE_PERL%%/Zim/History.pm
+%%SITE_PERL%%/Zim/Selection.pm
+%%SITE_PERL%%/Zim.pm
 share/pixmaps/zim/stock_calendar-view-month.png
-%%DATADIR%%/dates.list
-%%DATADIR%%/default.conf
-%%DATADIR%%/entities.list
-%%DATADIR%%/doc/.zim.config
+share/pixmaps/zim/mail-attachment.png
+share/pixmaps/zim/gtk-connect.png
+share/pixmaps/zim/stock_todo.png
+share/pixmaps/zim/xchecked-box.png
+share/pixmaps/zim/unchecked-box.png
+share/pixmaps/zim/checked-box.png
+share/pixmaps/zim.png
+share/applications/zim.desktop
+share/icons/hicolor/64x64/mimetypes/application-x-zim-notebook.png
+share/icons/hicolor/64x64/mimetypes/gnome-mime-application-x-zim-notebook.png
+share/mime/packages/zim.xml
+share/mime/text/x-zim-wiki.xml
+share/mime/application/x-zim-notebook.xml
+share/mime/application/x-gjots.xml
+%%DATADIR%%/doc/Install/OS_X.txt
+%%DATADIR%%/doc/Install/Unix.txt
+%%DATADIR%%/doc/Install/Windows.txt
+%%DATADIR%%/doc/Usage/plugins/DiagramEditor/diagram_01.dot
+%%DATADIR%%/doc/Usage/plugins/DiagramEditor/diagram_01.png
+%%DATADIR%%/doc/Usage/plugins/equation_01.png
+%%DATADIR%%/doc/Usage/plugins/TODOList.txt
+%%DATADIR%%/doc/Usage/plugins/EquationEditor.txt
+%%DATADIR%%/doc/Usage/plugins/DiagramEditor.txt
+%%DATADIR%%/doc/Usage/Encryption.txt
+%%DATADIR%%/doc/Usage/VersionControl.txt
+%%DATADIR%%/doc/Usage/searching.txt
+%%DATADIR%%/doc/Usage/getting_started.txt
+%%DATADIR%%/doc/Usage/syntax.txt
+%%DATADIR%%/doc/Usage/strategies.txt
+%%DATADIR%%/doc/Usage/checkboxes.txt
+%%DATADIR%%/doc/Usage/notebooks.txt
+%%DATADIR%%/doc/Usage/plugins.txt
+%%DATADIR%%/doc/Usage/linking.txt
+%%DATADIR%%/doc/Usage/preferences.txt
+%%DATADIR%%/doc/Usage/styles.txt
+%%DATADIR%%/doc/Usage/templates.txt
+%%DATADIR%%/doc/Usage/profiles.txt
+%%DATADIR%%/doc/Usage/Attaching_Files.txt
+%%DATADIR%%/doc/Usage/autoformat.txt
+%%DATADIR%%/doc/Usage/commandline.txt
+%%DATADIR%%/doc/Usage/exporting.txt
+%%DATADIR%%/doc/Usage/html_entities.txt
+%%DATADIR%%/doc/Usage/keybindings.txt
+%%DATADIR%%/doc/Usage/config.txt
+%%DATADIR%%/doc/Usage/properties.txt
+%%DATADIR%%/doc/About.txt
+%%DATADIR%%/doc/Usage.txt
+%%DATADIR%%/doc/globe_banner.png
+%%DATADIR%%/doc/FAQ.txt
 %%DATADIR%%/doc/Help.txt
-%%DATADIR%%/lingua/cs.pl
+%%DATADIR%%/doc/Translations.txt
+%%DATADIR%%/doc/Contributing.txt
+%%DATADIR%%/doc/notebook.zim
+%%DATADIR%%/doc/Install.txt
+%%DATADIR%%/doc/start-zim.sh
+%%DATADIR%%/doc/Bugs.txt
+%%DATADIR%%/doc/changelog.txt
+%%DATADIR%%/lingua/de.pl
+%%DATADIR%%/lingua/he.pl
+%%DATADIR%%/lingua/tr.pl
+%%DATADIR%%/lingua/gl.pl
+%%DATADIR%%/lingua/ru.pl
 %%DATADIR%%/lingua/es.pl
-%%DATADIR%%/lingua/fr.pl
 %%DATADIR%%/lingua/it.pl
 %%DATADIR%%/lingua/nl.pl
-%%DATADIR%%/lingua/pt.pl
 %%DATADIR%%/lingua/sv.pl
-%%DATADIR%%/plugins/EquationEditor.pl
+%%DATADIR%%/lingua/pl.pl
+%%DATADIR%%/lingua/cs.pl
+%%DATADIR%%/lingua/fr.pl
+%%DATADIR%%/lingua/zh_CN.pl
+%%DATADIR%%/lingua/pt.pl
+%%DATADIR%%/lingua/da.pl
+%%DATADIR%%/lingua/zh_TW.pl
+%%DATADIR%%/lingua/nb.pl
+%%DATADIR%%/lingua/en_GB.pl
+%%DATADIR%%/lingua/fi.pl
+%%DATADIR%%/lingua/el.pl
+%%DATADIR%%/plugins/VersionControl/Subversion.pl
+%%DATADIR%%/plugins/VersionControl/Bazaar.pl
 %%DATADIR%%/plugins/InsertScreenshot.pl
-%%DATADIR%%/plugins/PrintToBrowser.pl
+%%DATADIR%%/plugins/DiagramEditor.pl
 %%DATADIR%%/plugins/Spell.pl
-%%DATADIR%%/plugins/Subversion.pl
+%%DATADIR%%/plugins/SortSelection.pl
+%%DATADIR%%/plugins/EquationEditor.pl
+%%DATADIR%%/plugins/TODOList.pl
+%%DATADIR%%/plugins/Calendar.pl
+%%DATADIR%%/plugins/VersionControl.pl
+%%DATADIR%%/plugins/PrintToBrowser.pl
+%%DATADIR%%/plugins/ToggleReadOnly.pl
 %%DATADIR%%/plugins/TrayIcon.pl
-%%DATADIR%%/reader.conf
-%%DATADIR%%/style.conf
+%%DATADIR%%/templates/html/Print.html
 %%DATADIR%%/templates/html/Default.html
 %%DATADIR%%/templates/html/Presentation.html
-%%DATADIR%%/templates/html/Print.html
 %%DATADIR%%/templates/html/SlideShow_(S5).html
-%%DATADIR%%/templates/latex/_Equation.tex
 %%DATADIR%%/templates/latex/Default.tex
+%%DATADIR%%/templates/latex/_Equation.tex
 %%DATADIR%%/templates/txt2tags/Default.t2t
 %%DATADIR%%/templates/wiki/_New.txt
+%%DATADIR%%/templates/wiki/_Date.txt
+%%DATADIR%%/default.conf
+%%DATADIR%%/dates.list
+%%DATADIR%%/default.style
+%%DATADIR%%/reader.conf
 %%DATADIR%%/urls.list
+%%DATADIR%%/entities.list
 %%DATADIR%%/zim.svg
-@dirrmtry %%SITE_PERL%%/Gtk2/Ex
-@dirrmtry %%SITE_PERL%%/Gtk2
-@dirrm %%SITE_PERL%%/Zim/Store
-@dirrm %%SITE_PERL%%/Zim/OS
-@dirrm %%SITE_PERL%%/Zim/GUI
-@dirrm %%SITE_PERL%%/Zim/Formats
-@dirrm %%SITE_PERL%%/Zim
-@dirrm %%DATADIR%%/plugins
-@dirrm %%DATADIR%%/lingua
-@dirrm %%DATADIR%%/doc/Zim/Usage/plugins
-@dirrm %%DATADIR%%/doc/Zim/Usage
-@dirrm %%DATADIR%%/doc/Zim/Install
-@dirrm %%DATADIR%%/doc/Zim
-@dirrm %%DATADIR%%/doc
+%%DATADIR%%/globe_banner_small.png
 @dirrm %%DATADIR%%/templates/wiki
 @dirrm %%DATADIR%%/templates/txt2tags
-@dirrm %%DATADIR%%/templates/html
 @dirrm %%DATADIR%%/templates/latex
+@dirrm %%DATADIR%%/templates/html
 @dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%/plugins/VersionControl
+@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/lingua
+@dirrm %%DATADIR%%/doc/Usage/plugins/DiagramEditor
+@dirrm %%DATADIR%%/doc/Usage/plugins
+@dirrm %%DATADIR%%/doc/Usage
+@dirrm %%DATADIR%%/doc/Install
+@dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
-@dirrmtry share/pixmaps/zim
+@dirrmtry share/icons/hicolor/64x64/mimetypes
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrm share/pixmaps/zim
+@dirrm %%SITE_PERL%%/Zim/Store
+@dirrm %%SITE_PERL%%/Zim/OS
+@dirrm %%SITE_PERL%%/Zim/GUI
+@dirrm %%SITE_PERL%%/Zim/Formats
+@dirrm %%SITE_PERL%%/Zim/FS
+@dirrm %%SITE_PERL%%/Zim
+@dirrmtry %%SITE_PERL%%/Gtk2/Ex
+@dirrmtry %%SITE_PERL%%/Gtk2