diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2018-04-07 00:26:35 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2018-04-07 00:26:35 +0800 |
| commit | 48514957d7b9086382b05989b2f3edc04a14f59d (patch) | |
| tree | 9b6ad82e5f88bd3bf03785101ef0f239e17eef4d | |
| parent | 09b3952f6aaede68bdf4499cf15ee60fcfeb578c (diff) | |
| download | freebsd-ports-gnome-48514957d7b9086382b05989b2f3edc04a14f59d.tar.gz freebsd-ports-gnome-48514957d7b9086382b05989b2f3edc04a14f59d.tar.zst freebsd-ports-gnome-48514957d7b9086382b05989b2f3edc04a14f59d.zip | |
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.
| -rw-r--r-- | www/radicale/Makefile | 10 | ||||
| -rw-r--r-- | www/radicale/files/radicale.in | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/www/radicale/Makefile b/www/radicale/Makefile index 79cc44e3dbc9..2bb3187055ca 100644 --- a/www/radicale/Makefile +++ b/www/radicale/Makefile @@ -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/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 diff --git a/www/radicale/files/radicale.in b/www/radicale/files/radicale.in index b5f6e5859579..a6118c56e437 100644 --- a/www/radicale/files/radicale.in +++ b/www/radicale/files/radicale.in @@ -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 |