Clean up

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Clean up
From: Jason Bacon <bacon4000%gmail.com@localhost>
Date: Sun, 15 May 2016 00:03:09 +0000
Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Sat May 14 19:03:09 2016 -0500
Changeset:	4defd93f077aad389f322ebe58d2049124a26ab8

Modified Files:
	slurm/Makefile
	slurm/TODO
	slurm/distinfo
	slurm/patches/patch-etc_init.d.slurm.in
	slurm/patches/patch-src_common_callerid.c
	slurm/patches/patch-src_common_gres.c
	slurm/patches/patch-src_plugins_burst__buffer_common_burst__buffer__common.c
	slurm/patches/patch-src_plugins_power_common_power__common.c
	slurm/patches/patch-src_plugins_switch_generic_switch__generic.c
	slurm/patches/patch-src_slurmd_slurmstepd_task.c

Log Message:
Clean up

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

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

diffstat:
 slurm/Makefile                                      | 21 ++++++++++++---------
 slurm/TODO                                          |  2 +-
 slurm/distinfo                                      | 14 +++++++-------
 slurm/patches/patch-etc_init.d.slurm.in             |  1 +
 slurm/patches/patch-src_common_callerid.c           |  1 +
 slurm/patches/patch-src_common_gres.c               |  1 +
 ...ins_burst__buffer_common_burst__buffer__common.c |  1 +
 .../patch-src_plugins_power_common_power__common.c  |  1 +
 ...tch-src_plugins_switch_generic_switch__generic.c |  1 +
 slurm/patches/patch-src_slurmd_slurmstepd_task.c    |  1 +
 10 files changed, 27 insertions(+), 17 deletions(-)

diffs:
diff --git a/slurm/Makefile b/slurm/Makefile
index e797409..a9915c3 100644
--- a/slurm/Makefile
+++ b/slurm/Makefile
@@ -11,14 +11,16 @@ MAINTAINER=	asau%inbox.ru@localhost
 HOMEPAGE=	http://www.schedmd.com/
 COMMENT=	Simple Linux Utility for Resource Management
 
+LICENSE=	gnu-gpl-v2
+
 USE_LANGUAGES=	c c++
 
 GNU_CONFIGURE=	yes
 USE_TOOLS=	perl pkg-config
 USE_LIBTOOL=	yes
 
-CONFIGURE_ARGS+=	--htmldir=$(PREFIX)/share/doc/$(PKGNAME_NOREV)/html
-CONFIGURE_ARGS+=	--with-munge=$(BUILDLINK_PREFIX.munge:Q)
+CONFIGURE_ARGS+=	--htmldir=${PREFIX}/share/doc/${PKGNAME_NOREV}/html
+CONFIGURE_ARGS+=	--with-munge=${BUILDLINK_PREFIX.munge:Q}
 
 REPLACE_PYTHON=		doc/html/shtml2html.py
 
@@ -26,25 +28,26 @@ PKG_GROUPS=		slurm
 PKG_USERS=		slurm:slurm
 
 PKG_GECOS.slurm=	SLURM user
-PKG_SHELL.slurm=	$(NOLOGIN)
+PKG_SHELL.slurm=	${NOLOGIN}
 
 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|^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|'
 
+INSTALLATION_DIRS+=	share/examples/${PKGBASE}
+
 post-install:
-	$(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
+	${RM} -f ${WRKSRC}/etc/init.d.slurm.in.orig
+	${INSTALL_DATA} ${WRKSRC}/etc/* ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}/
+	${CHMOD} 755 ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}/init.d.slurm
 
 .include "../../lang/python/tool.mk"
 .include "../../security/munge/buildlink3.mk" # optional
diff --git a/slurm/TODO b/slurm/TODO
index b687356..5139e4b 100644
--- a/slurm/TODO
+++ b/slurm/TODO
@@ -1 +1 @@
-Clean up and test
+mkdir /var/log/slurm /var/run/slurm?
diff --git a/slurm/distinfo b/slurm/distinfo
index 8b27f46..0eefe5b 100644
--- a/slurm/distinfo
+++ b/slurm/distinfo
@@ -4,10 +4,10 @@ SHA1 (slurm-15.08.11.tar.bz2) = 1a69b8e44c3c40ee5403874e3c3a66fc476f62c8
 RMD160 (slurm-15.08.11.tar.bz2) = 73100156c355ac2a05a70efcf00b949276438b77
 SHA512 (slurm-15.08.11.tar.bz2) = f152893fc1c8f54120d886c81d1651545c79cc67606608b871d2c5a7e6c396deb59a7573a61e2a73fd9b9742e3ac5d53ab4db69b8b1e6a533a26b02e5e733b33
 Size (slurm-15.08.11.tar.bz2) = 5870156 bytes
-SHA1 (patch-etc_init.d.slurm.in) = f29d2c603b8d62df80aec4ac77f2e9bc218f55fc
-SHA1 (patch-src_common_callerid.c) = 1c0bac29ec2e0e6974e4d5f0369c9b500e692480
-SHA1 (patch-src_common_gres.c) = 65660b1f449c69d5c98418a2099c0a94354fc881
-SHA1 (patch-src_plugins_burst__buffer_common_burst__buffer__common.c) = 5effe55495c8071f0e8a693c5eb7e1274d2eff85
-SHA1 (patch-src_plugins_power_common_power__common.c) = f766709263fc1738f0ecd9e2316556a4ffe7a43e
-SHA1 (patch-src_plugins_switch_generic_switch__generic.c) = b91f4cbb253a1c93c83edc8e5f0d2b4606f96735
-SHA1 (patch-src_slurmd_slurmstepd_task.c) = 9d0a2384655301c0f00e2c291a767d9f4f4d0102
+SHA1 (patch-etc_init.d.slurm.in) = 0c779048fad16cb2de4abbe078a967a99fe0321f
+SHA1 (patch-src_common_callerid.c) = 5b8f75e8bfa51c3f5edff7a8398190df719453c9
+SHA1 (patch-src_common_gres.c) = 0bee6fa5fcec6285a5c42d318c26590e1f0c7951
+SHA1 (patch-src_plugins_burst__buffer_common_burst__buffer__common.c) = 64739577cc3567601eb4a9531554b6d9468f6210
+SHA1 (patch-src_plugins_power_common_power__common.c) = e95ea1a3825fbe68d44e571174ef2eddd0040a7b
+SHA1 (patch-src_plugins_switch_generic_switch__generic.c) = 877ace2fbc2f7d6747438ac0c32a6b5b902fd70f
+SHA1 (patch-src_slurmd_slurmstepd_task.c) = bb02a932efdd38369b08513cb0ec9d5ebe3cdd6f
diff --git a/slurm/patches/patch-etc_init.d.slurm.in b/slurm/patches/patch-etc_init.d.slurm.in
index 81a7f49..f3bd66c 100644
--- a/slurm/patches/patch-etc_init.d.slurm.in
+++ b/slurm/patches/patch-etc_init.d.slurm.in
@@ -1,5 +1,6 @@
 $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	2015-03-19 19:38:01.000000000 +0000
 +++ etc/init.d.slurm.in
 @@ -25,6 +25,9 @@
diff --git a/slurm/patches/patch-src_common_callerid.c b/slurm/patches/patch-src_common_callerid.c
index 31299ce..9a311dc 100644
--- a/slurm/patches/patch-src_common_callerid.c
+++ b/slurm/patches/patch-src_common_callerid.c
@@ -1,5 +1,6 @@
 $NetBSD$
 
+# Macros only provided for kernel in in6.h
 --- src/common/callerid.c.orig	2016-05-03 22:41:59.000000000 +0000
 +++ src/common/callerid.c
 @@ -61,6 +61,12 @@
diff --git a/slurm/patches/patch-src_common_gres.c b/slurm/patches/patch-src_common_gres.c
index 92da917..d30eb68 100644
--- a/slurm/patches/patch-src_common_gres.c
+++ b/slurm/patches/patch-src_common_gres.c
@@ -1,5 +1,6 @@
 $NetBSD$
 
+# Linux compatibility
 --- src/common/gres.c.orig	2016-05-03 22:41:59.000000000 +0000
 +++ src/common/gres.c
 @@ -79,6 +79,21 @@ typedef cpuset_t cpu_set_t;
diff --git a/slurm/patches/patch-src_plugins_burst__buffer_common_burst__buffer__common.c b/slurm/patches/patch-src_plugins_burst__buffer_common_burst__buffer__common.c
index 6d67297..5f11717 100644
--- a/slurm/patches/patch-src_plugins_burst__buffer_common_burst__buffer__common.c
+++ b/slurm/patches/patch-src_plugins_burst__buffer_common_burst__buffer__common.c
@@ -1,5 +1,6 @@
 $NetBSD$
 
+# Linux compat
 --- src/plugins/burst_buffer/common/burst_buffer_common.c.orig	2016-05-14 18:55:22.000000000 +0000
 +++ src/plugins/burst_buffer/common/burst_buffer_common.c
 @@ -52,7 +52,7 @@
diff --git a/slurm/patches/patch-src_plugins_power_common_power__common.c b/slurm/patches/patch-src_plugins_power_common_power__common.c
index 373d586..d7a205c 100644
--- a/slurm/patches/patch-src_plugins_power_common_power__common.c
+++ b/slurm/patches/patch-src_plugins_power_common_power__common.c
@@ -1,5 +1,6 @@
 $NetBSD$
 
+# Linux compat
 --- ./src/plugins/power/common/power_common.c.orig	2016-05-03 22:35:12.000000000 +0000
 +++ ./src/plugins/power/common/power_common.c
 @@ -50,7 +50,7 @@
diff --git a/slurm/patches/patch-src_plugins_switch_generic_switch__generic.c b/slurm/patches/patch-src_plugins_switch_generic_switch__generic.c
index 3efc5e7..7a8d8ab 100644
--- a/slurm/patches/patch-src_plugins_switch_generic_switch__generic.c
+++ b/slurm/patches/patch-src_plugins_switch_generic_switch__generic.c
@@ -1,5 +1,6 @@
 $NetBSD: patch-src_plugins_switch_generic_switch__generic.c,v 1.1 2015/04/20 13:08:37 outpaddling Exp $
 
+# Ensure proper #include order
 --- src/plugins/switch/generic/switch_generic.c.orig	2015-03-19 19:38:01.000000000 +0000
 +++ src/plugins/switch/generic/switch_generic.c
 @@ -40,12 +40,13 @@
diff --git a/slurm/patches/patch-src_slurmd_slurmstepd_task.c b/slurm/patches/patch-src_slurmd_slurmstepd_task.c
index 768c385..56ee3f8 100644
--- a/slurm/patches/patch-src_slurmd_slurmstepd_task.c
+++ b/slurm/patches/patch-src_slurmd_slurmstepd_task.c
@@ -1,5 +1,6 @@
 $NetBSD: patch-src_slurmd_slurmstepd_task.c,v 1.2 2015/04/20 13:08:37 outpaddling Exp $
 
+# Hack for Linux compat
 --- src/slurmd/slurmstepd/task.c.orig	2015-03-19 19:38:01.000000000 +0000
 +++ src/slurmd/slurmstepd/task.c
 @@ -540,6 +540,17 @@ _make_tmpdir(stepd_step_rec_t *job)
Prev by Date: lldb-git: Drop unneded patches
Next by Date: Merge plists
Previous by Thread: lldb-git: Drop unneded patches
Next by Thread: Merge plists
Indexes:
Home | Main Index | Thread Index | Old Index