From owner-svn-ports-head@FreeBSD.ORG  Sun May  3 19:44:08 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 1FBBFB11;
 Sun,  3 May 2015 19:44:08 +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 0D9CF121E;
 Sun,  3 May 2015 19:44:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t43Ji7iC077458;
 Sun, 3 May 2015 19:44:07 GMT (envelope-from olgeni@FreeBSD.org)
Received: (from olgeni@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t43Ji7YF077455;
 Sun, 3 May 2015 19:44:07 GMT (envelope-from olgeni@FreeBSD.org)
Message-Id: <201505031944.t43Ji7YF077455@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: olgeni set sender to
 olgeni@FreeBSD.org using -f
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Sun, 3 May 2015 19:44:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r385341 - in head/textproc/elasticsearch: . 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.20
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: Sun, 03 May 2015 19:44:08 -0000

Author: olgeni
Date: Sun May  3 19:44:06 2015
New Revision: 385341
URL: https://svnweb.freebsd.org/changeset/ports/385341

Log:
  Fix pidfile check when jps does not return full process information.
  
  PR:		197595 (comment)
  Submitted by:	cheffo@freebsd-bg.org

Modified:
  head/textproc/elasticsearch/Makefile
  head/textproc/elasticsearch/files/elasticsearch.in

Modified: head/textproc/elasticsearch/Makefile
==============================================================================
--- head/textproc/elasticsearch/Makefile	Sun May  3 19:40:34 2015	(r385340)
+++ head/textproc/elasticsearch/Makefile	Sun May  3 19:44:06 2015	(r385341)
@@ -3,6 +3,7 @@
 
 PORTNAME=	elasticsearch
 PORTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	textproc java devel
 MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
 		http://mirrors.rit.edu/zi/

Modified: head/textproc/elasticsearch/files/elasticsearch.in
==============================================================================
--- head/textproc/elasticsearch/files/elasticsearch.in	Sun May  3 19:40:34 2015	(r385340)
+++ head/textproc/elasticsearch/files/elasticsearch.in	Sun May  3 19:44:06 2015	(r385341)
@@ -122,7 +122,7 @@ elasticsearch_check_pidfile() {
 		debug "pid file ($_pidfile): no pid in file."
 		return
 	fi
-	if [ -n "`%%LOCALBASE%%/bin/jps -l | grep -e "^$_pid org.elasticsearch.bootstrap.Elasticsearch\$"`" ]; then
+	if [ -n "`%%LOCALBASE%%/bin/jps -l | grep -e "^$_pid"`" ]; then
 		echo -n $_pid
 	fi
 }