diff --git a/sysutils/runwhen/Makefile b/sysutils/runwhen/Makefile
index 832fc1267c49..7eff933d09e7 100644
--- a/sysutils/runwhen/Makefile
+++ b/sysutils/runwhen/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	runwhen
 PORTVERSION=	2021.04.30
+PORTREVISION=   1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://code.dogmap.org/runwhen/releases/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	crest@rlwinm.de
 COMMENT=	Tools for running commands at particular times
 
 LICENSE=	GPLv2
 
-BROKEN=		does not build: error: use of undeclared identifier 'localtmn_t'
-
+BUILD_DEPENDS=  skalibs>=2.12.0.0:devel/skalibs
 LIB_DEPENDS=	libskarnet.so:devel/skalibs
 
 USES=		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
 	${ECHO_CMD} ${LOCALBASE} > ${WRKSRC}/conf-compile/defaults/depend_skalibs
 	${ECHO_CMD} ${LOCALBASE}/lib/skalibs/sysdeps > ${WRKSRC}/conf-compile/defaults/depend_skalibs_sysdeps
 
 do-build:
 	cd ${WRKSRC} && package/compile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/command/* ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/sysutils/runwhen/files/patch-src_runwhen.h b/sysutils/runwhen/files/patch-src_runwhen.h
new file mode 100644
index 000000000000..16e027ef7a07
--- /dev/null
+++ b/sysutils/runwhen/files/patch-src_runwhen.h
@@ -0,0 +1,13 @@
+--- src/runwhen.h.orig	2022-08-10 16:08:24 UTC
++++ src/runwhen.h
+@@ -8,8 +8,8 @@
+   } while (0)
+ 
+ #include <skalibs/tai.h>
+-void rw_scan(tain_t*, char const*);
+-void rw_pass(tain_t const*, char**) gccattr_noreturn;
++void rw_scan(tain*, char const*);
++void rw_pass(tain const*, char**) gccattr_noreturn;
+ 
+ #define WARNTEXT0_clock_gettime "get current time"
+ 
diff --git a/sysutils/runwhen/files/patch-src_rw-add.c b/sysutils/runwhen/files/patch-src_rw-add.c
new file mode 100644
index 000000000000..fc7c7549e5c4
--- /dev/null
+++ b/sysutils/runwhen/files/patch-src_rw-add.c
@@ -0,0 +1,11 @@
+--- src/rw-add.c.orig	2022-08-10 16:08:24 UTC
++++ src/rw-add.c
+@@ -7,7 +7,7 @@
+ char const* PROG="rw-add";
+ 
+ int main(int argc, char** argv) {
+-  tain_t t, t0, t1;
++  tain t, t0, t1;
+   RW_ARG_CHECK(2, " stamp1 stamp2");
+   rw_scan(&t0, argv[1]);
+   rw_scan(&t1, argv[2]);
diff --git a/sysutils/runwhen/files/patch-src_rw-match.c b/sysutils/runwhen/files/patch-src_rw-match.c
new file mode 100644
index 000000000000..18b396ab1e9a
--- /dev/null
+++ b/sysutils/runwhen/files/patch-src_rw-match.c
@@ -0,0 +1,20 @@
+--- src/rw-match.c.orig	2022-08-10 16:08:24 UTC
++++ src/rw-match.c
+@@ -124,7 +124,7 @@ int main(int argc, char** argv) {
+   }
+ 
+   {
+-    tain_t stamp;
++    tain stamp;
+     struct tm* ptm;
+     struct timeval tv;
+     time_t t;
+@@ -187,7 +187,7 @@ int main(int argc, char** argv) {
+   }
+ 
+   {
+-    tain_t stamp;
++    tain stamp;
+     struct timeval tv;
+     time_t t;
+     if (units==units_weekday) {
diff --git a/sysutils/runwhen/files/patch-src_rw-max.c b/sysutils/runwhen/files/patch-src_rw-max.c
new file mode 100644
index 000000000000..5bd0a3073f83
--- /dev/null
+++ b/sysutils/runwhen/files/patch-src_rw-max.c
@@ -0,0 +1,11 @@
+--- src/rw-max.c.orig	2022-08-10 16:08:24 UTC
++++ src/rw-max.c
+@@ -7,7 +7,7 @@
+ char const* PROG="rw-max";
+ 
+ int main(int argc, char** argv) {
+-  tain_t t0, t1;
++  tain t0, t1;
+   RW_ARG_CHECK(2, " stamp1 stamp2");
+   rw_scan(&t0, argv[1]);
+   rw_scan(&t1, argv[2]);
diff --git a/sysutils/runwhen/files/patch-src_rw-min.c b/sysutils/runwhen/files/patch-src_rw-min.c
new file mode 100644
index 000000000000..da0a6d075f66
--- /dev/null
+++ b/sysutils/runwhen/files/patch-src_rw-min.c
@@ -0,0 +1,11 @@
+--- src/rw-min.c.orig	2022-08-10 16:08:24 UTC
++++ src/rw-min.c
+@@ -7,7 +7,7 @@
+ char const* PROG="rw-min";
+ 
+ int main(int argc, char** argv) {
+-  tain_t t0, t1;
++  tain t0, t1;
+   RW_ARG_CHECK(2, " stamp1 stamp2");
+   rw_scan(&t0, argv[1]);
+   rw_scan(&t1, argv[2]);
diff --git a/sysutils/runwhen/files/patch-src_rw-sleep.c b/sysutils/runwhen/files/patch-src_rw-sleep.c
new file mode 100644
index 000000000000..10b322212a9a
--- /dev/null
+++ b/sysutils/runwhen/files/patch-src_rw-sleep.c
@@ -0,0 +1,11 @@
+--- src/rw-sleep.c.orig	2022-08-10 16:08:24 UTC
++++ src/rw-sleep.c
+@@ -36,7 +36,7 @@ int main(int argc, char** argv) {
+     timer.it_value.tv_sec=0;
+     timer.it_value.tv_usec=0;
+   } else {
+-    tain_t now, wake_time;
++    tain now, wake_time;
+     tain_now(&now);
+     rw_scan(&wake_time, argv[1]);
+     if (tain_less(&wake_time, &now)) flag_sleep=0;
diff --git a/sysutils/runwhen/files/patch-src_rw-sub.c b/sysutils/runwhen/files/patch-src_rw-sub.c
new file mode 100644
index 000000000000..4614f6341ed3
--- /dev/null
+++ b/sysutils/runwhen/files/patch-src_rw-sub.c
@@ -0,0 +1,11 @@
+--- src/rw-sub.c.orig	2022-08-10 16:08:24 UTC
++++ src/rw-sub.c
+@@ -7,7 +7,7 @@
+ char const* PROG="rw-sub";
+ 
+ int main(int argc, char** argv) {
+-  tain_t t, t0, t1;
++  tain t, t0, t1;
+   RW_ARG_CHECK(2, " stamp1 stamp2");
+   rw_scan(&t0, argv[1]);
+   rw_scan(&t1, argv[2]);
diff --git a/sysutils/runwhen/files/patch-src_rw-touch.c b/sysutils/runwhen/files/patch-src_rw-touch.c
new file mode 100644
index 000000000000..862ee85ab6cf
--- /dev/null
+++ b/sysutils/runwhen/files/patch-src_rw-touch.c
@@ -0,0 +1,11 @@
+--- src/rw-touch.c.orig	2022-08-10 16:08:24 UTC
++++ src/rw-touch.c
+@@ -10,7 +10,7 @@
+ char const* PROG="rw-touch";
+ 
+ int main(int argc, char** argv) {
+-  tain_t t;
++  tain t;
+   struct timeval tv[2];
+   if (argc<3) DIE_USAGE(" stamp filename [program...]");
+   rw_scan(&t, argv[1]);
diff --git a/sysutils/runwhen/files/patch-src_rw__pass.c b/sysutils/runwhen/files/patch-src_rw__pass.c
new file mode 100644
index 000000000000..a8acb9692c66
--- /dev/null
+++ b/sysutils/runwhen/files/patch-src_rw__pass.c
@@ -0,0 +1,11 @@
+--- src/rw_pass.c.orig	2022-08-10 16:08:24 UTC
++++ src/rw_pass.c
+@@ -9,7 +9,7 @@
+ 
+ extern char const* PROG;
+ 
+-void rw_pass(tain_t const* t, char** argv) {
++void rw_pass(tain const* t, char** argv) {
+   char buf[2*TAIN_PACK+1];
+ 
+   buf[tain_fmt(buf, t)]='\0';
diff --git a/sysutils/runwhen/files/patch-src_rw__scan.c b/sysutils/runwhen/files/patch-src_rw__scan.c
new file mode 100644
index 000000000000..751572a1e3d1
--- /dev/null
+++ b/sysutils/runwhen/files/patch-src_rw__scan.c
@@ -0,0 +1,20 @@
+--- src/rw_scan.c.orig	2022-08-10 16:08:50 UTC
++++ src/rw_scan.c
+@@ -9,7 +9,7 @@
+ 
+ extern char const* PROG;
+ 
+-void rw_scan(tain_t* stamp, char const* text) {
++void rw_scan(tain* stamp, char const* text) {
+   unsigned int i, scale;
+   uint64 u;
+   char const* x;
+@@ -53,7 +53,7 @@ void rw_scan(tain_t* stamp, char const* text) {
+       tai_unix(tain_secp(stamp), u);
+       break;
+     case 'i': {
+-      localtmn_t loc;
++      localtmn loc;
+       short dummy;
+       ++text;
+       i=localtmn_scan(text, &loc);