www/radicale:

- Update to 3.0.3
- Rewrite config paths to /usr/local/etc/radicale
- Rewrite storage paths to /usr/local/share/radicale
- Use daemon in rc.d script because radicale itself cannot daemonize anymore

www/radicale/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	radicale
-PORTVERSION=	2.1.12
-PORTREVISION=	1
+PORTVERSION=	3.0.3
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,11 +18,10 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA
 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}
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}waitress>=0:www/py-waitress@${PY_FLAVOR}
 
 USES=		python:3.3+ shebangfix
 USE_PYTHON=	autoplist distutils
@@ -36,13 +34,20 @@ SHEBANG_FILES=	radicale.fcgi radicale.wsgi
 SUB_LIST=	USERS="${USERS}" GROUPS="${GROUPS}" PYTHON_CMD="${PYTHON_CMD}"
 
 post-patch:
-	@${REINPLACE_CMD} 's,= /etc,= ${PREFIX}/etc,g' ${WRKSRC}/config
-	@${REINPLACE_CMD} 's,~/.config/radicale,${DATADIR},g' ${WRKSRC}/config
+	@${REINPLACE_CMD} 's,/etc/radicale,${ETCDIR},g' \
+		${WRKSRC}/config \
+		${WRKSRC}/radicale/config.py
+	@${REINPLACE_CMD} 's,/etc/ssl,${ETCDIR},g' \
+		${WRKSRC}/config \
+		${WRKSRC}/radicale/config.py
+	@${REINPLACE_CMD} 's,/var/lib/radicale,${DATADIR},g' \
+		${WRKSRC}/config \
+		${WRKSRC}/radicale/config.py
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/${ETCDIR} ${STAGEDIR}/${DATADIR} ${STAGEDIR}/${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/config ${STAGEDIR}/${ETCDIR}/config.sample
-	${INSTALL_DATA} ${WRKSRC}/logging ${STAGEDIR}/${ETCDIR}/logging.sample
+	${INSTALL_DATA} ${WRKSRC}/rights ${STAGEDIR}/${ETCDIR}/rights.sample
 	${INSTALL_SCRIPT} ${WRKSRC}/radicale.fcgi ${STAGEDIR}${WWWDIR}/radicale.fcgi
 	${INSTALL_SCRIPT} ${WRKSRC}/radicale.wsgi ${STAGEDIR}${WWWDIR}/radicale.wsgi
 

www/radicale/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1589887684
-SHA256 (Radicale-2.1.12.tar.gz) = 8fd07806e3e4f873b63838dfee69bf0283216943df6051cf80a22f11d7a7eda4
-SIZE (Radicale-2.1.12.tar.gz) = 109781
+TIMESTAMP = 1591553904
+SHA256 (Radicale-3.0.3.tar.gz) = 3d9995adfaa47f7262151cf2d019c38ce35b1aa54b932231b2253ff0c9a3a222
+SIZE (Radicale-3.0.3.tar.gz) = 101402

www/radicale/files/radicale.in

@@ -29,9 +29,8 @@ load_rc_config $name
 : ${radicale_group=%%GROUPS%%}
 
 pidfile=/var/run/radicale/radicale.pid
-command=%%PREFIX%%/bin/radicale
-command_args="-d -p ${pidfile} -C ${radicale_config}"
-command_interpreter=%%PYTHON_CMD%%
+command=/usr/sbin/daemon
+command_args="-P ${pidfile} %%PREFIX%%/bin/radicale -C ${radicale_config}"
 required_files=${radicale_config}
 start_precmd=do_precmd
 

www/radicale/pkg-plist

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