svn commit: r405478 - in branches/2016Q1/net-p2p/sonarr: . files

[Mark Felder]

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 <bsd.port.mk>

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
- at dir(sonarr,wheel,755) sonarr