cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r526346 net-mgmt/netdata: Honour/respect default Python version

Browse Source 
PR:		243567
Reviewed by:	mat, koobs (python)
Approved by:	portmgr (blanket: run time bug fix, ports (Python) compliance)
Differential Revision:	D22909

Approved by:	ports-secteam (blanket: run time bug fix, ports (Python) compliance)
This commit is contained in:
Kubilay Kocak 2020-02-17 07:00:50 +00:00
parent 2b059e7583
commit d5c41481d9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q1/; revision=526347
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net-mgmt/netdata/Makefile
View File

@ -4,6 +4,7 @@
PORTNAME= netdata
PORTVERSION= 1.19.0
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= net-mgmt
MAINTAINER= mmokhi@FreeBSD.org
@ -88,6 +89,8 @@ post-patch:
${PATCH_WRKSRC}/configure.ac
@${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|g' \
${PATCH_WRKSRC}/configure.ac
@${REINPLACE_CMD} -e 's|%%PYTHON%%|${PYTHON_CMD}|g' \
${PATCH_WRKSRC}/collectors/python.d.plugin/python.d.plugin.in
post-install:
${MKDIR} ${STAGEDIR}${ETCDIR}

6
net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in
View File

@ -1,10 +1,10 @@
--- collectors/python.d.plugin/python.d.plugin.in.orig 2019-10-10 13:13:19 UTC
--- collectors/python.d.plugin/python.d.plugin.in.orig 2020-01-30 23:22:27 UTC
+++ collectors/python.d.plugin/python.d.plugin.in
@@ -1,6 +1,6 @@
#!/usr/local/bin/bash
#!/usr/bin/env bash
'''':;
-pybinary=$(which python || which python3 || which python2)
+pybinary=$(which python || which python3.6 || which python2.7)
+pybinary=%%PYTHON%%
filtered=()
for arg in "$@"
do