slurm: Clean NetBSD solution, add lua support

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

Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Fri Mar 2 19:55:23 2018 -0600
Changeset:	d3e136d35b7ff25e4c4feeff80c6d76f5f9ee31b

Modified Files:
	slurm/Makefile
	slurm/PLIST
	slurm/TODO

Log Message:
slurm: Clean NetBSD solution, add lua support

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

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

diffstat:
 slurm/Makefile | 21 ++++++++++++---------
 slurm/PLIST    |  2 ++
 slurm/TODO     |  6 ------
 3 files changed, 14 insertions(+), 15 deletions(-)

diffs:
diff --git a/slurm/Makefile b/slurm/Makefile
index 48b392b020..a63f6ee720 100644
--- a/slurm/Makefile
+++ b/slurm/Makefile
@@ -19,15 +19,18 @@ BUILD_DEPENDS+=	man2html-[0-9]*:../../wip/man2html
 USE_LANGUAGES=	c c++
 
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	perl pkg-config
+USE_TOOLS+=	bash perl pkg-config
 USE_LIBTOOL=	yes
 
 # Help find pkgsrc man2html
+CONFIG_SHELL=		bash
 CONFIGURE_ARGS+=	--bindir=${PREFIX}/bin
 CONFIGURE_ARGS+=	--htmldir=${PREFIX}/share/doc/${PKGNAME_NOREV}/html
 CONFIGURE_ARGS+=	--with-munge=${BUILDLINK_PREFIX.munge}
 CONFIGURE_ARGS+=	--with-hwloc=${PREFIX}
 CONFIGURE_ARGS+=	--with-json=${PREFIX}
+# CONFIGURE_ARGS+=	--with-rrdtool=${PREFIX}
+CONFIGURE_ARGS+=	--with-libssh2=${PREFIX}
 
 LDFLAGS+=		-llz4
 
@@ -65,13 +68,11 @@ SUBST_STAGE.make-ex=	post-install
 SUBST_FILES.make-ex=	etc/Makefile
 SUBST_SED.make-ex=	-e 's|${WRKDIR}|<build-prefix>|g'
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == NetBSD
-
+# .include "../../mk/bsd.prefs.mk"
+# .if ${OPSYS} == NetBSD
 # Workaround for configure not finding libslurmfull on NetBSD
-CONFIGURE_ARGS+=	--with-shared-libslurm=no
-.endif
+# CONFIGURE_ARGS+=	--with-shared-libslurm=no
+# .endif
 
 INSTALLATION_DIRS+=	share/examples/${PKGBASE}
 
@@ -90,9 +91,11 @@ post-install:
 .include "../../devel/readline/buildlink3.mk"
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../textproc/json-c/buildlink3.mk"
+# Rather big dependencies
+# .include "../../databases/rrdtool/buildlink3.mk"
+.include "../../security/libssh2/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
 .include "../../mk/mysql.buildlink3.mk"
-# For limiting user access to compute nodes
-.include "../../mk/pam.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/slurm/PLIST b/slurm/PLIST
index 2e20a9173b..4b3a4c45e9 100644
--- a/slurm/PLIST
+++ b/slurm/PLIST
@@ -60,6 +60,7 @@ lib/slurm/job_submit_all_partitions.la
 lib/slurm/job_submit_cray.la
 lib/slurm/job_submit_defaults.la
 lib/slurm/job_submit_logging.la
+lib/slurm/job_submit_lua.la
 lib/slurm/job_submit_partition.la
 lib/slurm/job_submit_pbs.la
 lib/slurm/job_submit_require_timelimit.la
@@ -96,6 +97,7 @@ lib/slurm/priority_basic.la
 lib/slurm/priority_multifactor.la
 lib/slurm/proctrack_cgroup.la
 lib/slurm/proctrack_linuxproc.la
+lib/slurm/proctrack_lua.la
 lib/slurm/proctrack_pgid.la
 lib/slurm/route_default.la
 lib/slurm/route_topology.la
diff --git a/slurm/TODO b/slurm/TODO
index dcd043be45..f02149bcca 100644
--- a/slurm/TODO
+++ b/slurm/TODO
@@ -1,9 +1,3 @@
-Fix configure for NetBSD so --with-shared-libslurm=no can be removed
-# Workaround for configure not finding libslurmfull on NetBSD
-# Causes LIB_SLURM and LIB_SLURMDB to lack
-# -L$(top_builddir)/src/db_api/.libs -lslurmdb -lslurmfull'
-# Look for failure to find libslurmful in configure output
-
 Get cpu affinity working on NetBSD
 
 SUBST_CLASSES+=		affin