Date: Wed, 12 Apr 2017 12:39:56 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438352 - in head/sysutils: munin-common munin-common/files munin-node Message-ID: <201704121239.v3CCduxM027533@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Apr 12 12:39:56 2017 New Revision: 438352 URL: https://svnweb.freebsd.org/changeset/ports/438352 Log: Update to 2.0.33. Add a PYTHON option to appease stage-qa. 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/munin.mk head/sysutils/munin-node/Makefile (contents, props changed) head/sysutils/munin-node/pkg-plist (contents, props changed) Modified: head/sysutils/munin-common/distinfo ============================================================================== --- head/sysutils/munin-common/distinfo Wed Apr 12 12:07:42 2017 (r438351) +++ head/sysutils/munin-common/distinfo Wed Apr 12 12:39:56 2017 (r438352) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488445467 -SHA256 (munin-2.0.32.tar.gz) = 132ed808f637af661b5ec8d51415638a53d175a8e0ab10878b89a28f67d018a8 -SIZE (munin-2.0.32.tar.gz) = 1342572 +TIMESTAMP = 1491998294 +SHA256 (munin-2.0.33.tar.gz) = 1c6f994bf62d6dee89554efba0733b6f96d4130ba906162c32f77587088974c4 +SIZE (munin-2.0.33.tar.gz) = 1342564 Modified: head/sysutils/munin-common/files/patch-Makefile ============================================================================== --- head/sysutils/munin-common/files/patch-Makefile Wed Apr 12 12:07:42 2017 (r438351) +++ head/sysutils/munin-common/files/patch-Makefile Wed Apr 12 12:39:56 2017 (r438352) @@ -1,4 +1,4 @@ ---- Makefile.orig 2014-11-24 21:46:24 UTC +--- Makefile.orig 2017-03-03 00:02:39 UTC +++ Makefile @@ -68,60 +68,47 @@ install: install-master-prime install-co @@ -153,6 +153,15 @@ install-common-prime: build-common install-common +@@ -449,7 +432,7 @@ t/install: + + # This builds */Build from Build.PL + %/Build: %/Build.PL +- cd $* && $(PERL) Build.PL ++ cd $* && $(PERL) Build.PL --config perl=$(PERL) + + build-%: %/Build + cd $* && $(PERL) Build @@ -466,6 +449,7 @@ install-%: %/Build --install_path sbin=$(SBINDIR) \ --install_path bindoc=$(MANDIR)/man1 \ Modified: head/sysutils/munin-common/munin.mk ============================================================================== --- head/sysutils/munin-common/munin.mk Wed Apr 12 12:07:42 2017 (r438351) +++ head/sysutils/munin-common/munin.mk Wed Apr 12 12:39:56 2017 (r438352) @@ -1,4 +1,4 @@ -MUNIN_VERSION= 2.0.32 +MUNIN_VERSION= 2.0.33 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 Wed Apr 12 12:07:42 2017 (r438351) +++ head/sysutils/munin-node/Makefile Wed Apr 12 12:39:56 2017 (r438352) @@ -35,12 +35,13 @@ ALL_TARGET= build-node build-plugins bui INSTALL_TARGET= install-node-prime install-async-prime install-plugins-prime NO_ARCH= yes -OPTIONS_DEFINE= SNMP PERL JAVA -OPTIONS_DEFAULT= SNMP PERL +OPTIONS_DEFINE= SNMP PERL PYTHON JAVA +OPTIONS_DEFAULT= SNMP PERL PYTHON OPTIONS_SUB= yes SNMP_DESC= Include SNMP plugins PERL_DESC= Include all Perl modules (adds dependencies) JAVA_DESC= Include JAVA plugins +PYTHON_DESC= Include Python plugins SNMP_BUILD_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP SNMP_RUN_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP @@ -48,6 +49,7 @@ PERL_RUN_DEPENDS= p5-DBD-Pg>=0:databases p5-Net-DNS>=0:dns/p5-Net-DNS \ p5-XML-Parser>=0:textproc/p5-XML-Parser \ p5-XML-LibXML>=0:textproc/p5-XML-LibXML +PYTHON_USES= python JAVA_USE= java=yes JAVA_INSTALL_TARGET= install-plugins-java JAVA_BUILD= yes Modified: head/sysutils/munin-node/pkg-plist ============================================================================== --- head/sysutils/munin-node/pkg-plist Wed Apr 12 12:07:42 2017 (r438351) +++ head/sysutils/munin-node/pkg-plist Wed Apr 12 12:39:56 2017 (r438352) @@ -115,7 +115,7 @@ sbin/munin-sched %%DATADIR%%/plugins/iostat %%DATADIR%%/plugins/ipac-ng %%DATADIR%%/plugins/ipmi_ -%%DATADIR%%/plugins/ipmi_sensor_ +%%PYTHON%%%%DATADIR%%/plugins/ipmi_sensor_ %%DATADIR%%/plugins/ircu %%JAVA%%%%DATADIR%%/plugins/jmx_ %%JAVA%%%%DATADIR%%/plugins/jmx_tomcat_dbpools @@ -200,7 +200,7 @@ sbin/munin-sched %%DATADIR%%/plugins/slapd_ %%DATADIR%%/plugins/slapd_bdb_cache_ %%PERL%%%%DATADIR%%/plugins/slony_lag_ -%%DATADIR%%/plugins/smart_ +%%PYTHON%%%%DATADIR%%/plugins/smart_ %%SNMP%%%%DATADIR%%/plugins/snmp__cpuload %%SNMP%%%%DATADIR%%/plugins/snmp__df %%SNMP%%%%DATADIR%%/plugins/snmp__df_ram
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704121239.v3CCduxM027533>