Attachment 124299 Details for Bug 167821 – file.txt

file.txt

file.txt (text/plain), 4.71 KB, created by Ruslan Makhmatkhanov on 2012-05-12 11:50:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ruslan Makhmatkhanov

Created: 2012-05-12 11:50:11 UTC

Size: 4.71 KB

patch

obsolete

>? zim-0.56.diff.txt
>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/editors/zim/Makefile,v
>retrieving revision 1.25
>diff -u -r1.25 Makefile
>--- Makefile	26 Mar 2012 04:53:37 -0000	1.25
>+++ Makefile	12 May 2012 10:42:31 -0000
>@@ -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 @@
> 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 @@
> 		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 @@
> .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-install:
> 	-@update-desktop-database
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/editors/zim/distinfo,v
>retrieving revision 1.14
>diff -u -r1.14 distinfo
>--- distinfo	26 Mar 2012 04:53:37 -0000	1.14
>+++ distinfo	12 May 2012 10:42:31 -0000
>@@ -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
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/editors/zim/pkg-plist,v
>retrieving revision 1.16
>diff -u -r1.16 pkg-plist
>--- pkg-plist	26 Mar 2012 04:53:37 -0000	1.16
>+++ pkg-plist	12 May 2012 10:42:31 -0000
>@@ -137,6 +137,9 @@
> %%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 @@
> %%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/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 @@
> %%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 @@
> @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

Actions: View

Attachments on bug 167821: 124299