- Update of cyrus-imspd from 1.7b to 1.8

- Startup script updated to rcNG

PR:		ports/108740
Submitted by:	Martin Matuska <martin_AT_matuska dot org>

5 files changed, 47 insertions, 29 deletions

diff --git a/databases/cyrus-imspd/Makefile b/databases/cyrus-imspd/Makefile
index 25cbdd401090..65fb8f765045 100644
--- a/databases/cyrus-imspd/Makefile
+++ b/databases/cyrus-imspd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cyrus-imspd
-PORTVERSION=	1.7b
+PORTVERSION=	1.8
 CATEGORIES=	databases mail
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		http://ftp.kfki.hu/packages/mail/cyrus/
@@ -22,13 +22,13 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-sasldir=${LOCALBASE} \
 		--with-auth=unix
 
+USE_RC_SUBR=	imspd
+
 pre-configure:
 		${REINPLACE_CMD} -e "s|<sasl.h>|<sasl2/sasl.h>|" \
 			${WRKSRC}/configure
 
 post-install:
-		${INSTALL_SCRIPT} ${FILESDIR}/imspd.sh \
-			${PREFIX}/etc/rc.d/imspd.sh
 		${INSTALL_DATA} ${FILESDIR}/imspd.conf \
 			${PREFIX}/lib/sasl2/imspd.conf
 		${MKDIR} /var/imsp
diff --git a/databases/cyrus-imspd/distinfo b/databases/cyrus-imspd/distinfo
index cdcdc353e7a9..da5d52e02be0 100644
--- a/databases/cyrus-imspd/distinfo
+++ b/databases/cyrus-imspd/distinfo
@@ -1,3 +1,3 @@
-MD5 (cyrus-imspd-v1.7b.tar.gz) = 58aed9741f975e29f364e7e604ddc5e9
-SHA256 (cyrus-imspd-v1.7b.tar.gz) = bbffc0096c17770fe990d14d5b1a106659b750ca2e71c76e5145c71fb5f94453
-SIZE (cyrus-imspd-v1.7b.tar.gz) = 636760
+MD5 (cyrus-imspd-v1.8.tar.gz) = 90de37a522f308186ca545596f6cafbb
+SHA256 (cyrus-imspd-v1.8.tar.gz) = ba1026dca5440b6a24a298cb9aa350321f9c6f921ba6404a74b9d546c02b70cd
+SIZE (cyrus-imspd-v1.8.tar.gz) = 650596
diff --git a/databases/cyrus-imspd/files/imspd.in b/databases/cyrus-imspd/files/imspd.in
new file mode 100644
index 000000000000..224a83b117a5
--- /dev/null
+++ b/databases/cyrus-imspd/files/imspd.in
@@ -0,0 +1,41 @@
+#! /bin/sh
+#
+#
+# PROVIDE: imspd
+# REQUIRE: DAEMON NETWORKING SERVERS
+#
+# Add the following line to /etc/rc.conf to enable imspd:
+#
+# imspd_enable="YES"
+#
+# Tweakable parameters for users to override in rc.conf
+
+. "%%RC_SUBR%%"
+
+name=imspd
+
+load_rc_config ${name}
+: ${imspd_enable="NO"}
+: ${imspd_pidfile=/var/run/imspd.pid}
+: ${imspd_options=/var/imspd/options}
+
+rcvar=`set_rcvar`
+pidfile=${imspd_pidfile}
+start_postcmd="start_postcmd"
+stop_postcmd="stop_postcmd"
+required_files=${imspd_options}
+command="%%PREFIX%%/sbin/imspd"
+command_args=">/dev/null &"
+
+start_postcmd()
+{
+        PID=`pgrep imspd`
+        [ -n "${PID}" ] && echo ${PID} > ${pidfile}
+}
+
+stop_postcmd()
+{
+        [ -f "${pidfile}" ] && rm ${pidfile}
+}
+
+run_rc_command "$1"
diff --git a/databases/cyrus-imspd/files/imspd.sh b/databases/cyrus-imspd/files/imspd.sh
deleted file mode 100644
index a8eab9d5edf8..000000000000
--- a/databases/cyrus-imspd/files/imspd.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# Start or stop cyrus-imspd
-# $FreeBSD$
-
-case "$1" in
-start)
-	if [ -x /usr/local/sbin/imspd -a \
-	     -f /var/imsp/options ]; then
-		/usr/local/sbin/imspd >/dev/null &
-		echo -n ' imspd'
-	fi
-	;;
-stop)
-	kill `ps -U root | awk '/imspd$/ {print $1}'` && echo -n ' imspd'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
diff --git a/databases/cyrus-imspd/pkg-plist b/databases/cyrus-imspd/pkg-plist
index ece51692d884..045e15af05b7 100644
--- a/databases/cyrus-imspd/pkg-plist
+++ b/databases/cyrus-imspd/pkg-plist
@@ -1,4 +1,3 @@
-etc/rc.d/imspd.sh
 lib/sasl2/imspd.conf
 sbin/imspd
 %%PORTDOCS%%share/doc/imspd/Setup-instructions