Index: head/sysutils/ganglia-monitor-core/Makefile
===================================================================
--- head/sysutils/ganglia-monitor-core/Makefile	(revision 550853)
+++ head/sysutils/ganglia-monitor-core/Makefile	(revision 550854)
@@ -1,115 +1,113 @@
 # $FreeBSD$
 
 PORTNAME=	monitor-core
-PORTVERSION=	3.7.1
-PORTREVISION=	2
+PORTVERSION=	3.7.2
 CATEGORIES=	sysutils net
 MASTER_SITES=	SF/ganglia/ganglia%20monitoring%20core/${PORTVERSION}
 PKGNAMEPREFIX=	ganglia-
 .if defined(CLUSTER)
 PKGNAMESUFFIX=	-${CLUSTER}
 .endif
 DISTNAME=	ganglia-${PORTVERSION}
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Ganglia cluster monitor, monitoring daemon
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 		libconfuse.so:devel/libconfuse \
 		libpcre.so:devel/pcre \
 		libexpat.so:textproc/expat2
 
-OPTIONS_DEFINE=	GMETAD
-OPTIONS_DEFAULT=	GMETAD
-GMETAD_DESC=	include gmetad
+USES=		libtool pkgconfig
 
-USES=		libtool pkgconfig python:2.7
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-setuid=ganglia --enable-setgid=ganglia \
-		--with-python=${PYTHON_CMD}
+		--disable-python
 CONFIGURE_ENV=	GANGLIA_ACK_SYSCONFDIR=1
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 USERS=		ganglia
 GROUPS=		ganglia
 
+OPTIONS_DEFINE=	GMETAD
+OPTIONS_DEFAULT=	GMETAD
+GMETAD_DESC=	include gmetad
+
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 SUB_FILES+=	pkg-message
 
 INSTALL_TARGET=	install-strip
 
 USE_RC_SUBR=	gmond
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGMETAD}
 USE_RC_SUBR+=	gmetad
 
 LIB_DEPENDS+=	librrd.so:databases/rrdtool
 CONFIGURE_ARGS+=	--with-gmetad
 PLIST_SUB+=	GMETAD=""
 SUB_LIST+=	GMETAD=""
 .else
 PLIST_SUB+=	GMETAD="@comment "
 SUB_LIST+=	GMETAD="\#"
 .endif
 
 USE_LDCONFIG=	yes
 
 CONF_DIR=	${PREFIX}/etc
 
 MODULES=	modcpu.so \
 		moddisk.so \
 		modload.so \
 		modmem.so \
 		modmulticpu.so \
 		modnet.so \
 		modproc.so \
-		modpython.so \
 		modsys.so
 
 # gmond.conf.5 and gmond.conf.html can be generated from conf.pod, but
 # doing so requires perl installed in the build stage.
-post-patch:
-	${REINPLACE_CMD} \
+pre-configure:
+	@${REINPLACE_CMD} \
 		-e "s|/etc/ganglia/\(gm[a-z]*d.conf\)|${PREFIX}/etc/\1|g" \
 		${WRKSRC}/README \
 		${WRKSRC}/mans/gmetad.1 \
 		${WRKSRC}/mans/gmond.1
-	${REINPLACE_CMD} -e "s|nobody|ganglia|g" \
+	@${REINPLACE_CMD} -e "s|nobody|ganglia|g" \
 		${WRKSRC}/gmetad/gmetad.conf.in \
 		${WRKSRC}/gmond/conf.pod \
 		${WRKSRC}/gmond/gmond.conf.5 \
 		${WRKSRC}/gmond/gmond.conf.html
 
 post-build:
-	${WRKSRC}/gmond/gmond -t > ${WRKDIR}/gmond.conf
+	@${WRKSRC}/gmond/gmond -t > ${WRKDIR}/gmond.conf
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/gmond.conf \
 		${STAGEDIR}${PREFIX}/etc/gmond.conf.sample
 .if ${PORT_OPTIONS:MGMETAD}
 	${INSTALL_SCRIPT} ${FILESDIR}/gmetasnap.sh \
 		${STAGEDIR}${PREFIX}/sbin/gmetasnap
 	${INSTALL_DATA} ${WRKSRC}/gmetad/gmetad.conf \
 		${STAGEDIR}${PREFIX}/etc/gmetad.conf.sample
 	${INSTALL_MAN} ${WRKSRC}/mans/gmetad.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1
 .endif
 	${INSTALL_MAN} \
 		${WRKSRC}/mans/gmetric.1 \
 		${WRKSRC}/mans/gmond.1 \
 		${WRKSRC}/mans/gstat.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/gmond/gmond.conf.5 \
 		${STAGEDIR}${MANPREFIX}/man/man5
 	${MKDIR} ${STAGEDIR}/var/db/ganglia/rrds
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/ganglia/python_modules
+	@${CHMOD} -R a+rX ${STAGEDIR}/var/db/ganglia
 
 .include <bsd.port.mk>
Index: head/sysutils/ganglia-monitor-core/distinfo
===================================================================
--- head/sysutils/ganglia-monitor-core/distinfo	(revision 550853)
+++ head/sysutils/ganglia-monitor-core/distinfo	(revision 550854)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470747673
-SHA256 (ganglia-3.7.1.tar.gz) = e735a6218986a0ff77c737e5888426b103196c12dc2d679494ca9a4269ca69a3
-SIZE (ganglia-3.7.1.tar.gz) = 1311019
+TIMESTAMP = 1601485985
+SHA256 (ganglia-3.7.2.tar.gz) = 042dbcaf580a661b55ae4d9f9b3566230b2232169a0898e91a797a4c61888409
+SIZE (ganglia-3.7.2.tar.gz) = 1302320
Index: head/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in
===================================================================
--- head/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in	(revision 550853)
+++ head/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in	(revision 550854)
@@ -1,11 +1,11 @@
---- gmetad/Makefile.in.orig	2013-05-07 09:39:40.000000000 -0500
-+++ gmetad/Makefile.in	2014-10-14 15:31:54.000000000 -0500
-@@ -659,8 +659,6 @@
+--- gmetad/Makefile.in.orig	2015-07-01 19:49:35 UTC
++++ gmetad/Makefile.in
+@@ -713,8 +713,6 @@ gmetad.service:	gmetad.service.in $(FIXCONFIG)
  	$(FIXCONFIG) gmetad.service.in
  
  install-data-hook:	gmetad.conf
 -	mkdir -p $(DESTDIR)$(sysconfdir) && \
 -	  $(INSTALL_DATA) gmetad.conf $(DESTDIR)$(sysconfdir)/gmetad.conf
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
Index: head/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in
===================================================================
--- head/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in	(revision 550853)
+++ head/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in	(revision 550854)
@@ -1,11 +1,11 @@
---- gmetad/conf.c.in.orig	2013-05-07 09:39:40.000000000 -0500
-+++ gmetad/conf.c.in	2014-10-14 15:31:54.000000000 -0500
-@@ -374,7 +374,7 @@
+--- gmetad/conf.c.in.orig	2015-07-01 19:49:35 UTC
++++ gmetad/conf.c.in
+@@ -475,7 +475,7 @@ set_defaults (gmetad_config_t *config)
     config->trusted_hosts = NULL;
     config->debug_level = 0;
     config->should_setuid = 1;
 -   config->setuid_username = "nobody";
 +   config->setuid_username = SETUID_USER;
     config->rrd_rootdir = "@varstatedir@/ganglia/rrds";
-    config->write_rrds = 1;
-    config->scalable_mode = 1;
+    config->rrdcached_addrstr = NULL;
+    memset(&config->rrdcached_address, 0, sizeof (config->rrdcached_address));
Index: head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_conf.d_modpython.conf.in
===================================================================
--- head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_conf.d_modpython.conf.in	(revision 550853)
+++ head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_conf.d_modpython.conf.in	(revision 550854)
@@ -1,13 +1,13 @@
---- gmond/modules/conf.d/modpython.conf.in.orig	2013-05-07 09:39:40.000000000 -0500
-+++ gmond/modules/conf.d/modpython.conf.in	2014-10-14 15:31:54.000000000 -0500
-@@ -9,8 +9,8 @@
+--- gmond/modules/conf.d/modpython.conf.in.orig	2015-07-01 19:49:35 UTC
++++ gmond/modules/conf.d/modpython.conf.in
+@@ -9,8 +9,8 @@ modules {
    module {
      name = "python_module"
      path = "modpython.so"
 -    params = "@moduledir@/python_modules"
 +    params = "@moduledir@"
    }
  }
  
 -include ("@sysconfdir@/conf.d/*.pyconf")
 +include ("@sysconfdir@/gmond.conf.d/*.pyconf")
Index: head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in
===================================================================
--- head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in	(revision 550853)
+++ head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in	(revision 550854)
@@ -1,13 +1,13 @@
---- gmond/modules/python/Makefile.in.orig	2013-05-07 09:39:40.000000000 -0500
-+++ gmond/modules/python/Makefile.in	2014-10-14 15:31:54.000000000 -0500
-@@ -601,8 +601,8 @@
+--- gmond/modules/python/Makefile.in.orig	2015-07-01 19:49:35 UTC
++++ gmond/modules/python/Makefile.in
+@@ -639,8 +639,8 @@ README:	README.in $(FIXCONFIG)
  # Note that README is listed as a dependency to be generated, but it
  # is not currently installed anywhere
  install-exec-hook:	../conf.d/modpython.conf README
 -	mkdir -p $(DESTDIR)$(sysconfdir)/conf.d && \
 -	  $(INSTALL_DATA) ../conf.d/modpython.conf $(DESTDIR)$(sysconfdir)/conf.d/modpython.conf
 +	mkdir -p $(DESTDIR)$(sysconfdir)/gmond.conf.d && \
 +	  $(INSTALL_DATA) ../conf.d/modpython.conf $(DESTDIR)$(sysconfdir)/gmond.conf.d/modpython.conf 
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
Index: head/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in
===================================================================
--- head/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in	(revision 550853)
+++ head/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in	(revision 550854)
@@ -1,11 +1,11 @@
---- lib/default_conf.h.in.orig	2013-05-07 09:39:40.000000000 -0500
-+++ lib/default_conf.h.in	2014-10-14 15:31:54.000000000 -0500
-@@ -397,7 +397,7 @@
+--- lib/default_conf.h.in.orig	2015-07-01 19:49:35 UTC
++++ lib/default_conf.h.in
+@@ -393,7 +393,7 @@ collection_group {\n\
    }\n\
  }\n\
  \n\
 -include (\"" SYSCONFDIR "/conf.d/*.conf\")\n\
 +include (\"" SYSCONFDIR "/gmond.conf.d/*.conf\")\n\
  \n\
  "
  
Index: head/sysutils/ganglia-monitor-core/files/patch-libmetrics_freebsd_metrics.c
===================================================================
--- head/sysutils/ganglia-monitor-core/files/patch-libmetrics_freebsd_metrics.c	(revision 550853)
+++ head/sysutils/ganglia-monitor-core/files/patch-libmetrics_freebsd_metrics.c	(revision 550854)
@@ -1,20 +1,20 @@
---- libmetrics/freebsd/metrics.c.orig	2013-05-07 09:39:40.000000000 -0500
-+++ libmetrics/freebsd/metrics.c	2014-10-14 15:32:43.000000000 -0500
-@@ -461,6 +461,17 @@
+--- libmetrics/freebsd/metrics.c.orig	2015-07-01 19:49:35 UTC
++++ libmetrics/freebsd/metrics.c
+@@ -461,6 +461,17 @@ cpu_sintr_func ( void )
     return val;
  }
  
 +/*
 +** FIXME - Not yet implemented on FreeBSD.
 +*/
 +g_val_t
 +cpu_steal_func ( void )
 +{
 +   g_val_t val;
 +   val.f = 0.0;
 +   return val;
 +}
 +
  g_val_t
  load_one_func ( void )
  {
Index: head/sysutils/ganglia-monitor-core/pkg-plist
===================================================================
--- head/sysutils/ganglia-monitor-core/pkg-plist	(revision 550853)
+++ head/sysutils/ganglia-monitor-core/pkg-plist	(revision 550854)
@@ -1,39 +1,36 @@
 bin/ganglia-config
 bin/gmetric
 bin/gstat
-etc/gmond.conf.d/modpython.conf
 @sample etc/gmond.conf.sample
 %%GMETAD%%@sample etc/gmetad.conf.sample
 include/ganglia.h
 include/ganglia_gexec.h
 include/gm_file.h
 include/gm_metric.h
 include/gm_mmn.h
 include/gm_msg.h
 include/gm_protocol.h
 include/gm_value.h
 lib/ganglia/modcpu.so
 lib/ganglia/moddisk.so
 lib/ganglia/modload.so
 lib/ganglia/modmem.so
 lib/ganglia/modmulticpu.so
 lib/ganglia/modnet.so
 lib/ganglia/modproc.so
-lib/ganglia/modpython.so
 lib/ganglia/modsys.so
 lib/libganglia.so.0
 lib/libganglia.so.0.0.0
 lib/libganglia.a
 lib/libganglia.so
 %%GMETAD%%man/man1/gmetad.1.gz
 %%GMETAD%%man/man1/gmetad.py.1.gz
 man/man1/gmetric.1.gz
 man/man1/gmond.1.gz
 man/man1/gstat.1.gz
 man/man5/gmond.conf.5.gz
 %%GMETAD%%sbin/gmetad
 %%GMETAD%%sbin/gmetasnap
 sbin/gmond
-@dir lib/ganglia/python_modules
 @dir(ganglia,ganglia,) /var/db/ganglia/rrds
 @dir(ganglia,ganglia,) /var/db/ganglia