- update to 0.56

- change USE_PYTHON range to just -2.7 (all < 2.6 is EOL)
- add options for GIT, MERCURIAL and DITAA (default off)
- change inclusion of bsd.port.pre.mk with bsd.port.options.mk
- drop extra simplejson dependency for python < 2.6

changelog:
=== 0.56 - Mon 2 Apr 2012 ===
* Merged support for Git and Mercurial version control backends -
  Damien Accorsi & John Drinkwater
* Merged plugin for "ditaa" diagrams - YPWang
* Merged patch for different configuration profiles, allowing per
  notebook configuration of plugins, font etc. - Mariano Draghi
* Added drag & drop support for the Attachment Browser plugin
* Made sidepane and tagcloud remember state
* Fixed critical bug for opening email adresses without "mailto:" prefix
* Fixed bug where context menu for page index applied to the current page
  instead of the selected page
* Added a Serbian translation

PR:		167821
Submitted by:	rm (myself)
Approved by:    acm (maintainer, via mail)

3 files changed, 32 insertions, 10 deletions

diff --git a/editors/zim/Makefile b/editors/zim/Makefile
index 2aef64131782..e9cef232a07a 100644
--- a/editors/zim/Makefile
+++ b/editors/zim/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zim
-PORTVERSION=	0.55
+PORTVERSION=	0.56
 CATEGORIES=	editors python
 MASTER_SITES=	http://www.zim-wiki.org/downloads/
 
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>=0:${PORTSDIR}/devel/py-xdg \
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	desktopfileutils gtk20 pygtk2 pygobject
-USE_PYTHON=	2.5-2.7
+USE_PYTHON=	-2.7
 USE_PYDISTUTILS=	yes
 
 MAN1=		zim.1
@@ -32,9 +32,12 @@ OPTIONS=	GNUR "Add support of plot editor based on GNU R" Off \
 		GRAPHVIZ "Add diagram editor support" Off \
 		SCROT "Add screenshot taking and inserting support" Off \
 		GNUPLOT "Add plot editor support" Off \
-		BZR "Add version control for notebooks support" Off
+		BZR "Use bzr for notebooks version control support" Off \
+		GIT "Use git for notebooks version control support" Off \
+		MERCURIAL "Use hg for notebooks version control support" Off \
+		DITAA "Add diagram editor support" Off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_GNUR)
 RUN_DEPENDS+=	R:${PORTSDIR}/math/R
@@ -54,9 +57,14 @@ RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
 .if defined(WITH_BZR)
 RUN_DEPENDS+=	bzr:${PORTSDIR}/devel/bazaar-ng
 .endif
-
-.if ${PYTHON_REL} < 260
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.9:${PORTSDIR}/devel/py-simplejson
+.if defined(WITH_GIT)
+RUN_DEPENDS+=	git:${PORTSDIR}/devel/git
+.endif
+.if defined(WITH_MERCURIAL)
+RUN_DEPENDS+=	hg:${PORTSDIR}/devel/mercurial
+.endif
+.if defined(WITH_DITAA)
+RUN_DEPENDS+=	ditaa:${PORTSDIR}/graphics/ditaa
 .endif
 
 post-patch:
@@ -65,4 +73,4 @@ post-patch:
 post-install:
 	-@update-desktop-database
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/zim/distinfo b/editors/zim/distinfo
index c66c36d7cbcc..19a3f1e85069 100644
--- a/editors/zim/distinfo
+++ b/editors/zim/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zim-0.55.tar.gz) = f80b6d3be744af07e88a512e665897e4cdc0170a16305106edbb9b144f5fe093
-SIZE (zim-0.55.tar.gz) = 1376720
+SHA256 (zim-0.56.tar.gz) = a4708a0e1f63a4b51ace7460d9324dc806b5b0221b51c1c821a24fdf5deaf1da
+SIZE (zim-0.56.tar.gz) = 1419603
diff --git a/editors/zim/pkg-plist b/editors/zim/pkg-plist
index 5874377028c8..d5d61639bea0 100644
--- a/editors/zim/pkg-plist
+++ b/editors/zim/pkg-plist
@@ -137,6 +137,9 @@ bin/zim
 %%PYTHON_SITELIBDIR%%/zim/plugins/diagrameditor.py
 %%PYTHON_SITELIBDIR%%/zim/plugins/diagrameditor.pyc
 %%PYTHON_SITELIBDIR%%/zim/plugins/diagrameditor.pyo
+%%PYTHON_SITELIBDIR%%/zim/plugins/ditaaeditor.py
+%%PYTHON_SITELIBDIR%%/zim/plugins/ditaaeditor.pyc
+%%PYTHON_SITELIBDIR%%/zim/plugins/ditaaeditor.pyo
 %%PYTHON_SITELIBDIR%%/zim/plugins/equationeditor.py
 %%PYTHON_SITELIBDIR%%/zim/plugins/equationeditor.pyc
 %%PYTHON_SITELIBDIR%%/zim/plugins/equationeditor.pyo
@@ -191,6 +194,12 @@ bin/zim
 %%PYTHON_SITELIBDIR%%/zim/plugins/versioncontrol/bzr.py
 %%PYTHON_SITELIBDIR%%/zim/plugins/versioncontrol/bzr.pyc
 %%PYTHON_SITELIBDIR%%/zim/plugins/versioncontrol/bzr.pyo
+%%PYTHON_SITELIBDIR%%/zim/plugins/versioncontrol/git.py
+%%PYTHON_SITELIBDIR%%/zim/plugins/versioncontrol/git.pyc
+%%PYTHON_SITELIBDIR%%/zim/plugins/versioncontrol/git.pyo
+%%PYTHON_SITELIBDIR%%/zim/plugins/versioncontrol/hg.py
+%%PYTHON_SITELIBDIR%%/zim/plugins/versioncontrol/hg.pyc
+%%PYTHON_SITELIBDIR%%/zim/plugins/versioncontrol/hg.pyo
 %%PYTHON_SITELIBDIR%%/zim/search.py
 %%PYTHON_SITELIBDIR%%/zim/search.pyc
 %%PYTHON_SITELIBDIR%%/zim/search.pyo
@@ -256,6 +265,7 @@ share/locale/pl/LC_MESSAGES/zim.mo
 share/locale/ru/LC_MESSAGES/zim.mo
 share/locale/sk/LC_MESSAGES/zim.mo
 share/locale/sl/LC_MESSAGES/zim.mo
+share/locale/sr/LC_MESSAGES/zim.mo
 share/locale/sv/LC_MESSAGES/zim.mo
 share/locale/tr/LC_MESSAGES/zim.mo
 share/locale/uk/LC_MESSAGES/zim.mo
@@ -304,6 +314,9 @@ share/pixmaps/zim.png
 %%DATADIR%%/manual/Plugins/Calendar.txt
 %%DATADIR%%/manual/Plugins/Diagram_Editor.txt
 %%DATADIR%%/manual/Plugins/Diagram_Editor/diagram.png
+%%DATADIR%%/manual/Plugins/Ditaa_Editor.txt
+%%DATADIR%%/manual/Plugins/Ditaa_Editor/ditaa.dia
+%%DATADIR%%/manual/Plugins/Ditaa_Editor/ditaa.png
 %%DATADIR%%/manual/Plugins/Equation_Editor.txt
 %%DATADIR%%/manual/Plugins/Equation_Editor/equation_01.png
 %%DATADIR%%/manual/Plugins/GNU_R_Plot_Editor.txt
@@ -375,6 +388,7 @@ share/pixmaps/zim.png
 @dirrm %%DATADIR%%/manual/Plugins/Gnuplot_Editor
 @dirrm %%DATADIR%%/manual/Plugins/GNU_R_Plot_Editor
 @dirrm %%DATADIR%%/manual/Plugins/Equation_Editor
+@dirrm %%DATADIR%%/manual/Plugins/Ditaa_Editor
 @dirrm %%DATADIR%%/manual/Plugins/Diagram_Editor
 @dirrm %%DATADIR%%/manual/Plugins
 @dirrm %%DATADIR%%/manual/Help/Export