Tue Mar 13 12:36:25 2012 UTC ()
Add c99 support, fixes build on SunOS.
Change long xdr macros to int32 ones, fixes build on SunOS and ABI=64.

Bump PKGREVISION.


(fhajny)
diff -r1.35 -r1.36 pkgsrc/parallel/ganglia-monitor-core/Makefile
diff -r1.10 -r1.11 pkgsrc/parallel/ganglia-monitor-core/distinfo
diff -r0 -r1.1 pkgsrc/parallel/ganglia-monitor-core/patches/patch-lib__gm_protocol_dr.c
cvs diff -r1.35 -r1.36 pkgsrc/parallel/ganglia-monitor-core/Makefile (expand / switch to unified diff)

--- pkgsrc/parallel/ganglia-monitor-core/Makefile 2012/03/03 00:13:49 1.35
+++ pkgsrc/parallel/ganglia-monitor-core/Makefile 2012/03/13 12:36:25 1.36
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: Makefile,v 1.35 2012/03/03 00:13:49 wiz Exp $ 1# $NetBSD: Makefile,v 1.36 2012/03/13 12:36:25 fhajny Exp $
2# 2#
3 3
4DISTNAME= ganglia-3.1.2 4DISTNAME= ganglia-3.1.2
5PKGNAME= ganglia-monitor-core-3.1.2 5PKGNAME= ganglia-monitor-core-3.1.2
6PKGREVISION= 10 6PKGREVISION= 11
7CATEGORIES= net parallel 7CATEGORIES= net parallel
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ganglia/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ganglia/}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://ganglia.sourceforge.net/ 11HOMEPAGE= http://ganglia.sourceforge.net/
12COMMENT= Ganglia cluster monitor, monitoring daemon 12COMMENT= Ganglia cluster monitor, monitoring daemon
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
18CONFIGURE_ARGS+= --with-gmetad 18CONFIGURE_ARGS+= --with-gmetad
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20USE_LANGUAGES+= c c++ fortran77 20USE_LANGUAGES+= c c++ c99 fortran77
21 21
22PLIST_VARS+= python 22PLIST_VARS+= python
23 23
24PKG_OPTIONS_VAR= PKG_OPTIONS.ganglia 24PKG_OPTIONS_VAR= PKG_OPTIONS.ganglia
25PKG_SUPPORTED_OPTIONS= python # Gmond support for python modules 25PKG_SUPPORTED_OPTIONS= python # Gmond support for python modules
26 26
27.include "../../mk/bsd.options.mk" 27.include "../../mk/bsd.options.mk"
28 28
29.if !empty(PKG_OPTIONS:Mpython) 29.if !empty(PKG_OPTIONS:Mpython)
30CONFIGURE_ARGS+= --with-python=${PYTHONBIN} 30CONFIGURE_ARGS+= --with-python=${PYTHONBIN}
31PLIST.python= yes 31PLIST.python= yes
32.include "../../lang/python/application.mk" 32.include "../../lang/python/application.mk"
33.else 33.else
cvs diff -r1.10 -r1.11 pkgsrc/parallel/ganglia-monitor-core/distinfo (expand / switch to unified diff)

--- pkgsrc/parallel/ganglia-monitor-core/distinfo 2010/11/18 13:50:09 1.10
+++ pkgsrc/parallel/ganglia-monitor-core/distinfo 2012/03/13 12:36:25 1.11
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.10 2010/11/18 13:50:09 wiz Exp $ 1$NetBSD: distinfo,v 1.11 2012/03/13 12:36:25 fhajny Exp $
2 2
3SHA1 (ganglia-3.1.2.tar.gz) = be5db246eb755d8c450140d1c80afef4f1179fe1 3SHA1 (ganglia-3.1.2.tar.gz) = be5db246eb755d8c450140d1c80afef4f1179fe1
4RMD160 (ganglia-3.1.2.tar.gz) = 1f78cf1019759e12c3c65901fd74ac65dfddf4e3 4RMD160 (ganglia-3.1.2.tar.gz) = 1f78cf1019759e12c3c65901fd74ac65dfddf4e3
5Size (ganglia-3.1.2.tar.gz) = 1213196 bytes 5Size (ganglia-3.1.2.tar.gz) = 1213196 bytes
6SHA1 (patch-aa) = e258e4efb1ae012db51901de87e614cede78812c 6SHA1 (patch-aa) = e258e4efb1ae012db51901de87e614cede78812c
7SHA1 (patch-ab) = 260a78711c2c7f1111ce8c4b0d54d2edd60dde08 7SHA1 (patch-ab) = 260a78711c2c7f1111ce8c4b0d54d2edd60dde08
8SHA1 (patch-ac) = d7fa7c4509589a88a568717296b1c7ea0b09fb1e 8SHA1 (patch-ac) = d7fa7c4509589a88a568717296b1c7ea0b09fb1e
 9SHA1 (patch-lib__gm_protocol_dr.c) = 9d17d79bb1a6426a2547c00006819483aff47363
File Added: pkgsrc/parallel/ganglia-monitor-core/patches/Attic/patch-lib__gm_protocol_dr.c
$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))