From b4418ec86ff0d5e7d738e37d2f6c843f2ffc35c0 Mon Sep 17 00:00:00 2001
From: fhajny <fhajny>
Date: Tue, 13 Mar 2012 12:36:25 +0000
Subject: Add c99 support, fixes build on SunOS. Change long xdr macros to
 int32 ones, fixes build on SunOS and ABI=64.

Bump PKGREVISION.
---
 parallel/ganglia-monitor-core/Makefile             |  6 ++---
 parallel/ganglia-monitor-core/distinfo             |  3 ++-
 .../patches/patch-lib__gm_protocol_dr.c            | 31 ++++++++++++++++++++++
 3 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 parallel/ganglia-monitor-core/patches/patch-lib__gm_protocol_dr.c

(limited to 'parallel/ganglia-monitor-core')

diff --git a/parallel/ganglia-monitor-core/Makefile b/parallel/ganglia-monitor-core/Makefile
index ed125944ea1..49fc8051c83 100644
--- a/parallel/ganglia-monitor-core/Makefile
+++ b/parallel/ganglia-monitor-core/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2012/03/03 00:13:49 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2012/03/13 12:36:25 fhajny Exp $
 #
 
 DISTNAME=		ganglia-3.1.2
 PKGNAME=		ganglia-monitor-core-3.1.2
-PKGREVISION=		10
+PKGREVISION=		11
 CATEGORIES=		net parallel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ganglia/}
 
@@ -17,7 +17,7 @@ GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--with-gmetad
 USE_LIBTOOL=		yes
-USE_LANGUAGES+=		c c++ fortran77
+USE_LANGUAGES+=		c c++ c99 fortran77
 
 PLIST_VARS+=		python
 
diff --git a/parallel/ganglia-monitor-core/distinfo b/parallel/ganglia-monitor-core/distinfo
index 570d052e9f5..b1c28fd19cd 100644
--- a/parallel/ganglia-monitor-core/distinfo
+++ b/parallel/ganglia-monitor-core/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2010/11/18 13:50:09 wiz Exp $
+$NetBSD: distinfo,v 1.11 2012/03/13 12:36:25 fhajny Exp $
 
 SHA1 (ganglia-3.1.2.tar.gz) = be5db246eb755d8c450140d1c80afef4f1179fe1
 RMD160 (ganglia-3.1.2.tar.gz) = 1f78cf1019759e12c3c65901fd74ac65dfddf4e3
@@ -6,3 +6,4 @@ Size (ganglia-3.1.2.tar.gz) = 1213196 bytes
 SHA1 (patch-aa) = e258e4efb1ae012db51901de87e614cede78812c
 SHA1 (patch-ab) = 260a78711c2c7f1111ce8c4b0d54d2edd60dde08
 SHA1 (patch-ac) = d7fa7c4509589a88a568717296b1c7ea0b09fb1e
+SHA1 (patch-lib__gm_protocol_dr.c) = 9d17d79bb1a6426a2547c00006819483aff47363
diff --git a/parallel/ganglia-monitor-core/patches/patch-lib__gm_protocol_dr.c b/parallel/ganglia-monitor-core/patches/patch-lib__gm_protocol_dr.c
new file mode 100644
index 00000000000..8bdba1e467d
--- /dev/null
+++ b/parallel/ganglia-monitor-core/patches/patch-lib__gm_protocol_dr.c
@@ -0,0 +1,31 @@
+$NetBSD: patch-lib__gm_protocol_dr.c,v 1.1 2012/03/13 12:36:25 fhajny Exp $
+
+Use INT32 macros, LONG ones were taken out of LP64 on Solaris.
+--- lib/gm_protocol_xdr.c.orig	2009-01-28 23:23:20.000000000 +0000
++++ lib/gm_protocol_xdr.c
+@@ -53,9 +53,9 @@ xdr_Ganglia_metadata_message (XDR *xdrs,
+ 				 return FALSE;
+ 
+ 		} else {
+-		IXDR_PUT_U_LONG(buf, objp->slope);
+-		IXDR_PUT_U_LONG(buf, objp->tmax);
+-		IXDR_PUT_U_LONG(buf, objp->dmax);
++		IXDR_PUT_U_INT32(buf, objp->slope);
++		IXDR_PUT_U_INT32(buf, objp->tmax);
++		IXDR_PUT_U_INT32(buf, objp->dmax);
+ 		}
+ 		 if (!xdr_array (xdrs, (char **)&objp->metadata.metadata_val, (u_int *) &objp->metadata.metadata_len, ~0,
+ 			sizeof (Ganglia_extra_data), (xdrproc_t) xdr_Ganglia_extra_data))
+@@ -78,9 +78,9 @@ xdr_Ganglia_metadata_message (XDR *xdrs,
+ 				 return FALSE;
+ 
+ 		} else {
+-		objp->slope = IXDR_GET_U_LONG(buf);
+-		objp->tmax = IXDR_GET_U_LONG(buf);
+-		objp->dmax = IXDR_GET_U_LONG(buf);
++		objp->slope = IXDR_GET_U_INT32(buf);
++		objp->tmax = IXDR_GET_U_INT32(buf);
++		objp->dmax = IXDR_GET_U_INT32(buf);
+ 		}
+ 		 if (!xdr_array (xdrs, (char **)&objp->metadata.metadata_val, (u_int *) &objp->metadata.metadata_len, ~0,
+ 			sizeof (Ganglia_extra_data), (xdrproc_t) xdr_Ganglia_extra_data))
-- 
cgit v1.2.3