svn commit: r439239 - in head/net-mgmt/prometheus: . files

[Larry Rosenman]

Author: ler
Date: Sun Apr 23 16:54:28 2017
New Revision: 439239
URL: https://svnweb.freebsd.org/changeset/ports/439239

Log:
  Update net-mgmt/prometheus to 1.6.1, add version info
  Removed STRIP=, as since go 1.6 stripping go binaries doesn't break them.
  
  Details of changes in this release are available here:
  https://github.com/prometheus/prometheus/releases/tag/v1.6.1
  
  PR:		218737
  Submitted by:	ports at ecadlabs.com (maintainer)
  Approved by:	adamw (mentor)
  Differential Revision:	https://reviews.freebsd.org/D10423

Modified:
  head/net-mgmt/prometheus/Makefile
  head/net-mgmt/prometheus/distinfo
  head/net-mgmt/prometheus/files/prometheus.in

Modified: head/net-mgmt/prometheus/Makefile
==============================================================================
--- head/net-mgmt/prometheus/Makefile	Sun Apr 23 16:51:04 2017	(r439238)
+++ head/net-mgmt/prometheus/Makefile	Sun Apr 23 16:54:28 2017	(r439239)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	prometheus
-PORTVERSION=	1.5.2
+PORTVERSION=	1.6.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-mgmt
 
@@ -21,11 +21,13 @@ USE_RC_SUBR=	prometheus
 USERS=		prometheus
 GROUPS=		prometheus
 
-STRIP=		# stripping can break go binaries
-
+LD_FLAG_STRING= ${GO_PKGNAME}/vendor/github.com/prometheus/common/version.
 do-build:
-	(cd ${GO_WRKSRC}/cmd/prometheus ; ${SETENV} ${GO_ENV} go install)
-	(cd ${GO_WRKSRC}/cmd/promtool ; ${SETENV} ${GO_ENV} go install)
+	(cd ${GO_WRKSRC}/cmd/prometheus ; ${SETENV} ${GO_ENV} go install -ldflags \
+	    "-s -X ${LD_FLAG_STRING}.Version=${PORTVERSION}") 
+
+	(cd ${GO_WRKSRC}/cmd/promtool ; ${SETENV} ${GO_ENV} go install -ldflags \
+	    "-s -X ${LD_FLAG_STRING}.Version=${PORTVERSION}")
 
 do-install:
 	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/prometheus ${STAGEDIR}${PREFIX}/bin

Modified: head/net-mgmt/prometheus/distinfo
==============================================================================
--- head/net-mgmt/prometheus/distinfo	Sun Apr 23 16:51:04 2017	(r439238)
+++ head/net-mgmt/prometheus/distinfo	Sun Apr 23 16:54:28 2017	(r439239)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486719210
-SHA256 (prometheus-prometheus-v1.5.2_GH0.tar.gz) = c4881cc305263cc8da434be69a20aa039386d4feab5e58f8b89a60bfe8b556ac
-SIZE (prometheus-prometheus-v1.5.2_GH0.tar.gz) = 5183537
+TIMESTAMP = 1492658004
+SHA256 (prometheus-prometheus-v1.6.1_GH0.tar.gz) = ecc9ce94fce45994c23b76eb0c5acbb1b942513be601872c8cd74d0821450c5e
+SIZE (prometheus-prometheus-v1.6.1_GH0.tar.gz) = 5220870

Modified: head/net-mgmt/prometheus/files/prometheus.in
==============================================================================
--- head/net-mgmt/prometheus/files/prometheus.in	Sun Apr 23 16:51:04 2017	(r439238)
+++ head/net-mgmt/prometheus/files/prometheus.in	Sun Apr 23 16:54:28 2017	(r439239)
@@ -44,7 +44,7 @@ extra_commands="reload"
 command_args="-p ${pidfile} /usr/bin/env ${procname} \
                 -config.file=${prometheus_config} \
                 -storage.local.path=${prometheus_data_dir} \
-                ${prometheus_args} > ${prometheus_log_file} 2>&1"
+                ${prometheus_args} >> ${prometheus_log_file} 2>&1"
 
 start_precmd=prometheus_startprecmd