From 46d45c1f21efd78368ccd4ab8565dfb2f70d7499 Mon Sep 17 00:00:00 2001
From: Oliver Lehmann <oliver@FreeBSD.org>
Date: Wed, 28 Jan 2004 21:21:42 +0000
Subject: [PATCH] Add DRAC support for courier-imap

Submitted By:	nork
---
 mail/courier-imap/Makefile               | 14 +++++++-
 mail/courier-imap/distinfo               |  1 +
 mail/courier-imap/files/extra-patch-drac | 43 ++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 mail/courier-imap/files/extra-patch-drac

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index d29bd4f7b2c3..41930de17312 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -7,12 +7,18 @@
 
 PORTNAME=	courier-imap
 PORTVERSION=	2.2.1
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
 
+.if defined(WITH_DRAC)
+PATCH_SITES=	http://www.smalltown.ne.jp/~usata/pub/patch/
+PATCHFILES=	courier-imap-2.2.1-drac.patch
+PATCH_DIST_STRIP=	-p1
+.endif
+
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	IMAP (and POP3) server that provides access to Maildir mailboxes
 
@@ -39,6 +45,7 @@ CONFIGURE_ENV=	CFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 # WITH_POSTGRESQL:		Build in postgresql support
 # WITH_LDAP:			Build in ldap support with openldap
 # WITH_FAM:			Build in fam support for IDLE command
+# WITH_DRAC:			Build in DRAC support
 # WITH_TRASHQUOTA:		Include deleted mails in the quota
 #
 
@@ -143,6 +150,11 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 .endif
 
+.if defined(WITH_DRAC)
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-drac
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
+.endif
+
 MAN1=		couriertcpd.1 maildirkw.1 maildirmake.1
 MAN7=		authlib.7
 MAN8=		makeuserdb.8 userdb.8 userdbpw.8 \
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index ca7958cf2c4f..1b3c855f6f49 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1 +1,2 @@
 MD5 (courier-imap-2.2.1.tar.bz2) = 27c90ce2ac2412bc90994cacbd75616b
+MD5 (courier-imap-2.2.1-drac.patch) = 8322356f508c087d0d8672bbbe96a97b
diff --git a/mail/courier-imap/files/extra-patch-drac b/mail/courier-imap/files/extra-patch-drac
new file mode 100644
index 000000000000..b040d3b1f6f7
--- /dev/null
+++ b/mail/courier-imap/files/extra-patch-drac
@@ -0,0 +1,43 @@
+--- imapd-ssl.rc.in.orig	Fri Nov 28 06:07:33 2003
++++ imapd-ssl.rc.in	Wed Jan 28 02:06:31 2004
+@@ -53,6 +53,7 @@ start)
+ 		. @sysconfdir@/imapd ; \
+ 		. @sysconfdir@/imapd-ssl ; \
+ 		IMAP_TLS=1; export IMAP_TLS; \
++		DRACHOST=${DRACHOST:-localhost}; export DRACHOST; \
+ 		@libexecdir@/couriertcpd -address=$SSLADDRESS \
+ 			-stderrlogger=@libexecdir@/courierlogger \
+ 			-stderrloggername=imapd-ssl \
+--- imapd.rc.in.orig	Fri Nov 28 06:07:34 2003
++++ imapd.rc.in	Wed Jan 28 02:06:40 2004
+@@ -54,6 +54,7 @@ start)
+ 				. @sysconfdir@/imapd-ssl ; \
+ 		IMAP_STARTTLS=$IMAPDSTARTTLS ; export IMAP_STARTTLS ; \
+ 		TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \
++		DRACHOST=${DRACHOST:-localhost}; export DRACHOST; \
+ 		@libexecdir@/couriertcpd -address=$ADDRESS \
+ 			-stderrlogger=@libexecdir@/courierlogger \
+ 			-stderrloggername=imapd \
+--- pop3d-ssl.rc.in.orig	Fri Nov 28 06:07:35 2003
++++ pop3d-ssl.rc.in	Wed Jan 28 02:06:51 2004
+@@ -49,6 +49,7 @@ start)
+ 		POP3_TLS=1; export POP3_TLS; \
+ 		POP3_STARTTLS=NO; export POP3_STARTTLS; \
+ 		POP3_TLS_REQUIRED=0; export POP3_TLS_REQUIRED; \
++		DRACHOST=${DRACHOST:-localhost}; export DRACHOST; \
+ 		@libexecdir@/couriertcpd -address=$SSLADDRESS \
+ 			-stderrlogger=@libexecdir@/courierlogger \
+ 			-stderrloggername=pop3d-ssl \
+--- pop3d.rc.in.orig	Fri Nov 28 06:07:35 2003
++++ pop3d.rc.in	Wed Jan 28 02:07:15 2004
+@@ -45,8 +45,8 @@ start)
+ 		libexecdir=@libexecdir@ ;
+ 		. @sysconfdir@/pop3d ; \
+ 				. @sysconfdir@/pop3d-ssl ; \
+-		TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \
+-		export TLS_PROTOCOL ;
++		TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL; export TLS_PROTOCOL ; \
++		DRACHOST=${DRACHOST:-localhost}; export DRACHOST; \
+ 		@libexecdir@/couriertcpd -address=$ADDRESS \
+ 			-stderrlogger=@libexecdir@/courierlogger \
+ 			-stderrloggername=pop3d \