CVS commit: pkgsrc/databases/prometheus

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jun 10 17:25:52 UTC 2024

Modified Files:
        pkgsrc/databases/prometheus: Makefile PLIST

Log Message:
prometheus: restore installation of react GUI

Noted by Marc Baudoin.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/databases/prometheus/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/databases/prometheus/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/prometheus/Makefile
diff -u pkgsrc/databases/prometheus/Makefile:1.101 pkgsrc/databases/prometheus/Makefile:1.102
--- pkgsrc/databases/prometheus/Makefile:1.101  Sun Jun  9 22:19:35 2024
+++ pkgsrc/databases/prometheus/Makefile        Mon Jun 10 17:25:52 2024
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.101 2024/06/09 22:19:35 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2024/06/10 17:25:52 wiz Exp $
 
 # Important: UI has to be manually built when updating. See instructions below.
 
 DISTNAME=      prometheus-2.52.1
+PKGREVISION=   1
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=prometheus/}
 CATEGORIES=    databases
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -12,8 +13,6 @@ HOMEPAGE=     https://prometheus.io/
 COMMENT=       The Prometheus monitoring system and time series database
 LICENSE=       apache-2.0
 
-.include "go-modules.mk"
-
 # How to rebuild UI after bumping version:
 # 1. install lang/nodejs (for the npm binary)
 # 2. comment out the DISTFILES=... line
@@ -36,6 +35,10 @@ REACT_UI_DIST=               ${DISTNAME}-react-ui.tar
 SITES.${REACT_UI_DIST}=        ${MASTER_SITE_LOCAL}
 # comment out this when running make update-ui
 DISTFILES=             ${DEFAULT_DISTFILES} ${REACT_UI_DIST}
+# go modules only extracts some files, but we need the react GUI extracted for installation
+GO_MODULE_EXTRACT=     ${REACT_UI_DIST}
+
+.include "go-modules.mk"
 
 GO_DIST_BASE=  ${DISTNAME}
 GO_SRCPATH=    github.com/prometheus/prometheus

Index: pkgsrc/databases/prometheus/PLIST
diff -u pkgsrc/databases/prometheus/PLIST:1.21 pkgsrc/databases/prometheus/PLIST:1.22
--- pkgsrc/databases/prometheus/PLIST:1.21      Sun May 12 19:52:45 2024
+++ pkgsrc/databases/prometheus/PLIST   Mon Jun 10 17:25:52 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2024/05/12 19:52:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2024/06/10 17:25:52 wiz Exp $
 bin/prometheus
 bin/promtool
 share/examples/prometheus/console_libraries/menu.lib
@@ -13,6 +13,16 @@ share/examples/prometheus/consoles/prome
 share/examples/prometheus/prometheus.yml
 share/prometheus/static/css/prom_console.css
 share/prometheus/static/js/prom_console.js
+share/prometheus/static/react/asset-manifest.json
+share/prometheus/static/react/favicon.ico
+share/prometheus/static/react/index.html
+share/prometheus/static/react/manifest.json
+share/prometheus/static/react/static/css/main.e075b686.css
+share/prometheus/static/react/static/js/main.87eaac7d.js
+share/prometheus/static/react/static/js/main.87eaac7d.js.LICENSE.txt
+share/prometheus/static/react/static/media/codicon.b3726f0165bf67ac6849.ttf
+share/prometheus/static/react/static/media/index.cd351d7c31d0d3fccf96.cjs
+share/prometheus/static/react/static/media/prometheus_logo_grey.3cf697e5443028ca5e5255b93c7906c5.svg
 share/prometheus/static/vendor/bootstrap-4.5.2/css/bootstrap-grid.css
 share/prometheus/static/vendor/bootstrap-4.5.2/css/bootstrap-grid.css.map
 share/prometheus/static/vendor/bootstrap-4.5.2/css/bootstrap-grid.min.css