From owner-svn-ports-head@freebsd.org Tue Dec 13 15:45:53 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75DB9C75BA3; Tue, 13 Dec 2016 15:45:53 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 506B1760; Tue, 13 Dec 2016 15:45:53 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBDFjqtG095010; Tue, 13 Dec 2016 15:45:52 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBDFjqE3095007; Tue, 13 Dec 2016 15:45:52 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201612131545.uBDFjqE3095007@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 13 Dec 2016 15:45:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428504 - head/sysutils/s6 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Dec 2016 15:45:53 -0000 Author: amdmi3 Date: Tue Dec 13 15:45:52 2016 New Revision: 428504 URL: https://svnweb.freebsd.org/changeset/ports/428504 Log: - Update to 2.4.0.0 - Update maintainer's email - While here, add LICENSE_FILE, fix library dependency, don't install unneeded docs, fix command for docs installation and apply some cosmetic fixes PR: 213899 Submitted by: colin@heliocat.net (maintainer) Modified: head/sysutils/s6/Makefile head/sysutils/s6/distinfo head/sysutils/s6/pkg-plist Modified: head/sysutils/s6/Makefile ============================================================================== --- head/sysutils/s6/Makefile Tue Dec 13 15:45:47 2016 (r428503) +++ head/sysutils/s6/Makefile Tue Dec 13 15:45:52 2016 (r428504) @@ -2,17 +2,18 @@ # $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 @@ -23,24 +24,22 @@ 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 README doc/*.html -DOCS= AUTHORS COPYING INSTALL 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 @@ -52,4 +51,8 @@ post-install: 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 Modified: head/sysutils/s6/distinfo ============================================================================== --- head/sysutils/s6/distinfo Tue Dec 13 15:45:47 2016 (r428503) +++ head/sysutils/s6/distinfo Tue Dec 13 15:45:52 2016 (r428504) @@ -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 Modified: head/sysutils/s6/pkg-plist ============================================================================== --- head/sysutils/s6/pkg-plist Tue Dec 13 15:45:47 2016 (r428503) +++ head/sysutils/s6/pkg-plist Tue Dec 13 15:45:52 2016 (r428504) @@ -1,5 +1,6 @@ bin/s6-accessrules-cdb-from-fs bin/s6-accessrules-fs-from-cdb +bin/s6-applyuidgid bin/s6-cleanfifodir bin/s6-connlimit bin/s6-envdir @@ -36,6 +37,7 @@ bin/s6-log bin/s6-mkfifodir bin/s6-setlock bin/s6-setsid +bin/s6-setuidgid bin/s6-softlimit bin/s6-sudo bin/s6-sudoc @@ -66,16 +68,12 @@ 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