From owner-svn-ports-head@freebsd.org Fri Sep 18 12:38:20 2020 Return-Path: Delivered-To: svn-ports-head@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 230C53E284D; Fri, 18 Sep 2020 12:38:20 +0000 (UTC) (envelope-from mandree@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BtCzw06ZNz4WnJ; Fri, 18 Sep 2020 12:38:20 +0000 (UTC) (envelope-from mandree@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 DC6171B2D8; Fri, 18 Sep 2020 12:38:19 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08ICcJQG075372; Fri, 18 Sep 2020 12:38:19 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08ICcJ1C075371; Fri, 18 Sep 2020 12:38:19 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202009181238.08ICcJ1C075371@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Fri, 18 Sep 2020 12:38:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548885 - head/net-mgmt/netdata X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: head/net-mgmt/netdata X-SVN-Commit-Revision: 548885 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Sep 2020 12:38:20 -0000 Author: mandree Date: Fri Sep 18 12:38:19 2020 New Revision: 548885 URL: https://svnweb.freebsd.org/changeset/ports/548885 Log: net-mgmt/netdata: fix pkg-plist @sample for ebpf_kernel_reject_list.txt. A @sample line with one file name argument that does not end in .sample would compare the file against itself and remove the configuration file even if modified in the pre-deinstall phase. Fix that. Bump PORTREVISION. Modified: head/net-mgmt/netdata/Makefile head/net-mgmt/netdata/pkg-plist Modified: head/net-mgmt/netdata/Makefile ============================================================================== --- head/net-mgmt/netdata/Makefile Fri Sep 18 12:14:30 2020 (r548884) +++ head/net-mgmt/netdata/Makefile Fri Sep 18 12:38:19 2020 (r548885) @@ -4,6 +4,7 @@ PORTNAME= netdata PORTVERSION= 1.24.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/ @@ -109,8 +110,9 @@ post-install: ${MKDIR} ${STAGEDIR}${NETDATA_CACHE} ${MKDIR} ${STAGEDIR}${NETDATA_LOG} ${MKDIR} ${STAGEDIR}${NETDATA_PERST} - (for fi in ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \ - ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*/*.conf; do \ + (for fi in ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \ + ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*/*.conf \ + ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.txt ; do \ ${MV} $$fi $$fi".sample"; \ done) Modified: head/net-mgmt/netdata/pkg-plist ============================================================================== --- head/net-mgmt/netdata/pkg-plist Fri Sep 18 12:14:30 2020 (r548884) +++ head/net-mgmt/netdata/pkg-plist Fri Sep 18 12:38:19 2020 (r548885) @@ -11,7 +11,7 @@ @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/opensips.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/sensors.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf_kernel_reject_list.txt +@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf_kernel_reject_list.txt.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/exporting.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/fping.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/adaptec_raid.conf.sample