- Drop the old .sh extension for rc script

- Remove ipfilter from PROVIDER so that chillispot can start up correctly
  at boot time
- Utilize @stopdaemon
- Bump PORTREVISION

PR:		ports/137967
Submitted by:	Sevan Janiyan <venture37 at geeklan.co.uk> (maintainer)

4 files changed, 26 insertions, 29 deletions

diff --git a/net-mgmt/chillispot/Makefile b/net-mgmt/chillispot/Makefile
index efa5c42118ca..4c04b0b62511 100644
--- a/net-mgmt/chillispot/Makefile
+++ b/net-mgmt/chillispot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	chillispot
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.chillispot.info/download/ \
 		http://www.geeklan.co.uk/files/ \
@@ -20,7 +20,7 @@ CONFLICTS=	coovachilli-[0-9]*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=-sysconfdir=${PREFIX}/etc
-USE_RC_SUBR=	chillispot.sh
+USE_RC_SUBR=	chillispot
 SUB_FILES=	pkg-message
 MAN8=		chilli.8
 
diff --git a/net-mgmt/chillispot/files/chillispot.in b/net-mgmt/chillispot/files/chillispot.in
new file mode 100644
index 000000000000..e8d685a9880b
--- /dev/null
+++ b/net-mgmt/chillispot/files/chillispot.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# PROVIDE: chillispot
+# REQUIRE: netif
+# BEFORE:  pf ipfw
+# KEYWORD: nojail
+
+. %%RC_SUBR%%
+
+name="chillispot"
+rcvar=${name}_enable
+
+command="%%PREFIX%%/sbin/chilli"
+pidfile=/var/run/chilli.pid
+
+load_rc_config $name
+
+: ${chillispot_enable="NO"}
+: ${chillispot_config="%%PREFIX%%/etc/chilli.conf"}
+
+command_args="--conf=${chillispot_config}"
+
+run_rc_command "$1"
diff --git a/net-mgmt/chillispot/files/chillispot.sh.in b/net-mgmt/chillispot/files/chillispot.sh.in
deleted file mode 100644
index 4c837587bac5..000000000000
--- a/net-mgmt/chillispot/files/chillispot.sh.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: chillispot
-# REQUIRE: netif
-# BEFORE:  pf ipfw ipfilter
-# KEYWORD: nojail
-
-. /etc/rc.subr
-
-chillispot_enable=${chillispot_enable-"NO"}
-chillispot_flags=${chillispot_flags-"--conf=/usr/local/etc/chilli.conf"}
-chillispot_pidfile=${utility_pidfile-"/var/run/chilli.pid"}
-
-. /etc/rc.subr
-
-name="chillispot"
-rcvar=`set_rcvar`
-command="/usr/local/sbin/chilli"
-
-load_rc_config $name
-
-pidfile="${chillipot_pidfile}"
-
-start_cmd="echo \"Starting ${name}.\"; /usr/bin/nice -5 ${command} ${chillispot_flags} ${command_args}"
-
-run_rc_command "$1"
diff --git a/net-mgmt/chillispot/pkg-plist b/net-mgmt/chillispot/pkg-plist
index b0c64f815f6f..b8d19f51f5e2 100644
--- a/net-mgmt/chillispot/pkg-plist
+++ b/net-mgmt/chillispot/pkg-plist
@@ -1,4 +1,4 @@
-@unexec %D/etc/rc.d/chillispot forcestop 2>/dev/null || true
+@stopdaemon chillispot
 sbin/chilli
 %%PORTDATA%%%%DATADIR%%/chilli.conf.sample
 %%PORTDATA%%%%DATADIR%%/dictionary.chillispot