This diff updates sysutils/runit to 1.7.2. Major differences from the previous
port:
* service directory moved from /service to /var/service
* the programs runsvctrl, runsvstat, svwaitdown, and svwaitup have been
combined into one program, sv.
The bulk of this update was done by Toni Mueller.
---
Lars Hansson
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/runit/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 2006/02/15 05:14:30 1.6
+++ Makefile 2006/12/08 13:43:34
@@ -2,8 +2,7 @@
COMMENT= "daemontools alike replacement for init"
-DISTNAME= runit-1.2.1
-PKGNAME= ${DISTNAME}p0
+DISTNAME= runit-1.7.2
CATEGORIES= sysutils
HOMEPAGE= http://www.smarden.org/runit/
@@ -19,19 +18,15 @@
MASTER_SITES= ${HOMEPAGE}
WRKDIST= ${WRKDIR}/admin/${DISTNAME}
WRKSRC= ${WRKDIST}/src
-SBINPROGRAMS= runit runit-init runsvdir runsvchdir runsv \
- runsvctrl runsvstat svlogd utmpset svwaitdown \
- svwaitup chpst
-MANPAGES= chpst.8 runit.8 runsvchdir.8 runsvdir.8 svlogd.8 \
- svwaitup.8 runit-init.8 runsv.8 runsvctrl.8 \
- runsvstat.8 svwaitdown.8 utmpset.8
-DOCS1= benefits.html replaceinit.html runsvchdir.8.html \
- svwaitup.8.html chpst.8.html runit-init.8.html \
- runsvctrl.8.html upgrade.html runit.8.html \
- runsvdir.8.html dependencies.html runlevels.html \
- runsvstat.8.html useinit.html index.html \
- runscripts.html svlogd.8.html utmpset.8.html \
- install.html runsv.8.html svwaitdown.8.html
+SBINPROGRAMS= chpst runit runit-init runsv runsvchdir runsvdir \
+ sv svlogd utmpset
+MANPAGES= chpst.8 runit.8 runit-init.8 runsv.8 runsvchdir.8 runsvdir.8 \
+ sv.8 svlogd.8 utmpset.8
+DOCS1= benefits.html chpst.8.html dependencies.html faq.html \
+ index.html install.html replaceinit.html runit-init.8.html \
+ runit.8.html runlevels.html runscripts.html runsv.8.html \
+ runsvchdir.8.html runsvdir.8.html sv.8.html svlogd.8.html \
+ upgrade.html useinit.html index.html utmpset.8.html
DOCS2= CHANGES README COPYING THANKS
EXAMPLES= etc/2 etc/openbsd/1 etc/openbsd/3 etc/openbsd/ctrlaltdel
@@ -49,7 +44,7 @@
.for pgm in ${SBINPROGRAMS}
${INSTALL_PROGRAM} ${WRKDIST}/command/${pgm} ${PREFIX}/sbin/
.endfor
- ${INSTALL_SCRIPT} files/runsvdir-start ${PREFIX}/sbin/
+ ${INSTALL_SCRIPT} ${WRKDIST}/etc/2 ${PREFIX}/sbin/runsvdir-start
.for page in ${MANPAGES}
${INSTALL_MAN} ${WRKDIST}/man/${page} ${PREFIX}/man/man8
.endfor
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/runit/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 2005/02/23 21:50:50 1.4
+++ distinfo 2006/12/08 13:43:34
@@ -1,4 +1,4 @@
-MD5 (runit-1.2.1.tar.gz) = 6bca396fe0cc212984434f2717ba3f0d
-RMD160 (runit-1.2.1.tar.gz) = 837b7450fa440519547c278318ed50a6bffbc771
-SHA1 (runit-1.2.1.tar.gz) = 7f94255e036e1c475f23c8ba8504a4df6a1aae61
-SIZE (runit-1.2.1.tar.gz) = 91062
+MD5 (runit-1.7.2.tar.gz) = 35448e97188544914f298c88871ab984
+RMD160 (runit-1.7.2.tar.gz) = b3377c35cdf1adf50d30dc46a3f63c73d483ae48
+SHA1 (runit-1.7.2.tar.gz) = 5b8d1351fe82ff5c547179235ede1fdb190be8c3
+SIZE (runit-1.7.2.tar.gz) = 102942
Index: files/rc.shutdown
===================================================================
RCS file: /cvs/ports/sysutils/runit/files/rc.shutdown,v
retrieving revision 1.2
diff -u -r1.2 rc.shutdown
--- files/rc.shutdown 2005/02/23 21:54:08 1.2
+++ files/rc.shutdown 2006/12/08 13:43:34
@@ -1,12 +1,6 @@
# Stop runit services
echo -n 'Waiting for services to stop...'
-/usr/local/sbin/svwaitdown -k -t350 /service/*
-if [ $? -eq 0 ]; then
- echo 'ok.'
-elif [ $? -eq 111 ]; then
- echo 'timeout.'
-else
- echo 'ok. $? services had errors.'
-fi
+/usr/local/sbin/sv -w196 force-stop /var/service/*
+/usr/local/sbin/sv exit /var/service/*
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/sysutils/runit/pkg/MESSAGE,v
retrieving revision 1.3
diff -u -r1.3 MESSAGE
--- pkg/MESSAGE 2006/02/15 05:14:30 1.3
+++ pkg/MESSAGE 2006/12/08 13:43:34
@@ -1,7 +1,12 @@
-You will need to add
+You will need to add
csh -cf '${PREFIX}/sbin/runsvdir-start &'
-to /etc/rc.local in order to have runit start at boot. The port expects
-services to be in /service. If you're using another location you will
-have to modify runsvdir-start.
+to /etc/rc.local in order to have runit start at boot.
+
+The service directory has moved from /service to /var/service.
+
+With this version the runsvctrl, runsvstat, svwaitdown, and svwaitup
+programs no longer are being installed. The functionality of these
+programs has been incorporated into the sv program.
+Read ${PREFIX}/share/doc/runit/upgrade.html on update.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/runit/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 2004/09/30 22:35:15 1.1.1.1
+++ pkg/PLIST 2006/12/08 13:43:34
@@ -4,25 +4,19 @@
@man man/man8/runit.8
@man man/man8/runsv.8
@man man/man8/runsvchdir.8
[EMAIL PROTECTED] man/man8/runsvctrl.8
@man man/man8/runsvdir.8
[EMAIL PROTECTED] man/man8/runsvstat.8
[EMAIL PROTECTED] man/man8/sv.8
@man man/man8/svlogd.8
[EMAIL PROTECTED] man/man8/svwaitdown.8
[EMAIL PROTECTED] man/man8/svwaitup.8
@man man/man8/utmpset.8
sbin/chpst
sbin/runit
sbin/runit-init
sbin/runsv
sbin/runsvchdir
-sbin/runsvctrl
sbin/runsvdir
sbin/runsvdir-start
-sbin/runsvstat
+sbin/sv
sbin/svlogd
-sbin/svwaitdown
-sbin/svwaitup
sbin/utmpset
share/doc/runit/
share/doc/runit/CHANGES
@@ -32,6 +26,7 @@
share/doc/runit/benefits.html
share/doc/runit/chpst.8.html
share/doc/runit/dependencies.html
+share/doc/runit/faq.html
share/doc/runit/index.html
share/doc/runit/install.html
share/doc/runit/replaceinit.html
@@ -41,12 +36,9 @@
share/doc/runit/runscripts.html
share/doc/runit/runsv.8.html
share/doc/runit/runsvchdir.8.html
-share/doc/runit/runsvctrl.8.html
share/doc/runit/runsvdir.8.html
-share/doc/runit/runsvstat.8.html
+share/doc/runit/sv.8.html
share/doc/runit/svlogd.8.html
-share/doc/runit/svwaitdown.8.html
-share/doc/runit/svwaitup.8.html
share/doc/runit/upgrade.html
share/doc/runit/useinit.html
share/doc/runit/utmpset.8.html
