CVS commit: pkgsrc/databases/prometheus

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Nov  4 21:53:18 UTC 2020

Modified Files:
        pkgsrc/databases/prometheus: Makefile PLIST

Log Message:
prometheus: don't install sample binaries. Bump PKGREVISION.

These binaries are not installed in the official binary distributions.
We probably installed them as a side effect of using pax(1) to copy the
whole bin/ directory. Use ${INSTALL_PROGRAM} instead.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/databases/prometheus/Makefile
cvs rdiff -u -r1.5 -r1.6 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.34 pkgsrc/databases/prometheus/Makefile:1.35
--- pkgsrc/databases/prometheus/Makefile:1.34   Tue Oct 20 09:56:52 2020
+++ pkgsrc/databases/prometheus/Makefile        Wed Nov  4 21:53:18 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2020/10/20 09:56:52 adam Exp $
+# $NetBSD: Makefile,v 1.35 2020/11/04 21:53:18 tnn Exp $
 
 DISTNAME=      prometheus-2.22.0
+PKGREVISION=   1
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=prometheus/}
 CATEGORIES=    databases
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -38,7 +39,7 @@ EXAMPLE_FILES+=       consoles/index.html.exam
 EXAMPLE_FILES+=        console_libraries/menu.lib console_libraries/prom.lib
 WEBUI_DIR=     ${PREFIX}/share/prometheus
 
-INSTALLATION_DIRS+=    ${PREFIX}/${EXAMPLE_DIR} ${WEBUI_DIR}
+INSTALLATION_DIRS+=    bin ${EXAMPLE_DIR} ${WEBUI_DIR}
 
 .for f in ${EXAMPLE_FILES}
 CONF_FILES+=   ${EXAMPLE_DIR}/${f} ${PKG_SYSCONFDIR}/${f}
@@ -47,7 +48,9 @@ CONF_FILES+=  ${EXAMPLE_DIR}/${f} ${PKG_S
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/documentation/examples/prometheus.yml \
                ${DESTDIR}${PREFIX}/${EXAMPLE_DIR}
-       cd ${WRKDIR} && ${PAX} -rw bin ${DESTDIR}${PREFIX}
+.for f in prometheus promtool
+       ${INSTALL_PROGRAM} ${WRKDIR}/bin/${f} ${DESTDIR}${PREFIX}/bin
+.endfor
 .for f in consoles console_libraries
        cd ${WRKSRC} && ${PAX} -rw ${f} ${DESTDIR}${PREFIX}/${EXAMPLE_DIR}
 .endfor

Index: pkgsrc/databases/prometheus/PLIST
diff -u pkgsrc/databases/prometheus/PLIST:1.5 pkgsrc/databases/prometheus/PLIST:1.6
--- pkgsrc/databases/prometheus/PLIST:1.5       Wed Sep 30 13:12:20 2020
+++ pkgsrc/databases/prometheus/PLIST   Wed Nov  4 21:53:18 2020
@@ -1,9 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2020/09/30 13:12:20 adam Exp $
-bin/adapter-usage
-bin/example_write_adapter
+@comment $NetBSD: PLIST,v 1.6 2020/11/04 21:53:18 tnn Exp $
 bin/prometheus
 bin/promtool
-bin/remote_storage_adapter
 share/examples/prometheus/console_libraries/menu.lib
 share/examples/prometheus/console_libraries/prom.lib
 share/examples/prometheus/consoles/index.html.example