From owner-svn-ports-head@freebsd.org  Mon Mar 14 15:31:57 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 92807AD00C9;
 Mon, 14 Mar 2016 15:31:57 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 62C9863A;
 Mon, 14 Mar 2016 15:31:57 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2EFVu0F028548;
 Mon, 14 Mar 2016 15:31:56 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2EFVurh028546;
 Mon, 14 Mar 2016 15:31:56 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201603141531.u2EFVurh028546@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
 feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 14 Mar 2016 15:31:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r411095 - in head/www/tomcat6: . 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.21
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Mar 2016 15:31:57 -0000

Author: feld
Date: Mon Mar 14 15:31:56 2016
New Revision: 411095
URL: https://svnweb.freebsd.org/changeset/ports/411095

Log:
  www/tomcat6: Make rc script more reliable
  
  By using procstat instead of jps to check if the daemon is running we
  avoid deadlocks if the java process is hung.
  
  PR:		206853

Modified:
  head/www/tomcat6/Makefile
  head/www/tomcat6/files/tomcat6.in

Modified: head/www/tomcat6/Makefile
==============================================================================
--- head/www/tomcat6/Makefile	Mon Mar 14 15:29:52 2016	(r411094)
+++ head/www/tomcat6/Makefile	Mon Mar 14 15:31:56 2016	(r411095)
@@ -3,6 +3,7 @@
 
 PORTNAME=	tomcat
 PORTVERSION=	6.0.45
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/tomcat/tomcat-6/v${PORTVERSION}/bin
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}

Modified: head/www/tomcat6/files/tomcat6.in
==============================================================================
--- head/www/tomcat6/files/tomcat6.in	Mon Mar 14 15:29:52 2016	(r411094)
+++ head/www/tomcat6/files/tomcat6.in	Mon Mar 14 15:31:56 2016	(r411095)
@@ -168,7 +168,7 @@ tomcat_check_pidfile() {
 		debug "pid file ($_pidfile): no pid in file."
 		return
 	fi
-	if [ -n "`%%LOCALBASE%%/bin/jps -l | grep -e "^$_pid $java_class\$"`" ]; then
+	if [ -n "`/usr/bin/procstat -c $_pid | grep -e "^$_pid.*$java_class"`" ]; then
 		echo -n $_pid
 	fi
 }