From 24bd771fce4e48a2a53cffae9f60c4ad83d4670e Mon Sep 17 00:00:00 2001
From: sergei <sergei@FreeBSD.org>
Date: Wed, 7 Sep 2005 08:15:35 +0000
Subject: - Update to 1.3.1 - Pass user-overridable SERVICE_DIR into installed
 rundvsdir.sh startup   file as well

---
 sysutils/runit/Makefile             |  3 ++-
 sysutils/runit/distinfo             |  4 ++--
 sysutils/runit/files/runsvdir.sh.in | 10 +++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'sysutils/runit')

diff --git a/sysutils/runit/Makefile b/sysutils/runit/Makefile
index 0b5d419364af..e6ef85504078 100644
--- a/sysutils/runit/Makefile
+++ b/sysutils/runit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	runit
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://smarden.org/${PORTNAME}/
 
@@ -18,6 +18,7 @@ WRKSRC=		${WRKDIR}/admin/${DISTNAME}
 ALL_TARGET=	default
 
 SERVICE_DIR?=	/var/service
+SUB_LIST=	SERVICE_DIR="${SERVICE_DIR}"
 
 MAN8=		chpst.8 runit-init.8 runit.8 runsv.8 runsvchdir.8 \
 		runsvctrl.8 runsvdir.8 runsvstat.8 sv.8 svlogd.8 \
diff --git a/sysutils/runit/distinfo b/sysutils/runit/distinfo
index 8890f1a0a3fd..742343d0c15a 100644
--- a/sysutils/runit/distinfo
+++ b/sysutils/runit/distinfo
@@ -1,2 +1,2 @@
-MD5 (runit-1.3.0.tar.gz) = a30420421e6d374afde59297941136ed
-SIZE (runit-1.3.0.tar.gz) = 97633
+MD5 (runit-1.3.1.tar.gz) = c4e99c9e89088ff4378a3722eb0b77b9
+SIZE (runit-1.3.1.tar.gz) = 98452
diff --git a/sysutils/runit/files/runsvdir.sh.in b/sysutils/runit/files/runsvdir.sh.in
index 256c17c253de..5cfbdfb2d29b 100644
--- a/sysutils/runit/files/runsvdir.sh.in
+++ b/sysutils/runit/files/runsvdir.sh.in
@@ -11,7 +11,7 @@
 # Add the following lines to /etc/rc.conf to enable `runsvdir':
 #
 #runsvdir_enable="YES"		(default: NO)
-#runsvdir_path="/service"	(default: /var/service)
+#runsvdir_path="/service"	(default: %%SERVICE_DIR%%)
 #
 
 . "/etc/rc.subr"
@@ -28,9 +28,9 @@ runsvdir_start()
 {
 	/bin/test -d ${runsvdir_path} || /bin/mkdir -p ${runsvdir_path}
 	/usr/bin/env -i \
-		PATH=/command:%%PREFIX%%/sbin:%%PREFIX%%/bin:/sbin:/bin:/usr/sbin:/usr/bin \
-		/usr/sbin/daemon \
-		${command} ${runsvdir_path}
+	PATH=/command:%%PREFIX%%/sbin:%%PREFIX%%/bin:/sbin:/bin:/usr/sbin:/usr/bin \
+	/usr/sbin/daemon \
+	${command} ${runsvdir_path}
 }
 
 runsvdir_post_stop()
@@ -41,6 +41,6 @@ runsvdir_post_stop()
 # read configuration and set defaults
 load_rc_config "$name"
 : ${runsvdir_enable="NO"}
-: ${runsvdir_path="/var/service"}
+: ${runsvdir_path="%%SERVICE_DIR%%"}
 
 run_rc_command "$1"
-- 
cgit