slurm-wlm: Clean up

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

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Fri Jan 31 09:45:16 2020 -0600
Changeset:	6e2ff30ca5a0624b3db77d945a2bf8fbbc273394

Modified Files:
	slurm-wlm/Makefile
	slurm-wlm/distinfo
	slurm-wlm/patches/patch-src_slurmd_slurmstepd_task.c

Log Message:
slurm-wlm: Clean up

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

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

diffstat:
 slurm-wlm/Makefile                                   |  4 ++--
 slurm-wlm/distinfo                                   |  2 +-
 slurm-wlm/patches/patch-src_slurmd_slurmstepd_task.c | 12 +++---------
 3 files changed, 6 insertions(+), 12 deletions(-)

diffs:
diff --git a/slurm-wlm/Makefile b/slurm-wlm/Makefile
index f8241eb8cc..51ef9cc728 100644
--- a/slurm-wlm/Makefile
+++ b/slurm-wlm/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple Linux Utility for Resource Management
 
 LICENSE=	gnu-gpl-v2
 
-BUILD_DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool-base
+# BUILD_DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool-base
 BUILD_DEPENDS+=	man2html-[0-9]*:../../textproc/man2html
 
 GNU_CONFIGURE=	yes
@@ -71,8 +71,8 @@ SUBST_SED.make-ex=	-e 's|${WRKDIR}|<build-prefix>|g'
 INSTALLATION_DIRS+=	share/examples/slurm
 
 post-install:
-	${RM} -f ${WRKSRC}/etc/init.d.slurm.in.orig
 	${INSTALL_DATA} ${WRKSRC}/etc/* ${DESTDIR}${PREFIX}/share/examples/slurm
+	${RM} -f ${DESTDIR}${PREFIX}/share/examples/slurm/init.d.slurm.in.orig
 
 .include "../../www/curl/buildlink3.mk"
 .include "../../lang/python/tool.mk"
diff --git a/slurm-wlm/distinfo b/slurm-wlm/distinfo
index b234303192..7dff50c6b6 100644
--- a/slurm-wlm/distinfo
+++ b/slurm-wlm/distinfo
@@ -11,4 +11,4 @@ SHA1 (patch-src_slurmd_common_task__plugin.h) = d4ad9f350efe1e873809adfe9dc4f559
 SHA1 (patch-src_slurmd_slurmd_slurmd.c) = 93f2da51d2a766a5817cc51e7de40e4ab2306649
 SHA1 (patch-src_slurmd_slurmd_slurmd.h) = a610b0bbe5b6b04be70eb2f8eac2a231139e6d1a
 SHA1 (patch-src_slurmd_slurmstepd_io.c) = b56782887621edb539be70d53dff8029a89e90ed
-SHA1 (patch-src_slurmd_slurmstepd_task.c) = 7948c76ce65b0e5211486d2e7b1901664c1f7016
+SHA1 (patch-src_slurmd_slurmstepd_task.c) = 756dd8eb7201d003a6a7f01aa84b699f9a3ce11b
diff --git a/slurm-wlm/patches/patch-src_slurmd_slurmstepd_task.c b/slurm-wlm/patches/patch-src_slurmd_slurmstepd_task.c
index 85a25355c0..d22f90c983 100644
--- a/slurm-wlm/patches/patch-src_slurmd_slurmstepd_task.c
+++ b/slurm-wlm/patches/patch-src_slurmd_slurmstepd_task.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_slurmd_slurmstepd_task.c,v 1.1 2018/04/22 21:31:09 bacon Exp $
+$NetBSD$
 
 # Linux compat
 
---- src/slurmd/slurmstepd/task.c.orig	2016-05-03 22:41:59.000000000 +0000
+--- src/slurmd/slurmstepd/task.c.orig	2019-12-20 20:44:51.000000000 +0000
 +++ src/slurmd/slurmstepd/task.c
-@@ -558,6 +558,18 @@ _make_tmpdir(stepd_step_rec_t *job)
+@@ -573,6 +573,12 @@ _make_tmpdir(stepd_step_rec_t *job)
  		 * still work with older systems we include this check.
  		 */
  
@@ -14,12 +14,6 @@ $NetBSD: patch-src_slurmd_slurmstepd_task.c,v 1.1 2018/04/22 21:31:09 bacon Exp
 +#define HAVE_EACCESS 1
 +#endif
 +  
-+// Unsure about the reason for this patch, but it dates back to SLURM 2.6.4
-+//#if defined(__FreeBSD__) || defined(__NetBSD__)
-+//#define __GLIBC__               (1) 
-+//#define __GLIBC_PREREQ(a,b)     (1) 
-+//#endif
-+
  #if defined(HAVE_FACCESSAT)
  		else if (faccessat(AT_FDCWD, tmpdir, X_OK|W_OK, AT_EACCESS))
  #elif defined(HAVE_EACCESS)