Index: head/www/radicale/Makefile
===================================================================
--- head/www/radicale/Makefile	(revision 466655)
+++ head/www/radicale/Makefile	(revision 466656)
@@ -1,49 +1,47 @@
 # Created by: Mark Felder <feld@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	radicale
 PORTVERSION=	1.1.6
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Radicale-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python based CalDAV/CardDAV server
 
 LICENSE=	GPLv3
 
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 USERS=		radicale
 GROUPS=		radicale
 USE_RC_SUBR=	radicale
-SUB_LIST=	USERS="${USERS}" PYTHON_CMD="${PYTHON_CMD}"
+SUB_LIST=	PYTHON_CMD="${PYTHON_CMD}"
 
 OPTIONS_DEFINE=	HTTP LDAP
 HTTP_DESC=	HTTP authentication support
 
 HTTP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests1>=0:www/py-requests1@${FLAVOR}
 LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=0:net/py-ldap@${FLAVOR}
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MHTTP} || ${PORT_OPTIONS:MLDAP}
+.if ${PORT_OPTIONS:MLDAP}
 USES+=		python:2.7
 .else
 USES+=		python
 .endif
 
 post-patch:
-	${REINPLACE_CMD} 's,= /etc,= ${PREFIX}/etc,g' ${WRKSRC}/config
-	${REINPLACE_CMD} 's,~/.config/radicale,${DATADIR},g' ${WRKSRC}/config
+	@${REINPLACE_CMD} 's|~/.config/radicale|${DATADIR}|; s|/etc|${PREFIX}/etc|' ${WRKSRC}/config
 
 post-install:
-	${MKDIR} ${STAGEDIR}/${ETCDIR}
-	${MKDIR} ${STAGEDIR}/${DATADIR}
+	${MKDIR} ${STAGEDIR}/${ETCDIR} ${STAGEDIR}/${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/config ${STAGEDIR}/${ETCDIR}/config.sample
 	${INSTALL_DATA} ${WRKSRC}/logging ${STAGEDIR}/${ETCDIR}/logging.sample
 
 .include <bsd.port.mk>
Index: head/www/radicale/files/radicale.in
===================================================================
--- head/www/radicale/files/radicale.in	(revision 466655)
+++ head/www/radicale/files/radicale.in	(revision 466656)
@@ -1,45 +1,45 @@
 #!/bin/sh
 # Created by: Mark Felder <feld@FreeBSD.org>
 # $FreeBSD$
 #
 
 # PROVIDE: radicale
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable radicale:
 #  radicale_enable (bool):    Set to "NO" by default.
 #                       Set it to "YES" to enable radicale.
 #
 
 . /etc/rc.subr
 
 name=radicale
 rcvar=radicale_enable
 
 # set defaults
 
 load_rc_config $name
 
 : ${radicale_enable:=NO}
 : ${radicale_config=%%PREFIX%%/etc/radicale/config}
-: ${radicale_user=%%USERS%%}
-: ${radicale_group=%%GROUPS%%}
+: ${radicale_user:=radicale}
+: ${radicale_group:=radicale}
 
 pidfile=/var/run/radicale/radicale.pid
 command=%%PREFIX%%/bin/radicale
 command_args="-d -p ${pidfile} -C ${radicale_config}"
 command_interpreter=%%PYTHON_CMD%%
 required_files=${radicale_config}
 start_precmd=do_precmd
 
 do_precmd()
 {
 	if [ ! -d ${pidfile%/*} ]; then
 		install -d -o ${radicale_user} ${pidfile%/*}
 	fi
 }
 
 run_rc_command "$1"