svn commit: r471537 - in head/www/radicale: . files

[Bernhard Froehlich]

Author: decke
Date: Mon Jun  4 09:43:46 2018
New Revision: 471537
URL: https://svnweb.freebsd.org/changeset/ports/471537

Log:
  www/radicale: Various fixes including startscript
  
  - Fix startscript after FLAVOURing
  - Add missing py-passlib dependency (required for authentication)
  - Pet portlint and move USES above USE_*
  
  PR:		228313
  Submitted by:	myself
  Approved by:	Sunpoet Po-Chuan Hsieh (maintainer timeout)
  MFH:		2018Q2

Modified:
  head/www/radicale/Makefile
  head/www/radicale/files/radicale.in

Modified: head/www/radicale/Makefile
==============================================================================
--- head/www/radicale/Makefile	Mon Jun  4 09:34:24 2018	(r471536)
+++ head/www/radicale/Makefile	Mon Jun  4 09:43:46 2018	(r471537)
@@ -3,7 +3,7 @@
 
 PORTNAME=	radicale
 PORTVERSION=	1.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,15 +14,18 @@ COMMENT=	Python based CalDAV/CardDAV server
 
 LICENSE=	GPLv3
 
-USE_PYTHON=	autoplist concurrent distutils
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}passlib>=1.6.5:security/py-passlib@${FLAVOR}
+
 USES=		python
+USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 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

Modified: head/www/radicale/files/radicale.in
==============================================================================
--- head/www/radicale/files/radicale.in	Mon Jun  4 09:34:24 2018	(r471536)
+++ head/www/radicale/files/radicale.in	Mon Jun  4 09:43:46 2018	(r471537)
@@ -24,12 +24,12 @@ rcvar=radicale_enable
 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}