Index | Thread | Search

From:
Ryan Freeman <ryan@slipgate.org>
Subject:
Re: UPDATE: net/slurm
To:
Landry Breuil <landry@openbsd.org>
Cc:
ports@openbsd.org
Date:
Tue, 19 May 2026 11:29:42 -0700

Download raw body.

Thread
On Fri, May 15, 2026 at 09:43:00AM +0200, Landry Breuil wrote:
> Le Wed, May 13, 2026 at 12:58:23PM -0700, Ryan Freeman a écrit :
> > On Sun, May 03, 2026 at 01:25:49PM +0200, Landry Breuil wrote:
> > > Le Sat, May 02, 2026 at 12:50:02PM -0700, Ryan Freeman a écrit :
> > > > On Tue, Apr 21, 2026 at 09:08:46PM -0700, Ryan Freeman wrote:
> > > > > On Mon, Apr 20, 2026 at 05:31:48PM -0700, Ryan Freeman wrote:
> > > > > > Hi,
> > > > > 
> > > > > Apologies for not responding to the reply; I wasn't subscribed to ports@
> > > > > and only saw it on marc.info.  I fixed that.
> > > > > 
> > > > > Applied @landry's suggestion to just use the fork repo for now w/ a comment.
> > > > > Added benefit is the fork includes the man page patch, so all patches are gone.
> > > > 
> > > > ping, resending diff for convenience
> > > 
> > > definitely ok if someone wants to commit it post-unlock, otherwise i'll
> > > take care of it.
> > 
> > ping,  thanks @landry!
> 
> thanks, ive' commited it and dropped the pre-configure target, since we
> dont patch slurm.1 there's not point in running subst_cmd on it..

Thanks for the commit.  Despite not having a patch for the manpage,
the SUBST_CMD still replaced ${PREFIX} in the manpage with the proper
path on OpenBSD.

When upstream merged OpenBSD patches, they also took the one that
puts PREFIX in the manual page:
https://github.com/mattthias/slurm/commit/ef79c98269eb16bc49efcb520588a379c99f4f57

Without SUBST_CMD:
-t theme
	select theme, searches ~/.slurm and ${PREFIX}/share/slurm

With SUBST_CMD:
-t theme
	select theme, searches ~/.slurm and /usr/local/share/slurm

> make package warns about it still:
> /usr/obj/ports/slurm-0.4.4pl0/fake-amd64/usr/local/man/man1/slurm.1: No one-line description, using filename "slurm"

I have patched the man page to add .Nm and .Nd  parts under .Sh NAME
I split at the '-' and now the manpage looks nicer.  I'll push toward
upstream as well.


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/slurm/Makefile,v
diff -u -p -r1.19 Makefile
--- Makefile	15 May 2026 07:43:35 -0000	1.19
+++ Makefile	19 May 2026 18:25:34 -0000
@@ -6,6 +6,8 @@ DIST_TUPLE =	github Iksas slurm 323d2bfc
 PKGNAME =	slurm-${V}pl0
 CATEGORIES =	net
 
+REVISION =	0
+
 HOMEPAGE =	https://github.com/mattthias/slurm/wiki/
 
 MAINTAINER =	Ryan Freeman <ryan@slipgate.org>
@@ -16,6 +18,9 @@ PERMIT_PACKAGE =	Yes
 WANTLIB =	c curses
 
 MODULES =	devel/meson
+
+pre-configure:
+	@${SUBST_CMD} ${WRKSRC}/slurm.1
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/slurm/
Index: patches/patch-slurm_1
===================================================================
RCS file: patches/patch-slurm_1
diff -N patches/patch-slurm_1
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-slurm_1	19 May 2026 18:25:34 -0000
@@ -0,0 +1,14 @@
+fix warning about missing one-line description during packaging
+
+Index: slurm.1
+--- slurm.1.orig
++++ slurm.1
+@@ -4,6 +4,7 @@
+ .\"
+ .Sh NAME
+-slurm \- yet another network load monitor
++.Nm slurm
++.Nd yet another network load monitor
+ .Sh SYNOPSIS
+ .Nm slurm
+ .Op Fl hHz