git: 6e5298df63d5 - main - sysutils/s6-rc: Update to 0.5.4.2

The branch main has been updated by fuz:

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

commit 6e5298df63d54cdac96dc1137cec31698cdd37c7
Author:     Jan Bramkamp <crest@rlwinm.de>
AuthorDate: 2024-05-27 14:09:01 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-06-16 11:54:29 +0000

    sysutils/s6-rc: Update to 0.5.4.2
    
    Also move USES below FLAVORS and FLAVOR in port Makefile as recommended by portlint.
    
    List of changes between 0.5.4.1 and 0.5.4.2 mentioned in the ./NEWS file:
    
    In 0.5.4.2
    ----------
     - Adaptation to skalibs-2.14.0.0.
     - Bugfixes.
    
    PR:             279116
---
 sysutils/s6-rc/Makefile  | 22 +++++++++++-----------
 sysutils/s6-rc/distinfo  |  6 +++---
 sysutils/s6-rc/pkg-plist |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/sysutils/s6-rc/Makefile b/sysutils/s6-rc/Makefile
index 6ed84bbfa331..e40e058bf49e 100644
--- a/sysutils/s6-rc/Makefile
+++ b/sysutils/s6-rc/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	s6-rc
-DISTVERSION=	0.5.4.1
+DISTVERSION=	0.5.4.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.skarnet.org/software/${PORTNAME}/
 
@@ -10,23 +10,23 @@ WWW=		https://www.skarnet.org/software/s6-rc/
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	execline>=2.9.3.0:lang/execline \
-		skalibs>=2.13.1.1:devel/skalibs \
-		s6>=2.11.3.2:sysutils/s6
-RUN_DEPENDS=	execline>=2.9.3.0:lang/execline \
-		skalibs>=2.13.1.1:devel/skalibs \
-		s6>=2.11.3.2:sysutils/s6
+BUILD_DEPENDS=	execline>=2.9.5.1:lang/execline \
+		skalibs>=2.14.1.1:devel/skalibs \
+		s6>=2.12.0.4:sysutils/s6
+RUN_DEPENDS=	execline>=2.9.5.1:lang/execline \
+		skalibs>=2.14.1.1:devel/skalibs \
+		s6>=2.12.0.4:sysutils/s6
 LIB_DEPENDS=	libs6.so:sysutils/s6 \
 		libskarnet.so:devel/skalibs
 
-USES=		gmake
+FLAVORS=	hier run
+FLAVOR?=	${FLAVORS:[1]}
 
+USES=		gmake
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 
-FLAVORS=	hier run
-FLAVOR?=	${FLAVORS:[1]}
-run_PKGNAMESUFFIX= -run
+run_PKGNAMESUFFIX=	-run
 
 # The only difference between the hier and the run flavors is the default live directory path
 # hard coded into the s6-rc utilities allowing their use without passing -l <live_dir>.
diff --git a/sysutils/s6-rc/distinfo b/sysutils/s6-rc/distinfo
index d463f0e156b4..6b38d259c0eb 100644
--- a/sysutils/s6-rc/distinfo
+++ b/sysutils/s6-rc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680559911
-SHA256 (s6-rc-0.5.4.1.tar.gz) = d7268cab7c5423305cf9598a33d4fcdab8a315952b3ec80f79c85b8cb76158f6
-SIZE (s6-rc-0.5.4.1.tar.gz) = 101078
+TIMESTAMP = 1716817196
+SHA256 (s6-rc-0.5.4.2.tar.gz) = 00bdfa596fa7161512e972ec9282a2abd8fd0e31f09177bad7a2bc3d8f283982
+SIZE (s6-rc-0.5.4.2.tar.gz) = 100896
diff --git a/sysutils/s6-rc/pkg-plist b/sysutils/s6-rc/pkg-plist
index ec62c7536573..ec0e06b81467 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.4.1
+lib/libs6rc.so.0.5.4.2
 lib/s6-rc/libs6rc.a
 libexec/s6-rc-fdholder-filler
 libexec/s6-rc-oneshot-run