ganglia-monitor-core-devel: Unbreak Linux build

[Jason Bacon <bacon%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Tue Jun 26 08:44:16 2018 -0500
Changeset:	9981d9c1e22f3cb2c16f942e0e91c12cf5dc2b1c

Modified Files:
	ganglia-monitor-core-devel/distinfo
	ganglia-monitor-core-devel/patches/patch-gmetad_data__thread.c
	ganglia-monitor-core-devel/patches/patch-gmetad_rrd__helpers.c
	ganglia-monitor-core/Makefile

Log Message:
ganglia-monitor-core-devel: Unbreak Linux build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9981d9c1e22f3cb2c16f942e0e91c12cf5dc2b1c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ganglia-monitor-core-devel/distinfo                            | 4 ++--
 ganglia-monitor-core-devel/patches/patch-gmetad_data__thread.c | 8 +++++---
 ganglia-monitor-core-devel/patches/patch-gmetad_rrd__helpers.c | 8 +++++---
 ganglia-monitor-core/Makefile                                  | 2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diffs:
diff --git a/ganglia-monitor-core-devel/distinfo b/ganglia-monitor-core-devel/distinfo
index 29a14e1317..4e17cdd743 100644
--- a/ganglia-monitor-core-devel/distinfo
+++ b/ganglia-monitor-core-devel/distinfo
@@ -7,8 +7,8 @@ Size (ganglia-3.7.2.tar.gz) = 1302320 bytes
 SHA1 (patch-ac) = 09a96c391f185ddd5f7a64a8b030f38c36ffbc76
 SHA1 (patch-configure) = d8f096263a8b2f04e30d4a053b4636ac5d1cd95f
 SHA1 (patch-gmetad_conf.c.in) = 75aa2d0c5d8af8a2864f7225444f1f263df4a60b
-SHA1 (patch-gmetad_data__thread.c) = 8dedb930e54872dab97d659f7d911a540171dbfd
-SHA1 (patch-gmetad_rrd__helpers.c) = 643c359f461e9616b547b276281bcc9a39a77a28
+SHA1 (patch-gmetad_data__thread.c) = a1dc8eec422490eb555809cc310df311d29113b8
+SHA1 (patch-gmetad_rrd__helpers.c) = 541f42ed529fdb24b4eba56fbfbbec35262344f4
 SHA1 (patch-gmond_gmond.conf.5) = dfabfee6fb26cd5a384c1baed48fe631b957cf5b
 SHA1 (patch-gmond_modules_conf.d_modpython.conf.in) = 5b0d79efb34dae2f46dd911509759e8d75b4af96
 SHA1 (patch-lib__gm_protocol_dr.c) = 9d17d79bb1a6426a2547c00006819483aff47363
diff --git a/ganglia-monitor-core-devel/patches/patch-gmetad_data__thread.c b/ganglia-monitor-core-devel/patches/patch-gmetad_data__thread.c
index 796dbdaac8..3967acfa7d 100644
--- a/ganglia-monitor-core-devel/patches/patch-gmetad_data__thread.c
+++ b/ganglia-monitor-core-devel/patches/patch-gmetad_data__thread.c
@@ -1,14 +1,16 @@
-$NetBSD: patch-gmetad_data__thread.c,v 1.1 2016/02/16 12:48:18 fhajny Exp $
+$NetBSD$
 
-Portability.
+# Portability
 
 --- gmetad/data_thread.c.orig	2015-07-01 19:49:35.000000000 +0000
 +++ gmetad/data_thread.c
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,9 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <unistd.h>
++#ifdef __NetBSD__
 +#include <sys/filio.h>
++#endif
  #include <sys/ioctl.h>
  #include <sys/poll.h>
  #include <sys/time.h>
diff --git a/ganglia-monitor-core-devel/patches/patch-gmetad_rrd__helpers.c b/ganglia-monitor-core-devel/patches/patch-gmetad_rrd__helpers.c
index 3040adb5f5..aa007d60d4 100644
--- a/ganglia-monitor-core-devel/patches/patch-gmetad_rrd__helpers.c
+++ b/ganglia-monitor-core-devel/patches/patch-gmetad_rrd__helpers.c
@@ -1,14 +1,16 @@
-$NetBSD: patch-gmetad_rrd__helpers.c,v 1.1 2016/02/16 12:48:18 fhajny Exp $
+$NetBSD$
 
-Portability.
+# Portability
 
 --- gmetad/rrd_helpers.c.orig	2015-07-01 19:49:35.000000000 +0000
 +++ gmetad/rrd_helpers.c
-@@ -2,6 +2,7 @@
+@@ -2,6 +2,9 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
++#ifdef __NetBSD__
 +#include <sys/filio.h>
++#endif
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <unistd.h>
diff --git a/ganglia-monitor-core/Makefile b/ganglia-monitor-core/Makefile
index 3d35c92dc1..d5d18626f3 100644
--- a/ganglia-monitor-core/Makefile
+++ b/ganglia-monitor-core/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	bacon%NetBSD.org@localhost
 COMMENT=	Ganglia cluster monitor, monitoring daemon
 LICENSE=	modified-bsd
 
-SET_LIBDIR=		yes
+SET_LIBDIR=	yes
 
 USE_LANGUAGES=	c
 USE_TOOLS+=	pkg-config