3 files changed, 36 insertions, 24 deletions

diff --git a/editors/zim/Makefile b/editors/zim/Makefile
index 34eb7d315a38..e1f8f8cd6a16 100644
--- a/editors/zim/Makefile
+++ b/editors/zim/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zim
-PORTVERSION=	0.15
+PORTVERSION=	0.16
 CATEGORIES=	editors perl5
 MASTER_SITES=	http://zoidberg.student.utwente.nl/downloads/Zim/ \
 		ftp://zoidberg.student.utwente.nl/Zim/
@@ -30,15 +30,18 @@ MAN3=		Gtk2::Ex::DesktopEntryMenu.3 \
 		Gtk2::Ex::HyperTextBuffer.3 \
 		Gtk2::Ex::HyperTextView.3 \
 		Gtk2::Ex::PathBar.3 \
-		Zim.3 \
-		Zim::Components::Calendar.3 \
-		Zim::Components::PageView.3 \
-		Zim::Components::PathBar.3 \
-		Zim::Components::SearchDialog.3 \
-		Zim::Components::Spell.3 \
-		Zim::Components::TrayIcon.3 \
-		Zim::Components::TreeView.3 \
 		Zim::File.3 \
+		Zim::GUI::Spell.3 \
+		Zim::Selection.3 \
+		Zim::GUI::Calendar.3 \
+		Zim::GUI::ExportDialog.3 \
+		Zim::GUI::FindReplaceDialog.3 \
+		Zim::GUI::SearchDialog.3 \
+		Zim::GUI.3 \
+		Zim::GUI::PageView.3 \
+		Zim::GUI::TrayIcon.3 \
+		Zim::GUI::TreeView.3 \
+		Zim::GUI::PathBar.3 \
 		Zim::Formats::Html.3 \
 		Zim::Formats::Pod.3 \
 		Zim::Formats::Wiki.3 \
@@ -58,6 +61,10 @@ 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.
+.endif
+
 .if !defined(WITHOUT_TRAYICON)
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Gtk2/TrayIcon.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2-TrayIcon
 .endif
diff --git a/editors/zim/distinfo b/editors/zim/distinfo
index ee2b2c646ddd..c4babb4fe23a 100644
--- a/editors/zim/distinfo
+++ b/editors/zim/distinfo
@@ -1,3 +1,3 @@
-MD5 (Zim-0.15.tar.gz) = b646b30b63a435d52552ffc5e5b32334
-SHA256 (Zim-0.15.tar.gz) = 23ff2140bf52b0aa5b8ab474203151177aa3a9684d5b9cd73f2f100d1bdde652
-SIZE (Zim-0.15.tar.gz) = 117215
+MD5 (Zim-0.16.tar.gz) = d1d11e42bed1e92db6ee9636d76416a8
+SHA256 (Zim-0.16.tar.gz) = 57a69a374639d7d5a7163ae8391465445a07a0cd38ffb35a167f669a76e3c4ae
+SIZE (Zim-0.16.tar.gz) = 142107
diff --git a/editors/zim/pkg-plist b/editors/zim/pkg-plist
index ef3fbba8460e..5092af68f609 100644
--- a/editors/zim/pkg-plist
+++ b/editors/zim/pkg-plist
@@ -4,19 +4,21 @@ bin/zim
 %%SITE_PERL%%/Gtk2/Ex/HyperTextBuffer.pm
 %%SITE_PERL%%/Gtk2/Ex/HyperTextView.pm
 %%SITE_PERL%%/Gtk2/Ex/PathBar.pm
-%%SITE_PERL%%/Zim.pm
-%%SITE_PERL%%/Zim/Components/Calendar.pm
-%%SITE_PERL%%/Zim/Components/PageView.pm
-%%SITE_PERL%%/Zim/Components/PathBar.pm
-%%SITE_PERL%%/Zim/Components/SearchDialog.pm
-%%SITE_PERL%%/Zim/Components/Spell.pm
-%%SITE_PERL%%/Zim/Components/TrayIcon.pm
-%%SITE_PERL%%/Zim/Components/TreeView.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/ExportDialog.pm
+%%SITE_PERL%%/Zim/GUI/FindReplaceDialog.pm
+%%SITE_PERL%%/Zim/GUI/PageView.pm
+%%SITE_PERL%%/Zim/GUI/PathBar.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/Page.pm
 %%SITE_PERL%%/Zim/Page/Text.pm
@@ -25,9 +27,11 @@ bin/zim
 %%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/Win32.pm
 share/applications/zim.desktop
 share/pixmaps/zim.png
+%%DATADIR%%/entities.list
 %%DATADIR%%/doc/.zim.config
 %%DATADIR%%/doc/Help.txt
 %%DATADIR%%/doc/zim.png
@@ -38,6 +42,7 @@ share/pixmaps/zim.png
 %%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
@@ -49,23 +54,23 @@ share/pixmaps/zim.png
 %%DATADIR%%/doc/zim/usage/getting_started.txt
 %%DATADIR%%/doc/zim/usage/html_entities.txt
 %%DATADIR%%/doc/zim/usage/keybindings.txt
-%%DATADIR%%/doc/zim/usage/links.txt
+%%DATADIR%%/doc/zim/usage/linking.txt
 %%DATADIR%%/doc/zim/usage/plugins.txt
 %%DATADIR%%/doc/zim/usage/preferences.txt
 %%DATADIR%%/doc/zim/usage/repositories.txt
 %%DATADIR%%/doc/zim/usage/searching.txt
 %%DATADIR%%/doc/zim/usage/strategies.txt
 %%DATADIR%%/doc/zim/usage/syntax.txt
-%%DATADIR%%/plugins/Calendar.pl
+%%DATADIR%%/plugins/PrintToBrowser.pl
 %%DATADIR%%/plugins/Spell.pl
 %%DATADIR%%/plugins/TrayIcon.pl
 %%DATADIR%%/templates/Default.html
-%%DATADIR%%/templates/Slides.html
+%%DATADIR%%/templates/Presentation.html
 %%DATADIR%%/urls.list
 %%DATADIR%%/zim.svg
 @dirrmtry %%SITE_PERL%%/Gtk2/Ex
 @dirrmtry %%SITE_PERL%%/Gtk2
-@dirrm %%SITE_PERL%%/Zim/Components
+@dirrm %%SITE_PERL%%/Zim/GUI
 @dirrm %%SITE_PERL%%/Zim/Repository
 @dirrm %%SITE_PERL%%/Zim/Formats
 @dirrm %%SITE_PERL%%/Zim/Page