3 files changed, 18 insertions, 23 deletions

diff --git a/editors/zim/Makefile b/editors/zim/Makefile
index e1f8f8cd6a16..954d32f6d78b 100644
--- a/editors/zim/Makefile
+++ b/editors/zim/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zim
-PORTVERSION=	0.16
+PORTVERSION=	0.17
 CATEGORIES=	editors perl5
 MASTER_SITES=	http://zoidberg.student.utwente.nl/downloads/Zim/ \
 		ftp://zoidberg.student.utwente.nl/Zim/
@@ -26,7 +26,6 @@ USE_GNOME=	gtk20
 PERL_MODBUILD=	yes
 MAN1=		zim.1
 MAN3=		Gtk2::Ex::DesktopEntryMenu.3 \
-		Gtk2::Ex::FormManager.3 \
 		Gtk2::Ex::HyperTextBuffer.3 \
 		Gtk2::Ex::HyperTextView.3 \
 		Gtk2::Ex::PathBar.3 \
@@ -34,8 +33,11 @@ MAN3=		Gtk2::Ex::DesktopEntryMenu.3 \
 		Zim::GUI::Spell.3 \
 		Zim::Selection.3 \
 		Zim::GUI::Calendar.3 \
+		Zim::GUI::Component.3 \
 		Zim::GUI::ExportDialog.3 \
 		Zim::GUI::FindReplaceDialog.3 \
+		Zim::GUI::PreferencesDialog.3 \
+		Zim::GUI::PropertiesDialog.3 \
 		Zim::GUI::SearchDialog.3 \
 		Zim::GUI.3 \
 		Zim::GUI::PageView.3 \
@@ -43,17 +45,15 @@ MAN3=		Gtk2::Ex::DesktopEntryMenu.3 \
 		Zim::GUI::TreeView.3 \
 		Zim::GUI::PathBar.3 \
 		Zim::Formats::Html.3 \
-		Zim::Formats::Pod.3 \
 		Zim::Formats::Wiki.3 \
-		Zim::Formats::XML.3 \
 		Zim::History.3 \
 		Zim::Page.3 \
 		Zim::Page::Text.3 \
 		Zim::Repository.3 \
 		Zim::Repository::Base.3 \
-		Zim::Repository::DBI.3 \
 		Zim::Repository::Files.3 \
 		Zim::Repository::Man.3 \
+		Zim::Template.3 \
 		Zim::Win32.3
 
 OPTIONS=	TRAYICON	"Support trayicon"	on \
@@ -62,7 +62,7 @@ OPTIONS=	TRAYICON	"Support trayicon"	on \
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
-IGNORE=	Perl 5.8.0 or newer required. Install lang/perl5.8 and try again.
+IGNORE=	Perl 5.8.0 or newer required, please install lang/perl5.8 and try again.
 .endif
 
 .if !defined(WITHOUT_TRAYICON)
diff --git a/editors/zim/distinfo b/editors/zim/distinfo
index c4babb4fe23a..69b084136eb9 100644
--- a/editors/zim/distinfo
+++ b/editors/zim/distinfo
@@ -1,3 +1,3 @@
-MD5 (Zim-0.16.tar.gz) = d1d11e42bed1e92db6ee9636d76416a8
-SHA256 (Zim-0.16.tar.gz) = 57a69a374639d7d5a7163ae8391465445a07a0cd38ffb35a167f669a76e3c4ae
-SIZE (Zim-0.16.tar.gz) = 142107
+MD5 (Zim-0.17.tar.gz) = b665ab613fc777073e14b5eee44f37d9
+SHA256 (Zim-0.17.tar.gz) = 595b6f2a3770fcb0b9e9f374b4ff1cc54694afae13fe3e7cb1cb4fb560c7957d
+SIZE (Zim-0.17.tar.gz) = 162516
diff --git a/editors/zim/pkg-plist b/editors/zim/pkg-plist
index 5092af68f609..0ce83ed1bc4f 100644
--- a/editors/zim/pkg-plist
+++ b/editors/zim/pkg-plist
@@ -1,20 +1,20 @@
 bin/zim
 %%SITE_PERL%%/Gtk2/Ex/DesktopEntryMenu.pm
-%%SITE_PERL%%/Gtk2/Ex/FormManager.pm
 %%SITE_PERL%%/Gtk2/Ex/HyperTextBuffer.pm
 %%SITE_PERL%%/Gtk2/Ex/HyperTextView.pm
 %%SITE_PERL%%/Gtk2/Ex/PathBar.pm
 %%SITE_PERL%%/Zim/File.pm
 %%SITE_PERL%%/Zim/Formats/Html.pm
-%%SITE_PERL%%/Zim/Formats/Pod.pm
 %%SITE_PERL%%/Zim/Formats/Wiki.pm
-%%SITE_PERL%%/Zim/Formats/XML.pm
 %%SITE_PERL%%/Zim/GUI.pm
 %%SITE_PERL%%/Zim/GUI/Calendar.pm
+%%SITE_PERL%%/Zim/GUI/Component.pm
 %%SITE_PERL%%/Zim/GUI/ExportDialog.pm
 %%SITE_PERL%%/Zim/GUI/FindReplaceDialog.pm
 %%SITE_PERL%%/Zim/GUI/PageView.pm
 %%SITE_PERL%%/Zim/GUI/PathBar.pm
+%%SITE_PERL%%/Zim/GUI/PreferencesDialog.pm
+%%SITE_PERL%%/Zim/GUI/PropertiesDialog.pm
 %%SITE_PERL%%/Zim/GUI/SearchDialog.pm
 %%SITE_PERL%%/Zim/GUI/Spell.pm
 %%SITE_PERL%%/Zim/GUI/TrayIcon.pm
@@ -24,27 +24,20 @@ bin/zim
 %%SITE_PERL%%/Zim/Page/Text.pm
 %%SITE_PERL%%/Zim/Repository.pm
 %%SITE_PERL%%/Zim/Repository/Base.pm
-%%SITE_PERL%%/Zim/Repository/DBI.pm
 %%SITE_PERL%%/Zim/Repository/Files.pm
 %%SITE_PERL%%/Zim/Repository/Man.pm
-lib/perl5/site_perl/5.8.8/Zim/Selection.pm
+%%SITE_PERL%%/Zim/Selection.pm
+%%SITE_PERL%%/Zim/Template.pm
 %%SITE_PERL%%/Zim/Win32.pm
 share/applications/zim.desktop
 share/pixmaps/zim.png
 %%DATADIR%%/entities.list
 %%DATADIR%%/doc/.zim.config
+%%DATADIR%%/doc/invade_your_desktop.png
 %%DATADIR%%/doc/Help.txt
-%%DATADIR%%/doc/zim.png
 %%DATADIR%%/doc/zim/about.txt
 %%DATADIR%%/doc/zim/bugs.txt
 %%DATADIR%%/doc/zim/changelog.txt
-%%DATADIR%%/doc/zim/development/class_diagram.txt
-%%DATADIR%%/doc/zim/development/database.txt
-%%DATADIR%%/doc/zim/development/formats.txt
-%%DATADIR%%/doc/zim/development/page.txt
-%%DATADIR%%/doc/zim/development/plugins.txt
-%%DATADIR%%/doc/zim/development/repository.txt
-%%DATADIR%%/doc/zim/development/todo.txt
 %%DATADIR%%/doc/zim/faq.txt
 %%DATADIR%%/doc/zim/features.txt
 %%DATADIR%%/doc/zim/usage.txt
@@ -57,6 +50,7 @@ share/pixmaps/zim.png
 %%DATADIR%%/doc/zim/usage/linking.txt
 %%DATADIR%%/doc/zim/usage/plugins.txt
 %%DATADIR%%/doc/zim/usage/preferences.txt
+%%DATADIR%%/doc/zim/usage/properties.txt
 %%DATADIR%%/doc/zim/usage/repositories.txt
 %%DATADIR%%/doc/zim/usage/searching.txt
 %%DATADIR%%/doc/zim/usage/strategies.txt
@@ -66,6 +60,8 @@ share/pixmaps/zim.png
 %%DATADIR%%/plugins/TrayIcon.pl
 %%DATADIR%%/templates/Default.html
 %%DATADIR%%/templates/Presentation.html
+%%DATADIR%%/templates/Print.html
+%%DATADIR%%/templates/SlideShow_(S5).html
 %%DATADIR%%/urls.list
 %%DATADIR%%/zim.svg
 @dirrmtry %%SITE_PERL%%/Gtk2/Ex
@@ -77,7 +73,6 @@ share/pixmaps/zim.png
 @dirrm %%SITE_PERL%%/Zim
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/doc/zim/usage
-@dirrm %%DATADIR%%/doc/zim/development
 @dirrm %%DATADIR%%/doc/zim
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/templates