Index: www/radicale/Makefile
===================================================================
--- www/radicale/Makefile	(revision 470008)
+++ www/radicale/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	radicale
 PORTVERSION=	1.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,8 +14,10 @@
 
 LICENSE=	GPLv3
 
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}passlib>=1.6.5:security/py-passlib@${FLAVOR}
+
+USES=		python
 USE_PYTHON=	autoplist concurrent distutils
-USES=		python
 
 NO_ARCH=	yes
 
@@ -22,7 +24,8 @@
 USERS=		radicale
 GROUPS=		radicale
 USE_RC_SUBR=	radicale
-SUB_LIST=	PYTHON_CMD="${PYTHON_CMD}"
+SUB_LIST=	PYTHON_CMD="${PYTHON_CMD}" \
+		PYTHON_VER="${PYTHON_VER}"
 
 OPTIONS_DEFINE=	HTTP LDAP
 HTTP_DESC=	HTTP authentication support
Index: www/radicale/files/radicale.in
===================================================================
--- www/radicale/files/radicale.in	(revision 470008)
+++ www/radicale/files/radicale.in	(working copy)
@@ -24,12 +24,12 @@
 load_rc_config $name
 
 : ${radicale_enable:=NO}
-: ${radicale_config=%%PREFIX%%/etc/radicale/config}
+: ${radicale_config=%%ETCDIR%%/config}
 : ${radicale_user:=radicale}
 : ${radicale_group:=radicale}
 
 pidfile=/var/run/radicale/radicale.pid
-command=%%PREFIX%%/bin/radicale
+command=%%PREFIX%%/bin/radicale-%%PYTHON_VER%%
 command_args="-d -p ${pidfile} -C ${radicale_config}"
 command_interpreter=%%PYTHON_CMD%%
 required_files=${radicale_config}