pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/prometheus prometheus: don't install sample ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4c19cb2299c5
branches:  trunk
changeset: 441496:4c19cb2299c5
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Nov 04 21:53:18 2020 +0000

description:
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.

diffstat:

 databases/prometheus/Makefile |  9 ++++++---
 databases/prometheus/PLIST    |  5 +----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (46 lines):

diff -r c3626501b3c7 -r 4c19cb2299c5 databases/prometheus/Makefile
--- a/databases/prometheus/Makefile     Wed Nov 04 21:46:53 2020 +0000
+++ b/databases/prometheus/Makefile     Wed Nov 04 21:53:18 2020 +0000
@@ -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+=        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 @@
 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
diff -r c3626501b3c7 -r 4c19cb2299c5 databases/prometheus/PLIST
--- a/databases/prometheus/PLIST        Wed Nov 04 21:46:53 2020 +0000
+++ b/databases/prometheus/PLIST        Wed Nov 04 21:53:18 2020 +0000
@@ -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



Home | Main Index | Thread Index | Old Index