slurm: Adjust NetBSD patch to include FreeBSD

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

Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Thu Mar 22 09:14:18 2018 -0500
Changeset:	979fa96fbd656d3f5e5abccb145caa2080252f4a

Modified Files:
	slurm/distinfo
	slurm/patches/patch-src_plugins_task_cgroup_task__cgroup__memory.c

Log Message:
slurm: Adjust NetBSD patch to include FreeBSD

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

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

diffstat:
 slurm/distinfo                                                 |  2 +-
 .../patch-src_plugins_task_cgroup_task__cgroup__memory.c       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs:
diff --git a/slurm/distinfo b/slurm/distinfo
index 0397322dc3..918f9e6897 100644
--- a/slurm/distinfo
+++ b/slurm/distinfo
@@ -5,7 +5,7 @@ RMD160 (slurm-17.11.5.tar.bz2) = 8d393e7ddf545ac1e8c81e8ddd9160a5e76d9311
 SHA512 (slurm-17.11.5.tar.bz2) = cb82e192bf0ab57fbc810fc3c9b32e90d4c28926b4a959514e3df51b63556b13d01057938d73da5bc0bea157bbd7712b1aad0712a913ad912bd7e6089fc0bd21
 Size (slurm-17.11.5.tar.bz2) = 6248551 bytes
 SHA1 (patch-etc_init.d.slurm.in) = beaedd5385b4aad04583d2bc5a23557519f74ec5
-SHA1 (patch-src_plugins_task_cgroup_task__cgroup__memory.c) = 967c2c5ba4ed880d81ee10681eb7bc4ce408d215
+SHA1 (patch-src_plugins_task_cgroup_task__cgroup__memory.c) = 1accc4ebb9456699db477557ddc783e136fdff00
 SHA1 (patch-src_slurmd_common_task__plugin.c) = 0d6680b10b45648703fe7a57411e605992fd9040
 SHA1 (patch-src_slurmd_common_task__plugin.h) = d4ad9f350efe1e873809adfe9dc4f559634e9ba2
 SHA1 (patch-src_slurmd_slurmd_slurmd.c) = 67cac6d8b4545c9053b655a4da77db63f5de7e63
diff --git a/slurm/patches/patch-src_plugins_task_cgroup_task__cgroup__memory.c b/slurm/patches/patch-src_plugins_task_cgroup_task__cgroup__memory.c
index e94babddbf..9ca5888e0b 100644
--- a/slurm/patches/patch-src_plugins_task_cgroup_task__cgroup__memory.c
+++ b/slurm/patches/patch-src_plugins_task_cgroup_task__cgroup__memory.c
@@ -1,14 +1,14 @@
 $NetBSD$
 
-# No eventfd on NetBSD 7
-
---- src/plugins/task/cgroup/task_cgroup_memory.c.orig	2018-02-26 19:16:37.000000000 +0000
+# Guard Linuxism?
+--- src/plugins/task/cgroup/task_cgroup_memory.c.orig	2018-03-15 18:57:29.000000000 +0000
 +++ src/plugins/task/cgroup/task_cgroup_memory.c
-@@ -39,7 +39,9 @@
+@@ -39,7 +39,10 @@
  #include <poll.h>
  #include <signal.h>
  #include <stdlib.h>		/* getenv */
-+#ifndef __NetBSD__
++// Should this be defined(__Linux__)?
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
  #include <sys/eventfd.h>
 +#endif
  #include <sys/types.h>