From owner-svn-ports-all@freebsd.org Mon Jun 4 09:43:47 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F960FED11D; Mon, 4 Jun 2018 09:43:47 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 527757D299; Mon, 4 Jun 2018 09:43:47 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 323573D03; Mon, 4 Jun 2018 09:43:47 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w549hl8J005714; Mon, 4 Jun 2018 09:43:47 GMT (envelope-from decke@FreeBSD.org) Received: (from decke@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w549hkcd005711; Mon, 4 Jun 2018 09:43:46 GMT (envelope-from decke@FreeBSD.org) Message-Id: <201806040943.w549hkcd005711@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: decke set sender to decke@FreeBSD.org using -f From: Bernhard Froehlich Date: Mon, 4 Jun 2018 09:43:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471537 - in head/www/radicale: . files X-SVN-Group: ports-head X-SVN-Commit-Author: decke X-SVN-Commit-Paths: in head/www/radicale: . files X-SVN-Commit-Revision: 471537 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jun 2018 09:43:47 -0000 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}