update zim from 0.60 to 0.62
- new patch patch-zim_environ_py and cvs rm patch-zim_config_py because they
moved code.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/productivity/zim/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 27 Mar 2015 08:14:14 -0000 1.13
+++ Makefile 26 Apr 2015 20:24:14 -0000
@@ -2,9 +2,8 @@
COMMENT = desktop wiki
-MODPY_EGG_VERSION = 0.60
+MODPY_EGG_VERSION = 0.62
DISTNAME = zim-${MODPY_EGG_VERSION}
-REVISION = 0
CATEGORIES = productivity
Index: distinfo
===================================================================
RCS file: /cvs/ports/productivity/zim/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 3 Jan 2014 22:15:24 -0000 1.4
+++ distinfo 26 Apr 2015 20:24:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (zim-0.60.tar.gz) = EJP3vwBR7ajqrTPwN7A99mswwk2iddWc7b+PeSARGWs=
-SIZE (zim-0.60.tar.gz) = 1634256
+SHA256 (zim-0.62.tar.gz) = GdYq69LBqS2E2AcgxsHc23ecOaISBGj+0Bt/JSURvcI=
+SIZE (zim-0.62.tar.gz) = 1772246
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/productivity/zim/patches/patch-setup_py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-setup_py
--- patches/patch-setup_py 21 Jun 2012 20:25:45 -0000 1.3
+++ patches/patch-setup_py 26 Apr 2015 20:24:14 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-setup_py,v 1.3 2012/06/21 20:25:45 gonzalo Exp $
---- setup.py.orig Wed Jan 18 13:46:01 2012
-+++ setup.py Fri May 18 09:44:41 2012
+--- setup.py.orig Wed Aug 20 15:35:11 2014
++++ setup.py Sun Apr 26 17:07:46 2015
@@ -81,7 +81,7 @@ def include_file(file):
def collect_data_files():
# Search for data files to be installed in share/
@@ -10,7 +10,7 @@ $OpenBSD: patch-setup_py,v 1.3 2012/06/2
('share/applications', ['xdg/zim.desktop']),
('share/mime/packages', ['xdg/zim.xml']),
('share/pixmaps', ['xdg/hicolor/48x48/apps/zim.png']),
-@@ -110,6 +110,12 @@ def collect_data_files():
+@@ -111,6 +111,12 @@ def collect_data_files():
files = [os.path.join(dir, f) for f in files]
data_files.append((target, files))
@@ -23,7 +23,7 @@ $OpenBSD: patch-setup_py,v 1.3 2012/06/2
if build_target == 'maemo':
# Remove default .desktop files and replace with our set
prefix = os.path.join('share', 'zim', 'applications')
-@@ -275,7 +281,7 @@ class zim_install_class(install_class):
+@@ -276,7 +282,7 @@ class zim_install_class(install_class):
def initialize_options(self):
install_class.initialize_options(self)
Index: patches/patch-zim_config_py
===================================================================
RCS file: patches/patch-zim_config_py
diff -N patches/patch-zim_config_py
--- patches/patch-zim_config_py 3 Jan 2014 22:15:24 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-zim_config_py,v 1.4 2014/01/03 22:15:24 benno Exp $
---- zim/config.py.orig Wed Dec 25 18:15:44 2013
-+++ zim/config.py Wed Dec 25 18:15:09 2013
-@@ -103,8 +103,8 @@ if os.name == 'nt':
- if not 'APPDATA' in os.environ or not os.environ['APPDATA']:
- os.environ['APPDATA'] = os.environ['HOME'] + '\\Application
Data'
-
--assert isdir(get_environ('HOME')), \
-- 'ERROR: environment variable $HOME not set correctly'
-+#assert isdir(get_environ('HOME')), \
-+# 'ERROR: environment variable $HOME not set correctly'
-
- if not 'USER' in os.environ or not os.environ['USER']:
- # E.g. Maemo doesn't define $USER
Index: patches/patch-zim_environ_py
===================================================================
RCS file: patches/patch-zim_environ_py
diff -N patches/patch-zim_environ_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-zim_environ_py 26 Apr 2015 20:24:14 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- zim/environ.py.orig Sun Apr 26 17:10:58 2015
++++ zim/environ.py Sun Apr 26 17:10:58 2015
+@@ -98,8 +98,8 @@
+ if not 'APPDATA' in environ or not environ['APPDATA']:
+ environ['APPDATA'] = environ['HOME'] + '\\Application Data'
+
+-assert isdir(environ['HOME']), \
+- 'ERROR: environment variable $HOME not set correctly value is "%s"'
++#assert isdir(environ['HOME']), \
++# 'ERROR: environment variable $HOME not set correctly value is "%s"'
+ # using our own environ here to ensure encoding
+
+ if not 'USER' in environ or not environ['USER']:
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/productivity/zim/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 3 Jan 2014 22:15:24 -0000 1.7
+++ pkg/PLIST 26 Apr 2015 20:24:14 -0000
@@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.7 2014/01/03 22:15:24 benno Exp $
bin/zim
lib/python${MODPY_VERSION}/site-packages/zim/
-lib/python${MODPY_VERSION}/site-packages/zim-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/zim/__init__.py
lib/python${MODPY_VERSION}/site-packages/zim/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/zim/_version.py
@@ -10,18 +10,45 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim/actions.pyc
lib/python${MODPY_VERSION}/site-packages/zim/applications.py
lib/python${MODPY_VERSION}/site-packages/zim/applications.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/async.py
-lib/python${MODPY_VERSION}/site-packages/zim/async.pyc
lib/python${MODPY_VERSION}/site-packages/zim/base.py
lib/python${MODPY_VERSION}/site-packages/zim/base.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/config.py
-lib/python${MODPY_VERSION}/site-packages/zim/config.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/command.py
+lib/python${MODPY_VERSION}/site-packages/zim/command.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/config/
+lib/python${MODPY_VERSION}/site-packages/zim/config/__init__.py
+lib/python${MODPY_VERSION}/site-packages/zim/config/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/config/basedirs.py
+lib/python${MODPY_VERSION}/site-packages/zim/config/basedirs.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/config/dicts.py
+lib/python${MODPY_VERSION}/site-packages/zim/config/dicts.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/config/manager.py
+lib/python${MODPY_VERSION}/site-packages/zim/config/manager.pyc
lib/python${MODPY_VERSION}/site-packages/zim/datetimetz.py
lib/python${MODPY_VERSION}/site-packages/zim/datetimetz.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/environ.py
+lib/python${MODPY_VERSION}/site-packages/zim/environ.pyc
lib/python${MODPY_VERSION}/site-packages/zim/errors.py
lib/python${MODPY_VERSION}/site-packages/zim/errors.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/exporter.py
-lib/python${MODPY_VERSION}/site-packages/zim/exporter.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/export/
+lib/python${MODPY_VERSION}/site-packages/zim/export/__init__.py
+lib/python${MODPY_VERSION}/site-packages/zim/export/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/export/__main__.py
+lib/python${MODPY_VERSION}/site-packages/zim/export/__main__.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/export/exporters/
+lib/python${MODPY_VERSION}/site-packages/zim/export/exporters/__init__.py
+lib/python${MODPY_VERSION}/site-packages/zim/export/exporters/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/export/exporters/files.py
+lib/python${MODPY_VERSION}/site-packages/zim/export/exporters/files.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/export/exporters/mhtml.py
+lib/python${MODPY_VERSION}/site-packages/zim/export/exporters/mhtml.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/export/layouts.py
+lib/python${MODPY_VERSION}/site-packages/zim/export/layouts.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/export/linker.py
+lib/python${MODPY_VERSION}/site-packages/zim/export/linker.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/export/selections.py
+lib/python${MODPY_VERSION}/site-packages/zim/export/selections.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/export/template.py
+lib/python${MODPY_VERSION}/site-packages/zim/export/template.pyc
lib/python${MODPY_VERSION}/site-packages/zim/formats/
lib/python${MODPY_VERSION}/site-packages/zim/formats/__init__.py
lib/python${MODPY_VERSION}/site-packages/zim/formats/__init__.pyc
@@ -46,16 +73,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim/gui/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/zim/gui/applications.py
lib/python${MODPY_VERSION}/site-packages/zim/gui/applications.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/gui/cleannotebookdialog.py
-lib/python${MODPY_VERSION}/site-packages/zim/gui/cleannotebookdialog.pyc
lib/python${MODPY_VERSION}/site-packages/zim/gui/clipboard.py
lib/python${MODPY_VERSION}/site-packages/zim/gui/clipboard.pyc
lib/python${MODPY_VERSION}/site-packages/zim/gui/customtools.py
lib/python${MODPY_VERSION}/site-packages/zim/gui/customtools.pyc
lib/python${MODPY_VERSION}/site-packages/zim/gui/exportdialog.py
lib/python${MODPY_VERSION}/site-packages/zim/gui/exportdialog.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/gui/imagegeneratordialog.py
-lib/python${MODPY_VERSION}/site-packages/zim/gui/imagegeneratordialog.pyc
lib/python${MODPY_VERSION}/site-packages/zim/gui/notebookdialog.py
lib/python${MODPY_VERSION}/site-packages/zim/gui/notebookdialog.pyc
lib/python${MODPY_VERSION}/site-packages/zim/gui/pageindex.py
@@ -91,8 +114,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim/index.pyc
lib/python${MODPY_VERSION}/site-packages/zim/ipc.py
lib/python${MODPY_VERSION}/site-packages/zim/ipc.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/main.py
+lib/python${MODPY_VERSION}/site-packages/zim/main.pyc
lib/python${MODPY_VERSION}/site-packages/zim/notebook.py
lib/python${MODPY_VERSION}/site-packages/zim/notebook.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/objectmanager.py
+lib/python${MODPY_VERSION}/site-packages/zim/objectmanager.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/parser.py
+lib/python${MODPY_VERSION}/site-packages/zim/parser.pyc
lib/python${MODPY_VERSION}/site-packages/zim/parsing.py
lib/python${MODPY_VERSION}/site-packages/zim/parsing.pyc
lib/python${MODPY_VERSION}/site-packages/zim/plugins/
@@ -102,10 +131,13 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim/plugins/arithmetic.pyc
lib/python${MODPY_VERSION}/site-packages/zim/plugins/attachmentbrowser.py
lib/python${MODPY_VERSION}/site-packages/zim/plugins/attachmentbrowser.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/plugins/automount.py
-lib/python${MODPY_VERSION}/site-packages/zim/plugins/automount.pyc
lib/python${MODPY_VERSION}/site-packages/zim/plugins/backlinkpane.py
lib/python${MODPY_VERSION}/site-packages/zim/plugins/backlinkpane.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/base/
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/base/__init__.py
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/base/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/base/imagegenerator.py
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/base/imagegenerator.pyc
lib/python${MODPY_VERSION}/site-packages/zim/plugins/calendar.py
lib/python${MODPY_VERSION}/site-packages/zim/plugins/calendar.pyc
lib/python${MODPY_VERSION}/site-packages/zim/plugins/diagrameditor.py
@@ -126,11 +158,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim/plugins/insertsymbol.pyc
lib/python${MODPY_VERSION}/site-packages/zim/plugins/linesorter.py
lib/python${MODPY_VERSION}/site-packages/zim/plugins/linesorter.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/plugins/linkmap/
-lib/python${MODPY_VERSION}/site-packages/zim/plugins/linkmap/__init__.py
-lib/python${MODPY_VERSION}/site-packages/zim/plugins/linkmap/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/plugins/linkmap/gui.py
-lib/python${MODPY_VERSION}/site-packages/zim/plugins/linkmap/gui.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/linkmap.py
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/linkmap.pyc
lib/python${MODPY_VERSION}/site-packages/zim/plugins/printtobrowser.py
lib/python${MODPY_VERSION}/site-packages/zim/plugins/printtobrowser.pyc
lib/python${MODPY_VERSION}/site-packages/zim/plugins/quicknote.py
@@ -139,6 +168,10 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim/plugins/scoreeditor.pyc
lib/python${MODPY_VERSION}/site-packages/zim/plugins/screenshot.py
lib/python${MODPY_VERSION}/site-packages/zim/plugins/screenshot.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/sequencediagrameditor.py
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/sequencediagrameditor.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/sourceview.py
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/sourceview.pyc
lib/python${MODPY_VERSION}/site-packages/zim/plugins/spell.py
lib/python${MODPY_VERSION}/site-packages/zim/plugins/spell.pyc
lib/python${MODPY_VERSION}/site-packages/zim/plugins/tableofcontents.py
@@ -173,14 +206,27 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim/stores/memory.pyc
lib/python${MODPY_VERSION}/site-packages/zim/stores/xml.py
lib/python${MODPY_VERSION}/site-packages/zim/stores/xml.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/templates.py
-lib/python${MODPY_VERSION}/site-packages/zim/templates.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/templates/
+lib/python${MODPY_VERSION}/site-packages/zim/templates/__init__.py
+lib/python${MODPY_VERSION}/site-packages/zim/templates/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/templates/expression.py
+lib/python${MODPY_VERSION}/site-packages/zim/templates/expression.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/templates/expressionparser.py
+lib/python${MODPY_VERSION}/site-packages/zim/templates/expressionparser.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/templates/functions.py
+lib/python${MODPY_VERSION}/site-packages/zim/templates/functions.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/templates/parser.py
+lib/python${MODPY_VERSION}/site-packages/zim/templates/parser.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/templates/processor.py
+lib/python${MODPY_VERSION}/site-packages/zim/templates/processor.pyc
lib/python${MODPY_VERSION}/site-packages/zim/utils.py
lib/python${MODPY_VERSION}/site-packages/zim/utils.pyc
lib/python${MODPY_VERSION}/site-packages/zim/www.py
lib/python${MODPY_VERSION}/site-packages/zim/www.pyc
@man man/man1/zim.1
man/zim.1
+share/appdata/
+share/appdata/zim.appdata.xml
share/applications/zim.desktop
share/icons/hicolor/16x16/apps/zim.png
share/icons/hicolor/16x16/mimetypes/application-x-zim-notebook.png
@@ -216,6 +262,7 @@ share/locale/el/LC_MESSAGES/zim.mo
share/locale/en_GB/LC_MESSAGES/zim.mo
share/locale/es/LC_MESSAGES/zim.mo
share/locale/et/LC_MESSAGES/zim.mo
+share/locale/fi/LC_MESSAGES/zim.mo
share/locale/fr/LC_MESSAGES/zim.mo
share/locale/gl/LC_MESSAGES/zim.mo
share/locale/he/LC_MESSAGES/zim.mo
@@ -245,6 +292,9 @@ share/zim/dates.list
share/zim/globe.svg
share/zim/globe_banner.svg
share/zim/globe_banner_small.png
+share/zim/helpers/
+share/zim/helpers/compare_files/
+share/zim/helpers/compare_files/meld.desktop
share/zim/manual/
share/zim/manual/About.txt
share/zim/manual/Bugs.txt
@@ -253,6 +303,7 @@ share/zim/manual/Help/
share/zim/manual/Help.txt
share/zim/manual/Help/Attachments.txt
share/zim/manual/Help/Auto_Formatting.txt
+share/zim/manual/Help/Automount.txt
share/zim/manual/Help/Check_Boxes.txt
share/zim/manual/Help/Commandline_Options.txt
share/zim/manual/Help/Config_Files.txt
@@ -278,7 +329,6 @@ share/zim/manual/Plugins/
share/zim/manual/Plugins.txt
share/zim/manual/Plugins/Arithmetic.txt
share/zim/manual/Plugins/Attachment_Browser.txt
-share/zim/manual/Plugins/Automount.txt
share/zim/manual/Plugins/BackLinks_Pane.txt
share/zim/manual/Plugins/Diagram_Editor/
share/zim/manual/Plugins/Diagram_Editor.txt
@@ -320,6 +370,10 @@ share/zim/manual/Plugins/Score_Editor/sc
share/zim/manual/Plugins/Score_Editor/score002.png
share/zim/manual/Plugins/Score_Editor/score003.ly
share/zim/manual/Plugins/Score_Editor/score003.png
+share/zim/manual/Plugins/Sequence_Diagram_Editor/
+share/zim/manual/Plugins/Sequence_Diagram_Editor.txt
+share/zim/manual/Plugins/Sequence_Diagram_Editor/diagram.png
+share/zim/manual/Plugins/Source_View.txt
share/zim/manual/Plugins/Spell_Checker.txt
share/zim/manual/Plugins/Table_Of_Contents.txt
share/zim/manual/Plugins/Tags.txt
@@ -360,7 +414,21 @@ share/zim/templates/html/Default.html
share/zim/templates/html/Default_with_index.html
share/zim/templates/html/Presentation.html
share/zim/templates/html/Print.html
+share/zim/templates/html/SlideShow_(S5)/
share/zim/templates/html/SlideShow_(S5).html
+share/zim/templates/html/SlideShow_(S5)/ui/
+share/zim/templates/html/SlideShow_(S5)/ui/default/
+share/zim/templates/html/SlideShow_(S5)/ui/default/blank.gif
+share/zim/templates/html/SlideShow_(S5)/ui/default/bodybg.gif
+share/zim/templates/html/SlideShow_(S5)/ui/default/framing.css
+share/zim/templates/html/SlideShow_(S5)/ui/default/iepngfix.htc
+share/zim/templates/html/SlideShow_(S5)/ui/default/opera.css
+share/zim/templates/html/SlideShow_(S5)/ui/default/outline.css
+share/zim/templates/html/SlideShow_(S5)/ui/default/pretty.css
+share/zim/templates/html/SlideShow_(S5)/ui/default/print.css
+share/zim/templates/html/SlideShow_(S5)/ui/default/s5-core.css
+share/zim/templates/html/SlideShow_(S5)/ui/default/slides.css
+share/zim/templates/html/SlideShow_(S5)/ui/default/slides.js
share/zim/templates/html/ZeroFiveEight.html
share/zim/templates/latex/
share/zim/templates/latex/Article.tex
