svn commit: r526346 - in head/net-mgmt/netdata: . files

[Kubilay Kocak]

Author: koobs
Date: Mon Feb 17 06:58:48 2020
New Revision: 526346
URL: https://svnweb.freebsd.org/changeset/ports/526346

Log:
  net-mgmt/netdata: Honour/respect default Python version
  
  PR:		243567
  Reviewed by:	mat, koobs (python)
  Approved by:	portmgr (blanket: run time bug fix, ports (Python) compliance)
  MFH:		2020Q1
  Differential Revision:	D22909

Modified:
  head/net-mgmt/netdata/Makefile
  head/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in

Modified: head/net-mgmt/netdata/Makefile
==============================================================================
--- head/net-mgmt/netdata/Makefile	Mon Feb 17 06:44:14 2020	(r526345)
+++ head/net-mgmt/netdata/Makefile	Mon Feb 17 06:58:48 2020	(r526346)
@@ -4,6 +4,7 @@
 PORTNAME=	netdata
 PORTVERSION=	1.19.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	mmokhi at 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}

Modified: head/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in
==============================================================================
--- head/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in	Mon Feb 17 06:44:14 2020	(r526345)
+++ head/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in	Mon Feb 17 06:58:48 2020	(r526346)
@@ -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