- Update to 3.6.0

- Pass maintainership to submitter

PR:		199074
Submitted by:	jwbacon@tds.net

11 files changed, 114 insertions, 110 deletions

diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index f65dc4fc593d..0b623c20e2d0 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	monitor-core
-PORTVERSION=	3.4.0
-PORTREVISION=	6
-CATEGORIES=	sysutils net parallel
+PORTVERSION=	3.6.0
+CATEGORIES=	sysutils net
 MASTER_SITES=	SF/ganglia/ganglia%20monitoring%20core/${PORTVERSION}
 PKGNAMEPREFIX=	ganglia-
 .if defined(CLUSTER)
@@ -11,16 +10,17 @@ PKGNAMESUFFIX=	-${CLUSTER}
 .endif
 DISTNAME=	ganglia-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jwbacon@tds.net
 COMMENT=	Ganglia cluster monitor, monitoring daemon
 
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/devel/apr1 \
 		libconfuse.so:${PORTSDIR}/devel/libconfuse \
 		libpcre.so:${PORTSDIR}/devel/pcre \
 		libexpat.so:${PORTSDIR}/textproc/expat2
 
-PKGINSTALL=	${WRKDIR}/pkg-install
-
 OPTIONS_DEFINE=	GMETAD
 OPTIONS_DEFAULT=	GMETAD
 GMETAD_DESC=	include gmetad
@@ -30,43 +30,30 @@ USES=		libtool pkgconfig python
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-setuid=ganglia --enable-setgid=ganglia \
 		--with-python=${PYTHON_CMD}
-CONFIGURE_ENV=	GANGLIA_ACK_SYSCONFDIR=1 "LDFLAGS=${LDFLAGS}"
+CONFIGURE_ENV=	GANGLIA_ACK_SYSCONFDIR=1
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-USERS=	ganglia
-GROUPS=	ganglia
+USERS=		ganglia
+GROUPS=		ganglia
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-SUB_FILES=	pkg-install
+SUB_FILES+=	pkg-message
 
-.if defined (GMETAD_CONF)
-.if !exists (${GMETAD_CONF})
-IGNORE=		the variable GMETAD_CONF must point to a file when defined
-.endif
-.else
-GMETAD_CONF=	${WRKSRC}/gmetad/gmetad.conf
-.endif
+INSTALL_TARGET=	install-strip
 
-.if defined (GMOND_CONF)
-.if !exists (${GMOND_CONF})
-IGNORE=		the variable GMOND_CONF must point to a file when defined
-.endif
-.else
-GMOND_CONF=	${WRKDIR}/gmond.conf
-.endif
+USE_RC_SUBR=	gmond
 
 .include <bsd.port.options.mk>
 
-USE_RC_SUBR=	gmond
 .if ${PORT_OPTIONS:MGMETAD}
 USE_RC_SUBR+=	gmetad
 
 LIB_DEPENDS+=	librrd.so:${PORTSDIR}/databases/rrdtool
 CONFIGURE_ARGS+=	--with-gmetad
-PLIST_SUB+=	GMETAD=
-SUB_LIST+=	GMETAD=
+PLIST_SUB+=	GMETAD=""
+SUB_LIST+=	GMETAD=""
 .else
 PLIST_SUB+=	GMETAD="@comment "
 SUB_LIST+=	GMETAD="\#"
@@ -76,20 +63,6 @@ USE_LDCONFIG=	yes
 
 CONF_DIR=	${PREFIX}/etc
 
-FIX_CONF_FILES=	README \
-		mans/gmetad.1 \
-		mans/gmond.1
-FIX_GMOND_CONF_DIR=	\
-		gmond/modules/conf.d/modpython.conf.in \
-		gmond/modules/python/Makefile.in \
-		lib/default_conf.h.in
-# gmond.conf.5 and gmond.conf.html can be generated from conf.pod, but
-# doing so requires perl installed in the build stage.
-FIX_USER_FILES=	gmetad/gmetad.conf.in \
-		gmond/conf.pod \
-		gmond/gmond.conf.5 \
-		gmond/gmond.conf.html
-
 MODULES=	modcpu.so \
 		moddisk.so \
 		modload.so \
@@ -100,27 +73,42 @@ MODULES=	modcpu.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} -e "s|/etc/ganglia/\(gm[a-z]*d.conf\)|${PREFIX}/etc/\1|g" \
-		${FIX_CONF_FILES:S|^|${WRKSRC}/|}
-	${REINPLACE_CMD} -e "s|%%GMONDCONFDIR%%|gmond.conf.d|g" \
-		${FIX_GMOND_CONF_DIR:S|^|${WRKSRC}/|}
+	${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" \
-		${FIX_USER_FILES:S|^|${WRKSRC}/|}
+		${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
 
 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_MAN} ${WRKSRC}/mans/gmetad.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_DATA} ${GMETAD_CONF} ${STAGEDIR}${PREFIX}/etc/gmetad.conf.sample
+	${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 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/mans/gmond.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/gmond/gmond.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/mans/gstat.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_DATA} ${GMOND_CONF} ${STAGEDIR}${PREFIX}/etc/gmond.conf.sample
+	${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
 
 .include <bsd.port.mk>
diff --git a/sysutils/ganglia-monitor-core/distinfo b/sysutils/ganglia-monitor-core/distinfo
index d004eec5fd5f..7cb6edb6d9a2 100644
--- a/sysutils/ganglia-monitor-core/distinfo
+++ b/sysutils/ganglia-monitor-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ganglia-3.4.0.tar.gz) = 036838b17621c10383daa98f705bb01a10d44031eeb6f310c3685a9ec2dbe800
-SIZE (ganglia-3.4.0.tar.gz) = 1156001
+SHA256 (ganglia-3.6.0.tar.gz) = 89eae02e1a117040d60b3b561fe55f88d7f8cf41b94af1492969ef68e6797886
+SIZE (ganglia-3.6.0.tar.gz) = 1248273
diff --git a/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in b/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in
index 8cc5e64dbabb..716892ca2f72 100644
--- a/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in
+++ b/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in
@@ -1,7 +1,7 @@
---- gmetad.orig/Makefile.in	2012-10-01 18:24:48.000000000 +0000
-+++ gmetad/Makefile.in	2012-10-01 18:38:55.000000000 +0000
-@@ -591,8 +591,6 @@
- 	$(FIXCONFIG) gmetad.conf.in
+--- 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 @@
+ 	$(FIXCONFIG) gmetad.service.in
  
  install-data-hook:	gmetad.conf
 -	mkdir -p $(DESTDIR)$(sysconfdir) && \
diff --git a/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in b/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in
index 45f0acc2e4c6..f03c7d461f4f 100644
--- a/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in
+++ b/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in
@@ -1,6 +1,6 @@
---- gmetad/conf.c.in.orig	2012-10-01 18:44:59.000000000 +0000
-+++ gmetad/conf.c.in	2012-10-01 18:45:20.000000000 +0000
-@@ -330,7 +330,7 @@
+--- 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 @@
     config->trusted_hosts = NULL;
     config->debug_level = 0;
     config->should_setuid = 1;
diff --git a/sysutils/ganglia-monitor-core/files/patch-gmond_modules_conf.d_modpython.conf.in b/sysutils/ganglia-monitor-core/files/patch-gmond_modules_conf.d_modpython.conf.in
index d02655a5fe46..e34b854cf4cb 100644
--- a/sysutils/ganglia-monitor-core/files/patch-gmond_modules_conf.d_modpython.conf.in
+++ b/sysutils/ganglia-monitor-core/files/patch-gmond_modules_conf.d_modpython.conf.in
@@ -1,8 +1,13 @@
---- gmond/modules/conf.d/modpython.conf.in.orig	2012-10-01 18:52:02.000000000 +0000
-+++ gmond/modules/conf.d/modpython.conf.in	2012-10-01 18:52:22.000000000 +0000
-@@ -13,4 +13,4 @@
+--- 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 @@
+   module {
+     name = "python_module"
+     path = "modpython.so"
+-    params = "@moduledir@/python_modules"
++    params = "@moduledir@"
    }
  }
  
 -include ("@sysconfdir@/conf.d/*.pyconf")
-+include ("@sysconfdir@/%%GMONDCONFDIR%%/*.pyconf")
++include ("@sysconfdir@/gmond.conf.d/*.pyconf")
diff --git a/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in b/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in
index 9ecda2ecb011..a8a040738aa0 100644
--- a/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in
+++ b/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in
@@ -1,13 +1,13 @@
---- gmond/modules/python/Makefile.in.orig	2012-10-01 19:01:51.000000000 +0000
-+++ gmond/modules/python/Makefile.in	2012-10-01 19:03:40.000000000 +0000
-@@ -588,8 +588,8 @@
+--- 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 @@
  # 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)/%%GMONDCONFDIR%% && \
-+	  $(INSTALL_DATA) ../conf.d/modpython.conf $(DESTDIR)$(sysconfdir)/%%GMONDCONFDIR%%/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.
diff --git a/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in b/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in
index 6b5744eb1d83..e5739f8d45c8 100644
--- a/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in
+++ b/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in
@@ -1,11 +1,11 @@
---- lib/default_conf.h.in.orig	2012-10-01 19:06:52.000000000 +0000
-+++ lib/default_conf.h.in	2012-10-01 19:08:01.000000000 +0000
-@@ -381,7 +381,7 @@
+--- 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 @@
    }\n\
  }\n\
  \n\
 -include (\"" SYSCONFDIR "/conf.d/*.conf\")\n\
-+include (\"" SYSCONFDIR "/%%GMONDCONFDIR%%/*.conf\")\n\
++include (\"" SYSCONFDIR "/gmond.conf.d/*.conf\")\n\
  \n\
  "
  
diff --git a/sysutils/ganglia-monitor-core/files/patch-libmetrics_freebsd_metrics.c b/sysutils/ganglia-monitor-core/files/patch-libmetrics_freebsd_metrics.c
new file mode 100644
index 000000000000..8eaf849572fd
--- /dev/null
+++ b/sysutils/ganglia-monitor-core/files/patch-libmetrics_freebsd_metrics.c
@@ -0,0 +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 @@
+    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 )
+ {
diff --git a/sysutils/ganglia-monitor-core/files/pkg-install.in b/sysutils/ganglia-monitor-core/files/pkg-install.in
deleted file mode 100644
index 659e2b965a1b..000000000000
--- a/sysutils/ganglia-monitor-core/files/pkg-install.in
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-u=ganglia
-g=ganglia
-rrd_rootdir=/var/db/ganglia/rrds
-
-case $2 in
-POST-INSTALL)
-	if [ ! -f %%PREFIX%%/etc/gmond.conf ]; then
-		cp %%PREFIX%%/etc/gmond.conf.sample %%PREFIX%%/etc/gmond.conf
-	fi
-
-%%GMETAD%%	mkdir -p ${rrd_rootdir}
-%%GMETAD%%	chown -R ${u}:${g} ${rrd_rootdir}
-%%GMETAD%%
-%%GMETAD%%	if [ ! -f %%PREFIX%%/etc/gmetad.conf ]; then
-%%GMETAD%%		cp %%PREFIX%%/etc/gmetad.conf.sample %%PREFIX%%/etc/gmetad.conf
-%%GMETAD%%	fi
-
-	;;
-esac
diff --git a/sysutils/ganglia-monitor-core/files/pkg-message.in b/sysutils/ganglia-monitor-core/files/pkg-message.in
new file mode 100644
index 000000000000..98a3fae964c4
--- /dev/null
+++ b/sysutils/ganglia-monitor-core/files/pkg-message.in
@@ -0,0 +1,13 @@
+
+======================================================================
+
+First-time configuration:
+
+Edit %%PREFIX%%/etc/gmond.conf
+and %%PREFIX%%/etc/gmetad.conf
+to suit your network.
+
+To enable services, set gmond_enable/gmond_flags and/or
+gmetad_enable/gmetad_flags in /etc/rc.conf.
+
+======================================================================
diff --git a/sysutils/ganglia-monitor-core/pkg-plist b/sysutils/ganglia-monitor-core/pkg-plist
index adeb59469ded..a6085a0c754f 100644
--- a/sysutils/ganglia-monitor-core/pkg-plist
+++ b/sysutils/ganglia-monitor-core/pkg-plist
@@ -1,23 +1,17 @@
 bin/ganglia-config
-bin/gstat
 bin/gmetric
-@unexec if cmp -s %D/etc/gmond.conf %D/etc/gmond.conf.sample; then rm -f %D/etc/gmond.conf; fi
+bin/gstat
 etc/gmond.conf.d/modpython.conf
-etc/gmond.conf.sample
-%%GMETAD%%@unexec if cmp -s %D/etc/gmetad.conf %D/etc/gmetad.conf.sample; then rm -f %D/etc/gmetad.conf; fi
-%%GMETAD%%etc/gmetad.conf.sample
+@sample etc/gmond.conf.sample
+%%GMETAD%%@sample etc/gmetad.conf.sample
 include/ganglia.h
 include/ganglia_gexec.h
 include/gm_file.h
-include/gm_mmn.h
 include/gm_metric.h
+include/gm_mmn.h
 include/gm_msg.h
 include/gm_protocol.h
 include/gm_value.h
-lib/libganglia-%%PORTVERSION%%.so.0
-lib/libganglia-%%PORTVERSION%%.so.0.0.0
-lib/libganglia.a
-lib/libganglia.so
 lib/ganglia/modcpu.so
 lib/ganglia/moddisk.so
 lib/ganglia/modload.so
@@ -27,14 +21,19 @@ lib/ganglia/modnet.so
 lib/ganglia/modproc.so
 lib/ganglia/modpython.so
 lib/ganglia/modsys.so
-man/man1/gmetric.1.gz
+lib/libganglia-%%PORTVERSION%%.so.0
+lib/libganglia-%%PORTVERSION%%.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
-@dirrmtry etc/gmond.conf.d
-@dirrm lib/ganglia
+@dir lib/ganglia/python_modules
+@dir(ganglia,ganglia,) /var/db/ganglia/rrds
+@dir(ganglia,ganglia,) /var/db/ganglia