svn commit: r466656 - in head/www/radicale: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Fri Apr 6 16:26:36 UTC 2018
Author: sunpoet
Date: Fri Apr 6 16:26:35 2018
New Revision: 466656
URL: https://svnweb.freebsd.org/changeset/ports/466656
Log:
Fix USES=python logic
- Silence patch message
- Cosmetic change
The USES=python restriction will be relaxed after net/py-ldap updated to 3.0.0.
Modified:
head/www/radicale/Makefile
head/www/radicale/files/radicale.in
Modified: head/www/radicale/Makefile
==============================================================================
--- head/www/radicale/Makefile Fri Apr 6 16:26:30 2018 (r466655)
+++ head/www/radicale/Makefile Fri Apr 6 16:26:35 2018 (r466656)
@@ -20,7 +20,7 @@ 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
@@ -30,19 +30,17 @@ LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=0:net/p
.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
Modified: head/www/radicale/files/radicale.in
==============================================================================
--- head/www/radicale/files/radicale.in Fri Apr 6 16:26:30 2018 (r466655)
+++ head/www/radicale/files/radicale.in Fri Apr 6 16:26:35 2018 (r466656)
@@ -25,8 +25,8 @@ 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
More information about the svn-ports-head
mailing list