www/radicale:

- Update to 2.1.12
- Please follow UPDATING instructions because you need to export the
storage with radicale 1.1.6 before updating

UPDATING

@@ -5,6 +5,16 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20200602:
+  AFFECTS: users of www/radicale
+  AUTHOR: decke@FreeBSD.org
+
+  Migration from radicale 1.x to 2.x requires that you export the storage
+  with radicale 1.1.6 before updating.
+
+  Migration instructions are available at:
+  https://web.archive.org/web/20190314225402/https://radicale.org/1to2/
+
 20200602:
   AFFECTS: users of sysutils/py-salt
   AUTHOR: krion@FreeBSD.org

www/radicale/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	radicale
-PORTVERSION=	1.1.6
-PORTREVISION=	3
+PORTVERSION=	2.1.12
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,32 +14,38 @@ COMMENT=	Python based CalDAV/CardDAV server
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}passlib>=1.6.5:security/py-passlib@${PY_FLAVOR}
-
-USES=		python
-USE_PYTHON=	autoplist concurrent distutils
-
-NO_ARCH=	yes
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}passlib>=0:security/py-passlib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}vobject>=0.9.6:deskutils/py-vobject@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}isort>=0:devel/py-isort@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
 
+USES=		python:3.3+ shebangfix
+USE_PYTHON=	autoplist distutils
 USERS=		radicale
 GROUPS=		radicale
 USE_RC_SUBR=	radicale
-SUB_LIST=	PYTHON_CMD="${PYTHON_CMD}" \
-		PYTHON_VER="${PYTHON_VER}"
+NO_ARCH=	yes
+SHEBANG_FILES=	radicale.fcgi radicale.wsgi
 
-OPTIONS_DEFINE=	HTTP LDAP
-HTTP_DESC=	HTTP authentication support
-
-#HTTP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests1>=0:www/py-requests1@${PY_FLAVOR}
-HTTP_BROKEN=		www/py-requests1 does not exist any more
-LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=0:net/py-ldap@${PY_FLAVOR}
+SUB_LIST=	USERS="${USERS}" GROUPS="${GROUPS}" PYTHON_CMD="${PYTHON_CMD}"
 
 post-patch:
-	@${REINPLACE_CMD} 's|~/.config/radicale|${DATADIR}|; s|/etc|${PREFIX}/etc|' ${WRKSRC}/config
+	@${REINPLACE_CMD} 's,= /etc,= ${PREFIX}/etc,g' ${WRKSRC}/config
+	@${REINPLACE_CMD} 's,~/.config/radicale,${DATADIR},g' ${WRKSRC}/config
 
 post-install:
-	@${MKDIR} ${STAGEDIR}/${ETCDIR} ${STAGEDIR}/${DATADIR}
+	@${MKDIR} ${STAGEDIR}/${ETCDIR} ${STAGEDIR}/${DATADIR} ${STAGEDIR}/${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/config ${STAGEDIR}/${ETCDIR}/config.sample
 	${INSTALL_DATA} ${WRKSRC}/logging ${STAGEDIR}/${ETCDIR}/logging.sample
+	${INSTALL_SCRIPT} ${WRKSRC}/radicale.fcgi ${STAGEDIR}${WWWDIR}/radicale.fcgi
+	${INSTALL_SCRIPT} ${WRKSRC}/radicale.wsgi ${STAGEDIR}${WWWDIR}/radicale.wsgi
+
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>

www/radicale/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1501318583
-SHA256 (Radicale-1.1.6.tar.gz) = c007198ea45ef797344672c681d4c13f8b4aa85c15c41a1156225767a405c92b
-SIZE (Radicale-1.1.6.tar.gz) = 48280
+TIMESTAMP = 1589887684
+SHA256 (Radicale-2.1.12.tar.gz) = 8fd07806e3e4f873b63838dfee69bf0283216943df6051cf80a22f11d7a7eda4
+SIZE (Radicale-2.1.12.tar.gz) = 109781

www/radicale/files/radicale.in

@@ -25,11 +25,11 @@ load_rc_config $name
 
 : ${radicale_enable:=NO}
 : ${radicale_config=%%ETCDIR%%/config}
-: ${radicale_user:=radicale}
-: ${radicale_group:=radicale}
+: ${radicale_user=%%USERS%%}
+: ${radicale_group=%%GROUPS%%}
 
 pidfile=/var/run/radicale/radicale.pid
-command=%%PREFIX%%/bin/radicale-%%PYTHON_VER%%
+command=%%PREFIX%%/bin/radicale
 command_args="-d -p ${pidfile} -C ${radicale_config}"
 command_interpreter=%%PYTHON_CMD%%
 required_files=${radicale_config}

www/radicale/pkg-descr

@@ -1,5 +1,15 @@
-The Radicale Project is a complete CalDAV (calendar) and CardDAV (contact)
-server solution.
+Radicale is a small but powerful CalDAV (calendars, todo-lists) and CardDAV
+(contacts) server, that:
+
+    Shares calendars through CalDAV, WebDAV and HTTP.
+    Shares contacts through CardDAV, WebDAV and HTTP.
+    Supports events, todos, journal entries and business cards.
+    Works out-of-the-box, no installation nor configuration required.
+    Can warn users on concurrent editing.
+    Can limit access by authentication.
+    Can secure connections.
+    Works with many CalDAV and CardDAV clients.
+    Is GPLv3-licensed free software.
 
 WWW: https://radicale.org/
 WWW: https://github.com/Kozea/Radicale

www/radicale/pkg-message

@@ -0,0 +1,10 @@
+[
+{ type: install
+  message: <<EOM
+Migration from radicale 1.x to 2.x requires that you export the storage
+with radicale 1.1.x before it can be used.
+
+Migration instructions: https://web.archive.org/web/20190314225402/https://radicale.org/1to2/
+EOM
+}
+]

www/radicale/pkg-plist

@@ -1,3 +1,5 @@
 @sample %%ETCDIR%%/config.sample
 @sample %%ETCDIR%%/logging.sample
 @dir(radicale,radicale,0755) %%DATADIR%%
+%%WWWDIR%%/radicale.fcgi
+%%WWWDIR%%/radicale.wsgi