From owner-svn-ports-all@freebsd.org Thu Feb 1 21:54:27 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 03D58ECD322; Thu, 1 Feb 2018 21:54:27 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A539C699D1; Thu, 1 Feb 2018 21:54:26 +0000 (UTC) (envelope-from brd@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A01CC12D4D; Thu, 1 Feb 2018 21:54:26 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w11LsQUh099942; Thu, 1 Feb 2018 21:54:26 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w11LsQN4099941; Thu, 1 Feb 2018 21:54:26 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201802012154.w11LsQN4099941@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Thu, 1 Feb 2018 21:54:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460640 - head/net-mgmt/prometheus X-SVN-Group: ports-head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: head/net-mgmt/prometheus X-SVN-Commit-Revision: 460640 X-SVN-Commit-Repository: ports 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.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Feb 2018 21:54:27 -0000 Author: brd Date: Thu Feb 1 21:54:26 2018 New Revision: 460640 URL: https://svnweb.freebsd.org/changeset/ports/460640 Log: net-mgmt/prometheus: Fix build info PR: 225430 Submitted by: David O'Rourke Approved by: ports@ecadlabs.com (maintainer) Modified: head/net-mgmt/prometheus/Makefile Modified: head/net-mgmt/prometheus/Makefile ============================================================================== --- head/net-mgmt/prometheus/Makefile Thu Feb 1 21:53:37 2018 (r460639) +++ head/net-mgmt/prometheus/Makefile Thu Feb 1 21:54:26 2018 (r460640) @@ -3,6 +3,7 @@ PORTNAME= prometheus PORTVERSION= 1.8.2 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= net-mgmt @@ -22,13 +23,20 @@ USE_RC_SUBR= prometheus USERS= prometheus GROUPS= prometheus -LD_FLAG_STRING= ${GO_PKGNAME}/vendor/github.com/prometheus/common/version. +BUILD_USER?= ${USER} +LD_FLAG_X_PREFIX= -X ${GO_PKGNAME}/vendor/github.com/prometheus/common/version +LD_FLAG_STRING= -s \ + ${LD_FLAG_X_PREFIX}.Version=${PORTVERSION} \ + ${LD_FLAG_X_PREFIX}.Revision=${PORTREVISION} \ + ${LD_FLAG_X_PREFIX}.Branch=release-${PORTVERSION:R} \ + ${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER} + do-build: - (cd ${GO_WRKSRC}/cmd/prometheus ; ${SETENV} ${GO_ENV} go install -ldflags \ - "-s -X ${LD_FLAG_STRING}.Version=${PORTVERSION}") + ( cd ${GO_WRKSRC}/cmd/prometheus ; \ + ${SETENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" ) - (cd ${GO_WRKSRC}/cmd/promtool ; ${SETENV} ${GO_ENV} go install -ldflags \ - "-s -X ${LD_FLAG_STRING}.Version=${PORTVERSION}") + ( cd ${GO_WRKSRC}/cmd/promtool ; \ + ${SETENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" ) do-install: ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/prometheus ${STAGEDIR}${PREFIX}/bin