11 files changed, 366 insertions, 9 deletions

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 660777513ca9..3c0f72c20056 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-imap
-PORTVERSION=	3.0.7
+PORTVERSION=	3.0.8
 PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
@@ -27,6 +27,7 @@ USE_REINPLACE=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_RC_SUBR=	yes
 
 CONFIGURE_ENV=	CFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
@@ -157,6 +158,8 @@ CONFIGURE_ARGS+=--with-authcram
 
 .include <bsd.port.pre.mk>
 
+RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+
 .if defined(WITH_FAM) || exists(${LOCALBASE}/lib/libfam.so)
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS}"
@@ -204,8 +207,10 @@ post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/authlib/authtest ${PREFIX}/bin/
 .for i in imapd pop3d
 	${INSTALL_DATA} ${WRKSRC}/imap/${i}.cnf ${CONFDIR}/${i}.cnf.dist
-	${LN} -s ${LIBEXECDIR}/${i}.rc ${RCDIR}/${PORTNAME}-${i}.sh.sample
-	${LN} -s ${LIBEXECDIR}/${i}-ssl.rc ${RCDIR}/${PORTNAME}-${i}-ssl.sh.sample
+.endfor
+.for i in imapd imapd-ssl pop3d pop3d-ssl
+	${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/courier-imap-${i}.sh > ${PREFIX}/etc/rc.d/courier-imap-${i}.sh
 .endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index eaf681d3799e..ac2c37537e14 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,4 +1,4 @@
-MD5 (courier-imap-3.0.7.tar.bz2) = 3177f4451d02b6380c5b45aa80d795a7
-SIZE(courier-imap-3.0.7.tar.bz2) = 1702769
+MD5 (courier-imap-3.0.8.tar.bz2) = 1b431e6dac39ed728d839ceb35474040
+SIZE(courier-imap-3.0.8.tar.bz2) = 1713447
 MD5 (courier-imap-3.0.6-drac.patch) = f369ea8f9d26012e6ae1220f12c07fff
 SIZE (courier-imap-3.0.6-drac.patch) = 10538
diff --git a/mail/courier-imap/files/courier-imap-imapd-ssl.in b/mail/courier-imap/files/courier-imap-imapd-ssl.in
new file mode 100644
index 000000000000..dcdd0a4ca6c8
--- /dev/null
+++ b/mail/courier-imap/files/courier-imap-imapd-ssl.in
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# An rc.subr-style startup script for Courier-IMAP's IMAP over SSL service.
+
+# PROVIDE: courier_imap_imapdssl
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+# Define these courier_imap_imapdssl_* variables in one of these files:
+# 	/etc/rc.conf
+# 	/etc/rc.conf.local
+# 	/etc/rc.conf.d/courier_imap_imapdssl
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+courier_imap_imapdssl_enable=${courier_imap_imapdssl_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name="courier_imap_imapdssl"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/libexec/courier-imap/imapd-ssl.rc"
+
+start_cmd="imapdssl_cmd start"
+stop_cmd="imapdssl_cmd stop"
+restart_cmd="imapdssl_cmd stop && imapdssl_cmd start"
+
+load_rc_config $name
+
+imapdssl_cmd () {
+	case $1 in
+	start)
+		echo "Starting ${name}."
+		${command} start
+		;;
+	stop)
+		echo "Stopping ${name}."
+		${command} stop
+		;;
+	esac
+}
+
+run_rc_command "$1"
+
diff --git a/mail/courier-imap/files/courier-imap-imapd-ssl.sh b/mail/courier-imap/files/courier-imap-imapd-ssl.sh
new file mode 100644
index 000000000000..dcdd0a4ca6c8
--- /dev/null
+++ b/mail/courier-imap/files/courier-imap-imapd-ssl.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# An rc.subr-style startup script for Courier-IMAP's IMAP over SSL service.
+
+# PROVIDE: courier_imap_imapdssl
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+# Define these courier_imap_imapdssl_* variables in one of these files:
+# 	/etc/rc.conf
+# 	/etc/rc.conf.local
+# 	/etc/rc.conf.d/courier_imap_imapdssl
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+courier_imap_imapdssl_enable=${courier_imap_imapdssl_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name="courier_imap_imapdssl"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/libexec/courier-imap/imapd-ssl.rc"
+
+start_cmd="imapdssl_cmd start"
+stop_cmd="imapdssl_cmd stop"
+restart_cmd="imapdssl_cmd stop && imapdssl_cmd start"
+
+load_rc_config $name
+
+imapdssl_cmd () {
+	case $1 in
+	start)
+		echo "Starting ${name}."
+		${command} start
+		;;
+	stop)
+		echo "Stopping ${name}."
+		${command} stop
+		;;
+	esac
+}
+
+run_rc_command "$1"
+
diff --git a/mail/courier-imap/files/courier-imap-imapd.in b/mail/courier-imap/files/courier-imap-imapd.in
new file mode 100644
index 000000000000..4985a3fea151
--- /dev/null
+++ b/mail/courier-imap/files/courier-imap-imapd.in
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# An rc.subr-style startup script for Courier-IMAP's IMAP service.
+
+# PROVIDE: courier_imap_imapd
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+# Define these courier_imap_imapd_* variables in one of these files:
+# 	/etc/rc.conf
+# 	/etc/rc.conf.local
+# 	/etc/rc.conf.d/courier_imap_imapd
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+courier_imap_imapd_enable=${courier_imap_imapd_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name="courier_imap_imapd"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/libexec/courier-imap/imapd.rc"
+
+start_cmd="imapd_cmd start"
+stop_cmd="imapd_cmd stop"
+restart_cmd="imapd_cmd stop && imapd_cmd start"
+
+load_rc_config $name
+
+imapd_cmd () {
+	case $1 in
+	start)
+		echo "Starting ${name}."
+		${command} start
+		;;
+	stop)
+		echo "Stopping ${name}."
+		${command} stop
+		;;
+	esac
+}
+
+run_rc_command "$1"
+
diff --git a/mail/courier-imap/files/courier-imap-imapd.sh b/mail/courier-imap/files/courier-imap-imapd.sh
new file mode 100644
index 000000000000..4985a3fea151
--- /dev/null
+++ b/mail/courier-imap/files/courier-imap-imapd.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# An rc.subr-style startup script for Courier-IMAP's IMAP service.
+
+# PROVIDE: courier_imap_imapd
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+# Define these courier_imap_imapd_* variables in one of these files:
+# 	/etc/rc.conf
+# 	/etc/rc.conf.local
+# 	/etc/rc.conf.d/courier_imap_imapd
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+courier_imap_imapd_enable=${courier_imap_imapd_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name="courier_imap_imapd"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/libexec/courier-imap/imapd.rc"
+
+start_cmd="imapd_cmd start"
+stop_cmd="imapd_cmd stop"
+restart_cmd="imapd_cmd stop && imapd_cmd start"
+
+load_rc_config $name
+
+imapd_cmd () {
+	case $1 in
+	start)
+		echo "Starting ${name}."
+		${command} start
+		;;
+	stop)
+		echo "Stopping ${name}."
+		${command} stop
+		;;
+	esac
+}
+
+run_rc_command "$1"
+
diff --git a/mail/courier-imap/files/courier-imap-pop3d-ssl.in b/mail/courier-imap/files/courier-imap-pop3d-ssl.in
new file mode 100644
index 000000000000..30636bd73879
--- /dev/null
+++ b/mail/courier-imap/files/courier-imap-pop3d-ssl.in
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# An rc.subr-style startup script for Courier-IMAP's POP3 over SSL service.
+
+# PROVIDE: courier_imap_pop3dssl
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+# Define these courier_imap_pop3dssl_* variables in one of these files:
+# 	/etc/rc.conf
+# 	/etc/rc.conf.local
+# 	/etc/rc.conf.d/courier_imap_pop3dssl
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+courier_imap_pop3dssl_enable=${courier_imap_pop3dssl_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name="courier_imap_pop3dssl"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/libexec/courier-imap/pop3d-ssl.rc"
+
+start_cmd="pop3dssl_cmd start"
+stop_cmd="pop3dssl_cmd stop"
+restart_cmd="pop3dssl_cmd stop && pop3dssl_cmd start"
+
+load_rc_config $name
+
+pop3dssl_cmd () {
+	case $1 in
+	start)
+		echo "Starting ${name}."
+		${command} start
+		;;
+	stop)
+		echo "Stopping ${name}."
+		${command} stop
+		;;
+	esac
+}
+
+run_rc_command "$1"
+
diff --git a/mail/courier-imap/files/courier-imap-pop3d-ssl.sh b/mail/courier-imap/files/courier-imap-pop3d-ssl.sh
new file mode 100644
index 000000000000..30636bd73879
--- /dev/null
+++ b/mail/courier-imap/files/courier-imap-pop3d-ssl.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# An rc.subr-style startup script for Courier-IMAP's POP3 over SSL service.
+
+# PROVIDE: courier_imap_pop3dssl
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+# Define these courier_imap_pop3dssl_* variables in one of these files:
+# 	/etc/rc.conf
+# 	/etc/rc.conf.local
+# 	/etc/rc.conf.d/courier_imap_pop3dssl
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+courier_imap_pop3dssl_enable=${courier_imap_pop3dssl_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name="courier_imap_pop3dssl"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/libexec/courier-imap/pop3d-ssl.rc"
+
+start_cmd="pop3dssl_cmd start"
+stop_cmd="pop3dssl_cmd stop"
+restart_cmd="pop3dssl_cmd stop && pop3dssl_cmd start"
+
+load_rc_config $name
+
+pop3dssl_cmd () {
+	case $1 in
+	start)
+		echo "Starting ${name}."
+		${command} start
+		;;
+	stop)
+		echo "Stopping ${name}."
+		${command} stop
+		;;
+	esac
+}
+
+run_rc_command "$1"
+
diff --git a/mail/courier-imap/files/courier-imap-pop3d.in b/mail/courier-imap/files/courier-imap-pop3d.in
new file mode 100644
index 000000000000..29d1762ed665
--- /dev/null
+++ b/mail/courier-imap/files/courier-imap-pop3d.in
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# An rc.subr-style startup script for Courier-IMAP's POP3 service.
+
+# PROVIDE: courier_imap_pop3d
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+# Define these courier_imap_pop3d_* variables in one of these files:
+# 	/etc/rc.conf
+# 	/etc/rc.conf.local
+# 	/etc/rc.conf.d/courier_imap_pop3d
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+courier_imap_pop3d_enable=${courier_imap_pop3d_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name="courier_imap_pop3d"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/libexec/courier-imap/pop3d.rc"
+
+start_cmd="pop3d_cmd start"
+stop_cmd="pop3d_cmd stop"
+restart_cmd="pop3d_cmd stop && pop3d_cmd start"
+
+load_rc_config $name
+
+pop3d_cmd () {
+	case $1 in
+	start)
+		echo "Starting ${name}."
+		${command} start
+		;;
+	stop)
+		echo "Stopping ${name}."
+		${command} stop
+		;;
+	esac
+}
+
+run_rc_command "$1"
+
diff --git a/mail/courier-imap/files/courier-imap-pop3d.sh b/mail/courier-imap/files/courier-imap-pop3d.sh
new file mode 100644
index 000000000000..29d1762ed665
--- /dev/null
+++ b/mail/courier-imap/files/courier-imap-pop3d.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# An rc.subr-style startup script for Courier-IMAP's POP3 service.
+
+# PROVIDE: courier_imap_pop3d
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+# Define these courier_imap_pop3d_* variables in one of these files:
+# 	/etc/rc.conf
+# 	/etc/rc.conf.local
+# 	/etc/rc.conf.d/courier_imap_pop3d
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+courier_imap_pop3d_enable=${courier_imap_pop3d_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name="courier_imap_pop3d"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/libexec/courier-imap/pop3d.rc"
+
+start_cmd="pop3d_cmd start"
+stop_cmd="pop3d_cmd stop"
+restart_cmd="pop3d_cmd stop && pop3d_cmd start"
+
+load_rc_config $name
+
+pop3d_cmd () {
+	case $1 in
+	start)
+		echo "Starting ${name}."
+		${command} start
+		;;
+	stop)
+		echo "Stopping ${name}."
+		${command} stop
+		;;
+	esac
+}
+
+run_rc_command "$1"
+
diff --git a/mail/courier-imap/pkg-plist b/mail/courier-imap/pkg-plist
index 2e6bdf827763..0aeb1c9fea97 100644
--- a/mail/courier-imap/pkg-plist
+++ b/mail/courier-imap/pkg-plist
@@ -17,10 +17,10 @@ bin/pop3d
 %%CONFDIR%%/pop3d.cnf.dist
 %%CONFDIR%%/pop3d.dist
 %%CONFDIR%%/quotawarnmsg.example
-%%RCDIR%%/courier-imap-imapd.sh.sample
-%%RCDIR%%/courier-imap-imapd-ssl.sh.sample
-%%RCDIR%%/courier-imap-pop3d.sh.sample
-%%RCDIR%%/courier-imap-pop3d-ssl.sh.sample
+%%RCDIR%%/courier-imap-imapd.sh
+%%RCDIR%%/courier-imap-imapd-ssl.sh
+%%RCDIR%%/courier-imap-pop3d.sh
+%%RCDIR%%/courier-imap-pop3d-ssl.sh
 %%LIBEXECDIR%%/authlib/authcustom
 %%AUTHDFLAG%%%%LIBEXECDIR%%/authlib/authdaemon
 %%AUTHDFLAG%%%%LIBEXECDIR%%/authlib/authdaemond