3 files changed, 32 insertions, 17 deletions

diff --git a/editors/zim/Makefile b/editors/zim/Makefile
index 6f85b2c94efe..9a97ada5ff85 100644
--- a/editors/zim/Makefile
+++ b/editors/zim/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	zim
-PORTVERSION=	0.19
-PORTREVISION=	1
+PORTVERSION=	0.20
 CATEGORIES=	editors perl5
 MASTER_SITES=	http://pardus-larus.student.utwente.nl/~pardus/downloads/Zim/
 DISTNAME=	Zim-${PORTVERSION}
@@ -22,7 +21,7 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 		${SITE_PERL}/File/DesktopEntry.pm:${PORTSDIR}/devel/p5-File-DesktopEntry
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_GNOME=	gtk20
+USE_GNOME=	gtk20 desktopfileutils
 PERL_MODBUILD=	yes
 MAN1=		zim.1
 MAN3=		Gtk2::Ex::DesktopEntryMenu.3 \
@@ -52,13 +51,15 @@ MAN3=		Gtk2::Ex::DesktopEntryMenu.3 \
 		Zim::Formats::Html.3 \
 		Zim::Formats::Wiki.3 \
 		Zim::History.3 \
+		Zim::OS::Win32.3 \
 		Zim::Page.3 \
-		Zim::Repository.3 \
-		Zim::Repository::Files.3 \
-		Zim::Repository::Man.3 \
+		Zim::Store.3 \
+		Zim::Store::Cached.3 \
+		Zim::Store::Files.3 \
+		Zim::Store::Man.3 \
 		Zim::Template.3 \
 		Zim::TextBuffer.3 \
-		Zim::Win32.3
+		Zim::Utils.3
 
 OPTIONS=	TRAYICON	"Support trayicon"	on \
 		SPELL	"Support spell"	on
@@ -66,7 +67,7 @@ OPTIONS=	TRAYICON	"Support trayicon"	on \
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
-IGNORE=	Perl 5.8.0 or newer required, please 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)
@@ -77,4 +78,7 @@ BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Gtk2/TrayIcon.pm:${PORTSDIR}/x11-toolk
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Gtk2/Spell.pm:${PORTSDIR}/devel/p5-Gtk2-Spell
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 83,84d ${WRKSRC}/Build.PL
+
 .include <bsd.port.post.mk>
diff --git a/editors/zim/distinfo b/editors/zim/distinfo
index d5b500fe9291..7382ed6d6a6c 100644
--- a/editors/zim/distinfo
+++ b/editors/zim/distinfo
@@ -1,3 +1,3 @@
-MD5 (Zim-0.19.tar.gz) = cfe31ce36602e1f6c203d1a3ef00498c
-SHA256 (Zim-0.19.tar.gz) = 2cd72b68d2ee88ee595f1817b5e03dab852c95f551a14575b901dab5db809e72
-SIZE (Zim-0.19.tar.gz) = 185999
+MD5 (Zim-0.20.tar.gz) = 51a6486b13e2656656fe081bbf0a7a91
+SHA256 (Zim-0.20.tar.gz) = fab788005aa1b3cef20d32e8a386e9cc75a8cc7b984fc511e64d7e32faea5903
+SIZE (Zim-0.20.tar.gz) = 198473
diff --git a/editors/zim/pkg-plist b/editors/zim/pkg-plist
index b0e2214d2746..bebf589016ef 100644
--- a/editors/zim/pkg-plist
+++ b/editors/zim/pkg-plist
@@ -25,19 +25,20 @@ bin/zim
 %%SITE_PERL%%/Zim/GUI/TrayIcon.pm
 %%SITE_PERL%%/Zim/GUI/TreeView.pm
 %%SITE_PERL%%/Zim/History.pm
+%%SITE_PERL%%/Zim/OS/Win32.pm
 %%SITE_PERL%%/Zim/Page.pm
-%%SITE_PERL%%/Zim/Repository.pm
-%%SITE_PERL%%/Zim/Repository/Files.pm
-%%SITE_PERL%%/Zim/Repository/Man.pm
+%%SITE_PERL%%/Zim/Store.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/Win32.pm
+%%SITE_PERL%%/Zim/Utils.pm
 share/applications/zim.desktop
 share/pixmaps/zim.png
 share/pixmaps/zim/gtk-connect.png
 share/pixmaps/zim/stock_calendar-view-month.png
-%%DATADIR%%/album.conf
 %%DATADIR%%/dates.list
 %%DATADIR%%/default.conf
 %%DATADIR%%/entities.list
@@ -49,6 +50,8 @@ share/pixmaps/zim/stock_calendar-view-month.png
 %%DATADIR%%/doc/zim/changelog.txt
 %%DATADIR%%/doc/zim/faq.txt
 %%DATADIR%%/doc/zim/features.txt
+%%DATADIR%%/doc/zim/install.txt
+%%DATADIR%%/doc/zim/install/unix.txt
 %%DATADIR%%/doc/zim/usage.txt
 %%DATADIR%%/doc/zim/usage/autoformat.txt
 %%DATADIR%%/doc/zim/usage/commandline.txt
@@ -64,29 +67,37 @@ share/pixmaps/zim/stock_calendar-view-month.png
 %%DATADIR%%/doc/zim/usage/repositories.txt
 %%DATADIR%%/doc/zim/usage/searching.txt
 %%DATADIR%%/doc/zim/usage/strategies.txt
+%%DATADIR%%/doc/zim/usage/styles.txt
 %%DATADIR%%/doc/zim/usage/syntax.txt
+%%DATADIR%%/doc/zim/usage/templates.txt
+%%DATADIR%%/doc/zim/install/windows.txt
 %%DATADIR%%/plugins/PrintToBrowser.pl
 %%DATADIR%%/plugins/Spell.pl
 %%DATADIR%%/plugins/Subversion.pl
 %%DATADIR%%/plugins/TrayIcon.pl
 %%DATADIR%%/reader.conf
+%%DATADIR%%/style.conf
 %%DATADIR%%/templates/html/Default.html
 %%DATADIR%%/templates/html/Presentation.html
 %%DATADIR%%/templates/html/Print.html
 %%DATADIR%%/templates/html/SlideShow_(S5).html
 %%DATADIR%%/templates/txt2tags/Default.t2t
+%%DATADIR%%/templates/wiki/_New.txt
 %%DATADIR%%/urls.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/Repository
 @dirrm %%SITE_PERL%%/Zim/Formats
 @dirrm %%SITE_PERL%%/Zim
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/doc/zim/usage
+@dirrm %%DATADIR%%/doc/zim/install
 @dirrm %%DATADIR%%/doc/zim
 @dirrm %%DATADIR%%/doc
+@dirrm %%DATADIR%%/templates/wiki
 @dirrm %%DATADIR%%/templates/txt2tags
 @dirrm %%DATADIR%%/templates/html
 @dirrm %%DATADIR%%/templates