From owner-svn-ports-head@freebsd.org Mon Jul 2 13:47:42 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A07F1029D1C; Mon, 2 Jul 2018 13:47:42 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F0894896D2; Mon, 2 Jul 2018 13:47:41 +0000 (UTC) (envelope-from mat@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 CD255649E; Mon, 2 Jul 2018 13:47:41 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w62Dlf7M033316; Mon, 2 Jul 2018 13:47:41 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w62DleN5033307; Mon, 2 Jul 2018 13:47:40 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201807021347.w62DleN5033307@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 2 Jul 2018 13:47:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473739 - in head/sysutils: munin-common munin-common/files munin-node X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/sysutils: munin-common munin-common/files munin-node X-SVN-Commit-Revision: 473739 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.27 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: Mon, 02 Jul 2018 13:47:42 -0000 Author: mat Date: Mon Jul 2 13:47:40 2018 New Revision: 473739 URL: https://svnweb.freebsd.org/changeset/ports/473739 Log: Update to 2.0.38. Sponsored by: Absolight Modified: head/sysutils/munin-common/distinfo (contents, props changed) head/sysutils/munin-common/files/patch-Makefile (contents, props changed) head/sysutils/munin-common/files/patch-Makefile.config (contents, props changed) head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in (contents, props changed) head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_memory.in (contents, props changed) head/sysutils/munin-common/munin.mk head/sysutils/munin-node/Makefile (contents, props changed) Modified: head/sysutils/munin-common/distinfo ============================================================================== --- head/sysutils/munin-common/distinfo Mon Jul 2 13:40:14 2018 (r473738) +++ head/sysutils/munin-common/distinfo Mon Jul 2 13:47:40 2018 (r473739) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522752589 -SHA256 (munin-2.0.37.tar.gz) = aa93bd3415fc52e4c3b1c2fff58ec078e5d42fdc7202d38a8546bef97fcbd5b4 -SIZE (munin-2.0.37.tar.gz) = 2242442 +TIMESTAMP = 1530519300 +SHA256 (munin-2.0.38.tar.gz) = ee44c8c5e0a0a08c0378a7bd324b3bfa50bf84eef77760d2c20c21059fdb3099 +SIZE (munin-2.0.38.tar.gz) = 2246848 Modified: head/sysutils/munin-common/files/patch-Makefile ============================================================================== --- head/sysutils/munin-common/files/patch-Makefile Mon Jul 2 13:40:14 2018 (r473738) +++ head/sysutils/munin-common/files/patch-Makefile Mon Jul 2 13:47:40 2018 (r473739) @@ -1,4 +1,4 @@ ---- Makefile.orig 2017-03-03 00:02:39 UTC +--- Makefile.orig 2018-06-29 00:50:01 UTC +++ Makefile @@ -68,60 +68,47 @@ install: install-master-prime install-co @@ -88,7 +88,7 @@ # Not ready to be installed yet # $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/ -@@ -139,33 +126,29 @@ endif +@@ -131,36 +118,30 @@ install-node-plugins: install-plugins-pr install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config @$(CHECKGROUP) @@ -105,6 +105,8 @@ + mkdir -p $(DESTDIR)$(LIBDIR)/plugins + mkdir -p $(DESTDIR)$(PLUGSTATE) + @# Process the OS specific plugins at the end. Otherwise they would be overridden by the + @# generic ones. for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \ if test -f "$$p" ; then \ echo Installing $$p; \ @@ -112,10 +114,10 @@ + $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ fi \ done -- $(HPUXONLY) mv $(LIBDIR)/plugins/*.adv $(LIBDIR) +- @# Some HP-UX plugins need *.adv support files in LIBDIR +- if [ "$(OSTYPE)" = "hp-ux" ]; then mv $(LIBDIR)/plugins/*.adv $(LIBDIR); done - $(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/ - $(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/ -+ $(HPUXONLY) mv $(DESTDIR)$(LIBDIR)/plugins/*.adv $(DESTDIR)$(LIBDIR) + $(INSTALL) -m 0644 build/plugins/plugins.history $(DESTDIR)$(LIBDIR)/plugins/ + $(INSTALL) -m 0644 build/plugins/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/ @@ -134,7 +136,7 @@ fi \ done -@@ -176,14 +159,14 @@ install-plugins-java: build-plugins-java +@@ -171,14 +152,14 @@ install-plugins-java: build-plugins-java install-async-prime: install-async install-async: @@ -153,7 +155,7 @@ install-common-prime: build-common install-common -@@ -449,7 +432,7 @@ t/install: +@@ -444,7 +425,7 @@ t/install: # This builds */Build from Build.PL %/Build: %/Build.PL @@ -162,7 +164,7 @@ build-%: %/Build cd $* && $(PERL) Build -@@ -466,6 +449,7 @@ install-%: %/Build +@@ -461,6 +442,7 @@ install-%: %/Build --install_path sbin=$(SBINDIR) \ --install_path bindoc=$(MANDIR)/man1 \ --install_path libdoc=$(MANDIR)/man3 \ Modified: head/sysutils/munin-common/files/patch-Makefile.config ============================================================================== --- head/sysutils/munin-common/files/patch-Makefile.config Mon Jul 2 13:40:14 2018 (r473738) +++ head/sysutils/munin-common/files/patch-Makefile.config Mon Jul 2 13:47:40 2018 (r473739) @@ -69,7 +69,7 @@ +PERL := /usr/local/bin/perl # The python interpreter to use (used by some plugins) --PYTHON := /usr/bin/env python +-PYTHON := /usr/bin/env python3 +PYTHON := /usr/local/bin/python # The ruby interpreter to use (used by some plugins) Modified: head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in ============================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in Mon Jul 2 13:40:14 2018 (r473738) +++ head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in Mon Jul 2 13:47:40 2018 (r473739) @@ -1,11 +1,11 @@ ---- plugins/node.d.freebsd/df.in.orig 2016-12-04 19:34:49 UTC +--- plugins/node.d.freebsd/df.in.orig 2018-06-29 00:50:01 UTC +++ plugins/node.d.freebsd/df.in @@ -24,7 +24,7 @@ if [ "$1" = "autoconf" ]; then exit 0 fi --EXCLUDEDFS="-t noprocfs,devfs,fdescfs,linprocfs,linsysfs,nfs,nullfs" -+EXCLUDEDFS="-t noprocfs,devfs,fdescfs,linprocfs,linsysfs,nfs,nullfs,autofs" +-EXCLUDEDFS="-t noprocfs,devfs,fdescfs,linprocfs,linsysfs,sysfs,nfs,nullfs" ++EXCLUDEDFS="-t noprocfs,devfs,fdescfs,linprocfs,linsysfs,sysfs,nfs,nullfs,autofs" if [ $(uname -s) = "GNU/kFreeBSD" ]; then - EXCLUDEDFS=$(echo $EXCLUDEDFS | sed 's/^-t /-x /; s/,/ -x /g') + # Debian ships df from GNU coreutils Modified: head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_memory.in ============================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_memory.in Mon Jul 2 13:40:14 2018 (r473738) +++ head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_memory.in Mon Jul 2 13:47:40 2018 (r473739) @@ -1,8 +1,8 @@ ---- plugins/node.d.freebsd/memory.in.orig 2014-11-24 21:46:24 UTC +--- plugins/node.d.freebsd/memory.in.orig 2018-06-29 00:50:01 UTC +++ plugins/node.d.freebsd/memory.in -@@ -74,4 +74,4 @@ echo wired.value $(($WIRED_COUNT*$PAGESI - echo buffers.value $(($BUFFERS_COUNT)) - echo cached.value $(($CACHE_COUNT*$PAGESIZE)) +@@ -93,4 +93,4 @@ if [ -n "$LAUNDRY_COUNT" ]; then + echo "laundry.value $(( LAUNDRY_COUNT * PAGESIZE ))" + fi echo free.value $(($FREE_COUNT*$PAGESIZE)) -echo swap.value $(swapinfo -k | awk '{sum += $3}; END {print sum * 1024}') +echo swap.value $(swapinfo -k | awk '!/^Total/ && !/^Device/ {sum += $3}; END {print sum * 1024}') Modified: head/sysutils/munin-common/munin.mk ============================================================================== --- head/sysutils/munin-common/munin.mk Mon Jul 2 13:40:14 2018 (r473738) +++ head/sysutils/munin-common/munin.mk Mon Jul 2 13:47:40 2018 (r473739) @@ -1,6 +1,6 @@ LICENSE= GPLv2 -MUNIN_VERSION= 2.0.37 +MUNIN_VERSION= 2.0.38 MUNIN_SITES= http://downloads.munin-monitoring.org/munin/stable/${MUNIN_VERSION}/ DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/files Modified: head/sysutils/munin-node/Makefile ============================================================================== --- head/sysutils/munin-node/Makefile Mon Jul 2 13:40:14 2018 (r473738) +++ head/sysutils/munin-node/Makefile Mon Jul 2 13:47:40 2018 (r473739) @@ -3,7 +3,7 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -node