slurm-wlm: Hack PLIST to allow NetBSD install w/o task affinity for now

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

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Thu Jan 30 10:11:03 2020 -0600
Changeset:	41b63a90dea1ca03d9ab301fe450ed6225c0367c

Modified Files:
	slurm-wlm/Makefile
	slurm-wlm/PLIST
	slurm-wlm/PLIST.Linux

Log Message:
slurm-wlm: Hack PLIST to allow NetBSD install w/o task affinity for now

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

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

diffstat:
 slurm-wlm/Makefile    | 10 ++++------
 slurm-wlm/PLIST       |  2 --
 slurm-wlm/PLIST.Linux |  2 ++
 3 files changed, 6 insertions(+), 8 deletions(-)

diffs:
diff --git a/slurm-wlm/Makefile b/slurm-wlm/Makefile
index df060cb1ab..f8241eb8cc 100644
--- a/slurm-wlm/Makefile
+++ b/slurm-wlm/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.6 2018/08/22 09:46:10 wiz Exp $
 
 DISTNAME=	slurm-19.05.5
-PKGNAME=	slurm-wlm-19.05.5
+PKGNAME=	${DISTNAME:S/-/-wlm-/}
 CATEGORIES=	parallel
 MASTER_SITES=	http://download.schedmd.com/slurm/
 MASTER_SITES+=	http://www.schedmd.com/download/latest/
@@ -13,9 +13,6 @@ COMMENT=	Simple Linux Utility for Resource Management
 
 LICENSE=	gnu-gpl-v2
 
-# Still need this since 17.11.5 was committed?
-SUPERSEDES+=	slurm-2.6.4.*
-
 BUILD_DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool-base
 BUILD_DEPENDS+=	man2html-[0-9]*:../../textproc/man2html
 
@@ -31,7 +28,8 @@ CONFIGURE_ARGS+=	--with-munge=${BUILDLINK_PREFIX.munge}
 CONFIGURE_ARGS+=	--with-hwloc=${PREFIX}
 CONFIGURE_ARGS+=	--with-json=${PREFIX}
 CONFIGURE_ARGS+=	--with-libssh2=${PREFIX}
-CONFIGURE_ARGS.NetBSD+=	ac_cv_func_sched_setaffinity=yes
+# Future: Enable task affinity code is fully patched for NetBSD
+# CONFIGURE_ARGS.NetBSD+=	ac_cv_func_sched_setaffinity=yes
 
 LDFLAGS+=		-llz4
 
@@ -59,7 +57,7 @@ SUBST_SED.linuxinit+=	-e 's|@sbindir@|$${exec_prefix}/sbin|'
 SUBST_SED.linuxinit+=	-e 's|@libdir@|$${exec_prefix}/lib|'
 SUBST_SED.linuxinit+=	-e 's|@sysconfdir@|$${prefix}/etc|'
 
-# Configure flag to disable gtk does not work, so set an impossible requirement
+# Config flag for disabling gtk does not work, so set an impossible requirement
 SUBST_CLASSES+=		gtk
 SUBST_STAGE.gtk=	pre-configure
 SUBST_SED.gtk=		-e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|'
diff --git a/slurm-wlm/PLIST b/slurm-wlm/PLIST
index cf024cea5b..7b38d950d0 100644
--- a/slurm-wlm/PLIST
+++ b/slurm-wlm/PLIST
@@ -111,10 +111,8 @@ lib/slurm/slurmctld_nonstop.la
 lib/slurm/spank_pbs.la
 lib/slurm/src/sattach/sattach.wrapper.c
 lib/slurm/src/srun/srun.wrapper.c
-lib/slurm/switch_cray_aries.la
 lib/slurm/switch_generic.la
 lib/slurm/switch_none.la
-lib/slurm/task_affinity.la
 lib/slurm/task_cray_aries.la
 lib/slurm/task_none.la
 lib/slurm/topology_3d_torus.la
diff --git a/slurm-wlm/PLIST.Linux b/slurm-wlm/PLIST.Linux
index c08552b1b2..4502136d61 100644
--- a/slurm-wlm/PLIST.Linux
+++ b/slurm-wlm/PLIST.Linux
@@ -1,4 +1,6 @@
 @comment $NetBSD$
 lib/slurm/jobacct_gather_cgroup.la
 lib/slurm/proctrack_cgroup.la
+lib/slurm/switch_cray_aries.la
+lib/slurm/task_affinity.la
 lib/slurm/task_cgroup.la