slurm: Remove patch conflicting with subst

[Jason Bacon <jwbacon%tds.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <jwbacon%tds.net@localhost>
Pushed By:	outpaddling
Date:		Tue Aug 16 21:43:21 2016 -0500
Changeset:	42adebe782ecee675a8f067cb7034f41e6b24f7d

Modified Files:
	slurm/Makefile
Removed Files:
	slurm/patches/patch-etc_init.d.slurm.in

Log Message:
slurm: Remove patch conflicting with subst

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

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

diffstat:
 slurm/Makefile                          | 10 ++++-----
 slurm/patches/patch-etc_init.d.slurm.in | 37 ---------------------------------
 2 files changed, 4 insertions(+), 43 deletions(-)

diffs:
diff --git a/slurm/Makefile b/slurm/Makefile
index d752d72..c9fec62 100644
--- a/slurm/Makefile
+++ b/slurm/Makefile
@@ -38,12 +38,10 @@ RCD_SCRIPTS+=		slurmd slurmctld
 SUBST_CLASSES+=		linuxinit
 SUBST_STAGE.linuxinit=	post-patch
 SUBST_FILES.linuxinit=	${WRKSRC}/etc/init.d.slurm.in
-SUBST_SED.linuxinit=	-e 's|^exec_prefix=|&${PREFIX}|'
-SUBST_SED.linuxinit+=	-e 's|^prefix=|&${PREFIX}|'
-SUBST_SED.linuxinit+=	-e 's|@bindir@|$${exec_prefix}/bin|'
-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|'
+SUBST_SED.linuxinit+=	-e 's|@bindir@|${PREFIX}|'
+SUBST_SED.linuxinit+=	-e 's|@sbindir@|${PREFIX}|'
+SUBST_SED.linuxinit+=	-e 's|@libdir@|${PREFIX}|'
+SUBST_SED.linuxinit+=	-e 's|@sysconfdir@|${PREFIX}|'
 
 SUBST_CLASSES+=		configure
 SUBST_STAGE.configure=	post-patch
diff --git a/slurm/patches/patch-etc_init.d.slurm.in b/slurm/patches/patch-etc_init.d.slurm.in
deleted file mode 100644
index 10f521e..0000000
--- a/slurm/patches/patch-etc_init.d.slurm.in
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-etc_init.d.slurm.in,v 1.1 2015/04/20 13:08:37 outpaddling Exp $
-
-# Provide something for SUBST to replace
-
---- etc/init.d.slurm.in.orig	2016-05-31 21:35:09.000000000 +0000
-+++ etc/init.d.slurm.in
-@@ -5,10 +5,10 @@
- #              manages exclusive access to a set of compute \
- #              resources and distributes work to those resources.
- #
--# processname: @sbindir@/slurmd
-+# processname: ${exec_prefix}/sbin/slurmd
- # pidfile: /var/run/slurmd.pid
- #
--# processname: @sbindir@/slurmctld
-+# processname: ${exec_prefix}/sbin/slurmctld
- # pidfile: /var/run/slurmctld.pid
- #
- # config: /etc/sysconfig/slurm
-@@ -25,10 +25,13 @@
- # Description:       Start slurm to provide resource management
- ### END INIT INFO
- 
--BINDIR="@bindir@"
--CONFDIR="@sysconfdir@"
--LIBDIR="@libdir@"
--SBINDIR="@sbindir@"
-+exec_prefix=/home/bacon/Pkgsrc/pkg-2016Q1
-+prefix=/home/bacon/Pkgsrc/pkg-2016Q1
-+
-+BINDIR="${exec_prefix}/bin"
-+CONFDIR="${prefix}/etc"
-+LIBDIR="${exec_prefix}/lib"
-+SBINDIR="${exec_prefix}/sbin"
- 
- # On a bluegene system this will be set to '#'.
- # Yes, FALSE is the correct variable to look at in the .in script.