Upgrade to 1.1.4.

Mostly minor fixes but adds a new option (--export-storage) to allow
the data to be exported so that users can migrate to 2.x.x.

3 files changed, 47 insertions, 48 deletions

diff --git a/net/Radicale/Makefile b/net/Radicale/Makefile
index b9d7707924c..a2e47b55e68 100644
--- a/net/Radicale/Makefile
+++ b/net/Radicale/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2017/03/20 10:49:03 sborrill Exp $
+# $NetBSD: Makefile,v 1.20 2017/07/01 05:31:59 darcy Exp $
 
-DISTNAME=	Radicale-1.1.1
-PKGREVISION=	2
+DISTNAME=	Radicale-1.1.4
 CATEGORIES=	net time www
 MASTER_SITES=	${MASTER_SITE_PYPI:=R/Radicale/}
 
@@ -16,6 +15,7 @@ RADICALE_USER?=		www
 RADICALE_GROUP?=	www
 PKG_GROUPS=		${RADICALE_GROUP}
 PKG_USERS=		${RADICALE_USER}:${RADICALE_GROUP}
+CONFLICTS+= Radicale2-[0-9]*
 
 INSTALLATION_DIRS=	${EGDIR}
 OWN_DIRS=		${PKG_SYSCONFDIR}/radicale
diff --git a/net/Radicale/PLIST b/net/Radicale/PLIST
index 0ac66910650..c36b93bae3a 100644
--- a/net/Radicale/PLIST
+++ b/net/Radicale/PLIST
@@ -1,71 +1,70 @@
-@comment $NetBSD: PLIST,v 1.7 2016/01/12 00:17:11 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.8 2017/07/01 05:31:59 darcy Exp $
 bin/radicale
 ${PYSITELIB}/${EGG_FILE}/PKG-INFO
 ${PYSITELIB}/${EGG_FILE}/SOURCES.txt
 ${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/pbr.json
 ${PYSITELIB}/${EGG_FILE}/top_level.txt
 ${PYSITELIB}/radicale/__init__.py
-${PYSITELIB}/radicale/__init__.pyc
-${PYSITELIB}/radicale/__init__.pyo
 ${PYSITELIB}/radicale/__main__.py
-${PYSITELIB}/radicale/__main__.pyc
+${PYSITELIB}/radicale/__init__.pyo
+${PYSITELIB}/radicale/__init__.pyc
 ${PYSITELIB}/radicale/__main__.pyo
+${PYSITELIB}/radicale/__main__.pyc
+${PYSITELIB}/radicale/config.pyo
+${PYSITELIB}/radicale/config.pyc
+${PYSITELIB}/radicale/ical.pyo
+${PYSITELIB}/radicale/ical.pyc
+${PYSITELIB}/radicale/log.pyo
+${PYSITELIB}/radicale/log.pyc
+${PYSITELIB}/radicale/pathutils.pyo
+${PYSITELIB}/radicale/pathutils.pyc
+${PYSITELIB}/radicale/xmlutils.pyo
+${PYSITELIB}/radicale/xmlutils.pyc
 ${PYSITELIB}/radicale/auth/IMAP.py
-${PYSITELIB}/radicale/auth/IMAP.pyc
-${PYSITELIB}/radicale/auth/IMAP.pyo
 ${PYSITELIB}/radicale/auth/LDAP.py
-${PYSITELIB}/radicale/auth/LDAP.pyc
-${PYSITELIB}/radicale/auth/LDAP.pyo
 ${PYSITELIB}/radicale/auth/PAM.py
-${PYSITELIB}/radicale/auth/PAM.pyc
-${PYSITELIB}/radicale/auth/PAM.pyo
 ${PYSITELIB}/radicale/auth/__init__.py
-${PYSITELIB}/radicale/auth/__init__.pyc
+${PYSITELIB}/radicale/auth/IMAP.pyo
+${PYSITELIB}/radicale/auth/IMAP.pyc
+${PYSITELIB}/radicale/auth/LDAP.pyo
+${PYSITELIB}/radicale/auth/LDAP.pyc
+${PYSITELIB}/radicale/auth/PAM.pyo
+${PYSITELIB}/radicale/auth/PAM.pyc
 ${PYSITELIB}/radicale/auth/__init__.pyo
-${PYSITELIB}/radicale/auth/courier.py
-${PYSITELIB}/radicale/auth/courier.pyc
+${PYSITELIB}/radicale/auth/__init__.pyc
 ${PYSITELIB}/radicale/auth/courier.pyo
-${PYSITELIB}/radicale/auth/htpasswd.py
-${PYSITELIB}/radicale/auth/htpasswd.pyc
+${PYSITELIB}/radicale/auth/courier.pyc
 ${PYSITELIB}/radicale/auth/htpasswd.pyo
-${PYSITELIB}/radicale/auth/http.py
-${PYSITELIB}/radicale/auth/http.pyc
+${PYSITELIB}/radicale/auth/htpasswd.pyc
 ${PYSITELIB}/radicale/auth/http.pyo
-${PYSITELIB}/radicale/auth/remote_user.py
-${PYSITELIB}/radicale/auth/remote_user.pyc
+${PYSITELIB}/radicale/auth/http.pyc
 ${PYSITELIB}/radicale/auth/remote_user.pyo
+${PYSITELIB}/radicale/auth/remote_user.pyc
+${PYSITELIB}/radicale/auth/courier.py
+${PYSITELIB}/radicale/auth/htpasswd.py
+${PYSITELIB}/radicale/auth/http.py
+${PYSITELIB}/radicale/auth/remote_user.py
 ${PYSITELIB}/radicale/config.py
-${PYSITELIB}/radicale/config.pyc
-${PYSITELIB}/radicale/config.pyo
 ${PYSITELIB}/radicale/ical.py
-${PYSITELIB}/radicale/ical.pyc
-${PYSITELIB}/radicale/ical.pyo
 ${PYSITELIB}/radicale/log.py
-${PYSITELIB}/radicale/log.pyc
-${PYSITELIB}/radicale/log.pyo
 ${PYSITELIB}/radicale/pathutils.py
-${PYSITELIB}/radicale/pathutils.pyc
-${PYSITELIB}/radicale/pathutils.pyo
 ${PYSITELIB}/radicale/rights/__init__.py
-${PYSITELIB}/radicale/rights/__init__.pyc
 ${PYSITELIB}/radicale/rights/__init__.pyo
-${PYSITELIB}/radicale/rights/regex.py
-${PYSITELIB}/radicale/rights/regex.pyc
+${PYSITELIB}/radicale/rights/__init__.pyc
 ${PYSITELIB}/radicale/rights/regex.pyo
+${PYSITELIB}/radicale/rights/regex.pyc
+${PYSITELIB}/radicale/rights/regex.py
 ${PYSITELIB}/radicale/storage/__init__.py
-${PYSITELIB}/radicale/storage/__init__.pyc
 ${PYSITELIB}/radicale/storage/__init__.pyo
-${PYSITELIB}/radicale/storage/database.py
-${PYSITELIB}/radicale/storage/database.pyc
+${PYSITELIB}/radicale/storage/__init__.pyc
 ${PYSITELIB}/radicale/storage/database.pyo
-${PYSITELIB}/radicale/storage/filesystem.py
-${PYSITELIB}/radicale/storage/filesystem.pyc
+${PYSITELIB}/radicale/storage/database.pyc
 ${PYSITELIB}/radicale/storage/filesystem.pyo
-${PYSITELIB}/radicale/storage/multifilesystem.py
-${PYSITELIB}/radicale/storage/multifilesystem.pyc
+${PYSITELIB}/radicale/storage/filesystem.pyc
 ${PYSITELIB}/radicale/storage/multifilesystem.pyo
+${PYSITELIB}/radicale/storage/multifilesystem.pyc
+${PYSITELIB}/radicale/storage/database.py
+${PYSITELIB}/radicale/storage/filesystem.py
+${PYSITELIB}/radicale/storage/multifilesystem.py
 ${PYSITELIB}/radicale/xmlutils.py
-${PYSITELIB}/radicale/xmlutils.pyc
-${PYSITELIB}/radicale/xmlutils.pyo
 share/examples/radicale/config
diff --git a/net/Radicale/distinfo b/net/Radicale/distinfo
index f5b9a4fd34f..f906ef7bf0b 100644
--- a/net/Radicale/distinfo
+++ b/net/Radicale/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2017/03/20 10:49:03 sborrill Exp $
+$NetBSD: distinfo,v 1.12 2017/07/01 05:31:59 darcy Exp $
 
-SHA1 (Radicale-1.1.1.tar.gz) = 0358b15a2cf2a0b3f95c9a490f2ff0747fc254c5
-RMD160 (Radicale-1.1.1.tar.gz) = d3d6d8051e7b0d95d72bc5a00af9a82f79240238
-SHA512 (Radicale-1.1.1.tar.gz) = dc251d8fa4d347c2bbcf472b7a2da94d674f858a007fec1d74774cd1f3ae43eb2d5902ed45762638ec49546b8ee1f66446d07b50fc0ff6595deb67ea07f87af2
-Size (Radicale-1.1.1.tar.gz) = 47174 bytes
+SHA1 (Radicale-1.1.4.tar.gz) = 62a4a5da757554a8bec316ee07ab7e4f10ac77ee
+RMD160 (Radicale-1.1.4.tar.gz) = 23d26ed5461e0443df1b64cc59398c33a4fdb80b
+SHA512 (Radicale-1.1.4.tar.gz) = cea576a303081cb5f7aa936cb6e253a9f4f41ed54ac69a7441047e4b1c012f264258c11fc881836293cb4c3f8c2f7d9a206784b78ff641b21f33c99b8cc6296c
+Size (Radicale-1.1.4.tar.gz) = 47874 bytes
 SHA1 (patch-config) = de1060a10ace5de77dfc8dd25cfae4d6aefa96ee
 SHA1 (patch-radicale___init__.py) = 9f5379cb4945cb1c62fd56f86e2e47f62a11885c
 SHA1 (patch-radicale_config.py) = ea1f0984f0744331675b8a5005d934f5c18a7447