svn commit: r410766 - in head: . textproc textproc/elasticsearch-plugin-marvel2 textproc/elasticsearch2-plugin-marvel

[Dan Langille]

Author: dvl
Date: Thu Mar 10 16:40:46 2016
New Revision: 410766
URL: https://svnweb.freebsd.org/changeset/ports/410766

Log:
  Move this port to where it should live, based on existing ports for
  Elasticsearch 2

Added:
  head/textproc/elasticsearch2-plugin-marvel/
     - copied from r410765, head/textproc/elasticsearch-plugin-marvel2/
Deleted:
  head/textproc/elasticsearch-plugin-marvel2/
Modified:
  head/MOVED
  head/textproc/Makefile
  head/textproc/elasticsearch2-plugin-marvel/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Thu Mar 10 16:35:15 2016	(r410765)
+++ head/MOVED	Thu Mar 10 16:40:46 2016	(r410766)
@@ -8226,3 +8226,4 @@ sysutils/logstash-contrib||2016-03-06|Ha
 devel/p5-DateTime-Event-SolarTerm|devel/p5-DateTime-Astro|2016-03-07|Has been part of DateTime-Astro for a long time
 devel/p5-DateTime-Util-Astro|devel/p5-DateTime-Astro|2016-03-07|Has been part of DateTime-Astro for a long time
 security/regripperplugins||2016-03-07|Merged into security/regripper
+elasticsearch-plugin-marvel2|elasticsearch2-plugin-marvel|Rename to match other Elasticsearch 2 plugins

Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile	Thu Mar 10 16:35:15 2016	(r410765)
+++ head/textproc/Makefile	Thu Mar 10 16:40:46 2016	(r410766)
@@ -156,11 +156,11 @@
     SUBDIR += elasticsearch-plugin-head
     SUBDIR += elasticsearch-plugin-hq
     SUBDIR += elasticsearch-plugin-marvel
-    SUBDIR += elasticsearch-plugin-marvel2
     SUBDIR += elasticsearch-plugin-sql
     SUBDIR += elasticsearch-river-rabbitmq
     SUBDIR += elasticsearch2
     SUBDIR += elasticsearch2-plugin-hq
+    SUBDIR += elasticsearch2-plugin-marvel
     SUBDIR += elasticsearch2-plugin-sql
     SUBDIR += elixir-earmark
     SUBDIR += elixir-ex_doc

Modified: head/textproc/elasticsearch2-plugin-marvel/Makefile
==============================================================================
--- head/textproc/elasticsearch-plugin-marvel2/Makefile	Thu Mar 10 16:35:15 2016	(r410765)
+++ head/textproc/elasticsearch2-plugin-marvel/Makefile	Thu Mar 10 16:40:46 2016	(r410766)
@@ -6,8 +6,7 @@ PORTVERSION=	2.1.0
 CATEGORIES=	textproc perl5
 MASTER_SITES=	http://download.elastic.co/elasticsearch/release/org/elasticsearch/plugin/license/${PORTVERSION}/:source1 \
 		http://download.elastic.co/elasticsearch/release/org/elasticsearch/plugin/marvel-agent/${PORTVERSION}/:source2
-PKGNAMEPREFIX=	elasticsearch-plugin-
-PKGNAMESUFFIX=	2
+PKGNAMEPREFIX=	elasticsearch2-plugin-
 DISTFILES=	license-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}:source1 \
 		marvel-agent-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}:source2