[Midnightbsd-cvs] mports: mail/courier-imap: Update to 4.3.1.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun May 11 11:51:41 EDT 2008


Log Message:
-----------
Update to 4.3.1.  Switch to subfiles for the shell scripts.

Modified Files:
--------------
    mports/mail/courier-imap:
        Makefile (r1.3 -> r1.4)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)

Added Files:
-----------
    mports/mail/courier-imap/files:
        courier-imap-imapd-ssl.in (r1.1)
        courier-imap-imapd.in (r1.1)
        courier-imap-pop3d-ssl.in (r1.1)
        courier-imap-pop3d.in (r1.1)

Removed Files:
-------------
    mports/mail/courier-imap/files:
        courier-imap-imapd-ssl.sh
        courier-imap-imapd.sh
        courier-imap-pop3d-ssl.sh
        courier-imap-pop3d.sh
        patch-maildir-maildirfilter.c

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/mail/courier-imap/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L mail/courier-imap/pkg-plist -L mail/courier-imap/pkg-plist -u -r1.1 -r1.2
--- mail/courier-imap/pkg-plist
+++ mail/courier-imap/pkg-plist
@@ -1,4 +1,4 @@
-%%OPENSSLFLAG%%bin/couriertls
+bin/couriertls
 bin/deliverquota
 bin/imapd
 bin/maildiracl
@@ -22,10 +22,6 @@
 %%CONFDIR%%/pop3d.dist
 @exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/pop3d.dist
 %%CONFDIR%%/quotawarnmsg.example
-%%RCDIR%%/courier-imap-imapd.sh
-%%RCDIR%%/courier-imap-imapd-ssl.sh
-%%RCDIR%%/courier-imap-pop3d.sh
-%%RCDIR%%/courier-imap-pop3d-ssl.sh
 %%LIBEXECDIR%%/couriertcpd
 %%LIBEXECDIR%%/imapd-ssl.rc
 %%LIBEXECDIR%%/imapd.rc
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/mail/courier-imap/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L mail/courier-imap/Makefile -L mail/courier-imap/Makefile -u -r1.3 -r1.4
--- mail/courier-imap/Makefile
+++ mail/courier-imap/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	courier-imap
-PORTVERSION=	4.1.2
-PORTREVISION=	1
+PORTVERSION=	4.3.1
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -25,7 +25,8 @@
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	courier-imap-imapd courier-imap-imapd-ssl \
+		courier-imap-pop3d courier-imap-pop3d-ssl
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -L${PREFIX}/lib
@@ -44,8 +45,7 @@
 # WITH_SYSLOG_FACILITY:         The syslogfacility to use
 #
 
-OPTIONS=	OPENSSL		"Build with OpenSSL support"			on \
-		FAM		"Build in fam support for IDLE command"		off \
+OPTIONS=	FAM		"Build in fam support for IDLE command"		off \
 		DRAC		"Build in DRAC support"				off \
 		TRASHQUOTA	"Include deleted mails in the quota"		off \
 		GDBM		"Use gdbm db instead of system bdb"		off \
@@ -59,12 +59,13 @@
 RCDIR?=		${PREFIX}/etc/rc.d
 USERDB?=	${PREFIX}/etc/userdb
 LIBEXECDIR?=	${PREFIX}/libexec/${PORTNAME}
+USE_OPENSSL=	yes
 
 PLIST_SUB=	CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \
 		RCDIR=${RCDIR:S,^${PREFIX}/,,} \
 		LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,}
 
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd6.0
 CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} \
 		--datadir=${DATADIR} \
 		--libexecdir=${LIBEXECDIR} \
@@ -87,16 +88,6 @@
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep"
 .endif
 
-.if !defined(WITHOUT_SSL)
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-PLIST_SUB+=	OPENSSLFLAG=
-CONFIGURE_ARGS+=--enable-ssl
-.else
-PLIST_SUB+=	OPENSSLFLAG="@comment "
-BROKEN=		"Incomplete pkg-plist"
-.endif
-
 .if defined(WITH_SYSLOG_FACILITY)
 CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
 .endif
@@ -149,20 +140,14 @@
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ -rpath=:${LOCALBASE}/lib/courier-authlib|' \
 		${WRKSRC}/imap/Makefile.in
-
-pre-fake:
-.for i in imapd imapd-ssl pop3d pop3d-ssl
-	${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/courier-imap-${i}.sh > ${WRKDIR}/courier-imap-${i}.sh
-.endfor
+	@${REINPLACE_CMD} -e 's|TLS_PROTOCOL=SSL3|TLS_PROTOCOL=SSL23|g' \
+		${WRKSRC}/imap/pop3d-ssl.dist.in \
+		${WRKSRC}/imap/imapd-ssl.dist.in
 
 post-install:
 .for i in imapd pop3d
 	${INSTALL_DATA} ${WRKSRC}/imap/${i}.cnf ${CONFDIR}/${i}.cnf.dist
 .endfor
-.for i in imapd imapd-ssl pop3d pop3d-ssl
-	${INSTALL_SCRIPT} ${WRKDIR}/courier-imap-${i}.sh ${RCDIR}/courier-imap-${i}.sh
-.endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for a in ${EXTRA_DOCS}
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/mail/courier-imap/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L mail/courier-imap/distinfo -L mail/courier-imap/distinfo -u -r1.1 -r1.2
--- mail/courier-imap/distinfo
+++ mail/courier-imap/distinfo
@@ -1,3 +1,6 @@
-MD5 (courier-imap-4.1.2.tar.bz2) = e4a1c75992cc85ba10f719e98f6df0ff
-SHA256 (courier-imap-4.1.2.tar.bz2) = 37c3530b31e0b9b5a5bcd639ac3db4862f12e77ec39d8d67f19e630d76853d71
-SIZE (courier-imap-4.1.2.tar.bz2) = 3257311
+MD5 (courier-imap-4.3.1.tar.bz2) = 6e25e51faeec55a695242679311b595f
+SHA256 (courier-imap-4.3.1.tar.bz2) = 963e35beaf420ac9c808d18b6dada68c7e5adba16fe1231e2e132f4410e9547d
+SIZE (courier-imap-4.3.1.tar.bz2) = 3342757
+MD5 (courier-imap-4.1.0-drac.patch) = 62d84c091eec8b8c49ea605d3d6eb080
+SHA256 (courier-imap-4.1.0-drac.patch) = 01363ee12c52b1e4d01082d9dd2b374b17b1985daf108ddd4596064131ca0940
+SIZE (courier-imap-4.1.0-drac.patch) = 8355
--- mail/courier-imap/files/courier-imap-pop3d.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# An rc.subr-style startup script for Courier-IMAP's POP3 service.
-
-# PROVIDE: courier_imap_pop3d
-# REQUIRE: LOGIN courier_authdaemond
-# KEYWORD: 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"
-pidfile="/var/run/pop3d.pid"
-procname="%%PREFIX%%/sbin/courierlogger"
-
-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"
-
--- /dev/null
+++ mail/courier-imap/files/courier-imap-pop3d.in
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# An rc.subr-style startup script for Courier-IMAP's POP3 service.
+
+# PROVIDE: courier_imap_pop3d
+# REQUIRE: LOGIN courier_authdaemond
+# KEYWORD: 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"
+pidfile="/var/run/pop3d.pid"
+procname="%%PREFIX%%/sbin/courierlogger"
+
+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"
+
--- /dev/null
+++ mail/courier-imap/files/courier-imap-imapd.in
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# An rc.subr-style startup script for Courier-IMAP's IMAP service.
+
+# PROVIDE: courier_imap_imapd
+# REQUIRE: LOGIN courier_authdaemond
+# KEYWORD: 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"
+pidfile="/var/run/imapd.pid"
+procname="%%PREFIX%%/sbin/courierlogger"
+
+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"
+
--- /dev/null
+++ mail/courier-imap/files/courier-imap-pop3d-ssl.in
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# An rc.subr-style startup script for Courier-IMAP's POP3 over SSL service.
+
+# PROVIDE: courier_imap_pop3d_ssl
+# REQUIRE: LOGIN courier_authdaemond
+# KEYWORD: shutdown
+
+# Define these courier_imap_pop3d_ssl_* variables in one of these files:
+# 	/etc/rc.conf
+# 	/etc/rc.conf.local
+# 	/etc/rc.conf.d/courier_imap_pop3d_ssl
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+courier_imap_pop3d_ssl_enable=${courier_imap_pop3d_ssl_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name="courier_imap_pop3d_ssl"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/libexec/courier-imap/pop3d-ssl.rc"
+pidfile="/var/run/pop3d-ssl.pid"
+procname="%%PREFIX%%/sbin/courierlogger"
+
+start_cmd="pop3d_ssl_cmd start"
+stop_cmd="pop3d_ssl_cmd stop"
+restart_cmd="pop3d_ssl_cmd stop && pop3d_ssl_cmd start"
+
+load_rc_config $name
+
+pop3d_ssl_cmd () {
+	case $1 in
+	start)
+		echo "Starting ${name}."
+		${command} start
+		;;
+	stop)
+		echo "Stopping ${name}."
+		${command} stop
+		;;
+	esac
+}
+
+run_rc_command "$1"
+
--- mail/courier-imap/files/courier-imap-imapd-ssl.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# An rc.subr-style startup script for Courier-IMAP's IMAP over SSL service.
-
-# PROVIDE: courier_imap_imapd_ssl
-# REQUIRE: LOGIN courier_authdaemond
-# KEYWORD: shutdown
-
-# Define these courier_imap_imapd_ssl_* variables in one of these files:
-# 	/etc/rc.conf
-# 	/etc/rc.conf.local
-# 	/etc/rc.conf.d/courier_imap_imapd_ssl
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-
-courier_imap_imapd_ssl_enable=${courier_imap_imapd_ssl_enable-"NO"}
-
-. %%RC_SUBR%%
-
-name="courier_imap_imapd_ssl"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/libexec/courier-imap/imapd-ssl.rc"
-pidfile="/var/run/imapd-ssl.pid"
-procname="%%PREFIX%%/sbin/courierlogger"
-
-start_cmd="imapd_ssl_cmd start"
-stop_cmd="imapd_ssl_cmd stop"
-restart_cmd="imapd_ssl_cmd stop && imapd_ssl_cmd start"
-
-load_rc_config $name
-
-imapd_ssl_cmd () {
-	case $1 in
-	start)
-		echo "Starting ${name}."
-		${command} start
-		;;
-	stop)
-		echo "Stopping ${name}."
-		${command} stop
-		;;
-	esac
-}
-
-run_rc_command "$1"
-
--- /dev/null
+++ mail/courier-imap/files/courier-imap-imapd-ssl.in
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# An rc.subr-style startup script for Courier-IMAP's IMAP over SSL service.
+
+# PROVIDE: courier_imap_imapd_ssl
+# REQUIRE: LOGIN courier_authdaemond
+# KEYWORD: shutdown
+
+# Define these courier_imap_imapd_ssl_* variables in one of these files:
+# 	/etc/rc.conf
+# 	/etc/rc.conf.local
+# 	/etc/rc.conf.d/courier_imap_imapd_ssl
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+courier_imap_imapd_ssl_enable=${courier_imap_imapd_ssl_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name="courier_imap_imapd_ssl"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/libexec/courier-imap/imapd-ssl.rc"
+pidfile="/var/run/imapd-ssl.pid"
+procname="%%PREFIX%%/sbin/courierlogger"
+
+start_cmd="imapd_ssl_cmd start"
+stop_cmd="imapd_ssl_cmd stop"
+restart_cmd="imapd_ssl_cmd stop && imapd_ssl_cmd start"
+
+load_rc_config $name
+
+imapd_ssl_cmd () {
+	case $1 in
+	start)
+		echo "Starting ${name}."
+		${command} start
+		;;
+	stop)
+		echo "Stopping ${name}."
+		${command} stop
+		;;
+	esac
+}
+
+run_rc_command "$1"
+
--- mail/courier-imap/files/courier-imap-imapd.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# An rc.subr-style startup script for Courier-IMAP's IMAP service.
-
-# PROVIDE: courier_imap_imapd
-# REQUIRE: LOGIN courier_authdaemond
-# KEYWORD: 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"
-pidfile="/var/run/imapd.pid"
-procname="%%PREFIX%%/sbin/courierlogger"
-
-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"
-
--- mail/courier-imap/files/patch-maildir-maildirfilter.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- maildir/maildirfilter.c.orig	Tue Jan  2 13:47:39 2007
-+++ maildir/maildirfilter.c	Tue Jan  2 13:48:14 2007
-@@ -81,6 +81,7 @@
- 		  int *errcode)
- {
- const char *c;
-+struct maildirfilterrule *pom;
- 
- /*
- ** Before creating a new rule, validate all input.
-@@ -101,7 +102,6 @@
- 	/* rule name: may not already exist */
- 	*errcode=MF_ERR_EXISTS;
- 	
--	struct maildirfilterrule *pom;
- 	for (pom=r->first; pom->next; pom=pom->next) {
- 	    if (p!=pom && !strcmp(name, pom->rulename))
- 		return (-1);
--- mail/courier-imap/files/courier-imap-pop3d-ssl.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# An rc.subr-style startup script for Courier-IMAP's POP3 over SSL service.
-
-# PROVIDE: courier_imap_pop3d_ssl
-# REQUIRE: LOGIN courier_authdaemond
-# KEYWORD: shutdown
-
-# Define these courier_imap_pop3d_ssl_* variables in one of these files:
-# 	/etc/rc.conf
-# 	/etc/rc.conf.local
-# 	/etc/rc.conf.d/courier_imap_pop3d_ssl
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-
-courier_imap_pop3d_ssl_enable=${courier_imap_pop3d_ssl_enable-"NO"}
-
-. %%RC_SUBR%%
-
-name="courier_imap_pop3d_ssl"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/libexec/courier-imap/pop3d-ssl.rc"
-pidfile="/var/run/pop3d-ssl.pid"
-procname="%%PREFIX%%/sbin/courierlogger"
-
-start_cmd="pop3d_ssl_cmd start"
-stop_cmd="pop3d_ssl_cmd stop"
-restart_cmd="pop3d_ssl_cmd stop && pop3d_ssl_cmd start"
-
-load_rc_config $name
-
-pop3d_ssl_cmd () {
-	case $1 in
-	start)
-		echo "Starting ${name}."
-		${command} start
-		;;
-	stop)
-		echo "Stopping ${name}."
-		${command} stop
-		;;
-	esac
-}
-
-run_rc_command "$1"
-


More information about the Midnightbsd-cvs mailing list