3 files changed, 10 insertions, 54 deletions

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 3beaf5246ed2..582ddf6f1988 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	courier-imap
 PORTVERSION=	4.0.6
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -19,14 +19,6 @@ COMMENT=	IMAP (and POP3) server that provides access to Maildir mailboxes
 BUILD_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
 RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
 
-.if defined(WITH_DRAC)
-# move me below .include <bsd.port.pre.mk> when re-enabling
-BROKEN=		"right now, there is no 4.0.4 compatible drac patch available"
-PATCH_SITES=	http://www.smalltown.ne.jp/~usata/pub/patch/
-PATCHFILES=	courier-imap-4.0.2-drac.patch
-PATCH_DIST_STRIP=	-p1
-.endif
-
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_PERL5=	yes
@@ -79,6 +71,13 @@ CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} \
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_DRAC)
+# move me below .include <bsd.port.pre.mk> when re-enabling
+PATCH_SITES=	http://www.smalltown.ne.jp/~usata/pub/patch/
+PATCHFILES=	courier-imap-4.0.6-drac.patch
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
+.endif
+
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep"
 .endif
@@ -122,11 +121,6 @@ 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 maildiracl.1 maildirkw.1 \
 		maildirmake.1
 
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index 57141bf71d58..6a87ce621c09 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,2 +1,4 @@
 MD5 (courier-imap-4.0.6.tar.bz2) = 5e1c53a49d5ffb2ec9f3b600a6e1fbef
 SIZE (courier-imap-4.0.6.tar.bz2) = 3157577
+MD5 (courier-imap-4.0.6-drac.patch) = 78a49403b04afc85220d24ad03004a34
+SIZE (courier-imap-4.0.6-drac.patch) = 8323
diff --git a/mail/courier-imap/files/extra-patch-drac b/mail/courier-imap/files/extra-patch-drac
deleted file mode 100644
index 638480da0b11..000000000000
--- a/mail/courier-imap/files/extra-patch-drac
+++ /dev/null
@@ -1,40 +0,0 @@
---- imapd-ssl.rc.in.orig	Mon Apr  4 00:47:32 2005
-+++ imapd-ssl.rc.in	Tue Jun 21 14:03:03 2005
-@@ -44,6 +44,7 @@
- 		. @sysconfdir@/imapd-ssl ; \
- 		PROXY_HOSTNAME=$PROXY_HOSTNAME ; export PROXY_HOSTNAME ; \
- 		IMAP_TLS=1; export IMAP_TLS; \
-+		DRACHOST=${DRACHOST:-localhost}; export DRACHOST; \
- 		@libexecdir@/couriertcpd -address=$SSLADDRESS \
- 			-stderrlogger=@courierlogger@ \
- 			-stderrloggername=imapd-ssl \
---- imapd.rc.in.orig	Mon Apr  4 00:47:32 2005
-+++ imapd.rc.in	Tue Jun 21 14:03:23 2005
-@@ -45,6 +45,7 @@
- 		IMAP_STARTTLS=$IMAPDSTARTTLS ; export IMAP_STARTTLS ; \
- 		PROXY_HOSTNAME=$PROXY_HOSTNAME ; export PROXY_HOSTNAME ; \
- 		TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \
-+		DRACHOST=${DRACHOST:-localhost}; export DRACHOST; \
- 		@libexecdir@/couriertcpd -address=$ADDRESS \
- 			-stderrlogger=@courierlogger@ \
- 			-stderrloggername=imapd \
---- pop3d-ssl.rc.in.orig	Mon Apr  4 00:47:32 2005
-+++ pop3d-ssl.rc.in	Tue Jun 21 14:03:34 2005
-@@ -39,6 +39,7 @@
- 		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=@courierlogger@ \
- 			-stderrloggername=pop3d-ssl \
---- pop3d.rc.in.orig	Mon Apr  4 00:47:32 2005
-+++ pop3d.rc.in	Tue Jun 21 14:03:50 2005
-@@ -37,6 +37,7 @@
- 		PROXY_HOSTNAME=$PROXY_HOSTNAME ; export PROXY_HOSTNAME ; \
- 		TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \
- 		export TLS_PROTOCOL ;
-+		DRACHOST=${DRACHOST:-localhost}; export DRACHOST; \
- 		@libexecdir@/couriertcpd -address=$ADDRESS \
- 			-stderrlogger=@courierlogger@ \
- 			-stderrloggername=pop3d \