- Update Skarnet.org software stack ports to their latest versions

- Allow to override default location of s6-rc's root (--livedir)

PR:	237760

12 files changed, 24 insertions, 21 deletions

diff --git a/devel/skalibs/Makefile b/devel/skalibs/Makefile
index 4b6e9445ff48..958aed6f2aa3 100644
--- a/devel/skalibs/Makefile
+++ b/devel/skalibs/Makefile
@@ -1,7 +1,7 @@
 # Created by: Sergei Kolobov <sergei@kolobov.com>
 
 PORTNAME=	skalibs
-PORTVERSION=	2.10.0.0
+PORTVERSION=	2.10.0.3
 CATEGORIES=	devel
 MASTER_SITES=	https://www.skarnet.org/software/${PORTNAME}/
 
diff --git a/devel/skalibs/distinfo b/devel/skalibs/distinfo
index e137ddfe7227..ded942021f6f 100644
--- a/devel/skalibs/distinfo
+++ b/devel/skalibs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610385141
-SHA256 (skalibs-2.10.0.0.tar.gz) = c1acf81f47cad74174e18fe85b6b6d16bde11093f50ce99ad35c19d8d78d5d88
-SIZE (skalibs-2.10.0.0.tar.gz) = 234214
+TIMESTAMP = 1618496341
+SHA256 (skalibs-2.10.0.3.tar.gz) = b780b0ae650dda0c3ec5f8975174998af2d24c2a2e2be669b1bab46e73b1464d
+SIZE (skalibs-2.10.0.3.tar.gz) = 232814
diff --git a/devel/skalibs/pkg-plist b/devel/skalibs/pkg-plist
index aa89664271dd..5bce56c382aa 100644
--- a/devel/skalibs/pkg-plist
+++ b/devel/skalibs/pkg-plist
@@ -84,7 +84,7 @@ include/skalibs/unixmessage.h
 include/skalibs/unixonacid.h
 lib/libskarnet.so
 lib/libskarnet.so.2.10
-lib/libskarnet.so.2.10.0.0
+lib/libskarnet.so.2.10.0.3
 lib/skalibs/libskarnet.a
 lib/skalibs/sysdeps/socket.lib
 lib/skalibs/sysdeps/spawn.lib
diff --git a/lang/execline/Makefile b/lang/execline/Makefile
index c1f6e55274ca..ebc67431860b 100644
--- a/lang/execline/Makefile
+++ b/lang/execline/Makefile
@@ -1,7 +1,7 @@
 # Created by: Sergei Kolobov <sergei@kolobov.com>
 
 PORTNAME=	execline
-PORTVERSION=	2.7.0.0
+PORTVERSION=	2.8.0.1
 CATEGORIES=	lang shells
 MASTER_SITES=	https://www.skarnet.org/software/${PORTNAME}/
 
diff --git a/lang/execline/distinfo b/lang/execline/distinfo
index 9882196ce684..ba6858498d0f 100644
--- a/lang/execline/distinfo
+++ b/lang/execline/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610385302
-SHA256 (execline-2.7.0.0.tar.gz) = 0d5f7ba9af702d5c648f93e1de7d4816a05a7dba10ea31117fba02d3a327874e
-SIZE (execline-2.7.0.0.tar.gz) = 93963
+TIMESTAMP = 1618496359
+SHA256 (execline-2.8.0.1.tar.gz) = a373f497d2335905d750e2f3be2ba47a028c11c4a7d5595dca9965c161e53aed
+SIZE (execline-2.8.0.1.tar.gz) = 94886
diff --git a/lang/execline/pkg-plist b/lang/execline/pkg-plist
index 04f08f674c4e..4e87f0ce070a 100644
--- a/lang/execline/pkg-plist
+++ b/lang/execline/pkg-plist
@@ -52,8 +52,8 @@ include/execline/config.h
 include/execline/execline.h
 lib/execline/libexecline.a
 lib/libexecline.so
-lib/libexecline.so.2.7
-lib/libexecline.so.2.7.0.0
+lib/libexecline.so.2.8
+lib/libexecline.so.2.8.0.1
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/background.html
diff --git a/sysutils/s6-rc/Makefile b/sysutils/s6-rc/Makefile
index b6470e871fde..662e9f1f885a 100644
--- a/sysutils/s6-rc/Makefile
+++ b/sysutils/s6-rc/Makefile
@@ -1,7 +1,7 @@
 # Created by: Andris Raugulis <moo@arthepsy.eu>
 
 PORTNAME=	s6-rc
-PORTVERSION=	0.5.2.1
+PORTVERSION=	0.5.2.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.skarnet.org/software/${PORTNAME}/
 
@@ -30,8 +30,11 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \
 	--with-lib=${LOCALBASE}/lib/execline \
 	--with-lib=${LOCALBASE}/lib/s6 \
 	--with-dynlib=${LOCALBASE}/lib \
+	--livedir=${LIVEDIR} \
 	--enable-shared
 
+LIVEDIR?=	/var/run/${PORTNAME}
+
 DOCS=		AUTHORS COPYING INSTALL README doc/*.html
 OPTIONS_DEFINE=	DOCS
 
diff --git a/sysutils/s6-rc/distinfo b/sysutils/s6-rc/distinfo
index fb207bece3ce..601118bb1391 100644
--- a/sysutils/s6-rc/distinfo
+++ b/sysutils/s6-rc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610387865
-SHA256 (s6-rc-0.5.2.1.tar.gz) = 2842fa55e2bddb65573d78d2c475c4a2f2b26b9258a18b457f8a0342e2fafa0a
-SIZE (s6-rc-0.5.2.1.tar.gz) = 98184
+TIMESTAMP = 1618496375
+SHA256 (s6-rc-0.5.2.2.tar.gz) = 2a8d1cd455c05c8502b34517cfe79841aa46d08ad969076b37a15d3910617f89
+SIZE (s6-rc-0.5.2.2.tar.gz) = 98158
diff --git a/sysutils/s6-rc/pkg-plist b/sysutils/s6-rc/pkg-plist
index 451f941cd099..abe45f02e6d9 100644
--- a/sysutils/s6-rc/pkg-plist
+++ b/sysutils/s6-rc/pkg-plist
@@ -14,7 +14,7 @@ include/s6-rc/s6rc-utils.h
 include/s6-rc/s6rc.h
 lib/libs6rc.so
 lib/libs6rc.so.0.5
-lib/libs6rc.so.0.5.2.1
+lib/libs6rc.so.0.5.2.2
 lib/s6-rc/libs6rc.a
 libexec/s6-rc-fdholder-filler
 libexec/s6-rc-oneshot-run
diff --git a/sysutils/s6/Makefile b/sysutils/s6/Makefile
index 16d2f978a619..0c5abc46a0ed 100644
--- a/sysutils/s6/Makefile
+++ b/sysutils/s6/Makefile
@@ -1,7 +1,7 @@
 # Created by: Colin Booth <colin@heliocat.net>
 
 PORTNAME=	s6
-PORTVERSION=	2.10.0.0
+PORTVERSION=	2.10.0.3
 CATEGORIES=	sysutils
 MASTER_SITES=	https://www.skarnet.org/software/${PORTNAME}/
 
diff --git a/sysutils/s6/distinfo b/sysutils/s6/distinfo
index 8585909b88aa..6bf02d5875c3 100644
--- a/sysutils/s6/distinfo
+++ b/sysutils/s6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610387539
-SHA256 (s6-2.10.0.0.tar.gz) = 60a69caf14bcea28aa69bc64b1fb7ed0f6c65ae1f20d1e78a553f25141cbf877
-SIZE (s6-2.10.0.0.tar.gz) = 218091
+TIMESTAMP = 1618496369
+SHA256 (s6-2.10.0.3.tar.gz) = 1d21373151704150df0e8ed199f097f6ee5d2befb9a68aca4f20f3862e5d8757
+SIZE (s6-2.10.0.3.tar.gz) = 218797
diff --git a/sysutils/s6/pkg-plist b/sysutils/s6/pkg-plist
index a199d38b3fab..109ac17ba4e4 100644
--- a/sysutils/s6/pkg-plist
+++ b/sysutils/s6/pkg-plist
@@ -69,7 +69,7 @@ include/s6/s6.h
 include/s6/s6lock.h
 lib/libs6.so
 lib/libs6.so.2.10
-lib/libs6.so.2.10.0.0
+lib/libs6.so.2.10.0.3
 lib/s6/libs6.a
 libexec/s6lockd-helper
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS