Add rcscripts to imap and pop3 servers

Help and ok ajacoutot@

mail/courier-imap/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.65 2010/11/19 07:23:06 espie Exp $
+# $OpenBSD: Makefile,v 1.66 2010/12/16 17:55:10 giovanni Exp $
 
 COMMENT-main=		imap server for maildir format mailboxes
 COMMENT-pop3=		pop3 server for maildir format mailboxes
@@ -6,9 +6,9 @@ COMMENT-pop3=		pop3 server for maildir format mailboxes
 V=			4.8.0
 DISTNAME=		courier-imap-${V}
 PKGNAME-main=		${DISTNAME}
-REVISION-main=		1
+REVISION-main=		2
 FULLPKGNAME-pop3=	courier-pop3-${V}
-REVISION-pop3=		1
+REVISION-pop3=		2
 FULLPKGPATH-pop3=	mail/courier-imap,-pop3
 
 CATEGORIES=		mail
@@ -26,10 +26,10 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=		c courierauth courierauthsasl gdbm idn
+WANTLIB-pop3=		c courierauth courierauthsasl idn ${MODGETTEXT_WANTLIB}
 
 USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
-USE_GROFF =		Yes
 CONFIGURE_STYLE=	gnu
 
 CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib" \

mail/courier-imap/pkg/MESSAGE-main

@@ -6,10 +6,3 @@ necessary. You MUST set the CN in imapd.cnf to the hostname by which
 your IMAP server is accessed, or else clients will complain. When this
 is done, you can use the 'mkimapdcert' script to automatically generate
 a server certificate, which is installed into /etc/ssl/private/imapd.pem
-
-To control the daemon use ${PREFIX}/libexec/imapd.rc and
-${PREFIX}/libexec/imapd-ssl.rc, and to run the authdaemon, place the
-following in /etc/rc.local:
-
-mkdir -p /var/run/courier{,-auth}/
-${PREFIX}/sbin/authdaemond start

mail/courier-imap/pkg/MESSAGE-pop3

@@ -3,6 +3,3 @@ installed in ${SYSCONFDIR}/.
 
 To use POP3-SSL, be sure to read ssl(8) and run the mkpop3dcert script
 if you require a self-signed certificate.
-
-To control the daemon use ${PREFIX}/libexec/pop3.rc and
-${PREFIX}/libexec/pop3-ssl.rc.

mail/courier-imap/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.3 2009/10/28 14:20:19 giovanni Exp $
+@comment $OpenBSD: PLIST-main,v 1.4 2010/12/16 17:55:10 giovanni Exp $
 @conflict imap-uw-*
 @conflict courier-utils-*
 @pkgpath ${BASE_PKGPATH}
@@ -60,3 +60,5 @@ share/examples/courier/quotawarnmsg.example
 @sample ${COURIERSTATE}/
 @extraunexec rm -rf ${SYSCONFDIR}/
 @extraunexec rm -rf ${COURIERSTATE}
+@rcscript ${RCDIR}/courier_imap
+@rcscript ${RCDIR}/courier_imap-ssl

mail/courier-imap/pkg/PLIST-pop3

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-pop3,v 1.7 2010/02/26 18:55:21 espie Exp $
+@comment $OpenBSD: PLIST-pop3,v 1.8 2010/12/16 17:55:10 giovanni Exp $
 @pkgpath courier/imap,-pop3,no_trashquota
 @pkgpath courier/imap,-pop3,no_trashquota,imap_bugs
 @pkgpath courier/imap,-pop3,imap_bugs
@@ -19,3 +19,5 @@ share/examples/courier/pop3d.dist
 @sample ${SYSCONFDIR}/pop3d
 @extraunexec rm -rf ${SYSCONFDIR}/
 @extraunexec rm -rf ${COURIERSTATE}
+@rcscript ${RCDIR}/courier_pop3
+@rcscript ${RCDIR}/courier_pop3-ssl

mail/courier-imap/pkg/courier_imap-ssl.rc

@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $OpenBSD: courier_imap-ssl.rc,v 1.1 2010/12/16 17:55:10 giovanni Exp $
+
+. /etc/rc.d/rc.subr
+
+daemon="${TRUEPREFIX}/libexec/imapd-ssl.rc"
+pexp=".*courierlogger.*imapd-ssl.pid"
+
+rc_start() {
+	${daemon} start 2>/dev/null
+}
+
+rc_stop() {
+	${daemon} stop 2>/dev/null
+}
+
+rc_cmd $1

mail/courier-imap/pkg/courier_imap.rc

@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $OpenBSD: courier_imap.rc,v 1.1 2010/12/16 17:55:10 giovanni Exp $
+
+. /etc/rc.d/rc.subr
+
+daemon="${TRUEPREFIX}/libexec/imapd.rc"
+pexp=".*courierlogger.*imapd.pid"
+
+rc_start() {
+	${daemon} start 2>/dev/null
+}
+
+rc_stop() {
+	${daemon} stop 2>/dev/null
+}
+
+rc_cmd $1

mail/courier-imap/pkg/courier_pop3-ssl.rc

@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $OpenBSD: courier_pop3-ssl.rc,v 1.1 2010/12/16 17:55:10 giovanni Exp $
+
+. /etc/rc.d/rc.subr
+
+daemon="${TRUEPREFIX}/libexec/pop3d-ssl.rc"
+pexp=".*courierlogger.*pop3d-ssl.pid"
+
+rc_start() {
+	${daemon} start 2>/dev/null
+}
+
+rc_stop() {
+	${daemon} stop 2>/dev/null
+}
+
+rc_cmd $1

mail/courier-imap/pkg/courier_pop3.rc

@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $OpenBSD: courier_pop3.rc,v 1.1 2010/12/16 17:55:10 giovanni Exp $
+
+. /etc/rc.d/rc.subr
+
+daemon="${TRUEPREFIX}/libexec/pop3d.rc"
+pexp=".*courierlogger.*pop3d.pid"
+
+rc_start() {
+	${daemon} start 2>/dev/null
+}
+
+rc_stop() {
+	${daemon} stop 2>/dev/null
+}
+
+rc_cmd $1