Index: head/sysutils/s6/Makefile =================================================================== --- head/sysutils/s6/Makefile (revision 428503) +++ head/sysutils/s6/Makefile (revision 428504) @@ -1,55 +1,58 @@ # Created by: Colin Booth # $FreeBSD$ PORTNAME= s6 -PORTVERSION= 2.2.4.3 +PORTVERSION= 2.4.0.0 CATEGORIES= sysutils MASTER_SITES= http://www.skarnet.org/software/${PORTNAME}/ -MAINTAINER= colin@heliocat.net +MAINTAINER= colin-ports@heliocat.net COMMENT= skarnet.org supervision suite LICENSE= ISCL +LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= skalibs>=2.3.9.0:devel/skalibs \ - execline>=2.1.4.5:lang/execline +LIB_DEPENDS= libskarnet.so:devel/skalibs +BUILD_DEPENDS= execline>=2.2.0.0:lang/execline RUN_DEPENDS= execlineb:lang/execline USES= gmake USE_RC_SUBR= s6 SERVICE_DIR?= /var/service SUB_FILES= s6-svscan_finish s6-svscan-log_run s6-svscanboot s6-svscan_env_PATH SUB_LIST= SERVICE_DIR="${SERVICE_DIR}" USE_LDCONFIG= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS+=--prefix=${PREFIX} \ - --with-default-path=${LOCALBASE}/bin:/usr/bin:/bin \ - --with-include=${LOCALBASE}/include \ - --with-dynlib=${LOCALBASE}/lib \ - --with-lib=${LOCALBASE}/lib/skalibs \ - --with-lib=${LOCALBASE}/lib/execline \ - --enable-shared +CONFIGURE_ARGS= --prefix=${PREFIX} \ + --with-default-path=${LOCALBASE}/bin:/usr/bin:/bin \ + --with-include=${LOCALBASE}/include \ + --with-dynlib=${LOCALBASE}/lib \ + --with-lib=${LOCALBASE}/lib/skalibs \ + --with-lib=${LOCALBASE}/lib/execline \ + --enable-shared -DOCS= AUTHORS COPYING INSTALL README doc/*.html +DOCS= AUTHORS README doc/*.html + OPTIONS_DEFINE= DOCS post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs6.so.${PORTVERSION} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/s6lockd-helper - @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_MAN} ${DOCS} ${STAGEDIR}${DOCSDIR} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs6.so.${PORTVERSION} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/s6lockd-helper cd ${WRKDIR} && ${INSTALL_SCRIPT} s6-svscanboot \ ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${ETCDIR}/s6-svscan/env cd ${WRKDIR} && ${INSTALL_SCRIPT} s6-svscan_finish \ ${STAGEDIR}${ETCDIR}/s6-svscan/finish.sample cd ${WRKDIR} && ${INSTALL_DATA} s6-svscan_env_PATH \ ${STAGEDIR}${ETCDIR}/s6-svscan/env/PATH.sample @${MKDIR} ${STAGEDIR}${ETCDIR}/s6-svscan-log cd ${WRKDIR} && ${INSTALL_SCRIPT} s6-svscan-log_run \ ${STAGEDIR}${ETCDIR}/s6-svscan-log/run.sample + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .include Index: head/sysutils/s6/distinfo =================================================================== --- head/sysutils/s6/distinfo (revision 428503) +++ head/sysutils/s6/distinfo (revision 428504) @@ -1,2 +1,3 @@ -SHA256 (s6-2.2.4.3.tar.gz) = f584ec56d5f2a3a2d81698d5f744b9b64d8fb6c22b56649faa71f3b62da7db3f -SIZE (s6-2.2.4.3.tar.gz) = 192153 +TIMESTAMP = 1477766011 +SHA256 (s6-2.4.0.0.tar.gz) = 5e788d5935dbcce76ac9a99cfcf6ee46a2ffb84220c84225df7589e9a3585560 +SIZE (s6-2.4.0.0.tar.gz) = 193534 Index: head/sysutils/s6/pkg-plist =================================================================== --- head/sysutils/s6/pkg-plist (revision 428503) +++ head/sysutils/s6/pkg-plist (revision 428504) @@ -1,149 +1,147 @@ bin/s6-accessrules-cdb-from-fs bin/s6-accessrules-fs-from-cdb +bin/s6-applyuidgid bin/s6-cleanfifodir bin/s6-connlimit bin/s6-envdir bin/s6-envuidgid bin/s6-fdholder-daemon bin/s6-fdholder-delete bin/s6-fdholder-deletec bin/s6-fdholder-getdump bin/s6-fdholder-getdumpc bin/s6-fdholder-list bin/s6-fdholder-listc bin/s6-fdholder-retrieve bin/s6-fdholder-retrievec bin/s6-fdholder-setdump bin/s6-fdholder-setdumpc bin/s6-fdholder-store bin/s6-fdholder-storec bin/s6-fdholder-transferdump bin/s6-fdholder-transferdumpc bin/s6-fdholderd bin/s6-fghack bin/s6-ftrig-listen bin/s6-ftrig-listen1 bin/s6-ftrig-notify bin/s6-ftrig-wait bin/s6-ftrigrd bin/s6-ioconnect bin/s6-ipcclient bin/s6-ipcserver bin/s6-ipcserver-access bin/s6-ipcserver-socketbinder bin/s6-ipcserverd bin/s6-log bin/s6-mkfifodir bin/s6-setlock bin/s6-setsid +bin/s6-setuidgid bin/s6-softlimit bin/s6-sudo bin/s6-sudoc bin/s6-sudod bin/s6-supervise bin/s6-svc bin/s6-svlisten bin/s6-svlisten1 bin/s6-svok bin/s6-svscan bin/s6-svscanboot bin/s6-svscanctl bin/s6-svstat bin/s6-svwait bin/s6-tai64n bin/s6-tai64nlocal bin/s6lockd bin/ucspilogd @sample %%ETCDIR%%/s6-svscan-log/run.sample @sample %%ETCDIR%%/s6-svscan/env/PATH.sample @sample %%ETCDIR%%/s6-svscan/finish.sample include/s6/accessrules.h include/s6/config.h include/s6/ftrigr.h include/s6/ftrigw.h include/s6/s6-fdholder.h include/s6/s6-supervise.h include/s6/s6.h include/s6/s6lock.h lib/libs6.so -lib/libs6.so.2.2 -lib/libs6.so.2.2.4 -lib/libs6.so.2.2.4.3 +lib/libs6.so.2.4 +lib/libs6.so.2.4.0 +lib/libs6.so.2.4.0.0 lib/s6/libs6.a libexec/s6lockd-helper -sbin/s6-applyuidgid -sbin/s6-setuidgid %%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/fifodir.html %%PORTDOCS%%%%DOCSDIR%%/ftrig.html %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/localservice.html %%PORTDOCS%%%%DOCSDIR%%/notifywhenup.html %%PORTDOCS%%%%DOCSDIR%%/overview.html %%PORTDOCS%%%%DOCSDIR%%/s6-accessrules-cdb-from-fs.html %%PORTDOCS%%%%DOCSDIR%%/s6-accessrules-fs-from-cdb.html %%PORTDOCS%%%%DOCSDIR%%/s6-applyuidgid.html %%PORTDOCS%%%%DOCSDIR%%/s6-cleanfifodir.html %%PORTDOCS%%%%DOCSDIR%%/s6-connlimit.html %%PORTDOCS%%%%DOCSDIR%%/s6-envdir.html %%PORTDOCS%%%%DOCSDIR%%/s6-envuidgid.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-daemon.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-delete.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-deletec.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-errorcodes.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-getdump.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-getdumpc.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-list.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-listc.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-retrieve.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-retrievec.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-setdump.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-setdumpc.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-store.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-storec.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-transferdump.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholder-transferdumpc.html %%PORTDOCS%%%%DOCSDIR%%/s6-fdholderd.html %%PORTDOCS%%%%DOCSDIR%%/s6-fghack.html %%PORTDOCS%%%%DOCSDIR%%/s6-ftrig-listen.html %%PORTDOCS%%%%DOCSDIR%%/s6-ftrig-listen1.html %%PORTDOCS%%%%DOCSDIR%%/s6-ftrig-notify.html %%PORTDOCS%%%%DOCSDIR%%/s6-ftrig-wait.html %%PORTDOCS%%%%DOCSDIR%%/s6-ioconnect.html %%PORTDOCS%%%%DOCSDIR%%/s6-ipcclient.html %%PORTDOCS%%%%DOCSDIR%%/s6-ipcserver-access.html %%PORTDOCS%%%%DOCSDIR%%/s6-ipcserver-socketbinder.html %%PORTDOCS%%%%DOCSDIR%%/s6-ipcserver.html %%PORTDOCS%%%%DOCSDIR%%/s6-ipcserverd.html %%PORTDOCS%%%%DOCSDIR%%/s6-log.html %%PORTDOCS%%%%DOCSDIR%%/s6-mkfifodir.html %%PORTDOCS%%%%DOCSDIR%%/s6-setlock.html %%PORTDOCS%%%%DOCSDIR%%/s6-setsid.html %%PORTDOCS%%%%DOCSDIR%%/s6-setuidgid.html %%PORTDOCS%%%%DOCSDIR%%/s6-softlimit.html %%PORTDOCS%%%%DOCSDIR%%/s6-sudo.html %%PORTDOCS%%%%DOCSDIR%%/s6-sudoc.html %%PORTDOCS%%%%DOCSDIR%%/s6-sudod.html %%PORTDOCS%%%%DOCSDIR%%/s6-supervise.html %%PORTDOCS%%%%DOCSDIR%%/s6-svc.html %%PORTDOCS%%%%DOCSDIR%%/s6-svlisten.html %%PORTDOCS%%%%DOCSDIR%%/s6-svlisten1.html %%PORTDOCS%%%%DOCSDIR%%/s6-svok.html %%PORTDOCS%%%%DOCSDIR%%/s6-svscan-1.html %%PORTDOCS%%%%DOCSDIR%%/s6-svscan-not-1.html %%PORTDOCS%%%%DOCSDIR%%/s6-svscan.html %%PORTDOCS%%%%DOCSDIR%%/s6-svscanctl.html %%PORTDOCS%%%%DOCSDIR%%/s6-svstat.html %%PORTDOCS%%%%DOCSDIR%%/s6-svwait.html %%PORTDOCS%%%%DOCSDIR%%/s6-tai64n.html %%PORTDOCS%%%%DOCSDIR%%/s6-tai64nlocal.html %%PORTDOCS%%%%DOCSDIR%%/scandir.html %%PORTDOCS%%%%DOCSDIR%%/servicedir.html %%PORTDOCS%%%%DOCSDIR%%/socket-activation.html %%PORTDOCS%%%%DOCSDIR%%/systemd.html %%PORTDOCS%%%%DOCSDIR%%/ucspilogd.html %%PORTDOCS%%%%DOCSDIR%%/upgrade.html %%PORTDOCS%%%%DOCSDIR%%/why.html