From owner-svn-ports-head@freebsd.org  Sun Jan 10 21:09:58 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 D96E9A6A35E;
 Sun, 10 Jan 2016 21:09:58 +0000 (UTC)
 (envelope-from olgeni@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 A821C13DA;
 Sun, 10 Jan 2016 21:09:58 +0000 (UTC)
 (envelope-from olgeni@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0AL9vpx059799;
 Sun, 10 Jan 2016 21:09:57 GMT (envelope-from olgeni@FreeBSD.org)
Received: (from olgeni@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0AL9vY5059798;
 Sun, 10 Jan 2016 21:09:57 GMT (envelope-from olgeni@FreeBSD.org)
Message-Id: <201601102109.u0AL9vY5059798@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: olgeni set sender to
 olgeni@FreeBSD.org using -f
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Sun, 10 Jan 2016 21:09:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r405748 - head/textproc/elasticsearch-plugin-sql
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: <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: Sun, 10 Jan 2016 21:09:58 -0000

Author: olgeni
Date: Sun Jan 10 21:09:57 2016
New Revision: 405748
URL: https://svnweb.freebsd.org/changeset/ports/405748

Log:
  Update ElasticSearch version requirement to 1.7.x.
  
  Remove unnecessary code from do-install.
  
  Mark conflict with upcoming version 2.x.

Modified:
  head/textproc/elasticsearch-plugin-sql/Makefile

Modified: head/textproc/elasticsearch-plugin-sql/Makefile
==============================================================================
--- head/textproc/elasticsearch-plugin-sql/Makefile	Sun Jan 10 21:07:39 2016	(r405747)
+++ head/textproc/elasticsearch-plugin-sql/Makefile	Sun Jan 10 21:09:57 2016	(r405748)
@@ -12,7 +12,9 @@ COMMENT=	ElasticSearch SQL plugin
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	elasticsearch>=1.5.0:${PORTSDIR}/textproc/elasticsearch
+RUN_DEPENDS=	elasticsearch>=1.7.0:${PORTSDIR}/textproc/elasticsearch
+
+CONFLICTS=      elasticsearch2-plugin-sql-2.*
 
 USES=		zip
 NO_BUILD=	yes
@@ -25,7 +27,6 @@ post-patch:
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/sql
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/sql/_site
 	${INSTALL_DATA} ${WRKSRC}/*.jar ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/sql
 	cd ${WRKSRC} && ${COPYTREE_SHARE} _site ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/sql