CVS commit: pkgsrc/databases/prometheus

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jan  4 09:57:19 UTC 2021

Modified Files:
        pkgsrc/databases/prometheus: Makefile PLIST distinfo
Removed Files:
        pkgsrc/databases/prometheus/files/react: asset-manifest.json
            favicon.ico index.html manifest.json
            precache-manifest.600e18226bdf38566b4336cf73cd409f.js
            service-worker.js
        pkgsrc/databases/prometheus/files/react/static/css:
            2.3cee880a.chunk.css 2.3cee880a.chunk.css.map
            main.1087ae1e.chunk.css main.1087ae1e.chunk.css.map
        pkgsrc/databases/prometheus/files/react/static/js: 2.57113e20.chunk.js
            2.57113e20.chunk.js.LICENSE.txt 2.57113e20.chunk.js.map
            main.ca4ac742.chunk.js main.ca4ac742.chunk.js.map
            runtime-main.7e00e584.js runtime-main.7e00e584.js.map

Log Message:
prometheus: use LOCAL_PORTS distfile for React UI as suggested by @jperkin


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/databases/prometheus/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/prometheus/PLIST
cvs rdiff -u -r1.22 -r1.23 pkgsrc/databases/prometheus/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/prometheus/files/react/asset-manifest.json \
    pkgsrc/databases/prometheus/files/react/favicon.ico \
    pkgsrc/databases/prometheus/files/react/index.html \
    pkgsrc/databases/prometheus/files/react/manifest.json \
    pkgsrc/databases/prometheus/files/react/precache-manifest.600e18226bdf38566b4336cf73cd409f.js \
    pkgsrc/databases/prometheus/files/react/service-worker.js
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/prometheus/files/react/static/css/2.3cee880a.chunk.css \
    pkgsrc/databases/prometheus/files/react/static/css/2.3cee880a.chunk.css.map \
    pkgsrc/databases/prometheus/files/react/static/css/main.1087ae1e.chunk.css \
    pkgsrc/databases/prometheus/files/react/static/css/main.1087ae1e.chunk.css.map
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/prometheus/files/react/static/js/2.57113e20.chunk.js \
    pkgsrc/databases/prometheus/files/react/static/js/2.57113e20.chunk.js.LICENSE.txt \
    pkgsrc/databases/prometheus/files/react/static/js/2.57113e20.chunk.js.map \
    pkgsrc/databases/prometheus/files/react/static/js/main.ca4ac742.chunk.js \
    pkgsrc/databases/prometheus/files/react/static/js/main.ca4ac742.chunk.js.map \
    pkgsrc/databases/prometheus/files/react/static/js/runtime-main.7e00e584.js \
    pkgsrc/databases/prometheus/files/react/static/js/runtime-main.7e00e584.js.map

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.42 pkgsrc/databases/prometheus/Makefile:1.43
--- pkgsrc/databases/prometheus/Makefile:1.42   Mon Jan  4 08:06:51 2021
+++ pkgsrc/databases/prometheus/Makefile        Mon Jan  4 09:57:18 2021
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2021/01/04 08:06:51 adam Exp $
+# $NetBSD: Makefile,v 1.43 2021/01/04 09:57:18 adam Exp $
 
-# Important: UI has to be manually built. See pre-configure below.
+# Important: UI has to be manually built. See instructions below.
 
 DISTNAME=      prometheus-2.23.0
-PKGREVISION=   1
+PKGREVISION=   2
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=prometheus/}
 CATEGORIES=    databases
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -13,6 +13,19 @@ HOMEPAGE=    https://prometheus.io/
 COMMENT=       The Prometheus monitoring system and time series database
 LICENSE=       apache-2.0
 
+# To generate UI distfile, install devel/yarn, and:
+# tar zxf ${DISTNAME}${EXTRACT_SUFX}
+# cd web/ui/react-app
+# yarn --frozen-lockfile
+# env PUBLIC_URL=. yarn build
+# chmod -x build/favicon.ico build/manifest.json
+# mv build ../static/react
+# cd ../../../..
+# tar zcf ${DISTNAME}-react-ui.tar.gz ${DISTNAME}/web/ui/static/react
+REACT_UI_DIST=         ${DISTNAME}-react-ui.tar.gz
+SITES.${REACT_UI_DIST}=        ${MASTER_SITE_LOCAL}
+DISTFILES=             ${DEFAULT_DISTFILES} ${REACT_UI_DIST}
+
 GO_DIST_BASE=  ${DISTNAME}
 GO_SRCPATH=    github.com/prometheus/prometheus
 
@@ -47,16 +60,6 @@ INSTALLATION_DIRS+=  bin ${EXAMPLE_DIR} $
 CONF_FILES+=   ${EXAMPLE_DIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
-# Requirement: devel/yarn
-# cd ${WRKSRC}/web/ui/react-app
-# yarn
-# env PUBLIC_URL=. yarn build
-# rm -r ${FILESDIR}/react
-# mv build ${FILESDIR}/react
-pre-configure:
-       cd ${FILESDIR} && \
-       ${PAX} -rw -s '|.*/CVS/.*||' react ${WRKSRC}/web/ui/static/
-
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/documentation/examples/prometheus.yml \
                ${DESTDIR}${PREFIX}/${EXAMPLE_DIR}

Index: pkgsrc/databases/prometheus/PLIST
diff -u pkgsrc/databases/prometheus/PLIST:1.7 pkgsrc/databases/prometheus/PLIST:1.8
--- pkgsrc/databases/prometheus/PLIST:1.7       Mon Jan  4 08:06:51 2021
+++ pkgsrc/databases/prometheus/PLIST   Mon Jan  4 09:57:18 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2021/01/04 08:06:51 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2021/01/04 09:57:18 adam Exp $
 bin/prometheus
 bin/promtool
 share/examples/prometheus/console_libraries/menu.lib
@@ -30,17 +30,17 @@ share/prometheus/static/react/asset-mani
 share/prometheus/static/react/favicon.ico
 share/prometheus/static/react/index.html
 share/prometheus/static/react/manifest.json
-share/prometheus/static/react/precache-manifest.600e18226bdf38566b4336cf73cd409f.js
+share/prometheus/static/react/precache-manifest.828fa8b4a6426c96d67ae897b0476bc3.js
 share/prometheus/static/react/service-worker.js
 share/prometheus/static/react/static/css/2.3cee880a.chunk.css
 share/prometheus/static/react/static/css/2.3cee880a.chunk.css.map
 share/prometheus/static/react/static/css/main.1087ae1e.chunk.css
 share/prometheus/static/react/static/css/main.1087ae1e.chunk.css.map
-share/prometheus/static/react/static/js/2.57113e20.chunk.js
-share/prometheus/static/react/static/js/2.57113e20.chunk.js.LICENSE.txt
-share/prometheus/static/react/static/js/2.57113e20.chunk.js.map
-share/prometheus/static/react/static/js/main.ca4ac742.chunk.js
-share/prometheus/static/react/static/js/main.ca4ac742.chunk.js.map
+share/prometheus/static/react/static/js/2.3336a8d7.chunk.js
+share/prometheus/static/react/static/js/2.3336a8d7.chunk.js.LICENSE.txt
+share/prometheus/static/react/static/js/2.3336a8d7.chunk.js.map
+share/prometheus/static/react/static/js/main.21929202.chunk.js
+share/prometheus/static/react/static/js/main.21929202.chunk.js.map
 share/prometheus/static/react/static/js/runtime-main.7e00e584.js
 share/prometheus/static/react/static/js/runtime-main.7e00e584.js.map
 share/prometheus/static/vendor/bootstrap-4.5.2/css/bootstrap-grid.css

Index: pkgsrc/databases/prometheus/distinfo
diff -u pkgsrc/databases/prometheus/distinfo:1.22 pkgsrc/databases/prometheus/distinfo:1.23
--- pkgsrc/databases/prometheus/distinfo:1.22   Thu Dec 10 16:35:24 2020
+++ pkgsrc/databases/prometheus/distinfo        Mon Jan  4 09:57:18 2021
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.22 2020/12/10 16:35:24 adam Exp $
+$NetBSD: distinfo,v 1.23 2021/01/04 09:57:18 adam Exp $
 
+SHA1 (prometheus-2.23.0-react-ui.tar.gz) = df5b9f951a570098db4bc9594838cce0b1ff15d9
+RMD160 (prometheus-2.23.0-react-ui.tar.gz) = ea464302d486bf00c1052f6997e5280dd6b7318a
+SHA512 (prometheus-2.23.0-react-ui.tar.gz) = 4a8a31aef5c4cdf9bf6603d986322938fdc9285d04a8d7e68fe22df0d6a9e03485bff3842b56496f277ff57fa09b7428981f5752ad70969d5c7be8e3b032a3c4
+Size (prometheus-2.23.0-react-ui.tar.gz) = 1682235 bytes
 SHA1 (prometheus-2.23.0.tar.gz) = c3b38b45f0496fe7b44d6b45c51586d977fbb24c
 RMD160 (prometheus-2.23.0.tar.gz) = 1839944d9607f3b046eee995381e1dee64220747
 SHA512 (prometheus-2.23.0.tar.gz) = cac78a69db38efc112bf6415623ba6b59c259d4e77c29f4e3d98df3d0aebf701f245a08f327b1ca3336fb72a1da3ef4c86c322831de2f095c342d67b111f7d6d