From owner-svn-ports-all@FreeBSD.ORG  Sat Oct 18 06:28:40 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5166C51F;
 Sat, 18 Oct 2014 06:28:40 +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 3D01B7FC;
 Sat, 18 Oct 2014 06:28:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9I6SeRG043521;
 Sat, 18 Oct 2014 06:28:40 GMT (envelope-from netchild@FreeBSD.org)
Received: (from netchild@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9I6SdJ1043519;
 Sat, 18 Oct 2014 06:28:39 GMT (envelope-from netchild@FreeBSD.org)
Message-Id: <201410180628.s9I6SdJ1043519@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: netchild set sender to
 netchild@FreeBSD.org using -f
From: Alexander Leidinger <netchild@FreeBSD.org>
Date: Sat, 18 Oct 2014 06:28:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r371092 - in head/net/serviio: . 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-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Oct 2014 06:28:40 -0000

Author: netchild
Date: Sat Oct 18 06:28:39 2014
New Revision: 371092
URL: https://svnweb.freebsd.org/changeset/ports/371092
QAT: https://qat.redports.org/buildarchive/r371092/

Log:
  Improve the status command of the rc script:
   - return error code if not running [1]
   - narrow down which java process to accept as "running"
  
  PR:		193728 [1]
  Noticed by:	jason.unovitch@gmail.com [1]

Modified:
  head/net/serviio/Makefile
  head/net/serviio/files/serviio.in

Modified: head/net/serviio/Makefile
==============================================================================
--- head/net/serviio/Makefile	Sat Oct 18 03:37:35 2014	(r371091)
+++ head/net/serviio/Makefile	Sat Oct 18 06:28:39 2014	(r371092)
@@ -3,7 +3,7 @@
 
 PORTNAME=	serviio
 PORTVERSION=	1.4.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net multimedia java www
 MASTER_SITES=	http://download.serviio.org/releases/
 EXTRACT_SUFX=	-linux.tar.gz

Modified: head/net/serviio/files/serviio.in
==============================================================================
--- head/net/serviio/files/serviio.in	Sat Oct 18 03:37:35 2014	(r371091)
+++ head/net/serviio/files/serviio.in	Sat Oct 18 06:28:39 2014	(r371092)
@@ -32,11 +32,12 @@ stop_cmd="$command -stop"
 
 status_cmd=${name}_status
 serviio_status() {
-	serviio_pid=$(ps -aU ${serviio_user} | awk '/java/ {print $1}')
+	serviio_pid=$(ps -wwwaU ${serviio_user} | awk '/java.*org.serviio.MediaServer/ {print $1}')
 	if [ -n "${serviio_pid}" ]; then
 		echo "${name} is running as pid ${serviio_pid}"
 	else
 		echo "${name} is not running"
+		return 1
 	fi
 }