Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Mar 2016 14:52:44 +0000 (UTC)
From:      Dan Langille <dvl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r412050 - head/textproc/elasticsearch2-plugin-marvel
Message-ID:  <201603281452.u2SEqijI002293@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603281452.u2SEqijI002293>