Re: UPDATE: productivity/zim 0.75.2
ok!
Caspar Schutijser(cas...@schutijser.com) on 2024.04.13 11:35:42 +0200:
> Hi,
>
> Below is a diff that updates Zim to 0.75.2. Tested on arm64,
> works fine here.
>
> Comments or OKs?
>
> Caspar
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/productivity/zim/Makefile,v
> retrieving revision 1.35
> diff -u -p -r1.35 Makefile
> --- Makefile 27 Sep 2023 15:04:14 - 1.35
> +++ Makefile 13 Apr 2024 09:35:24 -
> @@ -1,8 +1,7 @@
> COMMENT =desktop wiki
>
> -MODPY_EGG_VERSION = 0.75.1
> +MODPY_EGG_VERSION = 0.75.2
> DISTNAME = zim-${MODPY_EGG_VERSION}
> -REVISION = 0
>
> CATEGORIES = productivity
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/productivity/zim/distinfo,v
> retrieving revision 1.15
> diff -u -p -r1.15 distinfo
> --- distinfo 14 Nov 2022 17:59:32 - 1.15
> +++ distinfo 13 Apr 2024 09:35:24 -
> @@ -1,2 +1,2 @@
> -SHA256 (zim-0.75.1.tar.gz) = iOF11/fhQYlvnpWJidJS1yJVavF7xLxvBl59VCh9A4U=
> -SIZE (zim-0.75.1.tar.gz) = 2510821
> +SHA256 (zim-0.75.2.tar.gz) = QIkNsFsWeNHEcXhGHHZyJDMMW2lNvdwMJLGxeCZaLdI=
> +SIZE (zim-0.75.2.tar.gz) = 3211464
> Index: patches/patch-setup_py
> ===
> RCS file: /cvs/ports/productivity/zim/patches/patch-setup_py,v
> retrieving revision 1.8
> diff -u -p -r1.8 patch-setup_py
> --- patches/patch-setup_py11 Mar 2022 19:51:49 - 1.8
> +++ patches/patch-setup_py13 Apr 2024 09:35:24 -
> @@ -1,7 +1,7 @@
> Index: setup.py
> --- setup.py.orig
> +++ setup.py
> -@@ -72,7 +72,7 @@ def include_file(file):
> +@@ -77,7 +77,7 @@ def include_file(file):
> def collect_data_files():
> # Search for data files to be installed in share/
> data_files = [
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/productivity/zim/pkg/PLIST,v
> retrieving revision 1.19
> diff -u -p -r1.19 PLIST
> --- pkg/PLIST 14 Nov 2022 17:59:32 - 1.19
> +++ pkg/PLIST 13 Apr 2024 09:35:24 -
> @@ -338,11 +338,15 @@ share/locale/da/LC_MESSAGES/zim.mo
> share/locale/de/LC_MESSAGES/zim.mo
> share/locale/el/LC_MESSAGES/zim.mo
> share/locale/en_GB/LC_MESSAGES/zim.mo
> +share/locale/eo/LC_MESSAGES/zim.mo
> share/locale/es/LC_MESSAGES/zim.mo
> share/locale/et/LC_MESSAGES/zim.mo
> share/locale/eu/LC_MESSAGES/zim.mo
> share/locale/fi/LC_MESSAGES/zim.mo
> share/locale/fr/LC_MESSAGES/zim.mo
> +share/locale/fy/
> +share/locale/fy/LC_MESSAGES/
> +share/locale/fy/LC_MESSAGES/zim.mo
> share/locale/gl/LC_MESSAGES/zim.mo
> share/locale/he/LC_MESSAGES/zim.mo
> share/locale/hr/LC_MESSAGES/zim.mo
>
Re: UPDATE: productivity/zim 0.75.1
Caspar Schutijser(cas...@schutijser.com) on 2022.11.12 17:06:35 +0100:
> Hi,
>
> Below is a diff that updates Zim to 0.75.1. Tested on amd64 for a while,
> works fine here.
>
> Comments or OKs?
ok benno@
>
> Caspar
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/productivity/zim/Makefile,v
> retrieving revision 1.31
> diff -u -p -r1.31 Makefile
> --- Makefile 11 Mar 2022 19:51:49 - 1.31
> +++ Makefile 12 Nov 2022 16:06:05 -
> @@ -1,6 +1,6 @@
> COMMENT =desktop wiki
>
> -MODPY_EGG_VERSION = 0.74.3
> +MODPY_EGG_VERSION = 0.75.1
> DISTNAME = zim-${MODPY_EGG_VERSION}
>
> CATEGORIES = productivity
> Index: distinfo
> ===
> RCS file: /cvs/ports/productivity/zim/distinfo,v
> retrieving revision 1.14
> diff -u -p -r1.14 distinfo
> --- distinfo 25 Dec 2021 10:21:25 - 1.14
> +++ distinfo 12 Nov 2022 16:06:05 -
> @@ -1,2 +1,2 @@
> -SHA256 (zim-0.74.3.tar.gz) = 3ehPIkhsf1JnC9Qx3kQ6ilvRaBB7auBm2C1HOuNGzRU=
> -SIZE (zim-0.74.3.tar.gz) = 2998280
> +SHA256 (zim-0.75.1.tar.gz) = iOF11/fhQYlvnpWJidJS1yJVavF7xLxvBl59VCh9A4U=
> +SIZE (zim-0.75.1.tar.gz) = 2510821
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/productivity/zim/pkg/PLIST,v
> retrieving revision 1.18
> diff -u -p -r1.18 PLIST
> --- pkg/PLIST 11 Mar 2022 19:51:49 - 1.18
> +++ pkg/PLIST 12 Nov 2022 16:06:05 -
> @@ -361,10 +361,12 @@ share/locale/ru/LC_MESSAGES/zim.mo
> share/locale/si/LC_MESSAGES/zim.mo
> share/locale/sk/LC_MESSAGES/zim.mo
> share/locale/sl/LC_MESSAGES/zim.mo
> +share/locale/sq/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
> +share/locale/vi/LC_MESSAGES/zim.mo
> share/locale/zh_CN/LC_MESSAGES/zim.mo
> share/locale/zh_TW/LC_MESSAGES/zim.mo
> share/metainfo/
> @@ -388,7 +390,13 @@ share/zim/icons/hicolor/16x16/actions/fo
>
> share/zim/icons/hicolor/16x16/actions/format-text-subscript-symbolic.symbolic.png
>
> share/zim/icons/hicolor/16x16/actions/format-text-superscript-symbolic.symbolic.png
> share/zim/icons/hicolor/16x16/actions/linkmap-symbolic.symbolic.png
> +share/zim/icons/hicolor/16x16/actions/task-list-cancelled-symbolic.symbolic.png
> +share/zim/icons/hicolor/16x16/actions/task-list-closed-symbolic.symbolic.png
> +share/zim/icons/hicolor/16x16/actions/task-list-migrated-symbolic.symbolic.png
> +share/zim/icons/hicolor/16x16/actions/task-list-open-symbolic.symbolic.png
> share/zim/icons/hicolor/16x16/actions/task-list-symbolic.symbolic.png
> +share/zim/icons/hicolor/16x16/actions/task-list-transmigrated-symbolic.symbolic.png
> +share/zim/icons/hicolor/16x16/actions/window-pop-out-symbolic.symbolic.png
> share/zim/icons/hicolor/22x22/
> share/zim/icons/hicolor/22x22/actions/
> share/zim/icons/hicolor/22x22/actions/format-text-code-symbolic.symbolic.png
> @@ -396,7 +404,13 @@ share/zim/icons/hicolor/22x22/actions/fo
>
> share/zim/icons/hicolor/22x22/actions/format-text-subscript-symbolic.symbolic.png
>
> share/zim/icons/hicolor/22x22/actions/format-text-superscript-symbolic.symbolic.png
> share/zim/icons/hicolor/22x22/actions/linkmap-symbolic.symbolic.png
> +share/zim/icons/hicolor/22x22/actions/task-list-cancelled-symbolic.symbolic.png
> +share/zim/icons/hicolor/22x22/actions/task-list-closed-symbolic.symbolic.png
> +share/zim/icons/hicolor/22x22/actions/task-list-migrated-symbolic.symbolic.png
> +share/zim/icons/hicolor/22x22/actions/task-list-open-symbolic.symbolic.png
> share/zim/icons/hicolor/22x22/actions/task-list-symbolic.symbolic.png
> +share/zim/icons/hicolor/22x22/actions/task-list-transmigrated-symbolic.symbolic.png
> +share/zim/icons/hicolor/22x22/actions/window-pop-out-symbolic.symbolic.png
> share/zim/icons/hicolor/24x24/
> share/zim/icons/hicolor/24x24/actions/
> share/zim/icons/hicolor/24x24/actions/format-text-code-symbolic.symbolic.png
> @@ -404,14 +418,26 @@ share/zim/icons/hicolor/24x24/actions/fo
>
> share/zim/icons/hicolor/24x24/actions/format-text-subscript-symbolic.symbolic.png
>
> share/zim/icons/hicolor/24x24/actions/format-text-superscript-symbolic.symbolic.png
> share/zim/icons/hicolor/24x24/actions/linkmap-symbolic.symbolic.png
> +share/zim/icons/hicolor/24x24/actions/task-list-cancelled-symbolic.symbolic.png
> +share/zim/icons/hicolor/24x24/actions/task-list-closed-symbolic.symbolic.png
> +share/zim/icons/hicolor/24x24/actions/task-list-migrated-symbolic.symbolic.png
> +share/zim/icons/hicolor/24x24/actions/task-list-open-symbolic.symbolic.png
> share/zim/icons/hicolor/24x24/actions/task-list-symbolic.symbolic.png
> +share/zim/icons/hicolor/24x24/actions/task-list-transmigrated-symbolic.symbolic.png
> +share/zim/icons/hicolor/24x24/actions/window-pop-out-symbolic.symbolic.png
>
Re: UPDATE: productivity/zim 0.74.3
Hi,
thanks for the update!
I'm fine with it.
/Benno
Caspar Schutijser(cas...@schutijser.com) on 2021.12.21 18:37:14 +0100:
> Hi,
>
> Below is a diff that updates Zim to 0.74.3. Tested on amd64 for a couple
> of days, works fine here.
>
> Caspar
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/productivity/zim/Makefile,v
> retrieving revision 1.29
> diff -u -p -r1.29 Makefile
> --- Makefile 2 Nov 2021 00:02:07 - 1.29
> +++ Makefile 21 Dec 2021 17:30:34 -
> @@ -2,9 +2,8 @@
>
> COMMENT =desktop wiki
>
> -MODPY_EGG_VERSION = 0.74.0
> +MODPY_EGG_VERSION = 0.74.3
> DISTNAME = zim-${MODPY_EGG_VERSION}
> -REVISION = 0
>
> CATEGORIES = productivity
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/productivity/zim/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo 4 Oct 2021 16:35:11 - 1.13
> +++ distinfo 21 Dec 2021 17:30:34 -
> @@ -1,2 +1,2 @@
> -SHA256 (zim-0.74.0.tar.gz) = 8i8NR92wyuSplvc286YwU4WjgVgcnWQEDLDVaeg65g0=
> -SIZE (zim-0.74.0.tar.gz) = 2294152
> +SHA256 (zim-0.74.3.tar.gz) = 3ehPIkhsf1JnC9Qx3kQ6ilvRaBB7auBm2C1HOuNGzRU=
> +SIZE (zim-0.74.3.tar.gz) = 2998280
> Index: patches/patch-setup_py
> ===
> RCS file: /cvs/ports/productivity/zim/patches/patch-setup_py,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-setup_py
> --- patches/patch-setup_py2 Nov 2020 21:57:19 - 1.6
> +++ patches/patch-setup_py21 Dec 2021 17:30:34 -
> @@ -10,4 +10,4 @@ Index: setup.py
> +('man/man1', ['man/zim.1']),
> ('share/applications', ['xdg/zim.desktop']),
> ('share/mime/packages', ['xdg/zim.xml']),
> - ('share/pixmaps', ['xdg/hicolor/48x48/apps/zim.png']),
> + ('share/metainfo', ['xdg/org.zim_wiki.Zim.appdata.xml']),
>
Re: update productivity/zim
- Forwarded message from Sebastian Benoit -
From: Sebastian Benoit
To: Solene Rapenne
Cc: ports@openbsd.org
Date: Wed, 15 Sep 2021 23:38:44 +0200
Subject: Re: update productivity/zim
Solene Rapenne(sol...@perso.pw) on 2021.09.15 20:23:11 +0200:
> Hello,
>
> this update zim to latest version published last day.
thanks!
looks good to me, ok
> Changelog:
> https://github.com/zim-desktop-wiki/zim-desktop-wiki/commit/a532c35e4b54c8fa1823a483dc005e9f52865e7e#diff-06572a96a58dc510037d5efa622f9bec8519bc1beab13c9f251e97e657a9d4edR8
>
> it brings noticeable improvements such as anchor links within pages and
> many other improvements
>
>
> Index: Makefile
> ===
> RCS file: /home/reposync/ports/productivity/zim/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- Makefile 20 Jun 2021 17:32:09 - 1.27
> +++ Makefile 15 Sep 2021 16:41:51 -
> @@ -2,7 +2,7 @@
>
> COMMENT =desktop wiki
>
> -MODPY_EGG_VERSION = 0.73.5
> +MODPY_EGG_VERSION = 0.74.0
> DISTNAME = zim-${MODPY_EGG_VERSION}
>
> CATEGORIES = productivity
> Index: distinfo
> ===
> RCS file: /home/reposync/ports/productivity/zim/distinfo,v
> retrieving revision 1.12
> diff -u -p -r1.12 distinfo
> --- distinfo 29 Apr 2021 22:31:00 - 1.12
> +++ distinfo 15 Sep 2021 16:42:01 -
> @@ -1,2 +1,2 @@
> -SHA256 (zim-0.73.5.tar.gz) = o28V2Sw5lMDVWwf4MlOz2LgmvrNxSGXturwU8cyR1jo=
> -SIZE (zim-0.73.5.tar.gz) = 2159901
> +SHA256 (zim-0.74.0.tar.gz) = 8i8NR92wyuSplvc286YwU4WjgVgcnWQEDLDVaeg65g0=
> +SIZE (zim-0.74.0.tar.gz) = 2294152
> Index: pkg/PLIST
> ===
> RCS file: /home/reposync/ports/productivity/zim/pkg/PLIST,v
> retrieving revision 1.16
> diff -u -p -r1.16 PLIST
> --- pkg/PLIST 29 Apr 2021 22:31:15 - 1.16
> +++ pkg/PLIST 15 Sep 2021 16:42:54 -
> @@ -11,6 +11,7 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/zim/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/${MODPY_PYCACHE}fs.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/${MODPY_PYCACHE}history.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/zim/${MODPY_PYCACHE}import_files.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/${MODPY_PYCACHE}insertedobjects.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/${MODPY_PYCACHE}parsing.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -87,7 +88,7 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/zim/gui/${MODPY_PYCACHE}mainwindow.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/gui/${MODPY_PYCACHE}navigation.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/gui/${MODPY_PYCACHE}notebookdialog.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/zim/gui/${MODPY_PYCACHE}pageview.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/zim/gui/${MODPY_PYCACHE}notebookview.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/gui/${MODPY_PYCACHE}preferencesdialog.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/gui/${MODPY_PYCACHE}propertiesdialog.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/gui/${MODPY_PYCACHE}recentchangesdialog.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -105,7 +106,13 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/zim/gui/mainwindow.py
> lib/python${MODPY_VERSION}/site-packages/zim/gui/navigation.py
> lib/python${MODPY_VERSION}/site-packages/zim/gui/notebookdialog.py
> -lib/python${MODPY_VERSION}/site-packages/zim/gui/pageview.py
> +lib/python${MODPY_VERSION}/site-packages/zim/gui/notebookview.py
> +lib/python${MODPY_VERSION}/site-packages/zim/gui/pageview/
> +lib/python${MODPY_VERSION}/site-packages/zim/gui/pageview/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zim/gui/pageview/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/zim/gui/pageview/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/zim/gui/pageview/${MODPY_PYCACHE}editbar.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/zim/gui/pageview/editbar.py
> lib/python${MODPY_VERSION}/site-packages/zim/gui/preferencesdialog.py
Re: update productivity/zim
Solene Rapenne(sol...@perso.pw) on 2021.09.15 20:23:11 +0200:
> Hello,
>
> this update zim to latest version published last day.
thanks!
looks good to me, ok
> Changelog:
> https://github.com/zim-desktop-wiki/zim-desktop-wiki/commit/a532c35e4b54c8fa1823a483dc005e9f52865e7e#diff-06572a96a58dc510037d5efa622f9bec8519bc1beab13c9f251e97e657a9d4edR8
>
> it brings noticeable improvements such as anchor links within pages and
> many other improvements
>
>
> Index: Makefile
> ===
> RCS file: /home/reposync/ports/productivity/zim/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- Makefile 20 Jun 2021 17:32:09 - 1.27
> +++ Makefile 15 Sep 2021 16:41:51 -
> @@ -2,7 +2,7 @@
>
> COMMENT =desktop wiki
>
> -MODPY_EGG_VERSION = 0.73.5
> +MODPY_EGG_VERSION = 0.74.0
> DISTNAME = zim-${MODPY_EGG_VERSION}
>
> CATEGORIES = productivity
> Index: distinfo
> ===
> RCS file: /home/reposync/ports/productivity/zim/distinfo,v
> retrieving revision 1.12
> diff -u -p -r1.12 distinfo
> --- distinfo 29 Apr 2021 22:31:00 - 1.12
> +++ distinfo 15 Sep 2021 16:42:01 -
> @@ -1,2 +1,2 @@
> -SHA256 (zim-0.73.5.tar.gz) = o28V2Sw5lMDVWwf4MlOz2LgmvrNxSGXturwU8cyR1jo=
> -SIZE (zim-0.73.5.tar.gz) = 2159901
> +SHA256 (zim-0.74.0.tar.gz) = 8i8NR92wyuSplvc286YwU4WjgVgcnWQEDLDVaeg65g0=
> +SIZE (zim-0.74.0.tar.gz) = 2294152
> Index: pkg/PLIST
> ===
> RCS file: /home/reposync/ports/productivity/zim/pkg/PLIST,v
> retrieving revision 1.16
> diff -u -p -r1.16 PLIST
> --- pkg/PLIST 29 Apr 2021 22:31:15 - 1.16
> +++ pkg/PLIST 15 Sep 2021 16:42:54 -
> @@ -11,6 +11,7 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/zim/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/${MODPY_PYCACHE}fs.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/${MODPY_PYCACHE}history.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/zim/${MODPY_PYCACHE}import_files.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/${MODPY_PYCACHE}insertedobjects.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/${MODPY_PYCACHE}parsing.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -87,7 +88,7 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/zim/gui/${MODPY_PYCACHE}mainwindow.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/gui/${MODPY_PYCACHE}navigation.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/gui/${MODPY_PYCACHE}notebookdialog.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/zim/gui/${MODPY_PYCACHE}pageview.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/zim/gui/${MODPY_PYCACHE}notebookview.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/gui/${MODPY_PYCACHE}preferencesdialog.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/gui/${MODPY_PYCACHE}propertiesdialog.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/zim/gui/${MODPY_PYCACHE}recentchangesdialog.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -105,7 +106,13 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/zim/gui/mainwindow.py
> lib/python${MODPY_VERSION}/site-packages/zim/gui/navigation.py
> lib/python${MODPY_VERSION}/site-packages/zim/gui/notebookdialog.py
> -lib/python${MODPY_VERSION}/site-packages/zim/gui/pageview.py
> +lib/python${MODPY_VERSION}/site-packages/zim/gui/notebookview.py
> +lib/python${MODPY_VERSION}/site-packages/zim/gui/pageview/
> +lib/python${MODPY_VERSION}/site-packages/zim/gui/pageview/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zim/gui/pageview/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/zim/gui/pageview/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/zim/gui/pageview/${MODPY_PYCACHE}editbar.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/zim/gui/pageview/editbar.py
> lib/python${MODPY_VERSION}/site-packages/zim/gui/preferencesdialog.py
> lib/python${MODPY_VERSION}/site-packages/zim/gui/propertiesdialog.py
> lib/python${MODPY_VERSION}/site-packages/zim/gui/recentchangesdialog.py
> @@ -115,6 +122,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/zim/gui/uiactions.py
> lib/python${MODPY_VERSION}/site-packages/zim/gui/widgets.py
> lib/python${MODPY_VERSION}/site-packages/zim/history.py
> +lib/python${MODPY_VERSION}/site-packages/zim/import_files.py
Re: zim writes to HOME
Theo Buehler(t...@theobuehler.org) on 2021.06.12 14:27:48 +0200:
> When building zim, it leaves a /tmp/zim-zim-0.73.5_writes_to_HOME/
> behind. The build log shows these warnings (among others):
>
> Environment variable $HOME does not point to an existing folder:
> /zim-0.73.5_writes_to_HOME
> ...
> XDG_RUNTIME_DIR is not set, using /tmp/zim-zim-0.73.5_writes_to_HOME as a
> fallback
>
> This fixes it. No change in the package.
Hi, sorry i missed replying to this.
Seems ok to me.
/B.
> Index: Makefile
> ===
> RCS file: /cvs/ports/productivity/zim/Makefile,v
> retrieving revision 1.26
> diff -u -p -r1.26 Makefile
> --- Makefile 29 Apr 2021 22:31:00 - 1.26
> +++ Makefile 12 May 2021 20:53:02 -
> @@ -32,4 +32,7 @@ RUN_DEPENDS = ${COMMON_DEPENDS} \
> misc/shared-mime-info \
> x11/gtk+3,-guic
>
> +PORTHOME = ${WRKDIR}
> +MAKE_ENV += XDG_RUNTIME_DIR=${PORTHOME}
> +
> .include
>
Re: UPDATE: productivity/zim 0.73.5
Caspar Schutijser(cas...@schutijser.com) on 2021.04.28 20:32:46 +0200: > Hi, > > Below is a diff that updates productivity/zim to 0.73.5. I've been using > this for about a month on amd64, works fine here. Looking at the > CHANGELOG, it's mostly bug fixes: > https://github.com/zim-desktop-wiki/zim-desktop-wiki/blob/master/CHANGELOG.md commited, thanks! /B
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2021/04/29 16:31:15 Modified files: productivity/zim: Makefile distinfo productivity/zim/pkg: PLIST Log message: update zim to 0.73.5, from Caspar Schutijser, thanks! danj@ sthen@ agree
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2019/05/09 20:38:04 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: relayd-updateconf was used to update a OpenBSD 5.5 relayd config to OpenBSD 5.6 relayds format. Its no longer useful. ok danj@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2019/05/09 20:31:20 Removed files: sysutils/relayd-updateconf: Makefile distinfo sysutils/relayd-updateconf/patches: patch-parse_y sysutils/relayd-updateconf/pkg: DESCR PLIST Log message: remove relayd-updateconf, no longer useful. ok danj@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2019/05/09 20:29:37 Modified files: sysutils : Makefile Log message: unhook relayd-updateconf from build, it's no longer useful
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2019/03/29 06:19:45 Modified files: productivity/zim: Makefile distinfo Log message: update zim to version 0.69 ok pamela@, tested by Kurt Mosiejczuk.
UPDATE: productivity/zim 0.69
just a tiny update:
=== 0.69 - Sun 16 Dec 2018 ===
* Performance improvements for indexing large notebooks
* Performance improvement for auto-completion of page names in dialogs
* Updated translations from launchpad
ok?
Index: Makefile
===
RCS file: /cvs/ports/productivity/zim/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile10 Dec 2018 23:38:37 - 1.20
+++ Makefile27 Mar 2019 19:57:42 -
@@ -2,7 +2,7 @@
COMMENT = desktop wiki
-MODPY_EGG_VERSION =0.68
+MODPY_EGG_VERSION =0.69
DISTNAME = zim-${MODPY_EGG_VERSION}
CATEGORIES = productivity
Index: distinfo
===
RCS file: /cvs/ports/productivity/zim/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo10 Dec 2018 23:38:37 - 1.8
+++ distinfo27 Mar 2019 19:57:42 -
@@ -1,2 +1,2 @@
-SHA256 (zim-0.68.tar.gz) = 2RUY4BD2pulRp1MUE4tVRaTFEVH8mfUTqndooYhY3xU=
-SIZE (zim-0.68.tar.gz) = 2044224
+SHA256 (zim-0.69.tar.gz) = QZkIcIk5dqbiAnHh9ZoLiWAA82chjybBOohHElKgBMg=
+SIZE (zim-0.69.tar.gz) = 2044631
Re: NEW: squash-fuse
Diana Eichert(deich...@wrench.com) on 2019.02.27 15:11:50 -0700:
> Is this port for current? I have 6.4 on the USG and it failed here.
yes it is.
my best guess is that the autoconf/make stuff worked different on 6.4, but i
dont do much ports, so what do i know. sorry.
/Benno
> make package
> ===> Checking files for squashfuse-0.1.103
> `/usr/ports/distfiles/squashfuse-0.1.103.tar.gz' is up to date.
> >> (SHA256) squashfuse-0.1.103.tar.gz: OK
> ===> squashfuse-0.1.103 depends on: metaauto-* -> metaauto-1.0p1
> ===> squashfuse-0.1.103 depends on: autoconf-2.69 -> autoconf-2.69p2
> ===> squashfuse-0.1.103 depends on: automake->=1.16,<1.17 -> automake-1.16.1
> ===> squashfuse-0.1.103 depends on: libtool-* -> libtool-2.4.2p0
> ===> squashfuse-0.1.103 depends on: lz4-* -> lz4-1.8.3
> ===> squashfuse-0.1.103 depends on: lzo2-* -> lzo2-2.10p0
> ===> squashfuse-0.1.103 depends on: xz-* -> xz-5.2.4
> ===> squashfuse-0.1.103 depends on: zstd-* -> zstd-1.3.5p0
> ===> Verifying specs: c fuse lz4 lzma lzo2 pthread z zstd
> ===> found c.93.0 fuse.2.0 lz4.2.1 lzma.2.1 lzo2.1.0 pthread.25.1
> z.5.0 zstd.1.1
> ===> Extracting for squashfuse-0.1.103
> ===> Patching for squashfuse-0.1.103
> ===> Applying OpenBSD patch patch-extract_c
> Hmm... Looks like a unified diff to me...
> The text leading up to this was:
> --
> |$OpenBSD$
> |
> |Index: extract.c
> |--- extract.c.orig
> |+++ extract.c
> --
> Patching file extract.c using Plan A...
> Hunk #1 succeeded at 7.
> Hunk #2 succeeded at 101.
> done
> ===> Compiler link: cc -> /usr/bin/cc
> ===> Compiler link: c++ -> /usr/bin/c++
> ===> Configuring for squashfuse-0.1.103
> Using /usr/ports/pobj/squashfuse-0.1.103/config.site (generated)
> env: ./configure: No such file or directory
> *** Error 127 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2718
> 'do-configure': @for d in
> /usr/ports/pobj/squashfuse-0.1.103/squashfuse-0)
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2738
> '/usr/ports/pobj/squashfuse-0.1.103/.configure_done')
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2003
> '/usr/ports/packages/mips64/all/squashfuse-0.1.103.tgz')
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2465
> '_internal-package')
> *** Error 1 in /usr/ports/sysutils/squash-fuse
> (/usr/ports/infrastructure/mk/bsd.port.mk:2444 'package')
>
> find /usr/ports/pobj/squashfuse-0.1.103 -name "conf*"
> /usr/ports/pobj/squashfuse-0.1.103/squashfuse-0.1.103/configure.ac
> /usr/ports/pobj/squashfuse-0.1.103/squashfuse-0.1.103/win/config.h
> /usr/ports/pobj/squashfuse-0.1.103/squashfuse-0.1.103/config.guess
> /usr/ports/pobj/squashfuse-0.1.103/squashfuse-0.1.103/config.sub
> /usr/ports/pobj/squashfuse-0.1.103/config.site
>
>
> On Mon, Feb 25, 2019 at 12:47 PM Diana Eichert wrote:
> >
> > I'm going to try this port, since I'm building it on a USG it might
> > take awhile. :-)
> >
> > thanks
> >
> > diana
> >
> >
> > On Mon, Feb 25, 2019 at 12:22 PM Stuart Henderson
> > wrote:
> > >
> > > On 2019/02/25 18:55, Sebastian Benoit wrote:
> > > > squashfuse - Mount SquashFS archives using FUSE
> > > > https://github.com/vasi/squashfuse/blob/master/README
> > > >
> > > > I dont know if i got the WANTLIB right.
> > > >
> > > > I also havent tested it, for lack of a squashfs filesystem, but maybe
> > > > Diana
> > > > Eichert can try it. ;)
> > > >
> > >
> > > here's a diff on top, bit of cleanup, and enable the dep's - new tgz
> > > attached.
> > >
> > > I haven't changed it here but directory name is probably better as
> > > squashfuse rather than squash-fuse to match the PKGNAME
> > >
> > > diff --git Makefile Makefile
> > > index 81a19bd..f631117 100644
> > > --- Makefile
> > > +++ Makefile
> > > @@ -2,36 +2,37 @@
> > >
> > > COMMENT = squashfs file system through FUSE
> > >
> > > -V =0.1.103
> > > GH_ACCOUNT = vasi
> > > GH_PROJECT = squashfuse
> > > -GH_TAGNAME = ${V}
> > > -DISTNAME = squashfuse-${V}
> > > +GH_TAGNAME = 0.1.103
> > > +
> > > +SHARED_LIBS += fuseprivate 0.0 # 0.0
> > > +SHARED_LIBS += squashfuse0.0 # 0.0
> > >
> > > CATEGORIES = sysutils
&g
NEW: squash-fuse
squashfuse - Mount SquashFS archives using FUSE https://github.com/vasi/squashfuse/blob/master/README I dont know if i got the WANTLIB right. I also havent tested it, for lack of a squashfs filesystem, but maybe Diana Eichert can try it. ;) squash-fuse.tgz Description: GNU Unix tar archive
Re: password-store depends on gnupg-1.4.23?
Stuart Henderson(s...@spacehopper.org) on 2019.02.06 23:08:34 +: > On 2019/02/06 23:32, Sebastian Benoit wrote: > > $ doas pkg_delete gnupg-1.4.23p1 > > can't delete gnupg-1.4.23p1 without deleting password-store-1.7.3 > > Delete them as well ? [y/N/a] > > > > but password-store has security/gnupg2 as dependency, not gnupg-1.4... > > > > Port: password-store-1.7.3 > > Path: security/password-store > > Info: simple password store > > Maint: David Dahlberg > > Index: security > > L-deps: > > B-deps: archivers/xz devel/gmake > > R-deps: converters/base64 devel/git graphics/libqrencode misc/gnugetopt > > security/gnupg2 shells/bash sysutils/colortree x11/xclip > > Archs: any > > > > $ pkg_info | grep gnupg > > gnupg-1.4.23p1 GNU privacy guard - a free PGP replacement > > gnupg-2.2.12GNU privacy guard - a free PGP replacement > > > > Is there some magic i have to do? > > I just fixed this by adding the missing PKGSPEC line to gnupg2 (the > "opposite" of the one already present in gnupg1). > > If you update ports/security/gnupg2 in your tree (no need to build it) > and rebuild/update password-store from ports it should fix things up for > you - or it should be picked up automatically in a normal pkg_add -u > run after new pkgs are available. Yes, that works. Thanks :)
password-store depends on gnupg-1.4.23?
$ doas pkg_delete gnupg-1.4.23p1 can't delete gnupg-1.4.23p1 without deleting password-store-1.7.3 Delete them as well ? [y/N/a] but password-store has security/gnupg2 as dependency, not gnupg-1.4... Port: password-store-1.7.3 Path: security/password-store Info: simple password store Maint: David Dahlberg Index: security L-deps: B-deps: archivers/xz devel/gmake R-deps: converters/base64 devel/git graphics/libqrencode misc/gnugetopt security/gnupg2 shells/bash sysutils/colortree x11/xclip Archs: any $ pkg_info | grep gnupg gnupg-1.4.23p1 GNU privacy guard - a free PGP replacement gnupg-2.2.12GNU privacy guard - a free PGP replacement Is there some magic i have to do?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2019/02/03 14:24:08 Log message: add a port for the Yubico Personal Identity Verification (PIV) Tool ok sthen@ Status: Vendor Tag: benno Release Tags: benno_20180203 N ports/security/yubico/yubico-piv-tool/Makefile N ports/security/yubico/yubico-piv-tool/distinfo N ports/security/yubico/yubico-piv-tool/pkg/DESCR N ports/security/yubico/yubico-piv-tool/pkg/PLIST N ports/security/yubico/yubico-piv-tool/patches/patch-tool_yubico-piv-tool_c No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2019/02/03 14:26:40 Modified files: security/yubico: Makefile Log message: add new port yubico-piv-tool to the build ok sthen@
[NEW] yubico-piv-tool
Hi, here is a port of the Yubico Personal Identity Verification (PIV) Tool: The Yubico PIV tool is used for interacting with the Privilege and Identification Card (PIV) application on a YubiKey. With it you may generate keys on the device, importing keys and certificates, and create certificate requests, and other operations. See https://developers.yubico.com/PIV/ for more information. I have used this to successfully add ssh keys to a Yubikey and use them for ssh authentication (without using gnupg). Comments? Ok? /Benno yubico-piv-tool.tgz Description: GNU Unix tar archive
uninstalling packages
I'm cleaning up things on a system, and deleting quite a few packages. For example cups. Because its no longer needed. --- -cups-2.2.8p1 --- You should also run rm -rf /etc/cups/*.conf.O /var/log/cups You should also remove /etc/cups/cupsd.conf (which was modified) You should also remove /etc/cups/classes.conf (which was modified) You should also remove /etc/cups/printers.conf (which was modified) You should also remove /etc/cups/subscriptions.conf (which was modified) You should also remove /etc/cups/snmp.conf (which was modified) You should also run rm -rf /var/cache/cups You should also run rm -rf /var/spool/cups If i want to actually delete all that stuff, thats a lot of copy Are we actually expecting users to do that? Is there some option that i dont know of to automatically remove all the things? I know it might be dangerous to do that, but copy of tens of commands is also easy to mess up. /B.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2018/12/10 16:38:37 Modified files: productivity/zim: Makefile distinfo productivity/zim/pkg: PLIST Log message: Update zim to version 0.68, diff from Edward Lopez-Acosta (elopezacosta AT gmail DOT com), thanks! ok jca@
Re: UPDATE: productivity/zim-0.68
Hi,
i would like an ok to commit this.
I testes it, and it works.
/Benno
Edward Lopez-Acosta(elopezaco...@gmail.com) on 2018.12.01 19:24:42 -0600:
> Minor update, nothing depends on this, maintainer CC.
> Was able to drop one patch that no longer applied and I found no ill
> effects of doing so.
>
> Lots of bug fixes including some marked critical:
> https://github.com/jaap-karssenberg/zim-desktop-wiki/blob/master/CHANGELOG.txt
>
> Builds and runs fine on amd64.
>
> Thank you.
> --
> Edward Lopez-Acosta
> diff --git Makefile Makefile
> index cf02471b2d8..e27d5c1a241 100644
> --- Makefile
> +++ Makefile
> @@ -2,9 +2,8 @@
>
> COMMENT =desktop wiki
>
> -MODPY_EGG_VERSION = 0.67
> +MODPY_EGG_VERSION = 0.68
> DISTNAME = zim-${MODPY_EGG_VERSION}
> -REVISION = 2
>
> CATEGORIES = productivity
>
> diff --git distinfo distinfo
> index 04828b47254..221c06d9f65 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (zim-0.67.tar.gz) = s3zvPUkGqiY6vMsUk5Kafqa56NEaUO2SzUN+j5P/q70=
> -SIZE (zim-0.67.tar.gz) = 2034747
> +SHA256 (zim-0.68.tar.gz) = 2RUY4BD2pulRp1MUE4tVRaTFEVH8mfUTqndooYhY3xU=
> +SIZE (zim-0.68.tar.gz) = 2044224
> diff --git patches/patch-zim_environ_py patches/patch-zim_environ_py
> deleted file mode 100644
> index b16f02c843b..000
> --- patches/patch-zim_environ_py
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-zim_environ_py,v 1.1 2015/05/04 19:28:16 benno Exp $
> 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']:
> diff --git pkg/PLIST pkg/PLIST
> index 3d783f6c74b..925766fb6ca 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -273,8 +273,6 @@ 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
> @@ -336,6 +334,8 @@ share/locale/tr/LC_MESSAGES/zim.mo
> share/locale/uk/LC_MESSAGES/zim.mo
> share/locale/zh_CN/LC_MESSAGES/zim.mo
> share/locale/zh_TW/LC_MESSAGES/zim.mo
> +share/metainfo/
> +share/metainfo/org.zim_wiki.Zim.metainfo.xml
> share/mime/packages/zim.xml
> share/pixmaps/
> share/pixmaps/zim.png
Re: none
Pavel Korovin(p...@tristero.se) on 2018.04.25 22:23:37 +0300: > Sebastian, thank you! > OK for me with Jeremie's corrections. > Though I'd postpone commiting it to 5.6.4: hopefully I'll finish updating > ELK stack to 6.2.4 before the weekend and include it there, OK? yes, thats fine. just put it in there. thanks. > > -- > With best regards, > Pavel Korovin > > On 04/25, Jeremie Courreges-Anglas wrote: > > On Wed, Apr 25 2018, Sebastian Benoit <benoit-li...@fb12.de> wrote: > > > > - s/deafault/default/ keyboard on the x270 sucks > > - no need for -w in sysctl -w, it's not documented and might disappear copy and paste from the block above, needs removal there too > > one day > > > > No opinion on the content of the diff itself. > > > > > Index: Makefile > > > === > > > RCS file: /cvs/ports/textproc/elasticsearch/Makefile,v > > > retrieving revision 1.53 > > > diff -u -p -r1.53 Makefile > > > --- Makefile 4 Apr 2018 17:18:18 - 1.53 > > > +++ Makefile 25 Apr 2018 18:52:45 - > > > @@ -5,7 +5,7 @@ COMMENT= distributed RESTful search and > > > V= 5.6.4 > > > DISTNAME=elasticsearch-$V > > > CATEGORIES= textproc > > > -REVISION=1 > > > +REVISION=2 > > > > > > HOMEPAGE=https://www.elastic.co/products/elasticsearch > > > > > > Index: pkg/README > > > === > > > RCS file: /cvs/ports/textproc/elasticsearch/pkg/README,v > > > retrieving revision 1.5 > > > diff -u -p -r1.5 README > > > --- pkg/README17 Dec 2016 12:11:02 - 1.5 > > > +++ pkg/README25 Apr 2018 18:52:45 - > > > @@ -35,6 +35,12 @@ the open files limit in login.conf(5): > > > # sysctl -w kern.maxfiles=32768 > > > # echo "kern.maxfiles=32768" >> /etc/sysctl.conf > > > > > > +If you are getting "java.io.IOException: No locks available" errors, > > > +you need to increase kern.maxlocksperuid over the deafault of 1024: > > > + > > > + # sysctl -w kern.maxlocksperuid=2048 > > > + # echo "kern.maxlocksperuid=2048" >> /etc/sysctl.conf > > > + > --
[no subject]
ok? Index: Makefile === RCS file: /cvs/ports/textproc/elasticsearch/Makefile,v retrieving revision 1.53 diff -u -p -r1.53 Makefile --- Makefile4 Apr 2018 17:18:18 - 1.53 +++ Makefile25 Apr 2018 18:52:45 - @@ -5,7 +5,7 @@ COMMENT=distributed RESTful search and V= 5.6.4 DISTNAME= elasticsearch-$V CATEGORIES=textproc -REVISION= 1 +REVISION= 2 HOMEPAGE= https://www.elastic.co/products/elasticsearch Index: pkg/README === RCS file: /cvs/ports/textproc/elasticsearch/pkg/README,v retrieving revision 1.5 diff -u -p -r1.5 README --- pkg/README 17 Dec 2016 12:11:02 - 1.5 +++ pkg/README 25 Apr 2018 18:52:45 - @@ -35,6 +35,12 @@ the open files limit in login.conf(5): # sysctl -w kern.maxfiles=32768 # echo "kern.maxfiles=32768" >> /etc/sysctl.conf +If you are getting "java.io.IOException: No locks available" errors, +you need to increase kern.maxlocksperuid over the deafault of 1024: + + # sysctl -w kern.maxlocksperuid=2048 + # echo "kern.maxlocksperuid=2048" >> /etc/sysctl.conf + Elasticsearch Plugins Management Elasticsearch plugins management involves running Java code which can download
Re: [NEW] textproc/loccount 1.2
Thanks, i imported it. Stuart Henderson(s...@spacehopper.org) on 2017.12.29 16:12:03 +: > On 2017/12/27 22:04, Sebastian Benoit wrote: > > Klemens Nanni(k...@posteo.org) on 2017.12.25 16:41:42 +0100: > > > On Thu, Nov 09, 2017 at 12:11:05AM +0100, Klemens Nanni wrote: > > > > Hey ports@, > > > > > > > > here's https://gitlab.com/esr/loccount/, from DESCR: > > > > > > > > loccount is a re-implementation of David A. Wheeler's sloccount tool in > > > > Go. It is faster and handles more different languages. Because it's one > > > > source file in Go, it is easier to maintain and extend than the > > > > multi-file, multi-language implementation of the original. > > > > > > > > The algorithms are largely unchanged and can be expected to produce > > > > identical numbers for languages supported by both tools. Python is an > > > > exception; loccount corrects buggy counting of single-quote multiline > > > > literals in sloccount 2.26. > > > 1.2 from 05.12.2017 fixes a bug in the parallelized treewalker so here's > > > an updated tarball including all of the previous feedback of course. > > > > > > Anyone willing to commit this? > > > > yeah, i can do this. > > any oks? sthen? > > OK to import. > > (I'd rather re-wrap DESCR, wrapping hard on 80 columns is a bit awkward > to read, and it doesn't take any more lines wrapping with fmt(1) or > par(1) default settings, but that doesn't block import). > --
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2018/01/08 13:28:02 Modified files: textproc : Makefile Log message: link loccount to the build
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2018/01/08 13:26:08 Log message: add new port of loccount, it can count lines of codes in many languages. ported by Klemens Nanni, ok sthen@ Status: Vendor Tag: benno Release Tags: benno_20180108 N ports/textproc/loccount/Makefile N ports/textproc/loccount/distinfo N ports/textproc/loccount/pkg/DESCR N ports/textproc/loccount/pkg/PLIST No conflicts created by this import
Re: [NEW] textproc/loccount 1.2
Klemens Nanni(k...@posteo.org) on 2017.12.25 16:41:42 +0100: > On Thu, Nov 09, 2017 at 12:11:05AM +0100, Klemens Nanni wrote: > > Hey ports@, > > > > here's https://gitlab.com/esr/loccount/, from DESCR: > > > > loccount is a re-implementation of David A. Wheeler's sloccount tool in > > Go. It is faster and handles more different languages. Because it's one > > source file in Go, it is easier to maintain and extend than the > > multi-file, multi-language implementation of the original. > > > > The algorithms are largely unchanged and can be expected to produce > > identical numbers for languages supported by both tools. Python is an > > exception; loccount corrects buggy counting of single-quote multiline > > literals in sloccount 2.26. > 1.2 from 05.12.2017 fixes a bug in the parallelized treewalker so here's > an updated tarball including all of the previous feedback of course. > > Anyone willing to commit this? yeah, i can do this. any oks? sthen?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2017/11/04 16:02:59 Modified files: productivity/zim: Makefile distinfo productivity/zim/pkg: PLIST Log message: update zim to 0.67 ok juanfra@
[UPDATE] productivity/zim
ok?
Index: Makefile
===
RCS file: /cvs/ports/productivity/zim/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile29 Dec 2015 14:53:35 - 1.15
+++ Makefile4 Nov 2017 17:24:00 -
@@ -2,7 +2,7 @@
COMMENT = desktop wiki
-MODPY_EGG_VERSION =0.65
+MODPY_EGG_VERSION =0.67
DISTNAME = zim-${MODPY_EGG_VERSION}
CATEGORIES = productivity
Index: distinfo
===
RCS file: /cvs/ports/productivity/zim/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo29 Dec 2015 14:53:35 - 1.6
+++ distinfo4 Nov 2017 17:24:00 -
@@ -1,2 +1,2 @@
-SHA256 (zim-0.65.tar.gz) = VELzM0OVor6vxbmiu+wuU+OCcNS61pa1xAU91R3B7ZY=
-SIZE (zim-0.65.tar.gz) = 1899614
+SHA256 (zim-0.67.tar.gz) = s3zvPUkGqiY6vMsUk5Kafqa56NEaUO2SzUN+j5P/q70=
+SIZE (zim-0.67.tar.gz) = 2034747
Index: pkg/PLIST
===
RCS file: /cvs/ports/productivity/zim/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 29 Dec 2015 14:53:35 - 1.9
+++ pkg/PLIST 4 Nov 2017 17:24:00 -
@@ -4,16 +4,10 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim-${MODPY_EGG_VERSION}-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
-lib/python${MODPY_VERSION}/site-packages/zim/_version.pyc
lib/python${MODPY_VERSION}/site-packages/zim/actions.py
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/base.py
-lib/python${MODPY_VERSION}/site-packages/zim/base.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
@@ -112,14 +106,50 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim/inc/arithmetic.pyc
lib/python${MODPY_VERSION}/site-packages/zim/inc/xdot.py
lib/python${MODPY_VERSION}/site-packages/zim/inc/xdot.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/index.py
-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/main/
+lib/python${MODPY_VERSION}/site-packages/zim/main/__init__.py
+lib/python${MODPY_VERSION}/site-packages/zim/main/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/main/command.py
+lib/python${MODPY_VERSION}/site-packages/zim/main/command.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/main/ipc.py
+lib/python${MODPY_VERSION}/site-packages/zim/main/ipc.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/__init__.py
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/base.py
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/base.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/helpers.py
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/helpers.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/local.py
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/local.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/mock.py
+lib/python${MODPY_VERSION}/site-packages/zim/newfs/mock.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/__init__.py
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/__init__.py
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/base.py
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/base.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/files.py
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/files.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/links.py
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/links.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/notebook/index/pages.py
UPDATE: databases/pgpool
Hi,
this updates pgpool from 3.2.12 to 3.6.6.
Yesterdays 3.6.7 requires OpenSSL 1.1 or at least some patching, so i would
like to get this commited first before taking care of openssl and postgres
10).
ok?
/Benno
Index: Makefile
===
RCS file: /cvs/ports/databases/pgpool/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile4 Apr 2016 22:57:45 - 1.7
+++ Makefile10 Oct 2017 14:43:08 -
@@ -2,8 +2,7 @@
COMMENT= connection pool server for PostgreSQL
-DISTNAME= pgpool-II-3.2.12
-REVISION= 0
+DISTNAME= pgpool-II-3.6.6
CATEGORIES=databases
@@ -21,7 +20,7 @@ MASTER_SITES= http://www.pgpool.net/med
WANTLIB= c crypto m pq ssl pthread
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=--with-openssl
+CONFIGURE_ARGS=--with-openssl
USE_GMAKE= Yes
FAKE_FLAGS=sysconfdir=${PREFIX}/share/examples/pgpool-II/
@@ -30,11 +29,12 @@ BUILD_DEPENDS = databases/postgresql,-s
LIB_DEPENDS = databases/postgresql
post-install:
- @cd ${WRKSRC}/sql/pgpool-regclass && \
+ @cd ${WRKSRC}/src/sql/pgpool-regclass && \
env -i ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
-f ${MAKE_FILE} ${ALL_TARGET} && \
env -i ${MAKE_ENV} \
PREFIX=${WRKINST}${PREFIX} ${DESTDIRNAME}=${WRKINST}
TRUEPREFIX=${PREFIX} \
${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} -f ${MAKE_FILE} ${FAKE_TARGET}
+ ${INSTALL_MAN} ${WRKDIST}/./doc/src/sgml/man8/pgpool.8
${PREFIX}/man/man8/
.include
Index: distinfo
===
RCS file: /cvs/ports/databases/pgpool/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo4 Oct 2015 20:22:21 - 1.5
+++ distinfo10 Oct 2017 14:43:08 -
@@ -1,2 +1,2 @@
-SHA256 (pgpool-II-3.2.12.tar.gz) = 2ynh2OUX9qoDTehobSpAqPtCtWJOEXrKV3DIBWysbog=
-SIZE (pgpool-II-3.2.12.tar.gz) = 1626485
+SHA256 (pgpool-II-3.6.6.tar.gz) = X72sFKB7T0yr74vSJL4fuwdw2apHMdj6eQWHjcTCL7w=
+SIZE (pgpool-II-3.6.6.tar.gz) = 3171264
Index: patches/patch-pool_lobj_c
===
RCS file: patches/patch-pool_lobj_c
diff -N patches/patch-pool_lobj_c
--- patches/patch-pool_lobj_c 21 Dec 2011 15:51:04 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-pool_lobj_c,v 1.1.1.1 2011/12/21 15:51:04 pea Exp $
pool_lobj.c.orig Thu Nov 24 15:43:49 2011
-+++ pool_lobj.cThu Nov 24 15:44:02 2011
-@@ -27,6 +27,7 @@
- #include
- #include
- #include
-+#include
-
- #include "pool.h"
- #include "pool_lobj.h"
Index: patches/patch-pool_memqcache_c
===
RCS file: patches/patch-pool_memqcache_c
diff -N patches/patch-pool_memqcache_c
--- patches/patch-pool_memqcache_c 24 Sep 2012 19:39:59 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-pool_memqcache_c,v 1.1 2012/09/24 19:39:59 pea Exp $
pool_memqcache.c.orig Sun Sep 16 12:23:15 2012
-+++ pool_memqcache.c Sun Sep 16 12:23:26 2012
-@@ -36,6 +36,7 @@
- #include
- #include
- #include
-+#include
-
- #ifdef USE_MEMCACHED
- #include
Index: patches/patch-pool_select_walker_c
===
RCS file: patches/patch-pool_select_walker_c
diff -N patches/patch-pool_select_walker_c
--- patches/patch-pool_select_walker_c 24 Sep 2012 19:39:59 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-pool_select_walker_c,v 1.1 2012/09/24 19:39:59 pea Exp $
pool_select_walker.c.orig Sun Sep 16 12:30:03 2012
-+++ pool_select_walker.c Sun Sep 16 12:30:16 2012
-@@ -22,6 +22,7 @@
- #include
- #include
- #include
-+#include
-
- #include "pool.h"
- #include "pool_config.h"
Index: patches/patch-src_include_watchdog_wd_utils_h
===
RCS file: patches/patch-src_include_watchdog_wd_utils_h
diff -N patches/patch-src_include_watchdog_wd_utils_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_include_watchdog_wd_utils_h 10 Oct 2017 14:43:08
-
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/include/watchdog/wd_utils.h
+--- src/include/watchdog/wd_utils.h.orig
src/include/watchdog/wd_utils.h
+@@ -26,6 +26,7 @@
+ #define WD_UTILS_H
+
+ #include
++#include
+ #include "parser/pg_list.h"
+
+ #define WD_NG (0)
Index: patches/patch-src_pcp_con_pcp_worker_c
===
RCS file: patches/patch-src_pcp_con_pcp_worker_c
diff -N patches/patch-src_pcp_con_pcp_worker_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_pcp_con_pcp_worker_c 10 Oct 2017 14:43:08 -
@@ -0,0 +1,16 @@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2017/10/11 12:52:17 Modified files: net: Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: net/dnsfilter : Makefile distinfo net/dnsfilter/patches: patch-dnsfilter_h patch-pf_if_c net/dnsfilter/pkg: DESCR PLIST dnsfilter.rc Log message: remove net/dnsfilter, not maintained anymore. net/dnsdist is a possible replacement. ok florian@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2015/12/29 07:53:35 Modified files: productivity/zim: Makefile distinfo productivity/zim/pkg: PLIST Log message: update zim to version 0.65 ok ajacoutot@
Update: zim version 0.65
ok?
Index: Makefile
===
RCS file: /cvs/ports/productivity/zim/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile4 May 2015 19:28:16 - 1.14
+++ Makefile28 Dec 2015 22:48:33 -
@@ -2,7 +2,7 @@
COMMENT = desktop wiki
-MODPY_EGG_VERSION =0.62
+MODPY_EGG_VERSION =0.65
DISTNAME = zim-${MODPY_EGG_VERSION}
CATEGORIES = productivity
Index: distinfo
===
RCS file: /cvs/ports/productivity/zim/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo4 May 2015 19:28:16 - 1.5
+++ distinfo28 Dec 2015 22:48:33 -
@@ -1,2 +1,2 @@
-SHA256 (zim-0.62.tar.gz) = GdYq69LBqS2E2AcgxsHc23ecOaISBGj+0Bt/JSURvcI=
-SIZE (zim-0.62.tar.gz) = 1772246
+SHA256 (zim-0.65.tar.gz) = VELzM0OVor6vxbmiu+wuU+OCcNS61pa1xAU91R3B7ZY=
+SIZE (zim-0.65.tar.gz) = 1899614
Index: pkg/PLIST
===
RCS file: /cvs/ports/productivity/zim/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 4 May 2015 19:28:16 - 1.8
+++ pkg/PLIST 28 Dec 2015 22:48:33 -
@@ -81,6 +81,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim/gui/exportdialog.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/objectmanager.py
+lib/python${MODPY_VERSION}/site-packages/zim/gui/objectmanager.pyc
lib/python${MODPY_VERSION}/site-packages/zim/gui/pageindex.py
lib/python${MODPY_VERSION}/site-packages/zim/gui/pageindex.pyc
lib/python${MODPY_VERSION}/site-packages/zim/gui/pageview.py
@@ -129,8 +131,13 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim/plugins/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/zim/plugins/arithmetic.py
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/attachmentbrowser/
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/attachmentbrowser/__init__.py
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/attachmentbrowser/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/attachmentbrowser/filebrowser.py
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/attachmentbrowser/filebrowser.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/attachmentbrowser/thumbnailer.py
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/attachmentbrowser/thumbnailer.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/
@@ -138,6 +145,8 @@ lib/python${MODPY_VERSION}/site-packages
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/bookmarksbar.py
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/bookmarksbar.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
@@ -174,6 +183,8 @@ lib/python${MODPY_VERSION}/site-packages
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/tableeditor.py
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/tableeditor.pyc
lib/python${MODPY_VERSION}/site-packages/zim/plugins/tableofcontents.py
lib/python${MODPY_VERSION}/site-packages/zim/plugins/tableofcontents.pyc
lib/python${MODPY_VERSION}/site-packages/zim/plugins/tags.py
@@ -187,6 +198,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim/plugins/versioncontrol/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/zim/plugins/versioncontrol/bzr.py
lib/python${MODPY_VERSION}/site-packages/zim/plugins/versioncontrol/bzr.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/versioncontrol/fossil.py
+lib/python${MODPY_VERSION}/site-packages/zim/plugins/versioncontrol/fossil.pyc
lib/python${MODPY_VERSION}/site-packages/zim/plugins/versioncontrol/git.py
lib/python${MODPY_VERSION}/site-packages/zim/plugins/versioncontrol/git.pyc
lib/python${MODPY_VERSION}/site-packages/zim/plugins/versioncontrol/hg.py
@@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2015/10/04 14:22:22 Modified files: databases/pgpool: Makefile distinfo databases/pgpool/patches: patch-watchdog_wd_lifecheck_c patch-watchdog_wd_packet_c patch-watchdog_wd_ping_c Log message: update to pgpool-II-3.2.12 ok sthen
Re: update: pgpool-II 3.2.12
ok to commit? Sebastian Benoit(be...@openbsd.org) on 2015.09.19 18:34:08 +0200: > Hi, > > i upgraded pgpool to 3.2.12 on one of my machines, diff below. > > I'm running in with this config: > > # grep mode /etc/pgpool.conf > replication_mode = on > load_balance_mode = on > master_slave_mode = off > master_slave_sub_mode = 'slony' > parallel_mode = off > > This diff is against -current and i build it there and did a quick test, > however i really use it on 5.7. > > Changelog: > http://www.pgpool.net/docs/pgpool-II-3.2.12/NEWS.txt > > /Benno > > Index: databases/pgpool//Makefile > === > RCS file: /cvs/ports/databases/pgpool/Makefile,v > retrieving revision 1.5 > diff -u -p -r1.5 Makefile > --- databases/pgpool//Makefile22 Apr 2013 15:53:37 - 1.5 > +++ databases/pgpool//Makefile19 Sep 2015 16:28:47 - > @@ -2,7 +2,7 @@ > > COMMENT= connection pool server for PostgreSQL > > -DISTNAME=pgpool-II-3.2.3 > +DISTNAME=pgpool-II-3.2.12 > > CATEGORIES= databases > > Index: databases/pgpool//distinfo > === > RCS file: /cvs/ports/databases/pgpool/distinfo,v > retrieving revision 1.4 > diff -u -p -r1.4 distinfo > --- databases/pgpool//distinfo22 Apr 2013 15:53:37 - 1.4 > +++ databases/pgpool//distinfo19 Sep 2015 16:28:47 - > @@ -1,2 +1,2 @@ > -SHA256 (pgpool-II-3.2.3.tar.gz) = > yztilXr+UG5LQgvcC5Wfgp1ixwj9zhoX2ZqFIcWGpeU= > -SIZE (pgpool-II-3.2.3.tar.gz) = 1563129 > +SHA256 (pgpool-II-3.2.12.tar.gz) = > 2ynh2OUX9qoDTehobSpAqPtCtWJOEXrKV3DIBWysbog= > +SIZE (pgpool-II-3.2.12.tar.gz) = 1626485 > Index: databases/pgpool//patches/patch-watchdog_wd_lifecheck_c > === > RCS file: /cvs/ports/databases/pgpool/patches/patch-watchdog_wd_lifecheck_c,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-watchdog_wd_lifecheck_c > --- databases/pgpool//patches/patch-watchdog_wd_lifecheck_c 24 Sep 2012 > 19:39:59 - 1.1 > +++ databases/pgpool//patches/patch-watchdog_wd_lifecheck_c 19 Sep 2015 > 16:28:47 - > @@ -1,8 +1,8 @@ > $OpenBSD: patch-watchdog_wd_lifecheck_c,v 1.1 2012/09/24 19:39:59 pea Exp $ > watchdog/wd_lifecheck.c.orig Sun Sep 16 12:23:44 2012 > -+++ watchdog/wd_lifecheck.c Sun Sep 16 12:23:52 2012 > -@@ -30,6 +30,7 @@ > - #include > +--- watchdog/wd_lifecheck.c.orig Wed Apr 8 09:59:48 2015 > watchdog/wd_lifecheck.c Sun Jul 5 17:23:53 2015 > +@@ -29,6 +29,7 @@ > + #include > #include > #include > +#include > Index: databases/pgpool//patches/patch-watchdog_wd_packet_c > === > RCS file: /cvs/ports/databases/pgpool/patches/patch-watchdog_wd_packet_c,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-watchdog_wd_packet_c > --- databases/pgpool//patches/patch-watchdog_wd_packet_c 24 Sep 2012 > 19:39:59 - 1.1 > +++ databases/pgpool//patches/patch-watchdog_wd_packet_c 19 Sep 2015 > 16:28:47 - > @@ -1,16 +1,11 @@ > $OpenBSD: patch-watchdog_wd_packet_c,v 1.1 2012/09/24 19:39:59 pea Exp $ > watchdog/wd_packet.c.origSun Sep 16 12:24:07 2012 > -+++ watchdog/wd_packet.c Sun Sep 16 12:24:23 2012 > -@@ -34,10 +34,12 @@ > - #include > - #include > - #include > -+#include > - #include > +--- watchdog/wd_packet.c.origWed Apr 8 09:59:48 2015 > watchdog/wd_packet.c Sun Jul 5 17:29:19 2015 > +@@ -39,6 +39,7 @@ > #include > #include > #include > +#include > + #include > > #include "pool.h" > - #include "pool_config.h" > Index: databases/pgpool//patches/patch-watchdog_wd_ping_c > === > RCS file: /cvs/ports/databases/pgpool/patches/patch-watchdog_wd_ping_c,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-watchdog_wd_ping_c > --- databases/pgpool//patches/patch-watchdog_wd_ping_c24 Sep 2012 > 19:39:59 - 1.1 > +++ databases/pgpool//patches/patch-watchdog_wd_ping_c19 Sep 2015 > 16:28:47 - > @@ -1,11 +1,11 @@ > $OpenBSD: patch-watchdog_wd_ping_c,v 1.1 2012/09/24 19:39:59 pea Exp $ > watchdog/wd_ping.c.orig Sun Sep 16 12:24:32 2012 > -+++ watchdog/wd_ping.c Sun Sep 16 12:24:44 2012 > -@@ -31,6 +31,7 @@ > - #include > - #include > +--- watchdog/wd_ping.c.orig Wed Apr 8 09:59:48 2015 > watchdog/wd_ping.c Sun Jul 5 17:27:43 2015 > +@@ -24,6 +24,7 @@ > + #include > + #include > #include > +#include > - #include "pool.h" > - #include "pool_config.h" > - #include "watchdog.h" > + #include > + #include > + #include > --
update: pgpool-II 3.2.12
Hi, i upgraded pgpool to 3.2.12 on one of my machines, diff below. I'm running in with this config: # grep mode /etc/pgpool.conf replication_mode = on load_balance_mode = on master_slave_mode = off master_slave_sub_mode = 'slony' parallel_mode = off This diff is against -current and i build it there and did a quick test, however i really use it on 5.7. Changelog: http://www.pgpool.net/docs/pgpool-II-3.2.12/NEWS.txt /Benno Index: databases/pgpool//Makefile === RCS file: /cvs/ports/databases/pgpool/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- databases/pgpool//Makefile 22 Apr 2013 15:53:37 - 1.5 +++ databases/pgpool//Makefile 19 Sep 2015 16:28:47 - @@ -2,7 +2,7 @@ COMMENT= connection pool server for PostgreSQL -DISTNAME= pgpool-II-3.2.3 +DISTNAME= pgpool-II-3.2.12 CATEGORIES=databases Index: databases/pgpool//distinfo === RCS file: /cvs/ports/databases/pgpool/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- databases/pgpool//distinfo 22 Apr 2013 15:53:37 - 1.4 +++ databases/pgpool//distinfo 19 Sep 2015 16:28:47 - @@ -1,2 +1,2 @@ -SHA256 (pgpool-II-3.2.3.tar.gz) = yztilXr+UG5LQgvcC5Wfgp1ixwj9zhoX2ZqFIcWGpeU= -SIZE (pgpool-II-3.2.3.tar.gz) = 1563129 +SHA256 (pgpool-II-3.2.12.tar.gz) = 2ynh2OUX9qoDTehobSpAqPtCtWJOEXrKV3DIBWysbog= +SIZE (pgpool-II-3.2.12.tar.gz) = 1626485 Index: databases/pgpool//patches/patch-watchdog_wd_lifecheck_c === RCS file: /cvs/ports/databases/pgpool/patches/patch-watchdog_wd_lifecheck_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-watchdog_wd_lifecheck_c --- databases/pgpool//patches/patch-watchdog_wd_lifecheck_c 24 Sep 2012 19:39:59 - 1.1 +++ databases/pgpool//patches/patch-watchdog_wd_lifecheck_c 19 Sep 2015 16:28:47 - @@ -1,8 +1,8 @@ $OpenBSD: patch-watchdog_wd_lifecheck_c,v 1.1 2012/09/24 19:39:59 pea Exp $ watchdog/wd_lifecheck.c.orig Sun Sep 16 12:23:44 2012 -+++ watchdog/wd_lifecheck.cSun Sep 16 12:23:52 2012 -@@ -30,6 +30,7 @@ - #include +--- watchdog/wd_lifecheck.c.orig Wed Apr 8 09:59:48 2015 watchdog/wd_lifecheck.cSun Jul 5 17:23:53 2015 +@@ -29,6 +29,7 @@ + #include #include #include +#include Index: databases/pgpool//patches/patch-watchdog_wd_packet_c === RCS file: /cvs/ports/databases/pgpool/patches/patch-watchdog_wd_packet_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-watchdog_wd_packet_c --- databases/pgpool//patches/patch-watchdog_wd_packet_c24 Sep 2012 19:39:59 - 1.1 +++ databases/pgpool//patches/patch-watchdog_wd_packet_c19 Sep 2015 16:28:47 - @@ -1,16 +1,11 @@ $OpenBSD: patch-watchdog_wd_packet_c,v 1.1 2012/09/24 19:39:59 pea Exp $ watchdog/wd_packet.c.orig Sun Sep 16 12:24:07 2012 -+++ watchdog/wd_packet.c Sun Sep 16 12:24:23 2012 -@@ -34,10 +34,12 @@ - #include - #include - #include -+#include - #include +--- watchdog/wd_packet.c.orig Wed Apr 8 09:59:48 2015 watchdog/wd_packet.c Sun Jul 5 17:29:19 2015 +@@ -39,6 +39,7 @@ #include #include #include +#include + #include #include "pool.h" - #include "pool_config.h" Index: databases/pgpool//patches/patch-watchdog_wd_ping_c === RCS file: /cvs/ports/databases/pgpool/patches/patch-watchdog_wd_ping_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-watchdog_wd_ping_c --- databases/pgpool//patches/patch-watchdog_wd_ping_c 24 Sep 2012 19:39:59 - 1.1 +++ databases/pgpool//patches/patch-watchdog_wd_ping_c 19 Sep 2015 16:28:47 - @@ -1,11 +1,11 @@ $OpenBSD: patch-watchdog_wd_ping_c,v 1.1 2012/09/24 19:39:59 pea Exp $ watchdog/wd_ping.c.origSun Sep 16 12:24:32 2012 -+++ watchdog/wd_ping.c Sun Sep 16 12:24:44 2012 -@@ -31,6 +31,7 @@ - #include - #include +--- watchdog/wd_ping.c.origWed Apr 8 09:59:48 2015 watchdog/wd_ping.c Sun Jul 5 17:27:43 2015 +@@ -24,6 +24,7 @@ + #include + #include #include +#include - #include "pool.h" - #include "pool_config.h" - #include "watchdog.h" + #include + #include + #include
Re: UPDATE: zim-0.62
resend, ok?
- Forwarded message from Sebastian Benoit benoit-li...@fb12.de -
From: Sebastian Benoit benoit-li...@fb12.de
To: ports@openbsd.org
Date: Mon, 27 Apr 2015 00:26:05 +0200
Subject: Re: UPDATE: zim-0.62
Antoine Jacoutot(ajacou...@bsdfrog.org) on 2015.04.26 23:32:08 +0200:
On Sun, Apr 26, 2015 at 10:27:11PM +0100, Stuart Henderson wrote:
On 2015/04/26 22:24, Sebastian Benoit wrote:
-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
thx, i try to remember for next time ;)
update-plist gets things wrong for the majority of python ports, could you
reinstate the previous line here please (otherwise it will break if REVISION
is bumped).
Rest looks good to me.
+share/appdata/
+share/appdata/zim.appdata.xml
I don't *think* we need to do anything special with these but I'll draw
attention to it in case anyone reading knows better :)
We don't.
It's used by stuffs like gnome-software which we don't support.
And even if we did support that, there's no need for any goo :-)
--
Antoine
ok?
Index: Makefile
===
RCS file: /cvs/ports/productivity/zim/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile27 Mar 2015 08:14:14 - 1.13
+++ Makefile26 Apr 2015 22:24:46 -
@@ -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
--- distinfo3 Jan 2014 22:15:24 - 1.4
+++ distinfo26 Apr 2015 22:24:46 -
@@ -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 - 1.3
+++ patches/patch-setup_py 26 Apr 2015 22:24:46 -
@@ -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 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2015/05/04 13:28:16 Modified files: productivity/zim: Makefile distinfo productivity/zim/patches: patch-setup_py productivity/zim/pkg: PLIST Added files: productivity/zim/patches: patch-zim_environ_py Removed files: productivity/zim/patches: patch-zim_config_py Log message: update productivity/zim to version 0.62 with reminder from sthen@, ok dcoppa@ phessler@
Re: UPDATE: zim-0.62
Antoine Jacoutot(ajacou...@bsdfrog.org) on 2015.04.26 23:32:08 +0200:
On Sun, Apr 26, 2015 at 10:27:11PM +0100, Stuart Henderson wrote:
On 2015/04/26 22:24, Sebastian Benoit wrote:
-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
thx, i try to remember for next time ;)
update-plist gets things wrong for the majority of python ports, could you
reinstate the previous line here please (otherwise it will break if REVISION
is bumped).
Rest looks good to me.
+share/appdata/
+share/appdata/zim.appdata.xml
I don't *think* we need to do anything special with these but I'll draw
attention to it in case anyone reading knows better :)
We don't.
It's used by stuffs like gnome-software which we don't support.
And even if we did support that, there's no need for any goo :-)
--
Antoine
ok?
Index: Makefile
===
RCS file: /cvs/ports/productivity/zim/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile27 Mar 2015 08:14:14 - 1.13
+++ Makefile26 Apr 2015 22:24:46 -
@@ -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
--- distinfo3 Jan 2014 22:15:24 - 1.4
+++ distinfo26 Apr 2015 22:24:46 -
@@ -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 - 1.3
+++ patches/patch-setup_py 26 Apr 2015 22:24:46 -
@@ -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 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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 -
+++ patches/patch-zim_environ_py26 Apr 2015 22:24:46 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- zim/environ.py.origSun Apr 26 17:10:58
UPDATE: zim-0.62
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
--- Makefile27 Mar 2015 08:14:14 - 1.13
+++ Makefile26 Apr 2015 20:24:14 -
@@ -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
--- distinfo3 Jan 2014 22:15:24 - 1.4
+++ distinfo26 Apr 2015 20:24:14 -
@@ -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 - 1.3
+++ patches/patch-setup_py 26 Apr 2015 20:24:14 -
@@ -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 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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 -
+++ patches/patch-zim_environ_py26 Apr 2015 20:24:14 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- zim/environ.py.origSun 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 - 1.7
+++ pkg/PLIST 26 Apr 2015 20:24:14 -
@@ -1,7 +1,7 @@
NEW: misc/sloccount
Hi,
attached is a port (based on freebsds port) for sloccount:
quote from http://www.dwheeler.com/sloccount/sloccount.html
SLOCCount (pronounced sloc-count) is a suite of programs for counting
physical source lines of code (SLOC) in potentially large software systems.
Thus, SLOCCount is a software metrics tool or software measurement tool.
SLOCCount was developed by David A. Wheeler, originally to count SLOC in a
GNU/Linux distribution, but it can be used for counting the SLOC of
arbitrary software systems.
--
2 problems:
* binaries are not striped
i did not find a way yet to fix this
* portcheck complains about FULLPKGNAME:
trailing whitespace in pkg/DESCR
share/doc/${FULLPKGNAME}/
share/doc/${FULLPKGNAME}/ChangeLog
share/doc/${FULLPKGNAME}/README
share/doc/${FULLPKGNAME}/TODO
share/doc/${FULLPKGNAME}/sloccount.html
pkg/PLIST contains item(s) with ${FULLPKGNAME} in it, see above
feedback welcome :-)
/Benno
Re: NEW: misc/sloccount
and now with more port attached. sry.
Sebastian Benoit(benoit-li...@fb12.de) on 2014.10.13 23:24:10 +0200:
Hi,
attached is a port (based on freebsds port) for sloccount:
quote from http://www.dwheeler.com/sloccount/sloccount.html
SLOCCount (pronounced sloc-count) is a suite of programs for counting
physical source lines of code (SLOC) in potentially large software systems.
Thus, SLOCCount is a software metrics tool or software measurement tool.
SLOCCount was developed by David A. Wheeler, originally to count SLOC in a
GNU/Linux distribution, but it can be used for counting the SLOC of
arbitrary software systems.
--
2 problems:
* binaries are not striped
i did not find a way yet to fix this
* portcheck complains about FULLPKGNAME:
trailing whitespace in pkg/DESCR
share/doc/${FULLPKGNAME}/
share/doc/${FULLPKGNAME}/ChangeLog
share/doc/${FULLPKGNAME}/README
share/doc/${FULLPKGNAME}/TODO
share/doc/${FULLPKGNAME}/sloccount.html
pkg/PLIST contains item(s) with ${FULLPKGNAME} in it, see above
feedback welcome :-)
/Benno
--
sloccount.tgz
Description: GNU Unix tar archive
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2014/07/15 07:47:26 Modified files: infrastructure/db: user.list comms/conserver: Makefile comms/conserver/pkg: PLIST conserver.rc Added files: comms/conserver/files: console.cf comms/conserver/pkg: README Log message: run conserver as user _conserver instead of root change maintainer to sthen@ ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2014/07/09 07:54:42 Log message: import new port for relayd-updateconf, a utility to help to convert relayd config files across a major configuration syntax change, in its current version from OpenBSD 5.5 to OpenBSD 5.6 syntax. relayd-updateconf was written by Andre de Oliveira. ok sthen@ Status: Vendor Tag: benno Release Tags: benno_2014-07-09 N ports/sysutils/relayd-updateconf/Makefile N ports/sysutils/relayd-updateconf/distinfo N ports/sysutils/relayd-updateconf/pkg/DESCR N ports/sysutils/relayd-updateconf/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2014/07/09 08:01:13 Modified files: sysutils : Makefile Log message: hook up sysutils/relayd-updateconf ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2014/01/03 15:15:24 Modified files: productivity/zim: Makefile distinfo productivity/zim/patches: patch-zim_config_py productivity/zim/pkg: DESCR PLIST Log message: update zim to version 0.60 OK juanfra@
UPDATE productivity/zim to 0.60
Hi,
this updates zim to version 0.60.
ok?
Index: Makefile
===
RCS file: /cvs/ports/productivity/zim/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile20 Aug 2013 22:05:58 - 1.11
+++ Makefile25 Dec 2013 17:50:57 -
@@ -2,15 +2,14 @@
COMMENT = desktop wiki
-MODPY_EGG_VERSION =0.56
+MODPY_EGG_VERSION =0.60
DISTNAME = zim-${MODPY_EGG_VERSION}
-REVISION = 1
CATEGORIES = productivity
HOMEPAGE = http://zim-wiki.org/
-MAINTAINER = Sebastian Benoit benoit-li...@fb12.de
+MAINTAINER = Sebastian Benoit be...@openbsd.org
# GPL
PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===
RCS file: /cvs/ports/productivity/zim/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo21 Jun 2012 20:25:45 - 1.3
+++ distinfo25 Dec 2013 17:50:57 -
@@ -1,5 +1,2 @@
-MD5 (zim-0.56.tar.gz) = KRR2WOo2zYPkDt6XkABAnA==
-RMD160 (zim-0.56.tar.gz) = 0dwHFxjhhCTRksbDJn5yRn7WBec=
-SHA1 (zim-0.56.tar.gz) = thgiFoW75ikvEJ+BiJqdmGIY3Q8=
-SHA256 (zim-0.56.tar.gz) = pHCKDh9jpLUaznRg2TJNyAa1sCIbUcHIIaJP313q8do=
-SIZE (zim-0.56.tar.gz) = 1419603
+SHA256 (zim-0.60.tar.gz) = EJP3vwBR7ajqrTPwN7A99mswwk2iddWc7b+PeSARGWs=
+SIZE (zim-0.60.tar.gz) = 1634256
Index: patches/patch-zim_config_py
===
RCS file: /cvs/ports/productivity/zim/patches/patch-zim_config_py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-zim_config_py
--- patches/patch-zim_config_py 21 Jun 2012 20:25:45 - 1.3
+++ patches/patch-zim_config_py 25 Dec 2013 17:50:57 -
@@ -1,13 +1,13 @@
$OpenBSD: patch-zim_config_py,v 1.3 2012/06/21 20:25:45 gonzalo Exp $
zim/config.py.orig Mon Mar 26 15:45:34 2012
-+++ zim/config.py Fri May 18 09:44:41 2012
-@@ -51,8 +51,8 @@ if os.name == 'nt':
- home = os.environ['HOMEDRIVE'] + os.environ['HOMEPATH']
- os.environ['HOME'] = home
+--- 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(os.environ['HOME']), \
+-assert isdir(get_environ('HOME')), \
- 'ERROR: environment variable $HOME not set correctly'
-+#assert isdir(os.environ['HOME']), \
++#assert isdir(get_environ('HOME')), \
+# 'ERROR: environment variable $HOME not set correctly'
if not 'USER' in os.environ or not os.environ['USER']:
Index: pkg/DESCR
===
RCS file: /cvs/ports/productivity/zim/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 27 Dec 2010 12:05:13 - 1.1.1.1
+++ pkg/DESCR 25 Dec 2013 17:50:57 -
@@ -1,10 +1,10 @@
Zim aims to bring the concept of a wiki to your desktop. Every page is
saved as a text file with wiki markup. Pages can contain links to
other pages, and are saved automatically. This tool is intended to keep
-track of TODO lists or to serve as a personal scratch book.
+track of TODO lists or to serve as a personal scratch book.
A desktop wiki means that we try to capture the idea of a wiki, not
as a webpage but as a collection of files on your local file system
that can be edited with a GUI application. The main focus is a kind of
personal wiki that serves for all kind of notes: todo-lists,
-addresses, brainstorm ideas etc.
+addresses, brainstorm ideas etc.
Index: pkg/PLIST
===
RCS file: /cvs/ports/productivity/zim/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 20 Aug 2013 22:05:59 - 1.6
+++ pkg/PLIST 25 Dec 2013 17:50:57 -
@@ -6,14 +6,16 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/zim/_version.py
lib/python${MODPY_VERSION}/site-packages/zim/_version.pyc
+lib/python${MODPY_VERSION}/site-packages/zim/actions.py
+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/daemon.py
-lib/python${MODPY_VERSION}/site-packages/zim/daemon.pyc
lib/python${MODPY_VERSION}/site
Re: tedu lang/ghc?
please don't! we still need ghc! https://twitter.com/id_aa_carmack/status/331918309916295168 ;-) Matthias Kilian(k...@outback.escape.de) on 2013.05.07 23:50:25 +0200: Spoiler: I'm not talking about Haskell but about ghc here. I'd like to remove lang/ghc from the ports tree, because it's fucked up beyond repair: - configure runs ghc-pwd (instead of just pwd) to determine the current working directory. ghc-pwd is a program written in Haskell. In the past, when ghc-pwd appeared, configure first compiled that ghc-pwd program, which wouldn't work unless you already have a working Haskell compiler installed. - after replacing all occurrences of ghc-pwd by /bin/pwd, the build fails because it runs ghc-stage2 from the bootstrapper. (Note that binaries for ghc-pwd as well as ghc-stage2 and much more are included in the ghc sources and/or the bootstrapper for this purpose). - bootstrapping without a pre-installed ghc still doesn't work, and upstream doesn't careA - the ghc compiler is not deterministic, because function names (in hs-libraries) depend on what's already built. So if you start a build of ghc, interrupt it and restart it, you may end up with binary incompatible libraries to an uninterrupted build. This is also the reason for all those package bumps we do on hs-* ports. - with every new major ghc release, interfaces break. For example, last summer I had to fix various Num doesn't imply EQ issues as well as a lot of general typesystem issues. Imagine annual changes to the C programming language that require not only recompiliton but rewrites! So let's get rid of this crap. Ciao, Kili --
UPDATE: productivity/zim (repost)
Hi,
can someone look at this simple update?
/Benno
Index: Makefile
===
RCS file: /cvs/ports/productivity/zim/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile3 Dec 2011 23:04:37 - 1.6
+++ Makefile12 Jan 2012 01:54:11 -
@@ -2,9 +2,8 @@
COMMENT = desktop wiki
-MODPY_EGG_VERSION =0.52
+MODPY_EGG_VERSION =0.54
DISTNAME = zim-${MODPY_EGG_VERSION}
-REVISION = 2
CATEGORIES = productivity
Index: distinfo
===
RCS file: /cvs/ports/productivity/zim/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo2 May 2011 16:02:13 - 1.2
+++ distinfo12 Jan 2012 01:54:11 -
@@ -1,5 +1,5 @@
-MD5 (zim-0.52.tar.gz) = /duiyrHrR2KqUSWj9OFf6A==
-RMD160 (zim-0.52.tar.gz) = G59fAKKmiWRXDmjbF9N3OsNSZ78=
-SHA1 (zim-0.52.tar.gz) = STvAOAaZ41DqSBsRJDiXY+P2UE0=
-SHA256 (zim-0.52.tar.gz) = MPtl1f9Uwp2dNvpJn/yT8newoqV1V4ImuEAsHE7Lu9s=
-SIZE (zim-0.52.tar.gz) = 1195768
+MD5 (zim-0.54.tar.gz) = pmr371XOGvIOmI2LTDGW7g==
+RMD160 (zim-0.54.tar.gz) = Avl0b+R0s0UZgVuPDtVD6XyrZhs=
+SHA1 (zim-0.54.tar.gz) = /Yzf54GFpTIBbaOXTaZDc5mKRqM=
+SHA256 (zim-0.54.tar.gz) = pM1hjGvIvt6xGij8VGUsBWSPlA4T0tPfe+gA1c5FUZU=
+SIZE (zim-0.54.tar.gz) = 1326924
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/productivity/zim/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_py
--- patches/patch-setup_py 2 May 2011 16:02:13 - 1.2
+++ patches/patch-setup_py 12 Jan 2012 01:54:11 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-setup_py,v 1.2 2011/05/02 16:02:13 rpointel Exp $
setup.py.orig Thu Apr 7 22:21:33 2011
-+++ setup.py Fri Apr 29 18:37:55 2011
-@@ -81,7 +81,7 @@
+--- setup.py.orig Thu Sep 29 21:51:33 2011
setup.py Thu Jan 12 02:32:25 2012
+@@ -81,7 +81,7 @@ def include_file(file):
def collect_data_files():
# Search for data files to be installed in share/
data_files = [
@@ -10,7 +10,7 @@ $OpenBSD: patch-setup_py,v 1.2 2011/05/0
('share/applications', ['xdg/zim.desktop']),
('share/mime/packages', ['xdg/zim.xml']),
('share/pixmaps', ['xdg/hicolor/48x48/apps/zim.png']),
-@@ -104,6 +104,12 @@
+@@ -110,6 +110,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.2 2011/05/0
if build_target == 'maemo':
# Remove default .desktop files and replace with our set
prefix = os.path.join('share', 'zim', 'applications')
-@@ -246,7 +252,7 @@
+@@ -275,7 +281,7 @@ class zim_install_class(install_class):
def initialize_options(self):
install_class.initialize_options(self)
Index: patches/patch-zim_config_py
===
RCS file: /cvs/ports/productivity/zim/patches/patch-zim_config_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-zim_config_py
--- patches/patch-zim_config_py 2 May 2011 16:02:13 - 1.2
+++ patches/patch-zim_config_py 12 Jan 2012 01:54:11 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-zim_config_py,v 1.2 2011/05/02 16:02:13 rpointel Exp $
zim/config.py.orig Tue Apr 12 22:37:53 2011
-+++ zim/config.py Fri Apr 29 18:39:14 2011
-@@ -40,8 +40,8 @@
+--- zim/config.py.orig Wed Dec 14 19:58:32 2011
zim/config.py Thu Jan 12 02:32:25 2012
+@@ -51,8 +51,8 @@ if os.name == 'nt':
home = os.environ['HOMEDRIVE'] + os.environ['HOMEPATH']
os.environ['HOME'] = home
Index: pkg/PLIST
===
RCS file: /cvs/ports/productivity/zim/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 3 Dec 2011 23:04:36 - 1.3
+++ pkg/PLIST 12 Jan 2012 01:54:11 -
@@ -4,11 +4,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim-${MODPY_EGG_VERSION}-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/_lib/
-lib/python${MODPY_VERSION}/site-packages/zim/_lib/__init__.py
-lib/python${MODPY_VERSION}/site-packages/zim/_lib/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/_lib/xdot.py
-lib/python${MODPY_VERSION}/site-packages/zim/_lib/xdot.pyc
lib/python${MODPY_VERSION}/site-packages/zim/_version.py
lib/python${MODPY_VERSION}/site-packages/zim/_version.pyc
lib/python${MODPY_VERSION}/site-packages/zim/applications.py
@@ -73,6 +68,13 @@ lib/python${MODPY_VERSION}/site-packages
UPDATE: productivity/zim
Index: Makefile
===
RCS file: /cvs/ports/productivity/zim/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile3 Dec 2011 23:04:37 - 1.6
+++ Makefile12 Jan 2012 01:54:11 -
@@ -2,9 +2,8 @@
COMMENT = desktop wiki
-MODPY_EGG_VERSION =0.52
+MODPY_EGG_VERSION =0.54
DISTNAME = zim-${MODPY_EGG_VERSION}
-REVISION = 2
CATEGORIES = productivity
Index: distinfo
===
RCS file: /cvs/ports/productivity/zim/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo2 May 2011 16:02:13 - 1.2
+++ distinfo12 Jan 2012 01:54:11 -
@@ -1,5 +1,5 @@
-MD5 (zim-0.52.tar.gz) = /duiyrHrR2KqUSWj9OFf6A==
-RMD160 (zim-0.52.tar.gz) = G59fAKKmiWRXDmjbF9N3OsNSZ78=
-SHA1 (zim-0.52.tar.gz) = STvAOAaZ41DqSBsRJDiXY+P2UE0=
-SHA256 (zim-0.52.tar.gz) = MPtl1f9Uwp2dNvpJn/yT8newoqV1V4ImuEAsHE7Lu9s=
-SIZE (zim-0.52.tar.gz) = 1195768
+MD5 (zim-0.54.tar.gz) = pmr371XOGvIOmI2LTDGW7g==
+RMD160 (zim-0.54.tar.gz) = Avl0b+R0s0UZgVuPDtVD6XyrZhs=
+SHA1 (zim-0.54.tar.gz) = /Yzf54GFpTIBbaOXTaZDc5mKRqM=
+SHA256 (zim-0.54.tar.gz) = pM1hjGvIvt6xGij8VGUsBWSPlA4T0tPfe+gA1c5FUZU=
+SIZE (zim-0.54.tar.gz) = 1326924
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/productivity/zim/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_py
--- patches/patch-setup_py 2 May 2011 16:02:13 - 1.2
+++ patches/patch-setup_py 12 Jan 2012 01:54:11 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-setup_py,v 1.2 2011/05/02 16:02:13 rpointel Exp $
setup.py.orig Thu Apr 7 22:21:33 2011
-+++ setup.py Fri Apr 29 18:37:55 2011
-@@ -81,7 +81,7 @@
+--- setup.py.orig Thu Sep 29 21:51:33 2011
setup.py Thu Jan 12 02:32:25 2012
+@@ -81,7 +81,7 @@ def include_file(file):
def collect_data_files():
# Search for data files to be installed in share/
data_files = [
@@ -10,7 +10,7 @@ $OpenBSD: patch-setup_py,v 1.2 2011/05/0
('share/applications', ['xdg/zim.desktop']),
('share/mime/packages', ['xdg/zim.xml']),
('share/pixmaps', ['xdg/hicolor/48x48/apps/zim.png']),
-@@ -104,6 +104,12 @@
+@@ -110,6 +110,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.2 2011/05/0
if build_target == 'maemo':
# Remove default .desktop files and replace with our set
prefix = os.path.join('share', 'zim', 'applications')
-@@ -246,7 +252,7 @@
+@@ -275,7 +281,7 @@ class zim_install_class(install_class):
def initialize_options(self):
install_class.initialize_options(self)
Index: patches/patch-zim_config_py
===
RCS file: /cvs/ports/productivity/zim/patches/patch-zim_config_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-zim_config_py
--- patches/patch-zim_config_py 2 May 2011 16:02:13 - 1.2
+++ patches/patch-zim_config_py 12 Jan 2012 01:54:11 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-zim_config_py,v 1.2 2011/05/02 16:02:13 rpointel Exp $
zim/config.py.orig Tue Apr 12 22:37:53 2011
-+++ zim/config.py Fri Apr 29 18:39:14 2011
-@@ -40,8 +40,8 @@
+--- zim/config.py.orig Wed Dec 14 19:58:32 2011
zim/config.py Thu Jan 12 02:32:25 2012
+@@ -51,8 +51,8 @@ if os.name == 'nt':
home = os.environ['HOMEDRIVE'] + os.environ['HOMEPATH']
os.environ['HOME'] = home
Index: pkg/PLIST
===
RCS file: /cvs/ports/productivity/zim/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 3 Dec 2011 23:04:36 - 1.3
+++ pkg/PLIST 12 Jan 2012 01:54:11 -
@@ -4,11 +4,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim-${MODPY_EGG_VERSION}-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/_lib/
-lib/python${MODPY_VERSION}/site-packages/zim/_lib/__init__.py
-lib/python${MODPY_VERSION}/site-packages/zim/_lib/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/zim/_lib/xdot.py
-lib/python${MODPY_VERSION}/site-packages/zim/_lib/xdot.pyc
lib/python${MODPY_VERSION}/site-packages/zim/_version.py
lib/python${MODPY_VERSION}/site-packages/zim/_version.pyc
lib/python${MODPY_VERSION}/site-packages/zim/applications.py
@@ -73,6 +68,13 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zim/gui/widgets.pyc
Re: NEW: productivity/zim
Landry Breuil(lan...@rhaalovely.net) on 2010.12.17 21:01:46 +0100: as pointed out by remi pointel you should use MODPY_EGG_VERSION. yes, thanks. It doesn't build with USE_SYSTRACE set, as it tries to run update-desktop-databases from within make fake. Trying: update-desktop-database systrace: deny user: root, prog: /usr/local/bin/update-desktop-database, pid: 11343(0)[25991], policy: /usr/bin/make, filters: 197, syscall: native-chmod(15), filename: /usr/local/share/applications/cups. desktop, mode: 644 you should patch away setup.py to fix that (and make it not run update-mime-database too, see around skip_xdg_cmd variable..) i don't really like the config.py patch, but we can live with that.. as $HOME is set to a non-existing dir during build the check is pointless. Landry i fixed those problems, systrace now works. /Benno zim-0.49.tar.gz Description: Binary data
Re: NEW: productivity/zim
Remi Pointel(remi.poin...@xiri.fr) on 2010.12.26 22:14:24 +0100:
i fixed those problems, systrace now works.
Hi,
attached version :
- with PLIST modified (you must run make update-plist)
zim-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info instead of
zim-0.49-py${MODPY_VERSION}.egg-info.
- with correct file location of manpage (/usr/local/man/ and not
/usr/local/share/man/, see here :
http://www.openbsd.org/faq/ports/guide.html).
Another ok ?
thank you!
its working here.
/Benno
Re: NEW: productivity/zim
Hi,
you can find an updated port attached. I still have some of my earlier
questions, see below.
/Benno
Sebastian Benoit(benoit-li...@fb12.de) on 2010.12.11 21:53:42 +0100:
Hej,
attached is a port for Zim, http://zim-wiki.org/, a little desktop wiki
app i am using.
I have a few questions:
- I had to edit PLIST: the autogenerated line
lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME\-}-py${MODPY_VERSION}.egg-info
was causing a file not found error when doing make package, right now the
version is hardcoded.
what should i do here?
- There should probably be these lines
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor
2/dev/null || true
@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor
2 /dev/null || true
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
in PLIST
this seems to work, i also added
@exec %D/bin/update-mime-database %D/share/mime
@unexec-delete %D/bin/update-mime-database %D/share/mime
and removed lines from PLIST that overwrote files in /usr/local/share/mime.
- I have not tested it on python 2.5 recently, however the dependencies
should say ptyhon = 2.5
Also it needs python-simplejson (for python 2.6). How do i specify a
dependency like that?
- The setup.py file checks $HOME and aborts if it is not set - i had
problems with this and patched this out (see patches/patch-zim_config_py).
What should i do here?
- Am i missing anything else?
/Benno
port-zim-0.49.tgz
Description: GNU Unix tar archive
NEW: productivity/zim
Hej,
attached is a port for Zim, http://zim-wiki.org/, a little desktop wiki
app i am using.
I have a few questions:
- I had to edit PLIST: the autogenerated line
lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME\-}-py${MODPY_VERSION}.egg-info
was causing a file not found error when doing make package, right now the
version is hardcoded.
what should i do here?
- There should probably be these lines
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2/dev/null
|| true
@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2
/dev/null || true
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
in PLIST
- I have not tested it on python 2.5 recently, however the dependencies
should say ptyhon = 2.5
Also it needs python-simplejson (for python 2.6). How do i specify a
dependency like that?
- The setup.py file checks $HOME and aborts if it is not set - i had
problems with this and patched this out (see patches/patch-zim_config_py).
What should i do here?
- Am i missing anything else?
/Benno
port-zim-0.49.tgz
Description: GNU Unix tar archive
