Merge wwwoffle.sh and wwwoffled into one rc.d script that follows pkgsrc

conventions for rc.d scripts.

2 files changed, 11 insertions, 15 deletions

diff --git a/www/wwwoffle/files/wwwoffle.sh b/www/wwwoffle/files/wwwoffle.sh
deleted file mode 100644
index 458d2377c27..00000000000
--- a/www/wwwoffle/files/wwwoffle.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: wwwoffle.sh,v 1.1 1998/06/06 17:03:58 tron Exp $
-#
-if [ -x @PREFIX@/sbin/wwwoffled -a -f @PREFIX@/etc/wwwoffle/wwwoffle.conf ];
-then
- @PREFIX@/sbin/wwwoffled -c @PREFIX@/etc/wwwoffle/wwwoffle.conf >/dev/null 2>&1 &
- echo -n ' wwwoffled'
-fi
-exit 0
diff --git a/www/wwwoffle/files/wwwoffled b/www/wwwoffle/files/wwwoffled
index ddfebc481b0..eabf7305b8e 100644
--- a/www/wwwoffle/files/wwwoffled
+++ b/www/wwwoffle/files/wwwoffled
@@ -1,12 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: wwwoffled,v 1.2 2001/10/25 10:20:59 wiz Exp $
+# $NetBSD: wwwoffled,v 1.3 2002/08/07 09:15:44 jlam Exp $
 #
-
 # PROVIDE: wwwoffled
 # REQUIRE: DAEMON network
 
-. /etc/rc.subr
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr
+fi
 
 name="wwwoffled"
 command="@PREFIX@/sbin/${name}"
@@ -26,5 +27,10 @@ wwwoffled_start() {
 	eval "${control_prog} -fetch ${command_args}"
 }
 
-load_rc_config $name
-run_rc_command "$1"
+if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
+	load_rc_config $name
+	run_rc_command "$1"
+else
+	echo -n ' ${name}'
+	${start_cmd}
+fi