5 files changed, 20 insertions, 9 deletions

diff --git a/sysutils/munin-common/distinfo b/sysutils/munin-common/distinfo
index 19ff6e2c600b..ee57bc9e09ac 100644
--- a/sysutils/munin-common/distinfo
+++ b/sysutils/munin-common/distinfo
@@ -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
diff --git a/sysutils/munin-common/files/patch-Makefile b/sysutils/munin-common/files/patch-Makefile
index 7a9536c8c7a8..b9907103e0f0 100644
--- a/sysutils/munin-common/files/patch-Makefile
+++ b/sysutils/munin-common/files/patch-Makefile
@@ -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	\
diff --git a/sysutils/munin-common/munin.mk b/sysutils/munin-common/munin.mk
index 31463dd13527..3eb8038d86b7 100644
--- a/sysutils/munin-common/munin.mk
+++ b/sysutils/munin-common/munin.mk
@@ -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
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index e6ae713624a4..6dcd734b54fb 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -35,12 +35,13 @@ ALL_TARGET=	build-node build-plugins build/node/_bin/munin-async build/node/_bin
 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-DBD-Pg \
 		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
diff --git a/sysutils/munin-node/pkg-plist b/sysutils/munin-node/pkg-plist
index 1d6c5ca6477c..aeaa21260cd0 100644
--- a/sysutils/munin-node/pkg-plist
+++ b/sysutils/munin-node/pkg-plist
@@ -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