Index: head/net-p2p/sonarr/Makefile
===================================================================
--- head/net-p2p/sonarr/Makefile	(revision 404948)
+++ head/net-p2p/sonarr/Makefile	(revision 404949)
@@ -1,30 +1,31 @@
 # $FreeBSD$
 
 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
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	PVR for Usenet and BitTorrent users
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	mono>0:${PORTSDIR}/lang/mono \
 		mediainfo>0:${PORTSDIR}/multimedia/mediainfo \
 		sqlite3>0:${PORTSDIR}/databases/sqlite3
 
 USE_RC_SUBR=	sonarr
 
 NO_BUILD=	YES
 WRKSRC=	${WRKDIR}/NzbDrone
 
 USERS=	sonarr
 
 do-install:
 	${INSTALL} -d -m 755 ${STAGEDIR}/${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}
 	${MKDIR} ${STAGEDIR}/${PREFIX}/sonarr
 
 .include <bsd.port.mk>
Index: head/net-p2p/sonarr/files/sonarr.in
===================================================================
--- head/net-p2p/sonarr/files/sonarr.in	(revision 404948)
+++ head/net-p2p/sonarr/files/sonarr.in	(revision 404949)
@@ -1,29 +1,32 @@
 #!/bin/sh
 #
 # Author: Mark Felder <feld@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 # PROVIDE: sonarr
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable sonarr:
 # sonarr_enable="YES"
 
 . /etc/rc.subr
 
 name="sonarr"
 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"