From owner-svn-ports-all@freebsd.org  Mon Mar 28 14:52:45 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 4153FAE00A7;
 Mon, 28 Mar 2016 14:52:45 +0000 (UTC) (envelope-from dvl@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 035CC15EE;
 Mon, 28 Mar 2016 14:52:44 +0000 (UTC) (envelope-from dvl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2SEqiiG002294;
 Mon, 28 Mar 2016 14:52:44 GMT (envelope-from dvl@FreeBSD.org)
Received: (from dvl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2SEqijI002293;
 Mon, 28 Mar 2016 14:52:44 GMT (envelope-from dvl@FreeBSD.org)
Message-Id: <201603281452.u2SEqijI002293@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dvl set sender to dvl@FreeBSD.org
 using -f
From: Dan Langille <dvl@FreeBSD.org>
Date: Mon, 28 Mar 2016 14:52:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r412050 - head/textproc/elasticsearch2-plugin-marvel
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Mar 2016 14:52:45 -0000

Author: dvl
Date: Mon Mar 28 14:52:43 2016
New Revision: 412050
URL: https://svnweb.freebsd.org/changeset/ports/412050

Log:
  Install the proper items for the plugins
  Bump PORTREVISION

Modified:
  head/textproc/elasticsearch2-plugin-marvel/Makefile

Modified: head/textproc/elasticsearch2-plugin-marvel/Makefile
==============================================================================
--- head/textproc/elasticsearch2-plugin-marvel/Makefile	Mon Mar 28 14:31:03 2016	(r412049)
+++ head/textproc/elasticsearch2-plugin-marvel/Makefile	Mon Mar 28 14:52:43 2016	(r412050)
@@ -3,6 +3,7 @@
 
 PORTNAME=	marvel
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 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
@@ -38,9 +39,7 @@ do-extract:
 .endfor
 
 do-install:
-.for file in ${ZIP_FILES}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/${file}
-	@cd ${WRKDIR}/${file}-${PORTVERSION} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/${file}
-.endfor
-
+	# while installing, rename marvel-agent to marvel, which is what the plugin expects when running
+	@cd ${WRKDIR}/license-${PORTVERSION} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/license
+	@cd ${WRKDIR}/marvel-agent-${PORTVERSION} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins/marvel
 .include <bsd.port.mk>