slurm, slurm-devel: Clean up patches, Makefile, and merge plists per pkglint -Wall

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: slurm, slurm-devel: Clean up patches, Makefile, and merge plists per pkglint -Wall
From: Jason Bacon <bacon4000%gmail.com@localhost>
Date: Mon, 16 May 2016 15:17:37 +0000
Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Mon May 16 10:17:37 2016 -0500
Changeset:	0741af5d0d8f5097538dbc31acddfa67e8b2a720

Modified Files:
	slurm-devel/Makefile
	slurm-devel/PLIST.Linux
	slurm-devel/distinfo
	slurm-devel/patches/patch-src_slurmd_slurmstepd_task.c
	slurm/distinfo
	slurm/patches/patch-src_slurmd_slurmstepd_task.c

Log Message:
slurm, slurm-devel: Clean up patches, Makefile, and merge plists per pkglint -Wall

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

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

diffstat:
 slurm-devel/Makefile                               | 10 ++-
 slurm-devel/PLIST.Linux                            | 78 +++++++++++-----------
 slurm-devel/distinfo                               |  2 +-
 .../patches/patch-src_slurmd_slurmstepd_task.c     |  2 +
 slurm/distinfo                                     |  2 +-
 slurm/patches/patch-src_slurmd_slurmstepd_task.c   |  2 +
 6 files changed, 49 insertions(+), 47 deletions(-)

diffs:
diff --git a/slurm-devel/Makefile b/slurm-devel/Makefile
index 7ca8819..2e6878a 100644
--- a/slurm-devel/Makefile
+++ b/slurm-devel/Makefile
@@ -47,17 +47,15 @@ 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|'
 
-MAKEFILE_EXAMPLE=	${WRKSRC}/etc/Makefile
+SUBST_CLASSES+=		make-ex
+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}
 
 post-install:
-	# Sanity checks fail if installed files contain references to WRKSRC
-	${SED} -e "s|${WRKDIR}|PREFIX|g" \
-		${MAKEFILE_EXAMPLE} > ${MAKEFILE_EXAMPLE}.tmp
-	${MV} -f ${MAKEFILE_EXAMPLE}.tmp ${MAKEFILE_EXAMPLE}
 	${RM} -f ${WRKSRC}/etc/init.d.slurm.in.orig
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/etc/* ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}/
 	${CHMOD} 755 ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}/init.d.slurm
 
diff --git a/slurm-devel/PLIST.Linux b/slurm-devel/PLIST.Linux
index 68c65b0..bef2ecf 100644
--- a/slurm-devel/PLIST.Linux
+++ b/slurm-devel/PLIST.Linux
@@ -1,41 +1,41 @@
 @comment $NetBSD: PLIST.Linux,v 1.4 2015/04/29 12:41:49 outpaddling Exp $
 lib/slurm/task_affinity.la
-share/doc/${PKGNAME}-0rc1/html/acct_gather.conf.html
-share/doc/${PKGNAME}-0rc1/html/bluegene.conf.html
-share/doc/${PKGNAME}-0rc1/html/burst_buffer.conf.html
-share/doc/${PKGNAME}-0rc1/html/cgroup.conf.html
-share/doc/${PKGNAME}-0rc1/html/cray.conf.html
-share/doc/${PKGNAME}-0rc1/html/ext_sensors.conf.html
-share/doc/${PKGNAME}-0rc1/html/gres.conf.html
-share/doc/${PKGNAME}-0rc1/html/knl.conf.html
-share/doc/${PKGNAME}-0rc1/html/nonstop.conf.html
-share/doc/${PKGNAME}-0rc1/html/sacct.html
-share/doc/${PKGNAME}-0rc1/html/sacctmgr.html
-share/doc/${PKGNAME}-0rc1/html/salloc.html
-share/doc/${PKGNAME}-0rc1/html/sattach.html
-share/doc/${PKGNAME}-0rc1/html/sbatch.html
-share/doc/${PKGNAME}-0rc1/html/sbcast.html
-share/doc/${PKGNAME}-0rc1/html/scancel.html
-share/doc/${PKGNAME}-0rc1/html/scontrol.html
-share/doc/${PKGNAME}-0rc1/html/sdiag.html
-share/doc/${PKGNAME}-0rc1/html/sh5util.html
-share/doc/${PKGNAME}-0rc1/html/sinfo.html
-share/doc/${PKGNAME}-0rc1/html/slurm.conf.html
-share/doc/${PKGNAME}-0rc1/html/slurmctld.html
-share/doc/${PKGNAME}-0rc1/html/slurmd.html
-share/doc/${PKGNAME}-0rc1/html/slurmdbd.conf.html
-share/doc/${PKGNAME}-0rc1/html/slurmdbd.html
-share/doc/${PKGNAME}-0rc1/html/slurmstepd.html
-share/doc/${PKGNAME}-0rc1/html/smap.html
-share/doc/${PKGNAME}-0rc1/html/spank.html
-share/doc/${PKGNAME}-0rc1/html/sprio.html
-share/doc/${PKGNAME}-0rc1/html/squeue.html
-share/doc/${PKGNAME}-0rc1/html/sreport.html
-share/doc/${PKGNAME}-0rc1/html/srun.html
-share/doc/${PKGNAME}-0rc1/html/srun_cr.html
-share/doc/${PKGNAME}-0rc1/html/sshare.html
-share/doc/${PKGNAME}-0rc1/html/sstat.html
-share/doc/${PKGNAME}-0rc1/html/strigger.html
-share/doc/${PKGNAME}-0rc1/html/sview.html
-share/doc/${PKGNAME}-0rc1/html/topology.conf.html
-share/doc/${PKGNAME}-0rc1/html/wiki.conf.html
+share/doc/${PKGNAME}-0rc2/html/acct_gather.conf.html
+share/doc/${PKGNAME}-0rc2/html/bluegene.conf.html
+share/doc/${PKGNAME}-0rc2/html/burst_buffer.conf.html
+share/doc/${PKGNAME}-0rc2/html/cgroup.conf.html
+share/doc/${PKGNAME}-0rc2/html/cray.conf.html
+share/doc/${PKGNAME}-0rc2/html/ext_sensors.conf.html
+share/doc/${PKGNAME}-0rc2/html/gres.conf.html
+share/doc/${PKGNAME}-0rc2/html/knl.conf.html
+share/doc/${PKGNAME}-0rc2/html/nonstop.conf.html
+share/doc/${PKGNAME}-0rc2/html/sacct.html
+share/doc/${PKGNAME}-0rc2/html/sacctmgr.html
+share/doc/${PKGNAME}-0rc2/html/salloc.html
+share/doc/${PKGNAME}-0rc2/html/sattach.html
+share/doc/${PKGNAME}-0rc2/html/sbatch.html
+share/doc/${PKGNAME}-0rc2/html/sbcast.html
+share/doc/${PKGNAME}-0rc2/html/scancel.html
+share/doc/${PKGNAME}-0rc2/html/scontrol.html
+share/doc/${PKGNAME}-0rc2/html/sdiag.html
+share/doc/${PKGNAME}-0rc2/html/sh5util.html
+share/doc/${PKGNAME}-0rc2/html/sinfo.html
+share/doc/${PKGNAME}-0rc2/html/slurm.conf.html
+share/doc/${PKGNAME}-0rc2/html/slurmctld.html
+share/doc/${PKGNAME}-0rc2/html/slurmd.html
+share/doc/${PKGNAME}-0rc2/html/slurmdbd.conf.html
+share/doc/${PKGNAME}-0rc2/html/slurmdbd.html
+share/doc/${PKGNAME}-0rc2/html/slurmstepd.html
+share/doc/${PKGNAME}-0rc2/html/smap.html
+share/doc/${PKGNAME}-0rc2/html/spank.html
+share/doc/${PKGNAME}-0rc2/html/sprio.html
+share/doc/${PKGNAME}-0rc2/html/squeue.html
+share/doc/${PKGNAME}-0rc2/html/sreport.html
+share/doc/${PKGNAME}-0rc2/html/srun.html
+share/doc/${PKGNAME}-0rc2/html/srun_cr.html
+share/doc/${PKGNAME}-0rc2/html/sshare.html
+share/doc/${PKGNAME}-0rc2/html/sstat.html
+share/doc/${PKGNAME}-0rc2/html/strigger.html
+share/doc/${PKGNAME}-0rc2/html/sview.html
+share/doc/${PKGNAME}-0rc2/html/topology.conf.html
+share/doc/${PKGNAME}-0rc2/html/wiki.conf.html
diff --git a/slurm-devel/distinfo b/slurm-devel/distinfo
index 3c15ab1..a73562b 100644
--- a/slurm-devel/distinfo
+++ b/slurm-devel/distinfo
@@ -10,4 +10,4 @@ SHA1 (patch-src_common_gres.c) = 0051f23e065ad70856ee261469591f454eafaf61
 SHA1 (patch-src_plugins_burst__buffer_common_burst__buffer__common.c) = b21a852722c26b955ae51d8615c9d22304650d32
 SHA1 (patch-src_plugins_power_common_power__common.c) = 7527e0655efe6ea0243cb3a9ff21814002bed5d9
 SHA1 (patch-src_plugins_switch_generic_switch__generic.c) = acf9bcc6f8a787770cd8553de520edef5bdbda4a
-SHA1 (patch-src_slurmd_slurmstepd_task.c) = 38498af389b770145c55bc9428d84c5d6a10ca91
+SHA1 (patch-src_slurmd_slurmstepd_task.c) = 7948c76ce65b0e5211486d2e7b1901664c1f7016
diff --git a/slurm-devel/patches/patch-src_slurmd_slurmstepd_task.c b/slurm-devel/patches/patch-src_slurmd_slurmstepd_task.c
index 831091c..4681525 100644
--- a/slurm-devel/patches/patch-src_slurmd_slurmstepd_task.c
+++ b/slurm-devel/patches/patch-src_slurmd_slurmstepd_task.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+# Linux compat
+
 --- src/slurmd/slurmstepd/task.c.orig	2016-05-03 22:41:59.000000000 +0000
 +++ src/slurmd/slurmstepd/task.c
 @@ -558,6 +558,18 @@ _make_tmpdir(stepd_step_rec_t *job)
diff --git a/slurm/distinfo b/slurm/distinfo
index b5e753f..a89a5d9 100644
--- a/slurm/distinfo
+++ b/slurm/distinfo
@@ -10,4 +10,4 @@ SHA1 (patch-src_common_gres.c) = 0051f23e065ad70856ee261469591f454eafaf61
 SHA1 (patch-src_plugins_burst__buffer_common_burst__buffer__common.c) = b21a852722c26b955ae51d8615c9d22304650d32
 SHA1 (patch-src_plugins_power_common_power__common.c) = 7527e0655efe6ea0243cb3a9ff21814002bed5d9
 SHA1 (patch-src_plugins_switch_generic_switch__generic.c) = acf9bcc6f8a787770cd8553de520edef5bdbda4a
-SHA1 (patch-src_slurmd_slurmstepd_task.c) = 28a1e6035062d33fa1ca8837b5050d9308fa1c84
+SHA1 (patch-src_slurmd_slurmstepd_task.c) = 7948c76ce65b0e5211486d2e7b1901664c1f7016
diff --git a/slurm/patches/patch-src_slurmd_slurmstepd_task.c b/slurm/patches/patch-src_slurmd_slurmstepd_task.c
index 831091c..4681525 100644
--- a/slurm/patches/patch-src_slurmd_slurmstepd_task.c
+++ b/slurm/patches/patch-src_slurmd_slurmstepd_task.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+# Linux compat
+
 --- src/slurmd/slurmstepd/task.c.orig	2016-05-03 22:41:59.000000000 +0000
 +++ src/slurmd/slurmstepd/task.c
 @@ -558,6 +558,18 @@ _make_tmpdir(stepd_step_rec_t *job)
Prev by Date: imported py-cookiecutter as devel/py-cookiecutter
Next by Date: slurm, slurm-devel: Add cpuset_destroy() to NetBSD patch
Previous by Thread: imported py-cookiecutter as devel/py-cookiecutter
Next by Thread: slurm, slurm-devel: Add cpuset_destroy() to NetBSD patch
Indexes:
Home | Main Index | Thread Index | Old Index