- Update port to 3.4.0 - Take maintainership Fix: Patch attached with submission follows:
Responsible Changed From-To: freebsd-ports-bugs->brooks Over to maintainer (via the GNATS Auto Assign Tool)
Responsible Changed From-To: brooks->skreuzer Hand this back to the submitter now that I've handed off maintaintership. Sorry for the long delay.
Author: skreuzer Date: Wed Jun 12 13:59:16 2013 New Revision: 320696 URL: http://svnweb.freebsd.org/changeset/ports/320696 Log: Update to 3.4.0 Take maintainership PR: ports/172327 Submitted by: skreuzer@ Approved by: brooks@ Deleted: head/sysutils/ganglia-monitor-core/files/patch-libmetrics_freebsd_metrics.c Modified: head/sysutils/ganglia-monitor-core/Makefile head/sysutils/ganglia-monitor-core/distinfo head/sysutils/ganglia-monitor-core/files/gmetad.in (contents, props changed) head/sysutils/ganglia-monitor-core/files/gmetasnap.sh (contents, props changed) head/sysutils/ganglia-monitor-core/files/gmond.in (contents, props changed) head/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in (contents, props changed) head/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in (contents, props changed) head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_conf.d_modpython.conf.in (contents, props changed) head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in (contents, props changed) head/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in (contents, props changed) head/sysutils/ganglia-monitor-core/files/pkg-install.in head/sysutils/ganglia-monitor-core/pkg-plist Modified: head/sysutils/ganglia-monitor-core/Makefile ============================================================================== --- head/sysutils/ganglia-monitor-core/Makefile Wed Jun 12 13:59:13 2013 (r320695) +++ head/sysutils/ganglia-monitor-core/Makefile Wed Jun 12 13:59:16 2013 (r320696) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= monitor-core -PORTVERSION= 3.1.7 -PORTREVISION= 5 +PORTVERSION= 3.4.0 CATEGORIES= sysutils net parallel MASTER_SITES= SF/ganglia/ganglia%20monitoring%20core/${PORTVERSION} PKGNAMEPREFIX= ganglia- @@ -16,7 +15,8 @@ COMMENT= Ganglia cluster monitor, monito LIB_DEPENDS= apr-1:${PORTSDIR}/devel/apr1 \ confuse:${PORTSDIR}/devel/libconfuse \ - pcre:${PORTSDIR}/devel/pcre + pcre:${PORTSDIR}/devel/pcre \ + expat:${PORTSDIR}/textproc/expat2 PKGINSTALL= ${WRKDIR}/pkg-install @@ -34,6 +34,11 @@ CONFIGURE_ENV= GANGLIA_ACK_SYSCONFDIR=1 CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +USERS= ganglia +GROUPS= ganglia + +PLIST_SUB+= PORTVERSION=${PORTVERSION} + SUB_FILES= pkg-install .if defined (GMETAD_CONF) @@ -71,7 +76,7 @@ USE_LDCONFIG= yes MAN1= gmetric.1 gmond.1 gstat.1 .if ${PORT_OPTIONS:MGMETAD} -MAN1+= gmetad.1 +MAN1+= gmetad.1 gmetad.py.1 .endif MAN5= gmond.conf.5 Modified: head/sysutils/ganglia-monitor-core/distinfo ============================================================================== --- head/sysutils/ganglia-monitor-core/distinfo Wed Jun 12 13:59:13 2013 (r320695) +++ head/sysutils/ganglia-monitor-core/distinfo Wed Jun 12 13:59:16 2013 (r320696) @@ -1,2 +1,2 @@ -SHA256 (ganglia-3.1.7.tar.gz) = bb1a4953d72e7dace76010a30d6d332e4ac0991d1371dbbcbcc7b048e0a7e4bf -SIZE (ganglia-3.1.7.tar.gz) = 1278023 +SHA256 (ganglia-3.4.0.tar.gz) = 036838b17621c10383daa98f705bb01a10d44031eeb6f310c3685a9ec2dbe800 +SIZE (ganglia-3.4.0.tar.gz) = 1156001 Modified: head/sysutils/ganglia-monitor-core/files/gmetad.in ============================================================================== --- head/sysutils/ganglia-monitor-core/files/gmetad.in Wed Jun 12 13:59:13 2013 (r320695) +++ head/sysutils/ganglia-monitor-core/files/gmetad.in Wed Jun 12 13:59:16 2013 (r320696) @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD$ +# $FreeBSD: head/sysutils/ganglia-monitor-core/files/gmetad.in 302141 2012-08-05 23:19:36Z dougb $ # PROVIDE: gmetad # REQUIRE: gmond Modified: head/sysutils/ganglia-monitor-core/files/gmetasnap.sh ============================================================================== --- head/sysutils/ganglia-monitor-core/files/gmetasnap.sh Wed Jun 12 13:59:13 2013 (r320695) +++ head/sysutils/ganglia-monitor-core/files/gmetasnap.sh Wed Jun 12 13:59:16 2013 (r320696) @@ -2,7 +2,7 @@ # # gmetasnapshot - Ganglia gmetad snapshot manager # -# $FreeBSD$ +# $FreeBSD: head/sysutils/ganglia-monitor-core/files/gmetasnap.sh 300897 2012-07-14 14:29:18Z beat $ command=`basename $0` Modified: head/sysutils/ganglia-monitor-core/files/gmond.in ============================================================================== --- head/sysutils/ganglia-monitor-core/files/gmond.in Wed Jun 12 13:59:13 2013 (r320695) +++ head/sysutils/ganglia-monitor-core/files/gmond.in Wed Jun 12 13:59:16 2013 (r320696) @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD$ +# $FreeBSD: head/sysutils/ganglia-monitor-core/files/gmond.in 302141 2012-08-05 23:19:36Z dougb $ # PROVIDE: gmond # REQUIRE: DAEMON Modified: head/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in ============================================================================== --- head/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in Wed Jun 12 13:59:13 2013 (r320695) +++ head/sysutils/ganglia-monitor-core/files/patch-gmetad_Makefile.in Wed Jun 12 13:59:16 2013 (r320696) @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- gmetad/Makefile.in.orig -+++ gmetad/Makefile.in -@@ -539,8 +539,6 @@ +--- 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 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. - .NOEXPORT: Modified: head/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in ============================================================================== --- head/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in Wed Jun 12 13:59:13 2013 (r320695) +++ head/sysutils/ganglia-monitor-core/files/patch-gmetad_conf.c.in Wed Jun 12 13:59:16 2013 (r320696) @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- gmetad/conf.c.in.orig -+++ gmetad/conf.c.in -@@ -274,7 +274,7 @@ +--- 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 @@ 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->all_trusted = 0; Modified: 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 Wed Jun 12 13:59:13 2013 (r320695) +++ head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_conf.d_modpython.conf.in Wed Jun 12 13:59:16 2013 (r320696) @@ -1,13 +1,8 @@ - -$FreeBSD$ - ---- gmond/modules/conf.d/modpython.conf.in.orig -+++ gmond/modules/conf.d/modpython.conf.in -@@ -13,6 +13,6 @@ +--- 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 @@ } } --include ('@sysconfdir@/conf.d/*.pyconf') -+include ('@sysconfdir@/%%GMONDCONFDIR%%/*.pyconf') - - +-include ("@sysconfdir@/conf.d/*.pyconf") ++include ("@sysconfdir@/%%GMONDCONFDIR%%/*.pyconf") Modified: head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in ============================================================================== --- head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in Wed Jun 12 13:59:13 2013 (r320695) +++ head/sysutils/ganglia-monitor-core/files/patch-gmond_modules_python_Makefile.in Wed Jun 12 13:59:16 2013 (r320696) @@ -1,16 +1,13 @@ - -$FreeBSD$ - ---- gmond/modules/python/Makefile.in.orig -+++ gmond/modules/python/Makefile.in -@@ -538,8 +538,8 @@ +--- 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 @@ # 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 ++ $(INSTALL_DATA) ../conf.d/modpython.conf $(DESTDIR)$(sysconfdir)/%%GMONDCONFDIR%%/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. - .NOEXPORT: Modified: head/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in ============================================================================== --- head/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in Wed Jun 12 13:59:13 2013 (r320695) +++ head/sysutils/ganglia-monitor-core/files/patch-lib_default__conf.h.in Wed Jun 12 13:59:16 2013 (r320696) @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- lib/default_conf.h.in.orig -+++ lib/default_conf.h.in -@@ -111,7 +111,7 @@ +--- 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 @@ }\n\ }\n\ \n\ --include ('" SYSCONFDIR "/conf.d/*.conf')\n\ -+include ('" SYSCONFDIR "/%%GMONDCONFDIR%%/*.conf')\n\ +-include (\"" SYSCONFDIR "/conf.d/*.conf\")\n\ ++include (\"" SYSCONFDIR "/%%GMONDCONFDIR%%/*.conf\")\n\ \n\ - /* The old internal 2.5.x metric array has been replaced by the following\n\ - collection_group directives. What follows is the default behavior for\n\ + " + Modified: head/sysutils/ganglia-monitor-core/files/pkg-install.in ============================================================================== --- head/sysutils/ganglia-monitor-core/files/pkg-install.in Wed Jun 12 13:59:13 2013 (r320695) +++ head/sysutils/ganglia-monitor-core/files/pkg-install.in Wed Jun 12 13:59:16 2013 (r320696) @@ -2,35 +2,10 @@ u=ganglia g=ganglia -ugid=102 -homedir=/nonexistent -shell=/sbin/nologin rrd_rootdir=/var/db/ganglia/rrds case $2 in POST-INSTALL) - if pw group show "${g}" >/dev/null 2>&1; then - echo "Using existing group \"${g}\"." - else - echo "Creating group \"${g}\", (gid: ${ugid})." - pw groupadd ${g} -g ${ugid} - if [ $? != 0 ]; then - echo "Failed to add group \"${g}\"." - exit 1 - fi - fi - if pw user show "${u}" >/dev/null 2>&1; then - echo "Using existing user \"${u}\"." - else - echo "Creating user \"${u}\", (uid: ${ugid})." - pw useradd ${u} -u ${ugid} -g ${ugid} -h - \ - -d ${homedir} -s ${shell} -c "Ganglia User" - if [ $? != 0 ]; then - echo "Failed to add user \"${u}\"." - exit 1 - fi - fi - if [ ! -f %%PREFIX%%/etc/gmond.conf ]; then cp %%PREFIX%%/etc/gmond.conf.sample %%PREFIX%%/etc/gmond.conf fi Modified: head/sysutils/ganglia-monitor-core/pkg-plist ============================================================================== --- head/sysutils/ganglia-monitor-core/pkg-plist Wed Jun 12 13:59:13 2013 (r320695) +++ head/sysutils/ganglia-monitor-core/pkg-plist Wed Jun 12 13:59:16 2013 (r320696) @@ -9,13 +9,14 @@ etc/gmond.conf.sample %%GMETAD%%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_msg.h include/gm_protocol.h include/gm_value.h -lib/libganglia-3.1.7.so -lib/libganglia-3.1.7.so.0 +lib/libganglia-%%PORTVERSION%%.so +lib/libganglia-%%PORTVERSION%%.so.0 lib/libganglia.a lib/libganglia.la lib/libganglia.so _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!