4 files changed, 49 insertions, 65 deletions

diff --git a/mail/sqwebmail/files/patch-ldap b/mail/sqwebmail/files/patch-ldap
deleted file mode 100644
index df479a4cbbfe..000000000000
--- a/mail/sqwebmail/files/patch-ldap
+++ /dev/null
@@ -1,13 +0,0 @@
---- authlib/configure.orig	Wed Mar  3 05:54:13 2004
-+++ authlib/configure	Tue Mar 16 19:36:40 2004
-@@ -1268,6 +1268,10 @@
-    { (exit 1); exit 1; }; }
- fi
- 
-+CFLAGS="$CFLAGS -I%%LOCALBASE%%/include"
-+CPPFLAGS="$CPPFLAGS -I%%LOCALBASE%%/include"
-+LDFLAGS="-L%%LOCALBASE%%/lib $LDFLAGS"
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/mail/sqwebmail/files/patch-sqwebmail::maildir.c b/mail/sqwebmail/files/patch-sqwebmail::maildir.c
deleted file mode 100644
index 43363edd05e1..000000000000
--- a/mail/sqwebmail/files/patch-sqwebmail::maildir.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- sqwebmail/maildir.c.orig	Fri May 28 21:22:37 2004
-+++ sqwebmail/maildir.c	Fri May 28 21:23:00 2004
-@@ -1488,8 +1488,8 @@
- 	as=rfc2047_decode_unicode(a, &unicode_UTF8, 0);
- 	bs=rfc2047_decode_unicode(b, &unicode_UTF8, 0);
- #else
--	as=rfc2047_decode_simple(a, &unicode_UTF8);
--	bs=rfc2047_decode_simple(b, &unicode_UTF8);
-+	as=rfc2047_decode_simple(a);
-+	bs=rfc2047_decode_simple(b);
- #endif
- 
- 	if (as)
diff --git a/mail/sqwebmail/files/sqwebmail-authdaemond.sh b/mail/sqwebmail/files/sqwebmail-authdaemond.sh
deleted file mode 100644
index cd05b44900b1..000000000000
--- a/mail/sqwebmail/files/sqwebmail-authdaemond.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-case "$1" in
-start)
-	[ -r ${PREFIX}/share/sqwebmail/authdaemonrc ] && ${PREFIX}/libexec/sqwebmail/authlib/authdaemond start > /dev/null && echo -n ' authdaemond'
-	;;
-stop)
-	${PREFIX}/libexec/sqwebmail/authlib/authdaemond stop > /dev/null && echo -n ' authdaemond'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
-
diff --git a/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh b/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh
index 8ca408ee3096..a8b3a2eb325a 100644
--- a/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh
+++ b/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh
@@ -1,21 +1,52 @@
 #!/bin/sh
+#
+# An rc.subr-style startup script for courier-authdaemond service.
 
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-case "$1" in
-start)
-	${PREFIX}/libexec/sqwebmail/sqwebmaild.rc start && echo -n ' sqwebmaild'
-	;;
-stop)
-	${PREFIX}/libexec/sqwebmail/sqwebmaild.rc stop && echo -n ' sqwebmaild'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
+# PROVIDE: sqwebmaild
+# REQUIRE: LOGIN sqwebmaild
+# KEYWORD: FreeBSD shutdown
+
+# Define these sqwebmaild_* variables in one of these files:
+# 	/etc/rc.conf
+# 	/etc/rc.conf.local
+# 	/etc/rc.conf.d/sqwebmaild
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+sqwebmaild_enable=${sqwebmaild_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name="sqwebmaild"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/libexec/sqwebmaild.rc"
+
+start_cmd="sqwebmaild_cmd start"
+stop_cmd="sqwebmaild_cmd stop"
+restart_cmd="sqwebmaild_cmd stop && sqwebmaild_cmd start"
+pidfile="%%PREFIX%%/var/sqwebmail/run/sqwebmaild.pid"
+procname="%%PREFIX%%/sbin/courierlogger"
+
+load_rc_config $name
+
+sqwebmaild_cmd () {
+	case $1 in
+	start)
+		echo "Starting ${name}."
+		${command} start
+		;;
+	stop)
+		echo "Stopping ${name}."
+		${command} stop
+		if [ $? -eq 0 ] ; then
+			for file in "$pidfile" "$pidfile".lock "$pidfile".pcp.lock %%PREFIX%%/var/sqwebmail/sqwebmail.sock ; do
+				[ -f "$file" -o -S "$file" ] && rm -f "$file"
+			done
+			return 0
+		fi
+		;;
+	esac
+}
+
+run_rc_command "$1"