Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Nov 2016 19:47:27 +0000 (UTC)
From:      Joseph Mingrone <jrm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r425171 - in head/sysutils/slurm-wlm: . files
Message-ID:  <201611021947.uA2JlRto066625@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jrm
Date: Wed Nov  2 19:47:27 2016
New Revision: 425171
URL: https://svnweb.freebsd.org/changeset/ports/425171

Log:
  sysutils/slurm-wlm: update to version 16.05.06
  
  Changes in Slurm 16.05.6:
  https://github.com/SchedMD/slurm/blob/master/NEWS
  
  Port changes: Added a patch to fix a build issue. The patch was also
  accepted upstream and should appear in the next Slurm release.
  
  Reviewed by:	mat
  Approved by:	swills (mentor)
  Differential Revision:	https://reviews.freebsd.org/D8411

Added:
  head/sysutils/slurm-wlm/files/patch-src_plugins_node__features_knl__generic_node__features__knl__generic.c   (contents, props changed)
Modified:
  head/sysutils/slurm-wlm/Makefile
  head/sysutils/slurm-wlm/distinfo
  head/sysutils/slurm-wlm/pkg-plist

Modified: head/sysutils/slurm-wlm/Makefile
==============================================================================
--- head/sysutils/slurm-wlm/Makefile	Wed Nov  2 18:57:30 2016	(r425170)
+++ head/sysutils/slurm-wlm/Makefile	Wed Nov  2 19:47:27 2016	(r425171)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	slurm
-PORTVERSION=	16.05.5
+PORTVERSION=	16.05.6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.schedmd.com/download/latest/ \
 		http://www.schedmd.com/download/archive/ \
@@ -27,8 +27,10 @@ USE_LDCONFIG=	yes
 USE_RC_SUBR=	slurmctld slurmd
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool pkgconfig python:build readline ssl tar:bz2
+USES=		gmake libtool pkgconfig python:build readline shebangfix ssl \
+		tar:bz2
 USE_PERL5=	configure
+SHEBANG_FILES=	doc/html/shtml2html.py doc/man/man2html.py
 
 OPTIONS_DEFINE=	CURL DOCS GTK2 HDF5 HWLOC IPMI MYSQL RRD
 OPTIONS_DEFAULT=HDF5 HWLOC
@@ -76,10 +78,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -
 # add a pty.h for the build.
 post-patch:
 	${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm
-	${REINPLACE_CMD} \
-		-e 's|/usr/bin/env python|${PYTHON_CMD}|g' \
-		${WRKSRC}/doc/html/shtml2html.py \
-		${WRKSRC}/doc/man/man2html.py
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/slurm.conf.sample ${STAGEDIR}${PREFIX}/etc/

Modified: head/sysutils/slurm-wlm/distinfo
==============================================================================
--- head/sysutils/slurm-wlm/distinfo	Wed Nov  2 18:57:30 2016	(r425170)
+++ head/sysutils/slurm-wlm/distinfo	Wed Nov  2 19:47:27 2016	(r425171)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475245168
-SHA256 (slurm-16.05.5.tar.bz2) = 28cfd6a15599842f46cd81ae240a2b01b01e71a677f7eec6d5ba16b38e3d54e9
-SIZE (slurm-16.05.5.tar.bz2) = 6247257
+TIMESTAMP = 1478012730
+SHA256 (slurm-16.05.6.tar.bz2) = 992b74f400f3821d60625d66797f56739f8571b80bad56211de0001791abf58b
+SIZE (slurm-16.05.6.tar.bz2) = 6249232

Added: head/sysutils/slurm-wlm/files/patch-src_plugins_node__features_knl__generic_node__features__knl__generic.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/slurm-wlm/files/patch-src_plugins_node__features_knl__generic_node__features__knl__generic.c	Wed Nov  2 19:47:27 2016	(r425171)
@@ -0,0 +1,13 @@
+--- src/plugins/node_features/knl_generic/node_features_knl_generic.c.orig	2016-11-01 15:40:01 UTC
++++ src/plugins/node_features/knl_generic/node_features_knl_generic.c
+@@ -46,6 +46,10 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
++#if defined(__FreeBSD__) || defined(__NetBSD__)
++#define POLLRDHUP POLLHUP
++#endif
++
+ #include "slurm/slurm.h"
+ 
+ #include "src/common/assoc_mgr.h"

Modified: head/sysutils/slurm-wlm/pkg-plist
==============================================================================
--- head/sysutils/slurm-wlm/pkg-plist	Wed Nov  2 18:57:30 2016	(r425170)
+++ head/sysutils/slurm-wlm/pkg-plist	Wed Nov  2 19:47:27 2016	(r425171)
@@ -169,6 +169,8 @@ lib/slurm/mpi_pmi2.a
 lib/slurm/mpi_pmi2.so
 lib/slurm/node_features_knl_cray.a
 lib/slurm/node_features_knl_cray.so
+lib/slurm/node_features_knl_generic.a
+lib/slurm/node_features_knl_generic.so
 lib/slurm/power_none.a
 lib/slurm/power_none.so
 lib/slurm/preempt_job_prio.a



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611021947.uA2JlRto066625>