From owner-svn-ports-head@FreeBSD.ORG  Wed Feb 18 15:09:48 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9CC1FA5F;
 Wed, 18 Feb 2015 15:09:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 6E5A736A;
 Wed, 18 Feb 2015 15:09:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1IF9mIv021358;
 Wed, 18 Feb 2015 15:09:48 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1IF9lRr021356;
 Wed, 18 Feb 2015 15:09:47 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201502181509.t1IF9lRr021356@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: feld set sender to feld@FreeBSD.org
 using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 18 Feb 2015 15:09:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r379208 - in head/multimedia/plexmediaserver: . 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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Feb 2015 15:09:48 -0000

Author: feld
Date: Wed Feb 18 15:09:47 2015
New Revision: 379208
URL: https://svnweb.freebsd.org/changeset/ports/379208
QAT: https://qat.redports.org/buildarchive/r379208/

Log:
  Teach the rc script to clean up leftover children

Modified:
  head/multimedia/plexmediaserver/Makefile
  head/multimedia/plexmediaserver/files/plexmediaserver.in

Modified: head/multimedia/plexmediaserver/Makefile
==============================================================================
--- head/multimedia/plexmediaserver/Makefile	Wed Feb 18 14:56:19 2015	(r379207)
+++ head/multimedia/plexmediaserver/Makefile	Wed Feb 18 15:09:47 2015	(r379208)
@@ -3,7 +3,7 @@
 
 PORTNAME=	plexmediaserver
 PORTVERSION?=	0.9.11.7.803
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.plexapp.com/plex-media-server/${PORTVERSION}-${PLEX_BUILD}/ \
 		http://nightlies.plexapp.com/directdl/plex-media-server/dist-ninja/${PORTVERSION}-${PLEX_BUILD}/

Modified: head/multimedia/plexmediaserver/files/plexmediaserver.in
==============================================================================
--- head/multimedia/plexmediaserver/files/plexmediaserver.in	Wed Feb 18 14:56:19 2015	(r379207)
+++ head/multimedia/plexmediaserver/files/plexmediaserver.in	Wed Feb 18 15:09:47 2015	(r379208)
@@ -33,8 +33,10 @@ load_rc_config $name
 command=/usr/sbin/daemon
 procname="%%DATADIR%%/Plex_Media_Server"
 command_args="-f ${procname}"
-start_precmd=plex_precmd
 pidfile=/var/run/plex/plex.pid
+start_precmd=plex_precmd
+stop_precmd=plex_stop_precmd
+stop_postcmd=plex_stop_postcmd
 
 plex_precmd()
 {
@@ -66,4 +68,19 @@ plex_precmd()
 	fi
 }
 
+plex_stop_precmd()
+{
+	if [ -r ${pidfile} ]; then
+		export _PLEXPID=$(check_pidfile ${pidfile} ${procname})
+	fi
+}
+
+plex_stop_postcmd()
+{
+	_PLEX_CHILDREN=$(pgrep -g ${_PLEXPID})
+	echo "Cleaning up leftover child processes."
+	kill $sig_stop ${_PLEX_CHILDREN}
+	wait_for_pids ${_PLEX_CHILDREN}
+}
+
 run_rc_command "$1"