Attachment 159308 Details for Bug 201925 – Update port to new version

Update port to new version

s6-2.1.6.0.diff (text/plain), 2.91 KB, created by Colin Booth on 2015-07-27 15:36:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Booth

Created: 2015-07-27 15:36:43 UTC

Size: 2.91 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 392984)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	s6
>-PORTVERSION=	2.1.1.1
>+PORTVERSION=	2.1.6.0
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.skarnet.org/software/${PORTNAME}/
> 
>@@ -11,8 +11,8 @@
> 
> LICENSE=	ISCL
> 
>-BUILD_DEPENDS=	skalibs>=2.3.0.0:${PORTSDIR}/devel/skalibs \
>-		execline>=2.0.2.1:${PORTSDIR}/lang/execline
>+BUILD_DEPENDS=	skalibs>=2.3.5.1:${PORTSDIR}/devel/skalibs \
>+		execline>=2.1.2.2:${PORTSDIR}/lang/execline
> RUN_DEPENDS=	execlineb:${PORTSDIR}/lang/execline
> 
> USES=		gmake
>@@ -21,8 +21,6 @@
> SUB_FILES=	s6-svscan_finish s6-svscan-log_run s6-svscanboot s6-svscan_env_PATH
> SUB_LIST=	SERVICE_DIR="${SERVICE_DIR}"
> 
>-DOCS=		AUTHORS COPYING INSTALL README doc/*.html
>-
> USE_LDCONFIG=	yes
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS+=--prefix=${PREFIX} \
>@@ -32,7 +30,8 @@
> 	--with-lib=${LOCALBASE}/lib/execline \
> 	--enable-shared
> 
>-OPTIONS_DEFINE=	DOCS
>+DOCS=		AUTHORS COPYING INSTALL README doc/*.html
>+OPTIONS_DEFINE= DOCS
> 
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
>Index: distinfo
>===================================================================
>--- distinfo	(revision 392984)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (s6-2.1.1.1.tar.gz) = 857c841cb80935a945347c768981b729f11a6a441140744f58f3e3316b9ef336
>-SIZE (s6-2.1.1.1.tar.gz) = 180033
>+SHA256 (s6-2.1.6.0.tar.gz) = a4e977253fbe130788b721ae51a70680b71f4dfe3c02ebb1db0472e21548d467
>+SIZE (s6-2.1.6.0.tar.gz) = 191362
>Index: files/s6-svscan-log_run.in
>===================================================================
>--- files/s6-svscan-log_run.in	(revision 392984)
>+++ files/s6-svscan-log_run.in	(working copy)
>@@ -3,4 +3,4 @@
> redirfd -rnb 0 fifo
> s6-setuidgid nobody
> exec -c
>-s6-log -bt /tmp/uncaught-logs
>+s6-log -b t /tmp/uncaught-logs
>Index: files/s6.in
>===================================================================
>--- files/s6.in	(revision 392984)
>+++ files/s6.in	(working copy)
>@@ -28,7 +28,7 @@
> command="%%PREFIX%%/bin/s6-svscanboot"
> start_cmd=s6_start
> stop_cmd="%%PREFIX%%/bin/s6-svscanctl -t ${s6_path}"
>-stop_postcmd="%%PREFIX%%/bin/s6-svc -k ${s6_log}/"
>+stop_postcmd="%%PREFIX%%/bin/s6-svc -h ${s6_log}/"
> 
> s6_start()
> {
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 392984)
>+++ pkg-plist	(working copy)
>@@ -69,8 +69,8 @@
> lib/libs6.so
> lib/libs6.so.2
> lib/libs6.so.2.1
>-lib/libs6.so.2.1.1
>-lib/libs6.so.2.1.1.1
>+lib/libs6.so.2.1.6
>+lib/libs6.so.2.1.6.0
> lib/s6/libs6.a
> libexec/s6lockd-helper
> sbin/s6-applyuidgid
>@@ -84,6 +84,7 @@
> %%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

Actions: View

Attachments on bug 201925: 159308