Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Oct 2019 05:49:10 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r514034 - head/net-mgmt/prometheus2
Message-ID:  <201910080549.x985nAZ2022525@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Tue Oct  8 05:49:09 2019
New Revision: 514034
URL: https://svnweb.freebsd.org/changeset/ports/514034

Log:
  net-mgmt/prometheus2: Rename tsdb using GO_TARGET
  
  PR:		241065

Modified:
  head/net-mgmt/prometheus2/Makefile

Modified: head/net-mgmt/prometheus2/Makefile
==============================================================================
--- head/net-mgmt/prometheus2/Makefile	Tue Oct  8 05:09:39 2019	(r514033)
+++ head/net-mgmt/prometheus2/Makefile	Tue Oct  8 05:49:09 2019	(r514034)
@@ -58,9 +58,11 @@ LD_FLAG_STRING=		-s \
 		${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER}
 
 GO_BUILDFLAGS=	-v -ldflags "${LD_FLAG_STRING}"
+# A tsdb binary already exists in databases/opentsdb. Rename ours to
+# avoid issues.
 GO_TARGET=	./cmd/prometheus \
 		./cmd/promtool \
-		./tsdb/cmd/tsdb
+		./tsdb/cmd/tsdb:promtsdb
 
 post-install:
 	${INSTALL_DATA} \
@@ -76,9 +78,6 @@ post-install:
 	( cd ${WRKSRC}/consoles \
 		&& ${COPYTREE_SHARE} . ${STAGEDIR}${PROMETHEUS_CONSOLES_DIR} \
 	)
-	# A tsdb binary already exists in databases/opentsdb. Rename ours to
-	# avoid issues.
-	mv ${STAGEDIR}${LOCALBASE}/bin/tsdb ${STAGEDIR}${LOCALBASE}/bin/promtsdb
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}



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