git: ca83bc565ae8 - main - sysutils/runwhen: fix build with skalibs 2.13.x.y

The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ca83bc565ae88449e1a4ddeb93f12213f0e3044f

commit ca83bc565ae88449e1a4ddeb93f12213f0e3044f
Author:     Jan Bramkamp <crest@rlwinm.de>
AuthorDate: 2023-04-05 00:55:22 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-04-06 20:33:22 +0000

    sysutils/runwhen: fix build with skalibs 2.13.x.y
    
    While we are at it, convert to USES=localbase.
    
    MFH:            2023Q2
---
 sysutils/runwhen/Makefile                          | 13 +++---
 ...h-src_.mkmed-data_src_prjlibs-include_diewarn.h | 46 ++++++++++++++++++++++
 2 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/sysutils/runwhen/Makefile b/sysutils/runwhen/Makefile
index f20afbd09a4c..9bedabdc3f45 100644
--- a/sysutils/runwhen/Makefile
+++ b/sysutils/runwhen/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	runwhen
-PORTVERSION=	2021.04.30
-PORTREVISION=   1
+DISTVERSION=	2021.04.30
+PORTREVISION=   2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://code.dogmap.org/runwhen/releases/
 
@@ -9,26 +9,23 @@ COMMENT=	Tools for running commands at particular times
 WWW=		http://code.dogmap.org/runwhen/
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/package/LICENSE
 
-BUILD_DEPENDS=  skalibs>=2.12.0.0:devel/skalibs
+BUILD_DEPENDS=  skalibs>=2.13.1.1:devel/skalibs
 LIB_DEPENDS=	libskarnet.so:devel/skalibs
 
-USES=		tar:bzip2
+USES=		localbase tar:bzip2
 
 WRKSRC=		${WRKDIR}/admin/${DISTNAME}
 
 PLIST_FILES=	bin/rw-add bin/rw-match bin/rw-max bin/rw-min	\
 		bin/rw-sleep bin/rw-sub bin/rw-touch
 
-CFLAGS+=	-I${LOCALBASE}/include
-
 post-patch:
 	@${REINPLACE_CMD} -e 's!gcc -O2!${CC} ${CFLAGS}!' \
 		${WRKSRC}/conf-compile/defaults/host_compile.sh
 	@${REINPLACE_CMD} 's!gcc!${CC} ${LDFLAGS} ${LIBS}!' \
 		${WRKSRC}/conf-compile/defaults/host_link.sh
-	@${REINPLACE_CMD} 's!-lskarnet!-L${LOCALBASE}/lib -lskarnet!' \
-		${WRKSRC}/package/compile
 
 do-configure:
 	${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-compile/defaults/package_home
diff --git a/sysutils/runwhen/files/patch-src_.mkmed-data_src_prjlibs-include_diewarn.h b/sysutils/runwhen/files/patch-src_.mkmed-data_src_prjlibs-include_diewarn.h
new file mode 100644
index 000000000000..87343712d183
--- /dev/null
+++ b/sysutils/runwhen/files/patch-src_.mkmed-data_src_prjlibs-include_diewarn.h
@@ -0,0 +1,46 @@
+--- src/.mkmed-data/src/prjlibs-include/diewarn.h.orig	2023-04-05 00:31:59 UTC
++++ src/.mkmed-data/src/prjlibs-include/diewarn.h
+@@ -1,14 +1,14 @@
+ #ifndef PACKAGE__PROG__PRJLIBS__DIEWARN_H
+ #define PACKAGE__PROG__PRJLIBS__DIEWARN_H
+ 
+-#define DIE1X(status,x0)          strerr_die3x((status),PROG,": ",(x0))
+-#define DIE2X(status,x0,x1)       strerr_die4x((status),PROG,": ",(x0),(x1))
+-#define DIE3X(status,x0,x1,x2)    strerr_die5x((status),PROG,": ",(x0),(x1),\
++#define DIE1X(status,x0)          strerr_die((status),PROG,": ",(x0))
++#define DIE2X(status,x0,x1)       strerr_die((status),PROG,": ",(x0),(x1))
++#define DIE3X(status,x0,x1,x2)    strerr_die((status),PROG,": ",(x0),(x1),\
+                                                (x2))
+-#define DIE4X(status,x0,x1,x2,x3) strerr_die6x((status),PROG,": ",(x0),(x1),\
++#define DIE4X(status,x0,x1,x2,x3) strerr_die((status),PROG,": ",(x0),(x1),\
+                                                (x2),(x3))
+ 
+-#define DIE_USAGE(x0) strerr_die3x(100, "usage: ", PROG, x0)
++#define DIE_USAGE(x0) strerr_dien(100, 3, "usage: ", PROG, x0)
+ #define DIE_OVERFLOW() DIE1X(100, "arithmetic overflow")
+ #define DIE_NOTSET(x0) DIE2X(100, "variable not set: ", (x0))
+ #define DIE_MALFORMED(x0, x1) DIE4X(100, "malformed ", (x0), ": ", (x1))
+@@ -76,17 +76,17 @@
+ #define WARNTEXT1(op) WARNTEXT_unable(1, op) " "
+ #define WARNTEXT2(op) WARNTEXT_unable(2, op) " "
+ 
+-#define WARN0(op)       strerr_warn2sys(PROG, WARNTEXT0(WARNTEXT0_##op))
+-#define WARN1(op,x0)    strerr_warn4sys(PROG, WARNTEXT1(WARNTEXT1_##op), \
++#define WARN0(op)       strerr_warnsys(PROG, WARNTEXT0(WARNTEXT0_##op))
++#define WARN1(op,x0)    strerr_warnsys(PROG, WARNTEXT1(WARNTEXT1_##op), \
+                                         (x0), ": ")
+-#define WARN2(op,x0,x1) strerr_warn6sys(PROG, WARNTEXT2(WARNTEXT2_##op), \
++#define WARN2(op,x0,x1) strerr_warnsys(PROG, WARNTEXT2(WARNTEXT2_##op), \
+                                         (x0), WARNSEP2_##op, (x1), ": ")
+ 
+-#define DIE0(op)       strerr_die2sys(DIESTAT(#op), PROG, \
++#define DIE0(op)       strerr_diesys(DIESTAT(#op), PROG, \
+                                       WARNTEXT0(WARNTEXT0_##op))
+-#define DIE1(op,x0)    strerr_die4sys(DIESTAT(#op), PROG, \
++#define DIE1(op,x0)    strerr_diesys(DIESTAT(#op), PROG, \
+                                       WARNTEXT1(WARNTEXT1_##op), (x0), ": ")
+-#define DIE2(op,x0,x1) strerr_die6sys(DIESTAT(#op), PROG, \
++#define DIE2(op,x0,x1) strerr_diesys(DIESTAT(#op), PROG, \
+                                       WARNTEXT2(WARNTEXT2_##op), (x0),\
+                                       WARNSEP2_##op, (x1), ": ")
+