Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 2 Nov 2012 15:32:37 +0000 (UTC)
From:      Ruslan Mahmatkhanov <rm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r306861 - head/editors/zim
Message-ID:  <201211021532.qA2FWbIS049124@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rm
Date: Fri Nov  2 15:32:36 2012
New Revision: 306861
URL: http://svn.freebsd.org/changeset/ports/306861

Log:
  - update to 0.57
  - trim Makefile header
  - convert to optionsng
  - tab -> space change in pkg-descr:WWW
  
  changelog:
  https://lists.launchpad.net/zim-wiki/msg01905.html
  
  PR:		172881
  Submitted by:	rm (myself)
  Approved by:	maintainer timout (2 weeks)
  Feature safe:	yes

Modified:
  head/editors/zim/Makefile
  head/editors/zim/distinfo
  head/editors/zim/pkg-descr
  head/editors/zim/pkg-plist

Modified: head/editors/zim/Makefile
==============================================================================
--- head/editors/zim/Makefile	Fri Nov  2 15:11:03 2012	(r306860)
+++ head/editors/zim/Makefile	Fri Nov  2 15:32:36 2012	(r306861)
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	zim
-# Date created:		2006-03-21
-# Whom:			Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-#
+# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
-#
 
 PORTNAME=	zim
-PORTVERSION=	0.56
-PORTREVISION=	3
+PORTVERSION=	0.57
 CATEGORIES=	editors python
 MASTER_SITES=	http://www.zim-wiki.org/downloads/
 
@@ -28,43 +23,42 @@ USE_PYDISTUTILS=	yes
 
 MAN1=		zim.1
 
-OPTIONS=	GNUR "Add support of plot editor based on GNU R" Off \
-		LATEX "Add equation editor support" Off \
-		GRAPHVIZ "Add diagram editor support" Off \
-		SCROT "Add screenshot taking and inserting support" Off \
-		GNUPLOT "Add plot editor 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
+OPTIONS_DEFINE=	GNUR LATEX GRAPHVIZ SCROT GNUPLOT BZR GIT MERCURIAL DITAA
+OPTIONS_EXCLUDE=DOCS NLS
+GNUR_DESC=	Support of plot editor based on GNU R
+SCROT_DESC=	Screenshot taking and inserting support
+BZR_DESC=	Version control for notebooks using bzr
+GIT_DESC=	Version control for notebooks using git
+MERCURIAL_DESC=	Version control for notebooks using hg
+DITAA_DESC=		Diagram editor support
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_GNUR)
+.if ${PORT_OPTIONS:MGNUR}
 RUN_DEPENDS+=	R:${PORTSDIR}/math/R
 .endif
-.if defined(WITH_LATEX)
+.if ${PORT_OPTIONS:MLATEX}
 RUN_DEPENDS+=	latex:${PORTSDIR}/print/teTeX-base
 .endif
-.if defined(WITH_GRAPHVIZ)
+.if ${PORT_OPTIONS:MGRAPHVIZ}
 RUN_DEPENDS+=	fdp:${PORTSDIR}/graphics/graphviz
 .endif
-.if defined(WITH_SCROT)
+.if ${PORT_OPTIONS:MSCROT}
 RUN_DEPENDS+=	scrot:${PORTSDIR}/graphics/scrot
 .endif
-.if defined(WITH_GNUPLOT)
+.if ${PORT_OPTIONS:MGNUPLOT}
 RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
 .endif
-.if defined(WITH_BZR)
+.if ${PORT_OPTIONS:MBZR}
 RUN_DEPENDS+=	bzr:${PORTSDIR}/devel/bzr
 .endif
-.if defined(WITH_GIT)
+.if ${PORT_OPTIONS:MGIT}
 RUN_DEPENDS+=	git:${PORTSDIR}/devel/git
 .endif
-.if defined(WITH_MERCURIAL)
+.if ${PORT_OPTIONS:MMERCURIAL}
 RUN_DEPENDS+=	hg:${PORTSDIR}/devel/mercurial
 .endif
-.if defined(WITH_DITAA)
+.if ${PORT_OPTIONS:MDITAA}
 RUN_DEPENDS+=	ditaa:${PORTSDIR}/graphics/ditaa
 .endif
 

Modified: head/editors/zim/distinfo
==============================================================================
--- head/editors/zim/distinfo	Fri Nov  2 15:11:03 2012	(r306860)
+++ head/editors/zim/distinfo	Fri Nov  2 15:32:36 2012	(r306861)
@@ -1,2 +1,2 @@
-SHA256 (zim-0.56.tar.gz) = a4708a0e1f63a4b51ace7460d9324dc806b5b0221b51c1c821a24fdf5deaf1da
-SIZE (zim-0.56.tar.gz) = 1419603
+SHA256 (zim-0.57.tar.gz) = 1e29eeef6a3d467a5598f0f17b9e0d0b32a43b70cd32f71de12fa801b2338366
+SIZE (zim-0.57.tar.gz) = 1565535

Modified: head/editors/zim/pkg-descr
==============================================================================
--- head/editors/zim/pkg-descr	Fri Nov  2 15:11:03 2012	(r306860)
+++ head/editors/zim/pkg-descr	Fri Nov  2 15:32:36 2012	(r306861)
@@ -15,4 +15,4 @@ Zim can be used to:
 * Draft blog entries and emails
 * Do brainstorming
 
-WWW:	http://www.zim-wiki.org
+WWW: http://www.zim-wiki.org

Modified: head/editors/zim/pkg-plist
==============================================================================
--- head/editors/zim/pkg-plist	Fri Nov  2 15:11:03 2012	(r306860)
+++ head/editors/zim/pkg-plist	Fri Nov  2 15:32:36 2012	(r306861)
@@ -14,9 +14,6 @@ bin/zim
 %%PYTHON_SITELIBDIR%%/zim/config.py
 %%PYTHON_SITELIBDIR%%/zim/config.pyc
 %%PYTHON_SITELIBDIR%%/zim/config.pyo
-%%PYTHON_SITELIBDIR%%/zim/daemon.py
-%%PYTHON_SITELIBDIR%%/zim/daemon.pyc
-%%PYTHON_SITELIBDIR%%/zim/daemon.pyo
 %%PYTHON_SITELIBDIR%%/zim/datetimetz.py
 %%PYTHON_SITELIBDIR%%/zim/datetimetz.pyc
 %%PYTHON_SITELIBDIR%%/zim/datetimetz.pyo
@@ -44,6 +41,9 @@ bin/zim
 %%PYTHON_SITELIBDIR%%/zim/formats/plain.py
 %%PYTHON_SITELIBDIR%%/zim/formats/plain.pyc
 %%PYTHON_SITELIBDIR%%/zim/formats/plain.pyo
+%%PYTHON_SITELIBDIR%%/zim/formats/rst.py
+%%PYTHON_SITELIBDIR%%/zim/formats/rst.pyc
+%%PYTHON_SITELIBDIR%%/zim/formats/rst.pyo
 %%PYTHON_SITELIBDIR%%/zim/formats/wiki.py
 %%PYTHON_SITELIBDIR%%/zim/formats/wiki.pyc
 %%PYTHON_SITELIBDIR%%/zim/formats/wiki.pyo
@@ -95,6 +95,9 @@ bin/zim
 %%PYTHON_SITELIBDIR%%/zim/gui/server.py
 %%PYTHON_SITELIBDIR%%/zim/gui/server.pyc
 %%PYTHON_SITELIBDIR%%/zim/gui/server.pyo
+%%PYTHON_SITELIBDIR%%/zim/gui/templateeditordialog.py
+%%PYTHON_SITELIBDIR%%/zim/gui/templateeditordialog.pyc
+%%PYTHON_SITELIBDIR%%/zim/gui/templateeditordialog.pyo
 %%PYTHON_SITELIBDIR%%/zim/gui/widgets.py
 %%PYTHON_SITELIBDIR%%/zim/gui/widgets.pyc
 %%PYTHON_SITELIBDIR%%/zim/gui/widgets.pyo
@@ -113,6 +116,9 @@ bin/zim
 %%PYTHON_SITELIBDIR%%/zim/index.py
 %%PYTHON_SITELIBDIR%%/zim/index.pyc
 %%PYTHON_SITELIBDIR%%/zim/index.pyo
+%%PYTHON_SITELIBDIR%%/zim/ipc.py
+%%PYTHON_SITELIBDIR%%/zim/ipc.pyc
+%%PYTHON_SITELIBDIR%%/zim/ipc.pyo
 %%PYTHON_SITELIBDIR%%/zim/notebook.py
 %%PYTHON_SITELIBDIR%%/zim/notebook.pyc
 %%PYTHON_SITELIBDIR%%/zim/notebook.pyo
@@ -131,6 +137,9 @@ bin/zim
 %%PYTHON_SITELIBDIR%%/zim/plugins/automount.py
 %%PYTHON_SITELIBDIR%%/zim/plugins/automount.pyc
 %%PYTHON_SITELIBDIR%%/zim/plugins/automount.pyo
+%%PYTHON_SITELIBDIR%%/zim/plugins/backlinkpane.py
+%%PYTHON_SITELIBDIR%%/zim/plugins/backlinkpane.pyc
+%%PYTHON_SITELIBDIR%%/zim/plugins/backlinkpane.pyo
 %%PYTHON_SITELIBDIR%%/zim/plugins/calendar.py
 %%PYTHON_SITELIBDIR%%/zim/plugins/calendar.pyc
 %%PYTHON_SITELIBDIR%%/zim/plugins/calendar.pyo
@@ -170,6 +179,9 @@ bin/zim
 %%PYTHON_SITELIBDIR%%/zim/plugins/quicknote.py
 %%PYTHON_SITELIBDIR%%/zim/plugins/quicknote.pyc
 %%PYTHON_SITELIBDIR%%/zim/plugins/quicknote.pyo
+%%PYTHON_SITELIBDIR%%/zim/plugins/scoreeditor.py
+%%PYTHON_SITELIBDIR%%/zim/plugins/scoreeditor.pyc
+%%PYTHON_SITELIBDIR%%/zim/plugins/scoreeditor.pyo
 %%PYTHON_SITELIBDIR%%/zim/plugins/screenshot.py
 %%PYTHON_SITELIBDIR%%/zim/plugins/screenshot.pyc
 %%PYTHON_SITELIBDIR%%/zim/plugins/screenshot.pyo
@@ -200,9 +212,15 @@ bin/zim
 %%PYTHON_SITELIBDIR%%/zim/plugins/versioncontrol/hg.py
 %%PYTHON_SITELIBDIR%%/zim/plugins/versioncontrol/hg.pyc
 %%PYTHON_SITELIBDIR%%/zim/plugins/versioncontrol/hg.pyo
+%%PYTHON_SITELIBDIR%%/zim/plugins/zeitgeist-logger.py
+%%PYTHON_SITELIBDIR%%/zim/plugins/zeitgeist-logger.pyc
+%%PYTHON_SITELIBDIR%%/zim/plugins/zeitgeist-logger.pyo
 %%PYTHON_SITELIBDIR%%/zim/search.py
 %%PYTHON_SITELIBDIR%%/zim/search.pyc
 %%PYTHON_SITELIBDIR%%/zim/search.pyo
+%%PYTHON_SITELIBDIR%%/zim/signals.py
+%%PYTHON_SITELIBDIR%%/zim/signals.pyc
+%%PYTHON_SITELIBDIR%%/zim/signals.pyo
 %%PYTHON_SITELIBDIR%%/zim/stores/__init__.py
 %%PYTHON_SITELIBDIR%%/zim/stores/__init__.pyc
 %%PYTHON_SITELIBDIR%%/zim/stores/__init__.pyo
@@ -262,6 +280,8 @@ share/locale/ja/LC_MESSAGES/zim.mo
 share/locale/ko/LC_MESSAGES/zim.mo
 share/locale/nl/LC_MESSAGES/zim.mo
 share/locale/pl/LC_MESSAGES/zim.mo
+share/locale/pt_BR/LC_MESSAGES/zim.mo
+share/locale/ro/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
@@ -276,11 +296,6 @@ share/mime/application/x-zim-notebook.xm
 share/mime/packages/zim.xml
 share/mime/text/x-zim-wiki.xml
 share/pixmaps/zim.png
-%%DATADIR%%/applications/firefox.desktop
-%%DATADIR%%/applications/open.desktop
-%%DATADIR%%/applications/thunderbird.desktop
-%%DATADIR%%/applications/xdg-email.desktop
-%%DATADIR%%/applications/xdg-open.desktop
 %%DATADIR%%/dates.list
 %%DATADIR%%/globe.svg
 %%DATADIR%%/globe_banner.svg
@@ -289,10 +304,12 @@ share/pixmaps/zim.png
 %%DATADIR%%/manual/Bugs.txt
 %%DATADIR%%/manual/FAQ.txt
 %%DATADIR%%/manual/Help.txt
+%%DATADIR%%/manual/Help/Attachments.txt
 %%DATADIR%%/manual/Help/Auto_Formatting.txt
 %%DATADIR%%/manual/Help/Check_Boxes.txt
 %%DATADIR%%/manual/Help/Config_Files.txt
 %%DATADIR%%/manual/Help/Custom_Tools.txt
+%%DATADIR%%/manual/Help/Default_Applications.txt
 %%DATADIR%%/manual/Help/Export.txt
 %%DATADIR%%/manual/Help/Export/HTML.txt
 %%DATADIR%%/manual/Help/Export/LaTeX.txt
@@ -310,6 +327,7 @@ share/pixmaps/zim.png
 %%DATADIR%%/manual/Help/Wiki_Syntax.txt
 %%DATADIR%%/manual/Plugins.txt
 %%DATADIR%%/manual/Plugins/Arithmetic.txt
+%%DATADIR%%/manual/Plugins/Attachment_Browser.txt
 %%DATADIR%%/manual/Plugins/Automount.txt
 %%DATADIR%%/manual/Plugins/Calendar.txt
 %%DATADIR%%/manual/Plugins/Diagram_Editor.txt
@@ -331,7 +349,17 @@ share/pixmaps/zim.png
 %%DATADIR%%/manual/Plugins/Insert_Screenshot.txt
 %%DATADIR%%/manual/Plugins/Insert_Symbol.txt
 %%DATADIR%%/manual/Plugins/Link_Map.txt
+%%DATADIR%%/manual/Plugins/Log_events_with_Zeitgeist.txt
 %%DATADIR%%/manual/Plugins/Quick_Note.txt
+%%DATADIR%%/manual/Plugins/Score_Editor.txt
+%%DATADIR%%/manual/Plugins/Score_Editor/score.ly
+%%DATADIR%%/manual/Plugins/Score_Editor/score.png
+%%DATADIR%%/manual/Plugins/Score_Editor/score001.ly
+%%DATADIR%%/manual/Plugins/Score_Editor/score001.png
+%%DATADIR%%/manual/Plugins/Score_Editor/score002.ly
+%%DATADIR%%/manual/Plugins/Score_Editor/score002.png
+%%DATADIR%%/manual/Plugins/Score_Editor/score003.ly
+%%DATADIR%%/manual/Plugins/Score_Editor/score003.png
 %%DATADIR%%/manual/Plugins/Spell_Checker.txt
 %%DATADIR%%/manual/Plugins/Table_Of_Contents.txt
 %%DATADIR%%/manual/Plugins/Tags.txt
@@ -340,11 +368,13 @@ share/pixmaps/zim.png
 %%DATADIR%%/manual/Plugins/Version_Control.txt
 %%DATADIR%%/manual/Start.txt
 %%DATADIR%%/manual/Usage.txt
+%%DATADIR%%/manual/Usage/Collaboration.txt
 %%DATADIR%%/manual/Usage/Daily_Journal.txt
 %%DATADIR%%/manual/Usage/GTD_flowchart.png
 %%DATADIR%%/manual/Usage/GTD_flowchart.svg
 %%DATADIR%%/manual/Usage/Getting_Started.txt
 %%DATADIR%%/manual/Usage/Getting_Things_Done.txt
+%%DATADIR%%/manual/Usage/Publishing.txt
 %%DATADIR%%/manual/notebook.zim
 %%DATADIR%%/menubar-maemo4.xml
 %%DATADIR%%/menubar-maemo5.xml
@@ -361,10 +391,6 @@ share/pixmaps/zim.png
 %%DATADIR%%/pixmaps/xchecked-box.png
 %%DATADIR%%/style.conf
 %%DATADIR%%/symbols.list
-%%DATADIR%%/templates/_Equation.tex
-%%DATADIR%%/templates/_GNU_R_Plot.r
-%%DATADIR%%/templates/_gnuplot.gnu
-%%DATADIR%%/templates/_quicknote.txt
 %%DATADIR%%/templates/html/Default.html
 %%DATADIR%%/templates/html/Default_with_index.html
 %%DATADIR%%/templates/html/Presentation.html
@@ -374,17 +400,26 @@ share/pixmaps/zim.png
 %%DATADIR%%/templates/latex/Part.tex
 %%DATADIR%%/templates/latex/Report.tex
 %%DATADIR%%/templates/markdown/Default.markdown
+%%DATADIR%%/templates/plugins/equationeditor.tex
+%%DATADIR%%/templates/plugins/gnu_r_editor.r
+%%DATADIR%%/templates/plugins/gnuploteditor.gnu
+%%DATADIR%%/templates/plugins/quicknote.txt
+%%DATADIR%%/templates/plugins/scoreeditor.ly
+%%DATADIR%%/templates/rst/Default.rst
 %%DATADIR%%/templates/wiki/Calendar.txt
 %%DATADIR%%/templates/wiki/Default.txt
 %%DATADIR%%/urls.list
 %%DATADIR%%/zim.png
 @dirrm %%DATADIR%%/templates/wiki
+@dirrm %%DATADIR%%/templates/rst
+@dirrm %%DATADIR%%/templates/plugins
 @dirrm %%DATADIR%%/templates/markdown
 @dirrm %%DATADIR%%/templates/latex
 @dirrm %%DATADIR%%/templates/html
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/manual/Usage
+@dirrm %%DATADIR%%/manual/Plugins/Score_Editor
 @dirrm %%DATADIR%%/manual/Plugins/Gnuplot_Editor
 @dirrm %%DATADIR%%/manual/Plugins/GNU_R_Plot_Editor
 @dirrm %%DATADIR%%/manual/Plugins/Equation_Editor
@@ -394,7 +429,6 @@ share/pixmaps/zim.png
 @dirrm %%DATADIR%%/manual/Help/Export
 @dirrm %%DATADIR%%/manual/Help
 @dirrm %%DATADIR%%/manual
-@dirrm %%DATADIR%%/applications
 @dirrm %%DATADIR%%
 @dirrmtry share/mime/text
 @dirrmtry share/mime/packages



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211021532.qA2FWbIS049124>