* vobject != vdirsyncer.vobject, so correct dependency and remove pat…

…ches.

  Kozea/Radicale#675 (comment)

* override folder for storing local collections, from
  /var/lib/radicale/collections to ${PREFIX}/share/radicale/collections

Update Radicale2 to 2.1.4

2.1.4 - Wild Radish
-------------------

This feature is not compatible with the 1.x.x versions. See
http://radicale.org/1to2/ if you want to switch from 1.x.x to
2.x.x.

* Fix incorrect time range matching and calculation for some edge-cases with
  rescheduled recurrences
* Fix owner property

2.1.3 - Wild Radish
-------------------

This feature is not compatible with the 1.x.x versions. See
http://radicale.org/1to2/ if you want to switch from 1.x.x to
2.x.x.

* Enable timeout for SSL handshakes and move them out of the main thread
* Create cache entries during upload of items
* Stop built-in server on Windows when Ctrl+C is pressed
* Prevent slow down when multiple requests hit a collection during cache warm-up

2.1.2 - Wild Radish
-------------------

This feature is not compatible with the 1.x.x versions. See
http://radicale.org/1to2/ if you want to switch from 1.x.x to
2.x.x.

* Remove workarounds for bugs in VObject < 0.9.5
* Error checking of collection tags and associated components
* Improve error checking of uploaded collections and components
* Don't delete empty collection properties implicitly
* Improve logging of VObject serialization

net/Radicale2/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2017/07/12 14:33:39 prlw1 Exp $
+# $NetBSD: Makefile,v 1.5 2017/08/10 19:08:13 prlw1 Exp $
 
-DISTNAME=	Radicale-2.1.1
-PKGREVISION=	1
+DISTNAME=	Radicale-2.1.4
 CATEGORIES=	net time www
 MASTER_SITES=	${MASTER_SITE_PYPI:=R/Radicale/}
 
@@ -28,25 +27,26 @@ FILES_SUBST+=		PYTHONBIN=${PYTHONBIN}
 
 SUBST_CLASSES+=		config
 SUBST_SED.config+=	-e 's,/etc,${PKG_SYSCONFDIR},g'
-SUBST_SED.config+=	-e 's,apache2/,httpd/,g'
+SUBST_SED.config+=	-e 's,/var/lib,${PREFIX}/share,g'
 SUBST_FILES.config+=	radicale/config.py config logging
 SUBST_STAGE.config=	pre-configure
 SUBST_MESSAGE.config=	Fixing path to configuration file.
 
 SUBST_CLASSES+=		server
 SUBST_SED.server+=	-e 's,\#daemon = False,daemon = True,'
+SUBST_SED.server+=	-e 's,\#filesystem_folder,filesystem_folder,'
 SUBST_FILES.server+=	config
 SUBST_STAGE.server=	pre-configure
-SUBST_MESSAGE.server=	Configure as a daemon by default.
+SUBST_MESSAGE.server=	Configure as a daemon by default, and override default collection location
 
 # no options currently available
 # .include "options.mk"
 
+DEPENDS+=		${PYPKGPREFIX}-vobject-[0-9]*:../../textproc/py-vobject
+
 # 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

net/Radicale2/distinfo

@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2017/07/06 03:12:48 darcy Exp $
+$NetBSD: distinfo,v 1.3 2017/08/10 19:08:13 prlw1 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
+SHA1 (Radicale-2.1.4.tar.gz) = 020a9d31c8531ce0da0a10c637035f0f6f77568b
+RMD160 (Radicale-2.1.4.tar.gz) = 30838c8f6db16cf2a99dd6f7de9cd60c364e25d0
+SHA512 (Radicale-2.1.4.tar.gz) = e09af1533c9e91d350b99e5f11ae1be1a5f54a62f6313d0698940fa8e606cfa78ad0bb309d228ec3c6ed088d54aa1f6021d9833e8665e8738f45ecdebc0d4e82
+Size (Radicale-2.1.4.tar.gz) = 73889 bytes