summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2020-11-04 21:53:18 +0000
committertnn <tnn@pkgsrc.org>2020-11-04 21:53:18 +0000
commit462bca7dc4e27c24b7778b58aa089a7ae79c93ca (patch)
treeb4e51b6f5bfdbd6df8d02c4ccef4f603dd32d722 /databases
parentc81e6292bde4010a41d4f1db12913b79c23314db (diff)
downloadpkgsrc-462bca7dc4e27c24b7778b58aa089a7ae79c93ca.tar.gz
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 (limited to 'databases')
-rw-r--r--databases/prometheus/Makefile9
-rw-r--r--databases/prometheus/PLIST5
2 files changed, 7 insertions, 7 deletions
diff --git a/databases/prometheus/Makefile b/databases/prometheus/Makefile
index c1ed778ea61..ca6c4c7f2b4 100644
--- a/databases/prometheus/Makefile
+++ b/databases/prometheus/Makefile
@@ -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.example consoles/node-cpu.html \
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_SYSCONFDIR}/${f}
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 --git a/databases/prometheus/PLIST b/databases/prometheus/PLIST
index 78cefb66f1d..51314d513a2 100644
--- a/databases/prometheus/PLIST
+++ b/databases/prometheus/PLIST
@@ -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