spcm: Update to latest commit and fix CentOS build

diff --git a/spcm/Makefile b/spcm/Makefile
index 55bc57161d7162bc3c57476abc500fbc94aebdac..c57b6a17d047982447498de9c9383dff0e5eb89a 100644 (file)
--- a/spcm/Makefile
+++ b/spcm/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD$
 
-DISTNAME=      SPCM-0.4.1.16
+DISTNAME=      SPCM-0.4.1.17
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=outpaddling/}
-GITHUB_TAG=    d8b5d25fcb9bf29e465238df9eba9cf016a54ca7
+GITHUB_TAG=    91f8ab657e7c9014d3db054003ee5c37777b41e0
 
 MAINTAINER=    bacon@NetBSD.org
 HOMEPAGE=      http://acadix.biz/spcm.php
@@ -14,21 +14,10 @@ LICENSE=    2-clause-bsd
 
 DATADIR=       ${PREFIX}/share/cluster-admin
 
-SUBST_CLASSES+=                datadir
-SUBST_STAGE.datadir=   pre-configure
-SUBST_FILES.datadir=   CentOS/Sys-scripts/ganglia-web-setup \
-                       Common/Sys-scripts/slurm-update-idle-nodes
-SUBST_SED.datadir=     -e 's|%%DATADIR%%|${PREFIX}/share/cluster-admin|g'
-
-SUBST_CLASSES+=                prefix
-SUBST_STAGE.prefix=    pre-configure
-SUBST_FILES.prefix=    Common/User-scripts/slurm-shell
-SUBST_SED.prefix=      -e 's|/usr/local|${PREFIX}|g'
-
 SUBST_CLASSES+=                sbin
 SUBST_STAGE.sbin=      pre-configure
 SUBST_FILES.sbin+=     Common/Src/cluster-passwd.c
-SUBST_SED.sbin=                -e 's|/usr/local/sbin|${PREFIX}/sbin|g'
+SUBST_SED.sbin=                -e 's|%%PREFIX%%|${PREFIX}|g'
 
 DEPENDS+=      auto-admin>=0.6.3:../../wip/auto-admin
 

diff --git a/spcm/PLIST b/spcm/PLIST
index 6dddc7bb88668ea4b6300ecb3280edae598c3d67..2a1d4903b27dba56c0b33b16b6398c97346b9618 100644 (file)
--- a/spcm/PLIST
+++ b/spcm/PLIST
@@ -33,8 +33,6 @@ bin/slurm-shell
 bin/slurm-user-cores
 bin/topjob
 bin/topnode
-etc/spcm/slurm-node-resume
-etc/spcm/slurm-node-suspend
 libexec/add-gecos.awk
 sbin/cluster-add-to-group
 sbin/cluster-adduser
@@ -106,6 +104,8 @@ sbin/node-sync-groups
 sbin/node-sync-users
 sbin/slurm-cron-updates
 sbin/slurm-drain-all
+sbin/slurm-node-resume
+sbin/slurm-node-suspend
 sbin/slurm-restart
 sbin/slurm-resume-nodes
 sbin/slurm-resume-updated-nodes

diff --git a/spcm/distinfo b/spcm/distinfo
index db9540bd8c4679ac6bcde738fd9db37918f0bdb8..e6b1ee129adc010f82becbfca552edc4c9cfb71f 100644 (file)
--- a/spcm/distinfo
+++ b/spcm/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (SPCM-0.4.1.16-d8b5d25fcb9bf29e465238df9eba9cf016a54ca7.tar.gz) = 984cf9e2579cdc0c574cfb20bad965a30d3d11ef
-RMD160 (SPCM-0.4.1.16-d8b5d25fcb9bf29e465238df9eba9cf016a54ca7.tar.gz) = 50b2223d5f08ef5ada8159101b6ed4dc92977c62
-SHA512 (SPCM-0.4.1.16-d8b5d25fcb9bf29e465238df9eba9cf016a54ca7.tar.gz) = abc1702ef418e3f3e4ffbcabd14d91e9d0394384c401de36ae75af67f2149b69cdbd4913067bc2c8eb0bd94c7223582af37daf255928b51a3966a3d07988e6bb
-Size (SPCM-0.4.1.16-d8b5d25fcb9bf29e465238df9eba9cf016a54ca7.tar.gz) = 144657 bytes
+SHA1 (SPCM-0.4.1.17-91f8ab657e7c9014d3db054003ee5c37777b41e0.tar.gz) = 759e9fc80e48555f13c8e2f5427f00f3e3d68d40
+RMD160 (SPCM-0.4.1.17-91f8ab657e7c9014d3db054003ee5c37777b41e0.tar.gz) = f9dea4e3fd9525bbab4925cb011199d543e051ca
+SHA512 (SPCM-0.4.1.17-91f8ab657e7c9014d3db054003ee5c37777b41e0.tar.gz) = 50f0a95aa2372fcff00e7789830abb2dfd9273fdb52db5bd00f427b6eb2286d50767311b792f6b48fb7b3c2f8671342354e0fc80ba41431091bd40d63d34efb6
+Size (SPCM-0.4.1.17-91f8ab657e7c9014d3db054003ee5c37777b41e0.tar.gz) = 144539 bytes