From d9d25c12510d1fe6bbfd997ac9d003e4562baddc Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 24 Aug 2007 01:24:54 +0000
Subject: [PATCH] - Upgrade to ganglia 3.0.4 [1] - Fix support for large memory
 systems (hw.physmem is a u_long not a long) [2] - Make portlint happier [3]

PR:		ports/115362 [1], some of [3]
Submitted by:	Michael Fuckner <michael at fuckner dot net> [1], some of [3]
		Clement Laforet <clement at FreeBSD dot org> [2]
---
 sysutils/ganglia-monitor-core/Makefile             |  9 ++++-----
 sysutils/ganglia-monitor-core/distinfo             |  6 +++---
 .../files/patch-libmetrics_freebsd_metrics.c       | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 sysutils/ganglia-monitor-core/files/patch-libmetrics_freebsd_metrics.c

diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index 05c947605031..9ffa419d4275 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	monitor-core
-PORTVERSION=	3.0.3
+PORTVERSION=	3.0.4
 CATEGORIES=	sysutils net parallel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ganglia
@@ -33,7 +33,7 @@ SUB_FILES=	pkg-install
 
 .if defined (GMETAD_CONF)
 .if !exists (${GMETAD_CONF})
-IGNORE=		 "GMETAD_CONF must point to an existing file when defined"
+IGNORE=		GMETAD_CONF must point to an existing file when defined
 .endif
 .else
 GMETAD_CONF=	${WRKSRC}/gmetad/gmetad.conf
@@ -41,7 +41,7 @@ GMETAD_CONF=	${WRKSRC}/gmetad/gmetad.conf
 
 .if defined (GMOND_CONF)
 .if !exists (${GMOND_CONF})
-IGNORE=		"GMOND_CONF must point to an existing file when defined"
+IGNORE=		GMOND_CONF must point to an existing file when defined
 .endif
 .else
 GMOND_CONF=	${WRKDIR}/gmond.conf
@@ -61,7 +61,6 @@ USE_RC_SUBR+=	gmetad.sh
 USE_RC_SUBR=	ganglia.sh
 .endif
 
-
 .if defined (WITH_GMETAD)
 LIB_DEPENDS=	rrd.2:${PORTSDIR}/databases/rrdtool
 CONFIGURE_ARGS+=	--with-gmetad
@@ -73,7 +72,7 @@ SUB_LIST+=	GMETAD="\#"
 .endif
 
 .if defined (WITH_LIBGANGLIA)
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 PLIST_SUB+=	LIBGANGLIA=
 .else
 PLIST_SUB+=	LIBGANGLIA="@comment "
diff --git a/sysutils/ganglia-monitor-core/distinfo b/sysutils/ganglia-monitor-core/distinfo
index 51d2094f2f0f..2a2e078bebd9 100644
--- a/sysutils/ganglia-monitor-core/distinfo
+++ b/sysutils/ganglia-monitor-core/distinfo
@@ -1,3 +1,3 @@
-MD5 (ganglia-3.0.3.tar.gz) = c48320a112db20e8372ae8e89d97583e
-SHA256 (ganglia-3.0.3.tar.gz) = 02e6272aa5f614a5ea3336c8cc4e1cdcd794893114d08dda39188c010154deab
-SIZE (ganglia-3.0.3.tar.gz) = 2824785
+MD5 (ganglia-3.0.4.tar.gz) = 9a51023accb59b6ba76c10d7cb7322fa
+SHA256 (ganglia-3.0.4.tar.gz) = a63c802392d211e8c4beabb9eb175292d72b650a6192bbc332feebd9bb5f3ec4
+SIZE (ganglia-3.0.4.tar.gz) = 2842708
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..120aae2576bf
--- /dev/null
+++ b/sysutils/ganglia-monitor-core/files/patch-libmetrics_freebsd_metrics.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- libmetrics/freebsd/metrics.c.orig
++++ libmetrics/freebsd/metrics.c
+@@ -211,7 +211,7 @@
+ {
+    g_val_t val;
+    size_t len;
+-   long total;
++   u_long total;
+ 
+    len = sizeof(total);
+