svn commit: r405748 - head/textproc/elasticsearch-plugin-sql

[Jimmy Olgeni]

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