sysutils/slurm-wlm: Update to version 17.02.5

Upstream changes: https://github.com/SchedMD/slurm/blob/slurm-17.02/NEWS

4 files changed, 16 insertions, 35 deletions

diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile
index 56b29e76cdc7..d95cf4c90c9c 100644
--- a/sysutils/slurm-wlm/Makefile
+++ b/sysutils/slurm-wlm/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	slurm
-PORTVERSION=	16.05.9
-PORTREVISION=	4
+PORTVERSION=	17.02.5
+PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.schedmd.com/download/latest/ \
 		http://www.schedmd.com/download/archive/ \
@@ -29,8 +29,8 @@ USE_LDCONFIG=	yes
 USE_RC_SUBR=	slurmctld slurmd
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool pkgconfig python:build readline shebangfix ssl \
-		tar:bz2
+USES=		gmake libtool pkgconfig python:build readline:port shebangfix \
+		ssl tar:bz2
 USE_PERL5=	configure
 SHEBANG_FILES=	doc/html/shtml2html.py doc/man/man2html.py
 
@@ -90,7 +90,7 @@ post-patch:
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/bin/mail|/usr/bin/mail|g' \
 		${WRKSRC}/src/common/read_config.h \
-		${WRKSRC}/contribs/seff/smail.in \
+		${WRKSRC}/contribs/seff/smail \
 		${WRKSRC}/doc/html/configurator.easy.html.in \
 		${WRKSRC}/doc/html/configurator.html.in \
 		${WRKSRC}/contribs/cray/slurm.conf.template \
@@ -118,7 +118,6 @@ post-patch:
 		${WRKSRC}/src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.c \
 		${WRKSRC}/src/plugins/jobacct_gather/common/common_jag.c \
 		${WRKSRC}/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c \
-		${WRKSRC}/src/plugins/jobacct_gather/aix/jobacct_gather_aix.c \
 		${WRKSRC}/src/plugins/switch/cray/scaling.c \
 		${WRKSRC}/src/plugins/proctrack/cray/proctrack_cray.c \
 		${WRKSRC}/src/plugins/proctrack/cgroup/proctrack_cgroup.c \
diff --git a/sysutils/slurm-wlm/distinfo b/sysutils/slurm-wlm/distinfo
index 8bb4f71f4989..5f4cdd6ac20a 100644
--- a/sysutils/slurm-wlm/distinfo
+++ b/sysutils/slurm-wlm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485989478
-SHA256 (slurm-16.05.9.tar.bz2) = 2fca8b8ab86af91ca0a634743f9dbdfa29833b1f2189d26b126ac709b0f6d574
-SIZE (slurm-16.05.9.tar.bz2) = 6062510
+TIMESTAMP = 1499107640
+SHA256 (slurm-17.02.5.tar.bz2) = acb94a880fffc5e46b4968b9229af13b62b234acd1db6a7eb47f64f246521217
+SIZE (slurm-17.02.5.tar.bz2) = 6043607
diff --git a/sysutils/slurm-wlm/files/patch-doc_man_man2html.py b/sysutils/slurm-wlm/files/patch-doc_man_man2html.py
deleted file mode 100644
index 9e5da7e2cc01..000000000000
--- a/sysutils/slurm-wlm/files/patch-doc_man_man2html.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/man/man2html.py.orig	2016-08-24 23:46:50 UTC
-+++ doc/man/man2html.py
-@@ -180,7 +180,7 @@ version = sys.argv[1]
- for f in sys.argv[4:]:
-     posLastDot = f.rfind(".")
-     mhtmlname = f[:posLastDot] + ".mhtml"
--    cmd = "man2html " + f + "> " + mhtmlname
-+    cmd = "man2html < " + f + "> " + mhtmlname
-     os.system(cmd)
-     print(">>>>>>> " + mhtmlname)
-     files.append(mhtmlname)
diff --git a/sysutils/slurm-wlm/pkg-plist b/sysutils/slurm-wlm/pkg-plist
index e89dade361d4..6ea32bb6d5f5 100644
--- a/sysutils/slurm-wlm/pkg-plist
+++ b/sysutils/slurm-wlm/pkg-plist
@@ -31,12 +31,12 @@ lib/libpmi.so.0
 lib/libpmi.so.0.0.0
 lib/libslurm.a
 lib/libslurm.so
-lib/libslurm.so.30
-lib/libslurm.so.30.0.0
+lib/libslurm.so.31
+lib/libslurm.so.31.0.0
 lib/libslurmdb.a
 lib/libslurmdb.so
-lib/libslurmdb.so.30
-lib/libslurmdb.so.30.0.0
+lib/libslurmdb.so.31
+lib/libslurmdb.so.31.0.0
 lib/slurm/accounting_storage_filetxt.a
 lib/slurm/accounting_storage_filetxt.so
 %%MYSQL%%lib/slurm/accounting_storage_mysql.a
@@ -117,8 +117,6 @@ lib/slurm/job_submit_require_timelimit.a
 lib/slurm/job_submit_require_timelimit.so
 lib/slurm/job_submit_throttle.a
 lib/slurm/job_submit_throttle.so
-lib/slurm/jobacct_gather_aix.a
-lib/slurm/jobacct_gather_aix.so
 lib/slurm/jobacct_gather_cgroup.a
 lib/slurm/jobacct_gather_cgroup.so
 lib/slurm/jobacct_gather_linux.a
@@ -143,6 +141,8 @@ lib/slurm/layouts_power_default.a
 lib/slurm/layouts_power_default.so
 lib/slurm/layouts_unit_default.a
 lib/slurm/layouts_unit_default.so
+lib/slurm/mcs_account.a
+lib/slurm/mcs_account.so
 lib/slurm/mcs_group.a
 lib/slurm/mcs_group.so
 lib/slurm/mcs_none.a
@@ -201,10 +201,6 @@ lib/slurm/sched_builtin.a
 lib/slurm/sched_builtin.so
 lib/slurm/sched_hold.a
 lib/slurm/sched_hold.so
-lib/slurm/sched_wiki.a
-lib/slurm/sched_wiki.so
-lib/slurm/sched_wiki2.a
-lib/slurm/sched_wiki2.so
 lib/slurm/select_alps.a
 lib/slurm/select_alps.so
 lib/slurm/select_cons_res.a
@@ -254,7 +250,7 @@ man/man1/sbcast.1.gz
 man/man1/scancel.1.gz
 man/man1/scontrol.1.gz
 man/man1/sdiag.1.gz
-man/man1/sh5util.1.gz
+%%HDF5%%man/man1/sh5util.1.gz
 man/man1/sinfo.1.gz
 man/man1/slurm.1.gz
 man/man1/smap.1.gz
@@ -262,7 +258,6 @@ man/man1/sprio.1.gz
 man/man1/squeue.1.gz
 man/man1/sreport.1.gz
 man/man1/srun.1.gz
-man/man1/srun_cr.1.gz
 man/man1/sshare.1.gz
 man/man1/sstat.1.gz
 man/man1/strigger.1.gz
@@ -486,7 +481,6 @@ sbin/slurmstepd
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/hdf5_task_attr.png
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/high_throughput.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm-pe.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig1.png
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig2.png
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/intel_knl.html
@@ -581,12 +575,11 @@ sbin/slurmstepd
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/squeue_color.png
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sreport.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/srun.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/srun_cr.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sshare.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sstat.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/strigger.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/style.css
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sview.html
+%%PORTDOCS%%%%GTK2%%%%DOCSDIR%%-%%PORTVERSION%%/html/sview.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/switchplugins.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/taskplugins.html
 %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/team.html