summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2015-07-28 18:41:36 +0000
committerMark Felder <feld@FreeBSD.org>2015-07-28 18:41:36 +0000
commitdc0d7ef725e524f22bc2832704392fd449d1e4fc (patch)
tree00bcd90aad7e9a90b3dec5fe0ecac8d2aa985db9
parentwww/chromium: update to 44.0.2403.107 (diff)
Rename sysutils/slurm-hpc -> sysutils/slurm-wlm
Update to 14.11.8 Upstream is standardizing on "slurm-wlm", so we are renaming the port accordingly. PR: 200381 Approved by: maintainer
Notes
Notes: svn path=/head/; revision=393090
-rw-r--r--MOVED1
-rw-r--r--sysutils/Makefile2
-rw-r--r--sysutils/slurm-hpc/distinfo2
-rw-r--r--sysutils/slurm-wlm/Makefile (renamed from sysutils/slurm-hpc/Makefile)14
-rw-r--r--sysutils/slurm-wlm/distinfo2
-rw-r--r--sysutils/slurm-wlm/files/patch-src-plugins-acct_gather_filesystem-lustre-acct_gather_filesystem_lustre.c (renamed from sysutils/slurm-hpc/files/patch-src-plugins-acct_gather_filesystem-lustre-acct_gather_filesystem_lustre.c)0
-rw-r--r--sysutils/slurm-wlm/files/pty.h (renamed from sysutils/slurm-hpc/files/pty.h)0
-rw-r--r--sysutils/slurm-wlm/files/slurm.conf.example (renamed from sysutils/slurm-hpc/files/slurm.conf.example)0
-rw-r--r--sysutils/slurm-wlm/files/slurmctld.in (renamed from sysutils/slurm-hpc/files/slurmctld.in)0
-rw-r--r--sysutils/slurm-wlm/files/slurmd.in (renamed from sysutils/slurm-hpc/files/slurmd.in)0
-rw-r--r--sysutils/slurm-wlm/pkg-descr (renamed from sysutils/slurm-hpc/pkg-descr)0
-rw-r--r--sysutils/slurm-wlm/pkg-plist (renamed from sysutils/slurm-hpc/pkg-plist)1
12 files changed, 8 insertions, 14 deletions
diff --git a/MOVED b/MOVED
index 975287d0e1bf..7dead25a542e 100644
--- a/MOVED
+++ b/MOVED
@@ -7740,3 +7740,4 @@ devel/p5-Test-use-ok|devel/p5-Test-Simple|2015-07-25|Has expired: Part of devel/
math/mate-calc||2015-07-27|Not part of MATE 1.10. Instead galculator is used
x11/mate-dialogs||2015-07-27|Not part of MATE 1.10
devel/automake14||2015-07-27|Has expired: Not used in the ports tree anymore
+sysutils/slurm-hpc|sysutils/slurm-wlm|2015-07-28|Upstream is standardizing on the name "slurm-wlm"
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 4d5f5d1861c2..dc18aad8fbf5 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -924,7 +924,7 @@
SUBDIR += sleuthkit
SUBDIR += sloth
SUBDIR += slst
- SUBDIR += slurm-hpc
+ SUBDIR += slurm-wlm
SUBDIR += smartmontools
SUBDIR += smp_utils
SUBDIR += snap
diff --git a/sysutils/slurm-hpc/distinfo b/sysutils/slurm-hpc/distinfo
deleted file mode 100644
index 6b09138252c4..000000000000
--- a/sysutils/slurm-hpc/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (slurm-14.11.6.tar.bz2) = 3c6043cace83b602f016f3580f903e64b2874625eb844d8156e97ab7a106e049
-SIZE (slurm-14.11.6.tar.bz2) = 6338479
diff --git a/sysutils/slurm-hpc/Makefile b/sysutils/slurm-wlm/Makefile
index 5ce3d455021a..edc51b2657cc 100644
--- a/sysutils/slurm-hpc/Makefile
+++ b/sysutils/slurm-wlm/Makefile
@@ -2,13 +2,12 @@
# $FreeBSD$
PORTNAME= slurm
-PORTVERSION= 14.11.6
-PORTREVISION= 1
+PORTVERSION= 14.11.8
CATEGORIES= sysutils
MASTER_SITES= http://www.schedmd.com/download/latest/ \
http://www.schedmd.com/download/archive/ \
- http://www.schedmd.com/download/development/
-PKGNAMESUFFIX= -hpc
+ http://www.schedmd.com/download/development/
+PKGNAMESUFFIX= -wlm
MAINTAINER= jrm@ftfl.ca
COMMENT= Simple Linux Utility for Resource Management
@@ -29,7 +28,7 @@ USE_LDCONFIG= yes
USE_RC_SUBR= slurmctld slurmd
PLIST_SUB= PORTVERSION="${PORTVERSION}"
INSTALL_TARGET= install-strip
-USES= gmake libtool perl5 python tar:bz2
+USES= gmake libtool perl5 pkgconfig python tar:bz2
GTK2_USE= GNOME=glib20,gtk20
MYSQL_USE= MYSQL=yes
CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include
@@ -46,11 +45,6 @@ GTK2_DESC= Build GUI config tool sview
# #include <pty.h> with appropriate headers will therefore not work, so instead
# add a pty.h for the build.
post-patch:
-.if ! ${PORT_OPTIONS:MGTK2}
- ${REINPLACE_CMD} \
- -e 's|min_gtk_version=2.7.1|min_gtk_version=200.7.1|g' \
- ${WRKSRC}/configure
-.endif
${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm
${REINPLACE_CMD} \
-e 's|/usr/bin/env python|${PYTHON_CMD}|g' \
diff --git a/sysutils/slurm-wlm/distinfo b/sysutils/slurm-wlm/distinfo
new file mode 100644
index 000000000000..9c94cf3edbf1
--- /dev/null
+++ b/sysutils/slurm-wlm/distinfo
@@ -0,0 +1,2 @@
+SHA256 (slurm-14.11.8.tar.bz2) = 8f33dd8fcffd5bec80141add196d38a7baa14ac45cdc7e1d878b3af14b88f66a
+SIZE (slurm-14.11.8.tar.bz2) = 6348882
diff --git a/sysutils/slurm-hpc/files/patch-src-plugins-acct_gather_filesystem-lustre-acct_gather_filesystem_lustre.c b/sysutils/slurm-wlm/files/patch-src-plugins-acct_gather_filesystem-lustre-acct_gather_filesystem_lustre.c
index 2e26042037f0..2e26042037f0 100644
--- a/sysutils/slurm-hpc/files/patch-src-plugins-acct_gather_filesystem-lustre-acct_gather_filesystem_lustre.c
+++ b/sysutils/slurm-wlm/files/patch-src-plugins-acct_gather_filesystem-lustre-acct_gather_filesystem_lustre.c
diff --git a/sysutils/slurm-hpc/files/pty.h b/sysutils/slurm-wlm/files/pty.h
index 28671a8478d4..28671a8478d4 100644
--- a/sysutils/slurm-hpc/files/pty.h
+++ b/sysutils/slurm-wlm/files/pty.h
diff --git a/sysutils/slurm-hpc/files/slurm.conf.example b/sysutils/slurm-wlm/files/slurm.conf.example
index fe11d93b54ef..fe11d93b54ef 100644
--- a/sysutils/slurm-hpc/files/slurm.conf.example
+++ b/sysutils/slurm-wlm/files/slurm.conf.example
diff --git a/sysutils/slurm-hpc/files/slurmctld.in b/sysutils/slurm-wlm/files/slurmctld.in
index 5199e48b23bc..5199e48b23bc 100644
--- a/sysutils/slurm-hpc/files/slurmctld.in
+++ b/sysutils/slurm-wlm/files/slurmctld.in
diff --git a/sysutils/slurm-hpc/files/slurmd.in b/sysutils/slurm-wlm/files/slurmd.in
index 277d48a2d317..277d48a2d317 100644
--- a/sysutils/slurm-hpc/files/slurmd.in
+++ b/sysutils/slurm-wlm/files/slurmd.in
diff --git a/sysutils/slurm-hpc/pkg-descr b/sysutils/slurm-wlm/pkg-descr
index 76f190acd29f..76f190acd29f 100644
--- a/sysutils/slurm-hpc/pkg-descr
+++ b/sysutils/slurm-wlm/pkg-descr
diff --git a/sysutils/slurm-hpc/pkg-plist b/sysutils/slurm-wlm/pkg-plist
index fdf4a20248e6..a790a6fb9331 100644
--- a/sysutils/slurm-hpc/pkg-plist
+++ b/sysutils/slurm-wlm/pkg-plist
@@ -506,7 +506,6 @@ sbin/slurmstepd
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_logo.png
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_ug_agenda.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_ug_cfp.html
-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_ug_registration.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmctld_plugstack.html
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmstyles.css
%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sponsors.gif