diff --git a/sysutils/s6-rc/Makefile b/sysutils/s6-rc/Makefile index e40e058bf49e..270f68e08c14 100644 --- a/sysutils/s6-rc/Makefile +++ b/sysutils/s6-rc/Makefile @@ -1,67 +1,67 @@ PORTNAME= s6-rc -DISTVERSION= 0.5.4.2 +DISTVERSION= 0.5.5.0 CATEGORIES= sysutils MASTER_SITES= http://www.skarnet.org/software/${PORTNAME}/ MAINTAINER= crest@rlwinm.de COMMENT= Skarnet.org service manager WWW= https://www.skarnet.org/software/s6-rc/ LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/COPYING -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 +BUILD_DEPENDS= execline>=2.9.6.1:lang/execline \ + skalibs>=2.14.3.0:devel/skalibs \ + s6>=2.13.1.0:sysutils/s6 +RUN_DEPENDS= execline>=2.9.6.1:lang/execline \ + skalibs>=2.14.3.0:devel/skalibs \ + s6>=2.13.1.0:sysutils/s6 LIB_DEPENDS= libs6.so:sysutils/s6 \ libskarnet.so:devel/skalibs FLAVORS= hier run FLAVOR?= ${FLAVORS:[1]} USES= gmake USE_LDCONFIG= yes HAS_CONFIGURE= yes 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 . # A FreeBSD port should follow the operating system file system layout, but there is a corner # case where s6-rc replacing base system init system *has* to deviate from hier(7). # The problem is that s6-rc requires a writeable file system # (to track service state, bind unix sockets, create named fifos) # very early in the boot process before FreeBSD used to mount /var and /var/run. # One way to satisfy this requirement is to mount a tmpfs directly under /. # The live directory shouldn't be kept on /tmp because this often a small # file system that could be exhausted by accident breaking s6-rc. # Adding a small /run tmpfs dedicated to s6-rc solves this problem. .if ${FLAVOR} == run # Follow hier(7) LIVEDIR?= /run/${PORTNAME} .endif LIVEDIR?= /var/run/${PORTNAME} CONFIGURE_ARGS+=--prefix=${PREFIX} \ --with-include=${LOCALBASE}/include \ - --with-lib=${LOCALBASE}/lib/skalibs \ + --with-lib=${LOCALBASE}/lib \ --with-lib=${LOCALBASE}/lib/execline \ --with-lib=${LOCALBASE}/lib/s6 \ --with-dynlib=${LOCALBASE}/lib \ --livedir=${LIVEDIR} \ --enable-shared DOCS= AUTHORS COPYING INSTALL README doc/*.html OPTIONS_DEFINE= DOCS post-install: .for d in bin libexec ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${d}/* .endfor ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs6rc.so.${PORTVERSION} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .include diff --git a/sysutils/s6-rc/distinfo b/sysutils/s6-rc/distinfo index 6b38d259c0eb..55047b84bcea 100644 --- a/sysutils/s6-rc/distinfo +++ b/sysutils/s6-rc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716817196 -SHA256 (s6-rc-0.5.4.2.tar.gz) = 00bdfa596fa7161512e972ec9282a2abd8fd0e31f09177bad7a2bc3d8f283982 -SIZE (s6-rc-0.5.4.2.tar.gz) = 100896 +TIMESTAMP = 1733248228 +SHA256 (s6-rc-0.5.5.0.tar.gz) = c3b5f1b8d3acea60a20a59fb25280b69a6aac0bb3afdab21d2edeada77b2df01 +SIZE (s6-rc-0.5.5.0.tar.gz) = 101915 diff --git a/sysutils/s6-rc/pkg-plist b/sysutils/s6-rc/pkg-plist index ec0e06b81467..9aa925ac9dea 100644 --- a/sysutils/s6-rc/pkg-plist +++ b/sysutils/s6-rc/pkg-plist @@ -1,39 +1,41 @@ bin/s6-rc bin/s6-rc-bundle bin/s6-rc-compile bin/s6-rc-db bin/s6-rc-dryrun bin/s6-rc-format-upgrade bin/s6-rc-init bin/s6-rc-update include/s6-rc/config.h include/s6-rc/s6rc-constants.h include/s6-rc/s6rc-db.h include/s6-rc/s6rc-servicedir.h include/s6-rc/s6rc-utils.h include/s6-rc/s6rc.h +lib/libs6rc.a +@mode 755 lib/libs6rc.so lib/libs6rc.so.0.5 -lib/libs6rc.so.0.5.4.2 -lib/s6-rc/libs6rc.a +@mode +lib/libs6rc.so.0.5.5.0 libexec/s6-rc-fdholder-filler libexec/s6-rc-oneshot-run %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/faq.html %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/overview.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-bundle.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-compile.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-db.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-dryrun.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-fdholder-filler.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-format-upgrade.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-init.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-oneshot-run.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc-update.html %%PORTDOCS%%%%DOCSDIR%%/s6-rc.html %%PORTDOCS%%%%DOCSDIR%%/upgrade.html %%PORTDOCS%%%%DOCSDIR%%/why.html