Attachment #251024 for bug #279116




PORTNAME=	s6
DISTVERSION=	2.12.0.4
CATEGORIES=	sysutils
MASTER_SITES=	https://www.skarnet.org/software/${PORTNAME}/


LICENSE=	ISCL
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	execline>=2.9.5.1:lang/execline \
		skalibs>=2.14.1.1:devel/skalibs
LIB_DEPENDS=	libskarnet.so:devel/skalibs
RUN_DEPENDS=	execlineb:lang/execline


	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs6.so.${PORTVERSION}
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs6auto.so.${PORTVERSION}
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/s6lockd-helper
	cd ${WRKDIR} && ${INSTALL_SCRIPT} s6-svscanboot \
		${STAGEDIR}${PREFIX}/bin
	@${MKDIR} ${STAGEDIR}${ETCDIR}/s6-svscan/env

Lines 1-3 Link Here

(-)b/sysutils/s6/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1680559067	1	TIMESTAMP = 1716814822
2	SHA256 (s6-2.11.3.2.tar.gz) = 7c16138ad2f0ffbe0ed2ae8dd0cecada9f7c787edd33a69084d219110693df74	2	SHA256 (s6-2.12.0.4.tar.gz) = c95d51787602e0c8c8e4f92a710cbdaa4ee797ee886e71342727e2974f95c06b
3	SIZE (s6-2.11.3.2.tar.gz) = 247882	3	SIZE (s6-2.12.0.4.tar.gz) = 255314




bin/s6-tai64n
bin/s6-tai64nlocal
bin/s6-usertree-maker
bin/s6lockd
bin/ucspilogd
@sample %%ETCDIR%%/s6-svscan-log/run.sample
@sample %%ETCDIR%%/s6-svscan/env/PATH.sample

include/s6/servicedir.h
include/s6/supervise.h
lib/libs6.so
lib/libs6.so.2.12
lib/libs6.so.2.12.0.4
lib/libs6auto.so
lib/libs6auto.so.2.12
lib/libs6auto.so.2.12.0.4
lib/s6/libs6.a
lib/s6/libs6auto.a
libexec/s6lockd-helper
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/fifodir.html

%%PORTDOCS%%%%DOCSDIR%%/servicedir.html
%%PORTDOCS%%%%DOCSDIR%%/socket-activation.html
%%PORTDOCS%%%%DOCSDIR%%/ucspilogd.html
%%PORTDOCS%%%%DOCSDIR%%/unit-conversion.html
%%PORTDOCS%%%%DOCSDIR%%/upgrade.html
%%PORTDOCS%%%%DOCSDIR%%/why.html
- 

Return to bug 279116

Lines 1-5 Link Here

(-)b/sysutils/s6/Makefile (-3 / +3 lines)
1	PORTNAME= s6	1	PORTNAME= s6
2	DISTVERSION= 2.11.3.2	2	DISTVERSION= 2.12.0.4
3	CATEGORIES= sysutils	3	CATEGORIES= sysutils
4	MASTER_SITES= https://www.skarnet.org/software/${PORTNAME}/	4	MASTER_SITES= https://www.skarnet.org/software/${PORTNAME}/
5		5
Lines 10-16 WWW= https://www.skarnet.org/software/s6/ Link Here
10	LICENSE= ISCL	10	LICENSE= ISCL
11	LICENSE_FILE= ${WRKSRC}/COPYING	11	LICENSE_FILE= ${WRKSRC}/COPYING
12		12
13	BUILD_DEPENDS= execline>=2.9.3.0:lang/execline	13	BUILD_DEPENDS= execline>=2.9.5.1:lang/execline \
		14	skalibs>=2.14.1.1:devel/skalibs
14	LIB_DEPENDS= libskarnet.so:devel/skalibs	15	LIB_DEPENDS= libskarnet.so:devel/skalibs
15	RUN_DEPENDS= execlineb:lang/execline	16	RUN_DEPENDS= execlineb:lang/execline
16		17
Lines 39-45 post-install: Link Here
39	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*	40	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
40	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs6.so.${PORTVERSION}	41	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs6.so.${PORTVERSION}
41	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs6auto.so.${PORTVERSION}	42	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs6auto.so.${PORTVERSION}
42	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/s6lockd-helper
43	cd ${WRKDIR} && ${INSTALL_SCRIPT} s6-svscanboot \	43	cd ${WRKDIR} && ${INSTALL_SCRIPT} s6-svscanboot \
44	${STAGEDIR}${PREFIX}/bin	44	${STAGEDIR}${PREFIX}/bin
45	@${MKDIR} ${STAGEDIR}${ETCDIR}/s6-svscan/env	45	@${MKDIR} ${STAGEDIR}${ETCDIR}/s6-svscan/env

Lines 62-68 bin/s6-svwait Link Here

(-)b/sysutils/s6/pkg-plist (-7 / +5 lines)
62	bin/s6-tai64n	62	bin/s6-tai64n
63	bin/s6-tai64nlocal	63	bin/s6-tai64nlocal
64	bin/s6-usertree-maker	64	bin/s6-usertree-maker
65	bin/s6lockd
66	bin/ucspilogd	65	bin/ucspilogd
67	@sample %%ETCDIR%%/s6-svscan-log/run.sample	66	@sample %%ETCDIR%%/s6-svscan-log/run.sample
68	@sample %%ETCDIR%%/s6-svscan/env/PATH.sample	67	@sample %%ETCDIR%%/s6-svscan/env/PATH.sample
Lines 79-92 include/s6/s6.h Link Here
79	include/s6/servicedir.h	78	include/s6/servicedir.h
80	include/s6/supervise.h	79	include/s6/supervise.h
81	lib/libs6.so	80	lib/libs6.so
82	lib/libs6.so.2.11	81	lib/libs6.so.2.12
83	lib/libs6.so.2.11.3.2	82	lib/libs6.so.2.12.0.4
84	lib/libs6auto.so	83	lib/libs6auto.so
85	lib/libs6auto.so.2.11	84	lib/libs6auto.so.2.12
86	lib/libs6auto.so.2.11.3.2	85	lib/libs6auto.so.2.12.0.4
87	lib/s6/libs6.a	86	lib/s6/libs6.a
88	lib/s6/libs6auto.a	87	lib/s6/libs6auto.a
89	libexec/s6lockd-helper
90	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS	88	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
91	%%PORTDOCS%%%%DOCSDIR%%/README	89	%%PORTDOCS%%%%DOCSDIR%%/README
92	%%PORTDOCS%%%%DOCSDIR%%/fifodir.html	90	%%PORTDOCS%%%%DOCSDIR%%/fifodir.html
Lines 165-169 libexec/s6lockd-helper Link Here
165	%%PORTDOCS%%%%DOCSDIR%%/servicedir.html	163	%%PORTDOCS%%%%DOCSDIR%%/servicedir.html
166	%%PORTDOCS%%%%DOCSDIR%%/socket-activation.html	164	%%PORTDOCS%%%%DOCSDIR%%/socket-activation.html
167	%%PORTDOCS%%%%DOCSDIR%%/ucspilogd.html	165	%%PORTDOCS%%%%DOCSDIR%%/ucspilogd.html
		166	%%PORTDOCS%%%%DOCSDIR%%/unit-conversion.html
168	%%PORTDOCS%%%%DOCSDIR%%/upgrade.html	167	%%PORTDOCS%%%%DOCSDIR%%/upgrade.html
169	%%PORTDOCS%%%%DOCSDIR%%/why.html	168	%%PORTDOCS%%%%DOCSDIR%%/why.html
170	-