ganglia-monitor-core-devel: Clean up, reduce impact of patch change

[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 16:58:06 2018 -0500
Changeset:	e4679d445bc24540e186e9915d99bc2529bafbe9

Modified Files:
	ganglia-monitor-core-devel/MESSAGE
	ganglia-monitor-core-devel/Makefile
	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

Log Message:
ganglia-monitor-core-devel: Clean up, reduce impact of patch change

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

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

diffstat:
 ganglia-monitor-core-devel/MESSAGE                             | 2 ++
 ganglia-monitor-core-devel/Makefile                            | 1 +
 ganglia-monitor-core-devel/distinfo                            | 4 ++--
 ganglia-monitor-core-devel/patches/patch-gmetad_data__thread.c | 2 +-
 ganglia-monitor-core-devel/patches/patch-gmetad_rrd__helpers.c | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diffs:
diff --git a/ganglia-monitor-core-devel/MESSAGE b/ganglia-monitor-core-devel/MESSAGE
index d6d0a5a24d..84aecf41e3 100644
--- a/ganglia-monitor-core-devel/MESSAGE
+++ b/ganglia-monitor-core-devel/MESSAGE
@@ -1,3 +1,5 @@
+===========================================================================
+$NetBSD$
 
 The above refers to NetBSD.  Linux init and systemd scripts are available in
 
diff --git a/ganglia-monitor-core-devel/Makefile b/ganglia-monitor-core-devel/Makefile
index c6c37f7d80..e9393a2ed0 100644
--- a/ganglia-monitor-core-devel/Makefile
+++ b/ganglia-monitor-core-devel/Makefile
@@ -23,6 +23,7 @@ PLIST_VARS+=		python
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ganglia
 PKG_SUPPORTED_OPTIONS=	python		# Gmond support for python modules
+BUILD_DEFS+=		VARBASE
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/ganglia-monitor-core-devel/distinfo b/ganglia-monitor-core-devel/distinfo
index 4e17cdd743..87c5eeac0e 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) = a1dc8eec422490eb555809cc310df311d29113b8
-SHA1 (patch-gmetad_rrd__helpers.c) = 541f42ed529fdb24b4eba56fbfbbec35262344f4
+SHA1 (patch-gmetad_data__thread.c) = 1af7a1c5b3f78bf65de42638e8ed595bf718107a
+SHA1 (patch-gmetad_rrd__helpers.c) = e1afe61311b0df96f633983e673652b32a1938f4
 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 3967acfa7d..ecfc357f35 100644
--- a/ganglia-monitor-core-devel/patches/patch-gmetad_data__thread.c
+++ b/ganglia-monitor-core-devel/patches/patch-gmetad_data__thread.c
@@ -8,7 +8,7 @@ $NetBSD$
  #include <stdio.h>
  #include <stdlib.h>
  #include <unistd.h>
-+#ifdef __NetBSD__
++#ifndef __linux__
 +#include <sys/filio.h>
 +#endif
  #include <sys/ioctl.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 aa007d60d4..5f60b1ce7e 100644
--- a/ganglia-monitor-core-devel/patches/patch-gmetad_rrd__helpers.c
+++ b/ganglia-monitor-core-devel/patches/patch-gmetad_rrd__helpers.c
@@ -8,7 +8,7 @@ $NetBSD$
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-+#ifdef __NetBSD__
++#ifndef __linux__
 +#include <sys/filio.h>
 +#endif
  #include <sys/types.h>