CVS commit: pkgsrc/net/Radicale2

["D'Arcy J.M. Cain" <darcy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   darcy
Date:           Thu Jul  6 03:12:48 UTC 2017

Modified Files:
        pkgsrc/net/Radicale2: Makefile distinfo
Added Files:
        pkgsrc/net/Radicale2/patches: patch-radicale___init__.py
            patch-radicale_storage.py

Log Message:
Add DEPENDS on py-vdirsyncer.
Load vobject from vdirsyncer module.
Take maintainership.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/Radicale2/Makefile \
    pkgsrc/net/Radicale2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/Radicale2/patches/patch-radicale___init__.py \
    pkgsrc/net/Radicale2/patches/patch-radicale_storage.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/Radicale2/Makefile
diff -u pkgsrc/net/Radicale2/Makefile:1.1 pkgsrc/net/Radicale2/Makefile:1.2
--- pkgsrc/net/Radicale2/Makefile:1.1   Sat Jul  1 05:57:07 2017
+++ pkgsrc/net/Radicale2/Makefile       Thu Jul  6 03:12:48 2017
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2017/07/01 05:57:07 darcy Exp $
+# $NetBSD: Makefile,v 1.2 2017/07/06 03:12:48 darcy Exp $
 
 DISTNAME=      Radicale-2.1.1
+PKGREVISION=   1
 CATEGORIES=    net time www
 MASTER_SITES=  ${MASTER_SITE_PYPI:=R/Radicale/}
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    darcy%NetBSD.org@localhost
 HOMEPAGE=      http://radicale.org/
 COMMENT=       CalDAV (calendar) and CardDAV (contact) server
 LICENSE=       gnu-gpl-v3
@@ -15,7 +16,7 @@ RADICALE_USER?=               www
 RADICALE_GROUP?=       www
 PKG_GROUPS=            ${RADICALE_GROUP}
 PKG_USERS=             ${RADICALE_USER}:${RADICALE_GROUP}
-CONFLICTS+=            Radicale-1*
+CONFLICTS+=            Radicale-1.*
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 INSTALLATION_DIRS=     ${EGDIR}
@@ -44,6 +45,9 @@ SUBST_MESSAGE.server= Configure as a dae
 # for md5 htpasswd_encryption method
 DEPENDS+=              ${PYPKGPREFIX}-passlib-[0-9]*:../../security/py-passlib
 
+# to synchronize calendars
+DEPENDS+=              ${PYPKGPREFIX}-vdirsyncer-[0-9]*:../../time/py-vdirsyncer
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/config ${DESTDIR}${PREFIX}/${EGDIR}/config
 
Index: pkgsrc/net/Radicale2/distinfo
diff -u pkgsrc/net/Radicale2/distinfo:1.1 pkgsrc/net/Radicale2/distinfo:1.2
--- pkgsrc/net/Radicale2/distinfo:1.1   Sat Jul  1 05:57:07 2017
+++ pkgsrc/net/Radicale2/distinfo       Thu Jul  6 03:12:48 2017
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1 2017/07/01 05:57:07 darcy Exp $
+$NetBSD: distinfo,v 1.2 2017/07/06 03:12:48 darcy Exp $
 
 SHA1 (Radicale-2.1.1.tar.gz) = e250986f11a946da7e48de189b10da61c93d2427
 RMD160 (Radicale-2.1.1.tar.gz) = c950be03fd5b2edf37f4977bf4e060e544acfe8f
 SHA512 (Radicale-2.1.1.tar.gz) = 3aa5aa6d6d3abfa256ab0f02a932d68daeb91ea857b68376a2bda3dae9dd8951e78a54a0657e4e827186ebb6c0d90165cb876d22ebc988cb66ba2f4617761830
 Size (Radicale-2.1.1.tar.gz) = 70878 bytes
+SHA1 (patch-radicale___init__.py) = e075b25dee1ff3502df2412cc6ff79fa381516e4
+SHA1 (patch-radicale_storage.py) = 2a460ceb916cca15fe46489e61057b587147917b

Added files:

Index: pkgsrc/net/Radicale2/patches/patch-radicale___init__.py
diff -u /dev/null pkgsrc/net/Radicale2/patches/patch-radicale___init__.py:1.1
--- /dev/null   Thu Jul  6 03:12:48 2017
+++ pkgsrc/net/Radicale2/patches/patch-radicale___init__.py     Thu Jul  6 03:12:48 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-radicale___init__.py,v 1.1 2017/07/06 03:12:48 darcy Exp $
+
+Load vobject from vdirsyncer module
+
+--- radicale/__init__.py.orig   2017-07-01 03:05:13.000000000 +0000
++++ radicale/__init__.py
+@@ -48,7 +48,7 @@ from http import client
+ from urllib.parse import unquote, urlparse
+ from xml.etree import ElementTree as ET
+
+-import vobject
++import vdirsyncer.vobject
+
+ from . import auth, rights, storage, web, xmlutils
Index: pkgsrc/net/Radicale2/patches/patch-radicale_storage.py
diff -u /dev/null pkgsrc/net/Radicale2/patches/patch-radicale_storage.py:1.1
--- /dev/null   Thu Jul  6 03:12:48 2017
+++ pkgsrc/net/Radicale2/patches/patch-radicale_storage.py      Thu Jul  6 03:12:48 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-radicale_storage.py,v 1.1 2017/07/06 03:12:48 darcy Exp $
+
+Load vobject from vdirsyncer module 
+
+--- radicale/storage.py.orig    2017-07-01 03:05:13.000000000 +0000
++++ radicale/storage.py
+@@ -44,7 +44,7 @@ from random import getrandbits
+ from tempfile import NamedTemporaryFile, TemporaryDirectory
+
+ import pkg_resources
+-import vobject
++import vdirsyncer.vobject
+
+ if sys.version_info >= (3, 5):
+     # HACK: Avoid import cycle for Python < 3.5