From owner-svn-ports-head@freebsd.org  Thu Dec 31 15:22:58 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 36BD1A573A6;
 Thu, 31 Dec 2015 15:22:58 +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 03BB41FF6;
 Thu, 31 Dec 2015 15:22:57 +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 tBVFMvqV047646;
 Thu, 31 Dec 2015 15:22:57 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBVFMuio047643;
 Thu, 31 Dec 2015 15:22:56 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201512311522.tBVFMuio047643@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
 feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 31 Dec 2015 15:22:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r404949 - in head/net-p2p/sonarr: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Dec 2015 15:22:58 -0000

Author: feld
Date: Thu Dec 31 15:22:56 2015
New Revision: 404949
URL: https://svnweb.freebsd.org/changeset/ports/404949

Log:
  net-p2p/sonarr: Various improvements
  
  - Allow running sonarr as a different user
  - Use sonarr's pidfile
  - Allow configuring location of the data directory
  - Export XDG_CONFIG_HOME to a writable directory to prevent runtime problems
  
  PR:		205441

Modified:
  head/net-p2p/sonarr/Makefile
  head/net-p2p/sonarr/files/sonarr.in

Modified: head/net-p2p/sonarr/Makefile
==============================================================================
--- head/net-p2p/sonarr/Makefile	Thu Dec 31 15:19:38 2015	(r404948)
+++ head/net-p2p/sonarr/Makefile	Thu Dec 31 15:22:56 2015	(r404949)
@@ -2,6 +2,7 @@
 
 PORTNAME=	sonarr
 PORTVERSION=	2.0.0.3645
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://download.sonarr.tv/v2/master/mono/
 DISTNAME=	NzbDrone.master.${PORTVERSION}.mono

Modified: head/net-p2p/sonarr/files/sonarr.in
==============================================================================
--- head/net-p2p/sonarr/files/sonarr.in	Thu Dec 31 15:19:38 2015	(r404948)
+++ head/net-p2p/sonarr/files/sonarr.in	Thu Dec 31 15:22:56 2015	(r404949)
@@ -20,10 +20,13 @@ rcvar=sonarr_enable
 load_rc_config $name
 
 : ${sonarr_enable="NO"}
+: ${sonarr_user:="sonarr"}
+: ${sonarr_data_dir:="%%PREFIX%%/sonarr"}
 
-pidfile=/var/run/sonarr.pid
+pidfile="${sonarr_data_dir}/nzbdrone.pid"
 procname="%%PREFIX%%/bin/mono"
 command="/usr/sbin/daemon"
-command_args="-f -p ${pidfile} -u sonarr %%PREFIX%%/bin/mono %%DATADIR%%/NzbDrone.exe --nobrowser --data=%%PREFIX%%/sonarr"
+command_args="-f ${procname} %%DATADIR%%/NzbDrone.exe --nobrowser --data=${sonarr_data_dir}"
+start_precmd="export XDG_CONFIG_HOME=${sonarr_data_dir}"
 
 run_rc_command "$1"