svn commit: r428504 - head/sysutils/s6
Dmitry Marakasov
amdmi3 at FreeBSD.org
Tue Dec 13 15:45:53 UTC 2016
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 at 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 at heliocat.net
+MAINTAINER= colin-ports at 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 <bsd.port.mk>
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
More information about the svn-ports-all
mailing list