From owner-svn-ports-all@freebsd.org Mon Feb 17 06:58:49 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4336624F860; Mon, 17 Feb 2020 06:58:49 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48LZZx15x4z4fXK; Mon, 17 Feb 2020 06:58:49 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1EA1E2D91; Mon, 17 Feb 2020 06:58:49 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01H6wn77075981; Mon, 17 Feb 2020 06:58:49 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01H6wmND075979; Mon, 17 Feb 2020 06:58:48 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <202002170658.01H6wmND075979@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Mon, 17 Feb 2020 06:58:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526346 - in head/net-mgmt/netdata: . files X-SVN-Group: ports-head X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: in head/net-mgmt/netdata: . files X-SVN-Commit-Revision: 526346 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Feb 2020 06:58:49 -0000 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@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