From owner-svn-ports-all@freebsd.org Thu Jan 7 17:27:23 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 39E06A6563A; Thu, 7 Jan 2016 17:27:23 +0000 (UTC) (envelope-from feld@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 mx1.freebsd.org (Postfix) with ESMTPS id E61D818F2; Thu, 7 Jan 2016 17:27:22 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u07HRMNK076380; Thu, 7 Jan 2016 17:27:22 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u07HRL4O076377; Thu, 7 Jan 2016 17:27:21 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201601071727.u07HRL4O076377@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 7 Jan 2016 17:27:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r405478 - in branches/2016Q1/net-p2p/sonarr: . files X-SVN-Group: ports-branches 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.20 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: Thu, 07 Jan 2016 17:27:23 -0000 Author: feld Date: Thu Jan 7 17:27:21 2016 New Revision: 405478 URL: https://svnweb.freebsd.org/changeset/ports/405478 Log: MFH: r405476 net-p2p/sonarr: Fix $sonarr_data_dir creation Now that $sonarr_data_dir is configurable, move creation from package to rc script to prevent sonarr from failing to start successfully. PR: 205986 Approved by: ports-secteam (with hat) Modified: branches/2016Q1/net-p2p/sonarr/Makefile branches/2016Q1/net-p2p/sonarr/files/sonarr.in branches/2016Q1/net-p2p/sonarr/pkg-plist Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/net-p2p/sonarr/Makefile ============================================================================== --- branches/2016Q1/net-p2p/sonarr/Makefile Thu Jan 7 17:26:33 2016 (r405477) +++ branches/2016Q1/net-p2p/sonarr/Makefile Thu Jan 7 17:27:21 2016 (r405478) @@ -2,7 +2,7 @@ PORTNAME= sonarr PORTVERSION= 2.0.0.3645 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-p2p MASTER_SITES= http://download.sonarr.tv/v2/master/mono/ DISTNAME= NzbDrone.master.${PORTVERSION}.mono @@ -27,6 +27,5 @@ USERS= sonarr do-install: ${INSTALL} -d -m 755 ${STAGEDIR}/${DATADIR} cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR} - ${MKDIR} ${STAGEDIR}/${PREFIX}/sonarr .include Modified: branches/2016Q1/net-p2p/sonarr/files/sonarr.in ============================================================================== --- branches/2016Q1/net-p2p/sonarr/files/sonarr.in Thu Jan 7 17:26:33 2016 (r405477) +++ branches/2016Q1/net-p2p/sonarr/files/sonarr.in Thu Jan 7 17:27:21 2016 (r405478) @@ -27,6 +27,15 @@ pidfile="${sonarr_data_dir}/nzbdrone.pid procname="%%PREFIX%%/bin/mono" command="/usr/sbin/daemon" command_args="-f ${procname} %%DATADIR%%/NzbDrone.exe --nobrowser --data=${sonarr_data_dir}" -start_precmd="export XDG_CONFIG_HOME=${sonarr_data_dir}" +start_precmd=sonarr_precmd + +sonarr_precmd() +{ + export XDG_CONFIG_HOME=${sonarr_data_dir} + + if [ ! -d ${sonarr_data_dir} ]; then + install -d -o ${sonarr_user} ${sonarr_data_dir} + fi +} run_rc_command "$1" Modified: branches/2016Q1/net-p2p/sonarr/pkg-plist ============================================================================== --- branches/2016Q1/net-p2p/sonarr/pkg-plist Thu Jan 7 17:26:33 2016 (r405477) +++ branches/2016Q1/net-p2p/sonarr/pkg-plist Thu Jan 7 17:27:21 2016 (r405478) @@ -148,4 +148,3 @@ %%DATADIR%%/UI/templates.js %%DATADIR%%/UI/vendor.js %%DATADIR%%/UI/vendor.map -@dir(sonarr,wheel,755) sonarr