Date: Wed, 13 Nov 2019 21:43:55 +0000 (UTC) From: Dmitri Goutnik <dmgk@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517390 - head/net-mgmt/prometheus2 Message-ID: <201911132143.xADLhtNM071180@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dmgk Date: Wed Nov 13 21:43:55 2019 New Revision: 517390 URL: https://svnweb.freebsd.org/changeset/ports/517390 Log: net-mgmt/prometheus2: Add missing frontend files Pull in pre-compiled assets from the ports-assets/net-mgmt_prometheus2 GitHub repository and use them when compiling Prometheus, enabling the new UI to function properly. While here, remove GO_PKGNAME which is not needed with USES=go:modules. PR: 241925 Submitted by: David O'Rourke <dor.bsd@xm0.uk> (maintainer) Approved by: tz (mentor, implicit) Modified: head/net-mgmt/prometheus2/Makefile head/net-mgmt/prometheus2/distinfo Modified: head/net-mgmt/prometheus2/Makefile ============================================================================== --- head/net-mgmt/prometheus2/Makefile Wed Nov 13 21:41:51 2019 (r517389) +++ head/net-mgmt/prometheus2/Makefile Wed Nov 13 21:43:55 2019 (r517390) @@ -3,6 +3,7 @@ PORTNAME= prometheus DISTVERSIONPREFIX= v DISTVERSION= 2.14.0 +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= dor.bsd@xm0.uk @@ -12,11 +13,12 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules gmake + USE_GITHUB= yes +GH_TUPLE= ports-assets:net-mgmt_prometheus2:${DISTVERSIONFULL}:assets + USE_RC_SUBR= prometheus -GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} - OPTIONS_DEFINE= DOCS PROMETHEUS_USER?= prometheus @@ -57,12 +59,17 @@ LD_FLAG_STRING= -s \ ${LD_FLAG_X_PREFIX}.Branch=release-${PORTVERSION:R} \ ${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER} -GO_BUILDFLAGS= -v -ldflags "${LD_FLAG_STRING}" +GO_BUILDFLAGS= -v -ldflags "${LD_FLAG_STRING}" -tags netgo,builtinassets + # A tsdb binary already exists in databases/opentsdb. Rename ours to # avoid issues. GO_TARGET= ./cmd/prometheus \ ./cmd/promtool \ ./tsdb/cmd/tsdb:promtsdb + +post-patch: + @${LN} -s ${WRKSRC_assets}/web/ui/assets_vfsdata.go \ + ${WRKSRC}/web/ui/assets_vfadata.go post-install: ${INSTALL_DATA} \ Modified: head/net-mgmt/prometheus2/distinfo ============================================================================== --- head/net-mgmt/prometheus2/distinfo Wed Nov 13 21:41:51 2019 (r517389) +++ head/net-mgmt/prometheus2/distinfo Wed Nov 13 21:43:55 2019 (r517390) @@ -1,3 +1,5 @@ -TIMESTAMP = 1573508793 +TIMESTAMP = 1573669930 SHA256 (prometheus-prometheus-v2.14.0_GH0.tar.gz) = 5c40de1961997996ef5b59561a78116a9548235bc77305c05f214b6319a0284d SIZE (prometheus-prometheus-v2.14.0_GH0.tar.gz) = 12755125 +SHA256 (ports-assets-net-mgmt_prometheus2-v2.14.0_GH0.tar.gz) = b1ee6c5b77d5e88074726e1fe96c6321ad16410a0331cb2d033eeff815da441e +SIZE (ports-assets-net-mgmt_prometheus2-v2.14.0_GH0.tar.gz) = 5077609
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911132143.xADLhtNM071180>