From 8911abe47554863ae8fa4e9c40792eaa8529f597 Mon Sep 17 00:00:00 2001
From: bacon <bacon@pkgsrc.org>
Date: Sun, 22 Apr 2018 17:25:52 +0000
Subject: slurm: Rename to slurm-wlm to resolve conflict with net/slurm

ok wiz@
---
 parallel/Makefile       | 4 ++--
 parallel/slurm/DESCR    | 7 -------
 parallel/slurm/Makefile | 8 ++++----
 3 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 parallel/slurm/DESCR

(limited to 'parallel')

diff --git a/parallel/Makefile b/parallel/Makefile
index ee0750a6888..c527d7091d5 100644
--- a/parallel/Makefile
+++ b/parallel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2014/01/10 22:45:11 cheusov Exp $
+# $NetBSD: Makefile,v 1.25 2018/04/22 17:25:52 bacon Exp $
 #
 
 COMMENT=	Applications dealing with parallelism in computing
@@ -20,7 +20,7 @@ SUBDIR+=	pdsh
 SUBDIR+=	pvm3
 SUBDIR+=	py-billiard
 SUBDIR+=	sge
-SUBDIR+=	slurm
+SUBDIR+=	slurm-wlm
 SUBDIR+=	threadingbuildingblocks
 
 .include "../mk/misc/category.mk"
diff --git a/parallel/slurm/DESCR b/parallel/slurm/DESCR
deleted file mode 100644
index 655b1afe27c..00000000000
--- a/parallel/slurm/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-SLURM is an open-source resource manager designed for Linux clusters of
-all sizes. It provides three key functions. First it allocates exclusive
-and/or non-exclusive access to resources (computer nodes) to users for some
-duration of time so they can perform work. Second, it provides a framework
-for starting, executing, and monitoring work (typically a parallel job) on
-a set of allocated nodes. Finally, it arbitrates contention for resources
-by managing a queue of pending work.
diff --git a/parallel/slurm/Makefile b/parallel/slurm/Makefile
index 2a0dbd0484e..5b70875478e 100644
--- a/parallel/slurm/Makefile
+++ b/parallel/slurm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2018/03/25 14:55:29 bacon Exp $
+# $NetBSD: Makefile,v 1.26 2018/04/22 17:25:53 bacon Exp $
 
 DISTNAME=	slurm-17.11.5
+PKGNAME=	slurm-wlm-17.11.5
 CATEGORIES=	parallel
 MASTER_SITES=	http://www.schedmd.com/download/archive/
 MASTER_SITES+=	http://www.schedmd.com/download/latest/
@@ -66,12 +67,11 @@ SUBST_STAGE.make-ex=	post-install
 SUBST_FILES.make-ex=	etc/Makefile
 SUBST_SED.make-ex=	-e 's|${WRKDIR}|<build-prefix>|g'
 
-INSTALLATION_DIRS+=	share/examples/${PKGBASE}
+INSTALLATION_DIRS+=	share/examples/slurm
 
 post-install:
 	${RM} -f ${WRKSRC}/etc/init.d.slurm.in.orig
-	${INSTALL_DATA} ${WRKSRC}/etc/* \
-		${DESTDIR}${PREFIX}/share/examples/${PKGBASE}/
+	${INSTALL_DATA} ${WRKSRC}/etc/* ${DESTDIR}${PREFIX}/share/examples/slurm
 
 .include "../../www/curl/buildlink3.mk"
 .include "../../lang/python/tool.mk"
-- 
cgit v1.2.3