svn commit: r351395 - in head/news/sabnzbdplus: . files

[Mark Felder]

Author: feld
Date: Wed Apr 16 15:14:29 2014
New Revision: 351395
URL: http://svnweb.freebsd.org/changeset/ports/351395
QAT: https://qat.redports.org/buildarchive/r351395/

Log:
  Just spotted in the 0.7.17 changelog they implemented my request for full
  control over the pidfile! Now we no longer scrape the config file to guess
  its name, which was based on both the hostname of the server and the port.
  
  Previously, if you changed the hostname of your server you could no longer
  signal the running sabnzbd process through the rc framework...

Modified:
  head/news/sabnzbdplus/Makefile
  head/news/sabnzbdplus/files/sabnzbd.in

Modified: head/news/sabnzbdplus/Makefile
==============================================================================
--- head/news/sabnzbdplus/Makefile	Wed Apr 16 14:58:57 2014	(r351394)
+++ head/news/sabnzbdplus/Makefile	Wed Apr 16 15:14:29 2014	(r351395)
@@ -2,6 +2,7 @@
 
 PORTNAME=	sabnzbdplus
 PORTVERSION=	0.7.17
+PORTREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 DISTNAME=	SABnzbd-${PORTVERSION}-src

Modified: head/news/sabnzbdplus/files/sabnzbd.in
==============================================================================
--- head/news/sabnzbdplus/files/sabnzbd.in	Wed Apr 16 14:58:57 2014	(r351394)
+++ head/news/sabnzbdplus/files/sabnzbd.in	Wed Apr 16 15:14:29 2014	(r351395)
@@ -22,6 +22,7 @@
 #                       you want it to be. It uses '_sabnzbd' group by
 #                       default. Do not sets it as empty or it will run
 #                       as wheel.
+# sabnzbd_pidfile:      Set the location of the sabnzbd pidfile
 
 . /etc/rc.subr
 
@@ -33,14 +34,15 @@ load_rc_config ${name}
 : ${sabnzbd_user:=_sabnzbd}
 : ${sabnzbd_group:=_sabnzbd}
 : ${sabnzbd_conf_dir="%%PREFIX%%/sabnzbd"}
+: ${sabnzbd_pidfile:="/var/run/sabnzbd/sabnzbd.pid"}
 
-pidfile=/var/run/sabnzbd/sabnzbd-$(grep -m1 ^port ${sabnzbd_conf_dir}/sabnzbd.ini | tr -dc '[0-9]').pid
+pidfile=${sabnzbd_pidfile}
 
 start_precmd="${name}_prestart"
 extra_commands="status"
 command_interpreter="%%PYTHON_CMD%%"
 command="%%PREFIX%%/bin/SABnzbd.py"
-command_args="--daemon -f ${sabnzbd_conf_dir}/sabnzbd.ini --pid ${pidfile%/*}"
+command_args="--daemon -f ${sabnzbd_conf_dir}/sabnzbd.ini --pidfile ${pidfile}"
 
 sabnzbd_prestart()
 {