[patch] update mail/imap-uw to version 2006j

	The c-client and imap-uw ports are still at version 2004g. The attached
	patch updates imap-uw to version 2006j.

PR:		ports/114834
Submitted by:	"Pedro J. Lobo" <pjlobo@sec.upm.es>
Approved by:	maintainer timeout

9 files changed, 679 insertions, 485 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index e4fe992caae0..4f2bfe95a8b5 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	imap
-PORTVERSION=	2004g
+PORTVERSION=	2006j
+DISTVERSIONSUFFIX=	2
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
@@ -18,6 +19,7 @@ MASTER_SITE_SUBDIR=	. old
 PKGNAMESUFFIX=	-uw
 DISTNAME=	imap-${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
+DISTFILES=	${DISTNAME}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}
 
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	University of Washington IMAP4rev1/POP2/POP3 mail servers
@@ -28,12 +30,11 @@ COMMENT=	University of Washington IMAP4rev1/POP2/POP3 mail servers
 OPTIONS=	SSL "Compile with SSL support" on \
 		SSL_AND_PLAINTEXT "Allow plain text passwords and SSL" off \
 		DRAC "Dynamically open MTA for relaying" off \
-		NETSCAPE_BRAIN_DAMAGE "See Makefile for documentation" off \
-		ENTOURAGE_BRAIN_DAMAGE "See Makefile for documentation" off
+		NETSCAPE_BRAIN_DAMAGE "See Makefile for documentation" off
 
 .include <bsd.port.pre.mk>
 
-LIB_DEPENDS=	c-client4.8:${PORTSDIR}/mail/cclient
+LIB_DEPENDS=	c-client4.9:${PORTSDIR}/mail/cclient
 .if defined(WITH_DRAC)
 BUILD_DEPENDS=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
@@ -60,12 +61,18 @@ MAKE_ARGS+=	SSLTYPE=unix.nopwd
 .if defined(WITH_NETSCAPE_BRAIN_DAMAGE)
 MAKE_ARGS+=	WITH_NETSCAPE_BRAIN_DAMAGE=yes
 .endif
-# Define this to get possibly better interoperability with Microsoft Entourage.
-.if defined(WITH_ENTOURAGE_BRAIN_DAMAGE)
-MAKE_ARGS+=	WITH_ENTOURAGE_BRAIN_DAMAGE=yes
-.endif
 # See src/imapd/Makefile for more information about these three options.
 
+post-patch:
+	${REINPLACE_CMD} -e 's/include "linkage.c"/include "linkage.h"/' \
+		${WRKSRC}/src/dmail/dmail.c \
+		${WRKSRC}/src/imapd/imapd.c \
+		${WRKSRC}/src/ipopd/ipop2d.c \
+		${WRKSRC}/src/ipopd/ipop3d.c \
+		${WRKSRC}/src/mailutil/mailutil.c \
+		${WRKSRC}/src/mtest/mtest.c \
+		${WRKSRC}/src/tmail/tmail.c
+
 pre-build:
 	@${SH} ${PKGREQ}.rev ${LOCALBASE}/include/c-client/portrevision.h ${PORTVERSION}
 .if !defined(WITHOUT_SSL)
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 2b7cf1f11550..ba74e204c9a8 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,3 +1,3 @@
-MD5 (imap-2004g.tar.Z) = 9a80f58d8d6a0979c13714ae69050020
-SHA256 (imap-2004g.tar.Z) = 958ab8a6a8b5a1a53167793141fe5bf1fbafc012be1d3f70a21f5f2f493ffa6d
-SIZE (imap-2004g.tar.Z) = 2246713
+MD5 (imap-2006j2.tar.Z) = d7900691c415bcc725c1bf2b15e4fb99
+SHA256 (imap-2006j2.tar.Z) = 5b2ed247fd98f81c7a2d23d0822f602d49b742c19761a9c2dad6753f5f3e806e
+SIZE (imap-2006j2.tar.Z) = 2686745
diff --git a/mail/imap-uw/files/patch-ab b/mail/imap-uw/files/patch-ab
index a79003f09f3d..d81228f915c0 100644
--- a/mail/imap-uw/files/patch-ab
+++ b/mail/imap-uw/files/patch-ab
@@ -1,92 +1,154 @@
---- src/osdep/unix/Makefile.orig	Sat Apr 30 22:51:13 2005
-+++ src/osdep/unix/Makefile	Sun Jul  1 22:36:01 2007
-@@ -41,13 +41,13 @@
- 
- # Extended flags needed for SSL.  You may need to modify.
- 
--SSLDIR=/usr/local/ssl
--SSLCERTS=$(SSLDIR)/certs
-+#SSLDIR=/usr/local/ssl
-+SSLCERTS=$(PREFIX)/certs
- SSLKEYS=$(SSLCERTS)
- SSLINCLUDE=$(SSLDIR)/include
- SSLLIB=$(SSLDIR)/lib
- 
--SSLCRYPTO=-lcrypto
-+SSLCRYPTO=-lcrypto -lcrypt
- 
- # Older versions of MIT Kerberos also have a libcrypto.  If so, you may need
- # to use this instead
-@@ -60,7 +60,7 @@
- 
- SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
-  -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\" -DSSL_KEY_DIRECTORY=\"$(SSLKEYS)\"
--SSLLDFLAGS= -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
-+SSLLDFLAGS= # -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
- 
- 
- # Extended flags needed for non-standard passwd types.  You may need to modify.
-@@ -74,7 +74,7 @@
- # AFSLDFLAGS may also need -L/usr/ucblib -lucb
- DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
- DCELDFLAGS= -ldce
--PAMLDFLAGS= -lpam -ldl
-+PAMLDFLAGS= # -lpam -lcrypt
- 
- 
- # Build parameters normally set by the individual port
-@@ -111,7 +111,7 @@
- # Commands possibly overriden by the individual port
- 
- ARRC=ar rc
--CC=cc
-+CC?=cc
- LN=ln -s
- RANLIB=ranlib
- 
-@@ -129,7 +129,7 @@
-  dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
-  rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-  unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
--CFLAGS=-g
-+CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
- 
- CAT=cat
- MAKE=make
-@@ -212,6 +212,15 @@
- 	 BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst=" \
- 	 RANLIB=true ARRC="ar -rc"
- 
-+bfp:	# FreeBSD Pluggable Authentication Modules
-+	$(BUILD) `cat SPECIALS` OS=bsi SIGTYPE=psx CHECKPW=pam \
-+	 SPOOLDIR=/var \
-+	 ACTIVEFILE=/usr/local/news/lib/active \
-+	 RSHPATH=/usr/bin/rsh \
-+	 LOCKPGM=$(PREFIX)/libexec/mlock \
-+	 BASECFLAGS="-DNFSKLUDGE" \
-+	 BASELDFLAGS="-lpam -lcrypt"
-+
- bs3:	# BSD/i386 3.0 or higher
- 	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
- 	 CHECKPW=bsi LOGINPW=bsi CRXTYPE=nfs \
-@@ -231,8 +240,9 @@
- 	 SPOOLDIR=/var \
- 	 ACTIVEFILE=/usr/local/news/lib/active \
- 	 RSHPATH=/usr/bin/rsh \
--	 BASECFLAGS="-g -O -pipe" \
--	 BASELDFLAGS="-lcrypt"
-+	 LOCKPGM=$(PREFIX)/libexec/mlock \
-+	 BASECFLAGS="-DNFSKLUDGE" \
-+	 BASELDFLAGS=""
- 
- bsi:	# BSD/i386
- 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
-@@ -803,7 +813,7 @@
- 
- build:	clean once $(ARCHIVE)
- 
--all:	$(ARCHIVE)
-+all:	onceenv
- 
- $(ARCHIVE): $(BINARIES)
- 	sh -c '$(RM) $(ARCHIVE) || true'
+*** src/osdep/unix/Makefile.orig	Sun Jun 17 17:37:44 2007
+--- src/osdep/unix/Makefile	Mon Jul 23 17:34:03 2007
+***************
+*** 54,66 ****
+  
+  # Extended flags needed for SSL.  You may need to modify.
+  
+! SSLDIR=/usr/local/ssl
+! SSLCERTS=$(SSLDIR)/certs
+  SSLKEYS=$(SSLCERTS)
+  SSLINCLUDE=$(SSLDIR)/include
+  SSLLIB=$(SSLDIR)/lib
+  
+! SSLCRYPTO=-lcrypto
+  
+  # Older versions of MIT Kerberos also have a libcrypto.  If so, you may need
+  # to use this instead
+--- 54,66 ----
+  
+  # Extended flags needed for SSL.  You may need to modify.
+  
+! #SSLDIR=/usr/local/ssl
+! SSLCERTS=$(PREFIX)/certs
+  SSLKEYS=$(SSLCERTS)
+  SSLINCLUDE=$(SSLDIR)/include
+  SSLLIB=$(SSLDIR)/lib
+  
+! SSLCRYPTO=-lcrypto -lcrypt
+  
+  # Older versions of MIT Kerberos also have a libcrypto.  If so, you may need
+  # to use this instead
+***************
+*** 73,79 ****
+  
+  SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
+   -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\" -DSSL_KEY_DIRECTORY=\"$(SSLKEYS)\"
+! SSLLDFLAGS= -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
+  
+  
+  # Extended flags needed for non-standard passwd types.  You may need to modify.
+--- 73,79 ----
+  
+  SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
+   -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\" -DSSL_KEY_DIRECTORY=\"$(SSLKEYS)\"
+! SSLLDFLAGS= # -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
+  
+  
+  # Extended flags needed for non-standard passwd types.  You may need to modify.
+***************
+*** 87,93 ****
+  # AFSLDFLAGS may also need -L/usr/ucblib -lucb
+  DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
+  DCELDFLAGS= -ldce
+! PAMLDFLAGS= -lpam -ldl
+  
+  
+  # Build parameters normally set by the individual port
+--- 87,93 ----
+  # AFSLDFLAGS may also need -L/usr/ucblib -lucb
+  DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
+  DCELDFLAGS= -ldce
+! PAMLDFLAGS= # -lpam -lcrypt
+  
+  
+  # Build parameters normally set by the individual port
+***************
+*** 125,131 ****
+  # Commands possibly overriden by the individual port
+  
+  ARRC=ar rc
+! CC=cc
+  LN=ln -s
+  RANLIB=ranlib
+  
+--- 125,131 ----
+  # Commands possibly overriden by the individual port
+  
+  ARRC=ar rc
+! CC?=cc
+  LN=ln -s
+  RANLIB=ranlib
+  
+***************
+*** 149,155 ****
+   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
+   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
+   unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
+! CFLAGS=-g
+  
+  CAT=cat
+  MAKE=make
+--- 149,155 ----
+   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
+   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
+   unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
+! CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
+  
+  CAT=cat
+  MAKE=make
+***************
+*** 232,237 ****
+--- 232,246 ----
+  	 BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst=" \
+  	 RANLIB=true ARRC="ar -rc"
+  
++ bfp:	# FreeBSD Pluggable Authentication Modules
++ 	$(BUILD) `cat SPECIALS` OS=bsi SIGTYPE=psx CHECKPW=pam \
++ 	 SPOOLDIR=/var \
++ 	 ACTIVEFILE=/usr/local/news/lib/active \
++ 	 RSHPATH=/usr/bin/rsh \
++ 	 LOCKPGM=$(PREFIX)/libexec/mlock \
++ 	 BASECFLAGS="-DNFSKLUDGE" \
++ 	 BASELDFLAGS="-lpam -lcrypt"
++ 
+  bs3:	# BSD/i386 3.0 or higher
+  	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
+  	 CHECKPW=bsi LOGINPW=bsi CRXTYPE=nfs \
+***************
+*** 251,258 ****
+  	 SPOOLDIR=/var \
+  	 ACTIVEFILE=/usr/local/news/lib/active \
+  	 RSHPATH=/usr/bin/rsh \
+  	 BASECFLAGS="$(GCCCFLAGS)" \
+! 	 BASELDFLAGS="-lcrypt"
+  
+  bsi:	# BSD/i386
+  	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
+--- 260,268 ----
+  	 SPOOLDIR=/var \
+  	 ACTIVEFILE=/usr/local/news/lib/active \
+  	 RSHPATH=/usr/bin/rsh \
++ 	 LOCKPGM=$(PREFIX)/libexec/mlock \
+  	 BASECFLAGS="$(GCCCFLAGS)" \
+! 	 BASELDFLAGS=""
+  
+  bsi:	# BSD/i386
+  	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
+***************
+*** 842,848 ****
+  
+  build:	clean once $(ARCHIVE)
+  
+! all:	$(ARCHIVE)
+  
+  $(ARCHIVE): $(BINARIES)
+  	sh -c '$(RM) $(ARCHIVE) || true'
+--- 852,858 ----
+  
+  build:	clean once $(ARCHIVE)
+  
+! all:	onceenv
+  
+  $(ARCHIVE): $(BINARIES)
+  	sh -c '$(RM) $(ARCHIVE) || true'
diff --git a/mail/imap-uw/files/patch-ac b/mail/imap-uw/files/patch-ac
index ad5a5cc6925d..0eb221b2e8ee 100644
--- a/mail/imap-uw/files/patch-ac
+++ b/mail/imap-uw/files/patch-ac
@@ -1,73 +1,85 @@
---- src/imapd/Makefile.orig	Tue Jun 29 21:26:28 2004
-+++ src/imapd/Makefile	Fri Sep  3 21:23:29 2004
-@@ -18,11 +18,11 @@
- # CPYRIGHT, included with this Distribution.
- 
- 
--ALERT=/etc/imapd.alert
-+ALERT=$(PREFIX)/etc/imapd.alert
- USERALERT=.imapalert
--SHUTDOWN=/etc/nologin
--ANO=/etc/anonymous.newsgroups
--NNTP=/etc/imapd.nntp
-+SHUTDOWN=$(PREFIX)/etc/nologin
-+ANO=$(PREFIX)/etc/anonymous.newsgroups
-+NNTP=$(PREFIX)//etc/imapd.nntp
- SHELL= /bin/sh
- 
- 
-@@ -30,7 +30,9 @@
- # causes the "Manage Mail" menu item to open the given URL, e.g. to point to
- # an alternative IMAP client (e.g. Pine) or perhaps to a homebrew mail
- # account management page.
--#NSBD= -DNETSCAPE_BRAIN_DAMAGE=\"http://www.washington.edu/pine\"
-+.if defined(WITH_NETSCAPE_BRAIN_DAMAGE)
-+NSBD= -DNETSCAPE_BRAIN_DAMAGE=\"http://www.washington.edu/pine\"
-+.endif
- 
- 
- 
-@@ -39,28 +41,30 @@
- # broken program does a STATUS on the selected mailbox.  This shouldn't be
- # necessary, and it's been reported that Entourage works without having to
- # un-comment this.
--#ENBD= -DENTOURAGE_BRAIN_DAMAGE
-+.if defined(WITH_ENTOURAGE_BRAIN_DAMAGE)
-+ENBD= -DENTOURAGE_BRAIN_DAMAGE
-+.endif
- 
- 
- # Get local definitions from c-client directory
- 
- C = ../c-client
--CCLIENTLIB = $C/c-client.a
--CC = `cat $C/CCTYPE`
--CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(ENBD) -DANOFILE=\"$(ANO)\" \
--	-DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \
--	-DUSERALERTFILE=\"$(USERALERT)\" -DSHUTDOWNFILE=\"$(SHUTDOWN)\"
--LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
-+#CCLIENTLIB = $C/c-client.a
-+CFLAGS+=	-DNFSKLUDGE -I$(LOCALBASE)/include/c-client \
-+		-DANOFILE=\"$(ANO)\" -DALERTFILE=\"$(ALERT)\" \
-+		-DNNTPFILE=\"$(NNTP)\" -DUSERALERTFILE=\"$(USERALERT)\" \
-+		-DSHUTDOWNFILE=\"$(SHUTDOWN)\"
-+LDFLAGS+=	$(EXTRALDFLAGS) -L$(LOCALBASE)/lib -lc-client4
-+.if defined(WITH_DRAC)
-+CFLAGS+=	-DETC_DIR=\"$(PREFIX)/etc\" -DDRAC_AUTH
-+LDFLAGS+=	-ldrac
-+.endif
-+CFLAGS+= $(NSBD) $(ENBD)
- 
- all:	imapd
- 
--imapd: $(CCLIENTLIB) imapd.o
-+imapd:	imapd.o
- 	$(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS)
--
--imapd.o: $C/mail.h $C/misc.h $C/osdep.h
--
--$(CCLIENTLIB):
--	cd $C;make
- 
- clean:
- 	rm -f *.o imapd || true
+*** src/imapd/Makefile.orig	Thu Aug 31 02:10:44 2006
+--- src/imapd/Makefile	Mon Jul 23 18:02:12 2007
+***************
+*** 25,35 ****
+  # Last Edited:	30 August 2006
+  
+  
+! ALERT=/etc/imapd.alert
+  USERALERT=.imapalert
+! SHUTDOWN=/etc/nologin
+! ANO=/etc/anonymous.newsgroups
+! NNTP=/etc/imapd.nntp
+  SHELL= /bin/sh
+  
+  
+--- 25,35 ----
+  # Last Edited:	30 August 2006
+  
+  
+! ALERT=$(PREFIX)/etc/imapd.alert
+  USERALERT=.imapalert
+! SHUTDOWN=$(PREFIX)/etc/nologin
+! ANO=$(PREFIX)/etc/anonymous.newsgroups
+! NNTP=$(PREFIX)//etc/imapd.nntp
+  SHELL= /bin/sh
+  
+  
+***************
+*** 37,64 ****
+  # causes the "Manage Mail" menu item to open the given URL, e.g. to point to
+  # an alternative IMAP client (e.g. Pine) or perhaps to a homebrew mail
+  # account management page.
+! #NSBD= -DNETSCAPE_BRAIN_DAMAGE=\"http://www.washington.edu/pine\"
+  
+  
+  # Get local definitions from c-client directory
+  
+! C = ../c-client
+! CCLIENTLIB = $C/c-client.a
+! CC = `cat $C/CCTYPE`
+! CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(ENBD) -DANOFILE=\"$(ANO)\" \
+  	-DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \
+  	-DUSERALERTFILE=\"$(USERALERT)\" -DSHUTDOWNFILE=\"$(SHUTDOWN)\"
+! LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+  
+  all:	imapd
+  
+! imapd: $(CCLIENTLIB) imapd.o
+  	$(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS)
+- 
+- imapd.o: $C/mail.h $C/misc.h $C/osdep.h
+- 
+- $(CCLIENTLIB):
+- 	cd $C;make
+  
+  clean:
+  	rm -f *.o imapd || true
+--- 37,63 ----
+  # causes the "Manage Mail" menu item to open the given URL, e.g. to point to
+  # an alternative IMAP client (e.g. Pine) or perhaps to a homebrew mail
+  # account management page.
+! .if defined(WITH_NETSCAPE_BRAIN_DAMAGE)
+! NSBD= -DNETSCAPE_BRAIN_DAMAGE=\"http://www.washington.edu/pine\"
+! .endif
+  
+  
+  # Get local definitions from c-client directory
+  
+! CFLAGS = -DNFSKLUDGE -I$(LOCALBASE)/include/c-client $(NSBD) \
+! 	-DANOFILE=\"$(ANO)\" \
+  	-DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \
+  	-DUSERALERTFILE=\"$(USERALERT)\" -DSHUTDOWNFILE=\"$(SHUTDOWN)\"
+! LDFLAGS+=	$(EXTRALDFLAGS) -L$(LOCALBASE)/lib -lc-client4
+! .if defined(WITH_DRAC)
+! CFLAGS+=	-DETC_DIR=\"$(PREFIX)/etc\" -DDRAC_AUTH
+! LDFLAGS+=	-ldrac
+! .endif
+  
+  all:	imapd
+  
+! imapd: imapd.o
+  	$(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS)
+  
+  clean:
+  	rm -f *.o imapd || true
diff --git a/mail/imap-uw/files/patch-ad b/mail/imap-uw/files/patch-ad
index 69c86029fe56..1da592cee2a5 100644
--- a/mail/imap-uw/files/patch-ad
+++ b/mail/imap-uw/files/patch-ad
@@ -1,70 +1,110 @@
---- Makefile.orig	Tue Nov  5 01:19:13 2002
-+++ Makefile	Thu Nov 28 00:11:51 2002
-@@ -148,7 +148,7 @@
- # std	system standard (typically passwd file), determined by port
- # two	try alternative (defined by CHECKPWALT), then std
- 
--PASSWDTYPE=std
-+PASSWDTYPE=pam
- 
- 
- # SSL type.  Defines whether or not SSL support is on this system
-@@ -215,12 +215,12 @@
- #	gradually-increasing intervals, starting at 2800-2900, and becoming
- #	permanent at 48,300.
- 
--EXTRACFLAGS=
-+EXTRACFLAGS=-I$(PREFIX)/include/c-client
- 
- 
- # Extra linker flags (additional/alternative libraries, etc.)
- 
--EXTRALDFLAGS=
-+EXTRALDFLAGS=-L$(PREFIX)/lib -lc-client4
- 
- 
- # Special make flags (e.g. to override make environment variables)
-@@ -256,13 +256,7 @@
- 
- # Make the IMAP Toolkit
- 
--all:	SPECIALS c-client rebuild bundled
--
--c-client:
--	@echo Not processed yet.  In a first-time build, you must specify
--	@echo the system type so that the sources are properly processed.
--	@false
--
-+all:	bundled
- 
- SPECIALS:
- 	echo $(SPECIALS) > SPECIALS
-@@ -396,9 +390,6 @@
- 	@echo + In order to rectify this problem, you MUST build with:
- 	@echo ++ SSLTYPE=$(SSLTYPE).nopwd
- 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
--	@echo
--	@echo Do you want to continue this build anyway?  Type y or n please:
--	@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
- 
- sslnone:
- 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -411,9 +402,6 @@
- 	@echo ++ SSLTYPE=nopwd
- 	@echo + You must also have OpenSSL or equivalent installed.
- 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
--	@echo
--	@echo Do you want to continue this build anyway?  Type y or n please:
--	@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
- 
- 
- # C compiler types
-@@ -434,7 +422,7 @@
- 	$(TOOLS)/$@ "$(LN)" src/tmail tmail
- 	$(LN) $(TOOLS)/$@ .
- 
--build:	OSTYPE rebuild rebuildclean bundled
-+build:	bundled
- 
- OSTYPE:
- 	@echo Building c-client for $(BUILDTYPE)...
+*** Makefile.orig	Wed May  9 00:50:45 2007
+--- Makefile	Mon Jul 23 17:45:00 2007
+***************
+*** 164,170 ****
+  # std	system standard (typically passwd file), determined by port
+  # two	try alternative (defined by CHECKPWALT), then std
+  
+! PASSWDTYPE=std
+  
+  
+  # SSL type.  Defines whether or not SSL support is on this system
+--- 164,170 ----
+  # std	system standard (typically passwd file), determined by port
+  # two	try alternative (defined by CHECKPWALT), then std
+  
+! PASSWDTYPE=pam
+  
+  
+  # SSL type.  Defines whether or not SSL support is on this system
+***************
+*** 253,264 ****
+  #	British.  As of 2005, the Julian calendar and the Gregorian calendar
+  #	diverge by 15 days.
+  
+! EXTRACFLAGS=
+  
+  
+  # Extra linker flags (additional/alternative libraries, etc.)
+  
+! EXTRALDFLAGS=
+  
+  
+  # Special make flags (e.g. to override make environment variables)
+--- 253,264 ----
+  #	British.  As of 2005, the Julian calendar and the Gregorian calendar
+  #	diverge by 15 days.
+  
+! EXTRACFLAGS=-I$(PREFIX)/include/c-client
+  
+  
+  # Extra linker flags (additional/alternative libraries, etc.)
+  
+! EXTRALDFLAGS=-L$(PREFIX)/lib -lc-client4
+  
+  
+  # Special make flags (e.g. to override make environment variables)
+***************
+*** 294,306 ****
+  
+  # Make the IMAP Toolkit
+  
+! all:	c-client SPECIALS rebuild bundled
+! 
+! c-client:
+! 	@echo Not processed yet.  In a first-time build, you must specify
+! 	@echo the system type so that the sources are properly processed.
+! 	@false
+! 
+  
+  SPECIALS:
+  	echo $(SPECIALS) > SPECIALS
+--- 294,300 ----
+  
+  # Make the IMAP Toolkit
+  
+! all:	bundled
+  
+  SPECIALS:
+  	echo $(SPECIALS) > SPECIALS
+***************
+*** 559,567 ****
+  	@echo + In order to rectify this problem, you MUST build with:
+  	@echo ++ SSLTYPE=$(SSLTYPE).nopwd
+  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+- 	@echo
+- 	@echo Do you want to continue this build anyway?  Type y or n please:
+- 	@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nounenc;exit 1);; esac'
+  
+  nounenc:
+  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+--- 553,558 ----
+***************
+*** 582,590 ****
+  	@echo ++ SSLTYPE=nopwd
+  	@echo + You must also have OpenSSL or equivalent installed.
+  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+- 	@echo
+- 	@echo Do you want to continue this build anyway?  Type y or n please:
+- 	@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nonossl;exit 1);; esac'
+  
+  nonossl:
+  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+--- 573,578 ----
+***************
+*** 659,665 ****
+  	$(TOOLS)/$@ "$(LN)" src/tmail tmail
+  	$(LN) $(TOOLS)/$@ .
+  
+! build:	OSTYPE rebuild rebuildclean bundled
+  
+  OSTYPE:
+  	@$(MAKE) ip$(IP)
+--- 647,653 ----
+  	$(TOOLS)/$@ "$(LN)" src/tmail tmail
+  	$(LN) $(TOOLS)/$@ .
+  
+! build:	bundled
+  
+  OSTYPE:
+  	@$(MAKE) ip$(IP)
diff --git a/mail/imap-uw/files/patch-ah b/mail/imap-uw/files/patch-ah
index 08556e41c6f5..84869622a158 100644
--- a/mail/imap-uw/files/patch-ah
+++ b/mail/imap-uw/files/patch-ah
@@ -1,131 +1,173 @@
---- src/ipopd/ipop3d.c.orig	Tue Jun 22 00:58:07 2004
-+++ src/ipopd/ipop3d.c	Fri Sep  3 20:57:24 2004
-@@ -28,6 +28,11 @@
- #include <time.h>
- #include "c-client.h"
- 
-+#ifdef DRAC_AUTH
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <stdlib.h>
-+#endif /* DRAC_AUTH */
- 
- #define CRLF PSOUT ("\015\012")	/* primary output terpri */
- 
-@@ -57,6 +62,12 @@
- 
- /* Global storage */
- 
-+#ifdef DRAC_AUTH
-+#define DRACTIMEOUT 10*60     /* check every 10 minutes */
-+time_t lastdrac = 0;          /* time of last drac check */
-+extern char *getenv ();
-+#endif /* DRAC_AUTH */
-+
- char *version = "2004.89";	/* server version */
- short state = AUTHORIZATION;	/* server state */
- short critical = NIL;		/* non-zero if in critical code */
-@@ -89,7 +100,53 @@
- int mbxopen (char *mailbox);
- long blat (char *text,long lines,unsigned long size);
- void rset ();
--
-+#ifdef DRAC_AUTH
-+void drac_auth();
-+#endif /* DRAC_AUTH */
-+
-+#ifdef DRAC_AUTH
-+/* DRAC Authorization
-+ */
-+void drac_auth ()
-+{
-+  if (time (0) > lastdrac + DRACTIMEOUT)
-+  {
-+	  FILE *dracconf;
-+	  char host[100];
-+	  char *drachost;
-+	  char *err;
-+	  char *p;
-+
-+	  if ( (dracconf = fopen(ETC_DIR "/dracd.host", "r")) == NULL)
-+	  {
-+		syslog (LOG_INFO, "dracd: error opening %s/dracd.host config file",ETC_DIR);
-+		exit(1);
-+	  }
-+
-+	  fgets(host, 100, dracconf);
-+	  p = strchr(host, '\n');
-+	  if(p != NULL)
-+		*p = '\0';
-+	  fclose(dracconf);
-+
-+	  if( drachost = (host) )
-+	  {
-+		  struct sockaddr_in sin;
-+		  int sinlen = sizeof (struct sockaddr_in);
-+		  char *client = getpeername (0,(struct sockaddr *) &sin,(void *) &sinlen) ?
-+			"UNKNOWN" : inet_ntoa (sin.sin_addr);
-+
-+		  lastdrac = time(0);
-+
-+		  if (dracauth(drachost, inet_addr(client), &err) != 0)
-+			  syslog (LOG_INFO, err);
-+		  else
-+			  syslog (LOG_INFO, "dracd: authorized ip %s", client);
-+	  }
-+  }
-+}
-+#endif /* DRAC_AUTH */
-+
- /* Main program */
- 
- int main (int argc,char *argv[])
-@@ -102,7 +159,7 @@
-     (((s = strrchr (argv[0],'/')) || (s = strrchr (argv[0],'\\'))) ?
-      s+1 : argv[0]) : "ipop3d";
- 				/* set service name before linkage */
--  mail_parameters (NIL,SET_SERVICENAME,(void *) "pop");
-+  mail_parameters (NIL,SET_SERVICENAME,(void *) "pop3");
- #include "linkage.c"
- 				/* initialize server */
-   server_init (pgmname,"pop3","pop3s",clkint,kodint,hupint,trmint);
-@@ -205,9 +262,13 @@
- 	      syslog (LOG_INFO,"AUTHENTICATE %s failure host=%.80s",s,
- 		      tcp_clienthost ());
- 	    }
--	    else if ((state = mbxopen ("INBOX")) == TRANSACTION)
-+	    else if ((state = mbxopen ("INBOX")) == TRANSACTION) {
-+		#ifdef DRAC_AUTH
-+		drac_auth();
-+		#endif /* DRAC_AUTH */
- 	      syslog (LOG_INFO,"Auth user=%.80s host=%.80s nmsgs=%ld/%ld",
- 		      user,tcp_clienthost (),nmsgs,stream->nmsgs);
-+		}
- 	    else syslog (LOG_INFO,"Auth user=%.80s host=%.80s no mailbox",
- 			 user,tcp_clienthost ());
- 	  }
-@@ -235,9 +296,13 @@
- 	      PSOUT ("-ERR Missing APOP argument\015\012");
- 	    else if (!(user = apop_login (challenge,s,t,argc,argv)))
- 	      PSOUT ("-ERR Bad APOP\015\012");
--	    else if ((state = mbxopen ("INBOX")) == TRANSACTION)
-+	    else if ((state = mbxopen ("INBOX")) == TRANSACTION) {
-+		#ifdef DRAC_AUTH
-+		drac_auth();
-+		#endif /* DRAC_AUTH */
- 	      syslog (LOG_INFO,"APOP user=%.80s host=%.80s nmsgs=%ld/%ld",
- 		      user,tcp_clienthost (),nmsgs,stream->nmsgs);
-+		}
- 	    else syslog (LOG_INFO,"APOP user=%.80s host=%.80s no mailbox",
- 			 user,tcp_clienthost ());
- 	  }
-@@ -575,6 +640,9 @@
- 				/* attempt the login */
-     if (server_login (user,pass,t,argc,argv)) {
-       int ret = mbxopen ("INBOX");
-+	#ifdef DRAC_AUTH
-+	drac_auth();
-+	#endif /* DRAC_AUTH */
-       if (ret == TRANSACTION)	/* mailbox opened OK? */
- 	syslog (LOG_INFO,"%sLogin user=%.80s host=%.80s nmsgs=%ld/%ld",
- 		t ? "Admin " : "",user,tcp_clienthost (),nmsgs,stream->nmsgs);
+*** src/ipopd/ipop3d.c.orig	Tue May 22 01:23:47 2007
+--- src/ipopd/ipop3d.c	Mon Jul 23 17:46:53 2007
+***************
+*** 36,41 ****
+--- 36,46 ----
+  #include <time.h>
+  #include "c-client.h"
+  
++ #ifdef DRAC_AUTH
++ #include <netinet/in.h>
++ #include <arpa/inet.h>
++ #include <stdlib.h>
++ #endif /* DRAC_AUTH */
+  
+  #define CRLF PSOUT ("\015\012")	/* primary output terpri */
+  
+***************
+*** 65,70 ****
+--- 70,81 ----
+  
+  /* Global storage */
+  
++ #ifdef DRAC_AUTH
++ #define DRACTIMEOUT 10*60     /* check every 10 minutes */
++ time_t lastdrac = 0;          /* time of last drac check */
++ extern char *getenv ();
++ #endif /* DRAC_AUTH */
++ 
+  char *version = "98";		/* edit number of this server */
+  short state = AUTHORIZATION;	/* server state */
+  short critical = NIL;		/* non-zero if in critical code */
+***************
+*** 98,104 ****
+  int mbxopen (char *mailbox);
+  long blat (char *text,long lines,unsigned long size,STRING *st);
+  void rset ();
+! 
+  /* Main program */
+  
+  int main (int argc,char *argv[])
+--- 109,161 ----
+  int mbxopen (char *mailbox);
+  long blat (char *text,long lines,unsigned long size,STRING *st);
+  void rset ();
+! #ifdef DRAC_AUTH
+! void drac_auth();
+! #endif /* DRAC_AUTH */
+! 
+! #ifdef DRAC_AUTH
+! /* DRAC Authorization
+!  */
+! void drac_auth ()
+! {
+!   if (time (0) > lastdrac + DRACTIMEOUT)
+!   {
+! 	  FILE *dracconf;
+! 	  char host[100];
+! 	  char *drachost;
+! 	  char *err;
+! 	  char *p;
+! 
+! 	  if ( (dracconf = fopen(ETC_DIR "/dracd.host", "r")) == NULL)
+! 	  {
+! 		syslog (LOG_INFO, "dracd: error opening %s/dracd.host config file",ETC_DIR);
+! 		exit(1);
+! 	  }
+! 
+! 	  fgets(host, 100, dracconf);
+! 	  p = strchr(host, '\n');
+! 	  if(p != NULL)
+! 		*p = '\0';
+! 	  fclose(dracconf);
+! 
+! 	  if( drachost = (host) )
+! 	  {
+! 		  struct sockaddr_in sin;
+! 		  int sinlen = sizeof (struct sockaddr_in);
+! 		  char *client = getpeername (0,(struct sockaddr *) &sin,(void *) &sinlen) ?
+! 			"UNKNOWN" : inet_ntoa (sin.sin_addr);
+! 
+! 		  lastdrac = time(0);
+! 
+! 		  if (dracauth(drachost, inet_addr(client), &err) != 0)
+! 			  syslog (LOG_INFO, err);
+! 		  else
+! 			  syslog (LOG_INFO, "dracd: authorized ip %s", client);
+! 	  }
+!   }
+! }
+! #endif /* DRAC_AUTH */
+! 
+  /* Main program */
+  
+  int main (int argc,char *argv[])
+***************
+*** 111,117 ****
+      (((s = strrchr (argv[0],'/')) || (s = strrchr (argv[0],'\\'))) ?
+       s+1 : argv[0]) : "ipop3d";
+  				/* set service name before linkage */
+!   mail_parameters (NIL,SET_SERVICENAME,(void *) "pop");
+  #include "linkage.c"
+  				/* initialize server */
+    server_init (pgmname,"pop3","pop3s",clkint,kodint,hupint,trmint);
+--- 168,174 ----
+      (((s = strrchr (argv[0],'/')) || (s = strrchr (argv[0],'\\'))) ?
+       s+1 : argv[0]) : "ipop3d";
+  				/* set service name before linkage */
+!   mail_parameters (NIL,SET_SERVICENAME,(void *) "pop3");
+  #include "linkage.c"
+  				/* initialize server */
+    server_init (pgmname,"pop3","pop3s",clkint,kodint,hupint,trmint);
+***************
+*** 215,223 ****
+  	      syslog (LOG_INFO,"AUTHENTICATE %s failure host=%.80s",s,
+  		      tcp_clienthost ());
+  	    }
+! 	    else if ((state = mbxopen ("INBOX")) == TRANSACTION)
+  	      syslog (LOG_INFO,"Auth user=%.80s host=%.80s nmsgs=%ld/%ld",
+  		      user,tcp_clienthost (),nmsgs,stream->nmsgs);
+  	    else syslog (LOG_INFO,"Auth user=%.80s host=%.80s no mailbox",
+  			 user,tcp_clienthost ());
+  	  }
+--- 272,284 ----
+  	      syslog (LOG_INFO,"AUTHENTICATE %s failure host=%.80s",s,
+  		      tcp_clienthost ());
+  	    }
+! 	    else if ((state = mbxopen ("INBOX")) == TRANSACTION) {
+! 		#ifdef DRAC_AUTH
+! 		drac_auth();
+! 		#endif /* DRAC_AUTH */
+  	      syslog (LOG_INFO,"Auth user=%.80s host=%.80s nmsgs=%ld/%ld",
+  		      user,tcp_clienthost (),nmsgs,stream->nmsgs);
++ 		}
+  	    else syslog (LOG_INFO,"Auth user=%.80s host=%.80s no mailbox",
+  			 user,tcp_clienthost ());
+  	  }
+***************
+*** 247,255 ****
+  	      PSOUT ("-ERR Missing APOP argument\015\012");
+  	    else if (!(user = apop_login (challenge,s,t,argc,argv)))
+  	      PSOUT ("-ERR Bad APOP\015\012");
+! 	    else if ((state = mbxopen ("INBOX")) == TRANSACTION)
+  	      syslog (LOG_INFO,"APOP user=%.80s host=%.80s nmsgs=%ld/%ld",
+  		      user,tcp_clienthost (),nmsgs,stream->nmsgs);
+  	    else syslog (LOG_INFO,"APOP user=%.80s host=%.80s no mailbox",
+  			 user,tcp_clienthost ());
+  	  }
+--- 308,320 ----
+  	      PSOUT ("-ERR Missing APOP argument\015\012");
+  	    else if (!(user = apop_login (challenge,s,t,argc,argv)))
+  	      PSOUT ("-ERR Bad APOP\015\012");
+! 	    else if ((state = mbxopen ("INBOX")) == TRANSACTION) {
+! 		#ifdef DRAC_AUTH
+! 		drac_auth();
+! 		#endif /* DRAC_AUTH */
+  	      syslog (LOG_INFO,"APOP user=%.80s host=%.80s nmsgs=%ld/%ld",
+  		      user,tcp_clienthost (),nmsgs,stream->nmsgs);
++ 		}
+  	    else syslog (LOG_INFO,"APOP user=%.80s host=%.80s no mailbox",
+  			 user,tcp_clienthost ());
+  	  }
+***************
+*** 609,614 ****
+--- 674,682 ----
+  				/* attempt the login */
+      if (server_login (user,pass,t,argc,argv)) {
+        int ret = mbxopen ("INBOX");
++ 	#ifdef DRAC_AUTH
++ 	drac_auth();
++ 	#endif /* DRAC_AUTH */
+        if (ret == TRANSACTION)	/* mailbox opened OK? */
+  	syslog (LOG_INFO,"%sLogin user=%.80s host=%.80s nmsgs=%ld/%ld",
+  		t ? "Admin " : "",user,tcp_clienthost (),nmsgs,stream->nmsgs);
diff --git a/mail/imap-uw/files/patch-ai b/mail/imap-uw/files/patch-ai
index 5bbb280d4636..cc5e0a3df96f 100644
--- a/mail/imap-uw/files/patch-ai
+++ b/mail/imap-uw/files/patch-ai
@@ -1,89 +1,103 @@
---- src/imapd/imapd.c.orig	Tue Jun 29 21:56:17 2004
-+++ src/imapd/imapd.c	Fri Sep  3 20:59:40 2004
-@@ -29,6 +29,11 @@
- #include "c-client.h"
- #include <sys/stat.h>
- 
-+#ifdef DRAC_AUTH
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <stdlib.h>
-+#endif /* DRAC_AUTH */
- 
- #define CRLF PSOUT ("\015\012")	/* primary output terpri */
- 
-@@ -183,6 +188,12 @@
- 
- /* Global storage */
- 
-+#ifdef DRAC_AUTH
-+#define DRACTIMEOUT 10*60     /* check every 10 minutes */
-+time_t lastdrac = 0;          /* time of last drac check */
-+extern char *getenv ();
-+#endif /* DRAC_AUTH */
-+
- char *version = "2004.357";	/* version number of this server */
- time_t alerttime = 0;		/* time of last alert */
- time_t sysalerttime = 0;	/* time of last system alert */
-@@ -246,7 +257,50 @@
-   msg_string_next,		/* get next byte in string structure */
-   msg_string_setpos		/* set position in string structure */
- };
--
-+
-+#ifdef DRAC_AUTH
-+/* DRAC Authorization
-+ */
-+void drac_auth ()
-+{
-+  if (time (0) > lastdrac + DRACTIMEOUT)
-+  {
-+	  FILE *dracconf;
-+	  char host[100];
-+	  char *drachost;
-+	  char *err;
-+	  char *p;
-+
-+	  if ( (dracconf = fopen(ETC_DIR "/dracd.host", "r")) == NULL)
-+	  {
-+		syslog (LOG_INFO, "dracd: error opening %s/dracd.host config file",ETC_DIR);
-+		exit(1);
-+	  }
-+
-+	  fgets(host, 100, dracconf);
-+	  p = strchr(host, '\n');
-+	  if(p != NULL)
-+		*p = '\0';
-+	  fclose(dracconf);
-+
-+	  if( drachost = (host) )
-+	  {
-+		  struct sockaddr_in sin;
-+		  int sinlen = sizeof (struct sockaddr_in);
-+		  char *client = getpeername (0,(struct sockaddr *) &sin,(void *) &sinlen) ?
-+			"UNKNOWN" : inet_ntoa (sin.sin_addr);
-+
-+		  lastdrac = time(0);
-+
-+		  if (dracauth(drachost, inet_addr(client), &err) != 0)
-+			  syslog (LOG_INFO, err);
-+		  else
-+			  syslog (LOG_INFO, "dracd: authorized ip %s", client);
-+	  }
-+  }
-+}
-+#endif /* DRAC_AUTH */
-+
- /* Main program */
- 
- int main (int argc,char *argv[])
-@@ -1251,6 +1305,9 @@
- 	      lasterror ());
-       return;
-     }
-+	#ifdef DRAC_AUTH
-+	drac_auth();
-+	#endif /* DRAC_AUTH */
- 				/* change in number of messages? */
-     if (existsquelled || (nmsgs != stream->nmsgs)) {
-       PSOUT ("* ");
+*** src/imapd/imapd.c.orig	Wed Jul 11 22:08:16 2007
+--- src/imapd/imapd.c	Mon Jul 23 17:48:56 2007
+***************
+*** 38,43 ****
+--- 38,48 ----
+  #include "newsrc.h"
+  #include <sys/stat.h>
+  
++ #ifdef DRAC_AUTH
++ #include <netinet/in.h>
++ #include <arpa/inet.h>
++ #include <stdlib.h>
++ #endif /* DRAC_AUTH */
+  
+  #define CRLF PSOUT ("\015\012")	/* primary output terpri */
+  
+***************
+*** 203,208 ****
+--- 208,219 ----
+  
+  /* Global storage */
+  
++ #ifdef DRAC_AUTH
++ #define DRACTIMEOUT 10*60     /* check every 10 minutes */
++ time_t lastdrac = 0;          /* time of last drac check */
++ extern char *getenv ();
++ #endif /* DRAC_AUTH */
++ 
+  char *version = "389";		/* edit number of this server */
+  char *logout = "Logout";	/* syslogreason for logout */
+  char *goodbye = NIL;		/* bye reason */
+***************
+*** 277,283 ****
+    msg_string_next,		/* get next byte in string structure */
+    msg_string_setpos		/* set position in string structure */
+  };
+! 
+  /* Main program */
+  
+  int main (int argc,char *argv[])
+--- 288,337 ----
+    msg_string_next,		/* get next byte in string structure */
+    msg_string_setpos		/* set position in string structure */
+  };
+! 
+! #ifdef DRAC_AUTH
+! /* DRAC Authorization
+!  */
+! void drac_auth ()
+! {
+!   if (time (0) > lastdrac + DRACTIMEOUT)
+!   {
+! 	  FILE *dracconf;
+! 	  char host[100];
+! 	  char *drachost;
+! 	  char *err;
+! 	  char *p;
+! 
+! 	  if ( (dracconf = fopen(ETC_DIR "/dracd.host", "r")) == NULL)
+! 	  {
+! 		syslog (LOG_INFO, "dracd: error opening %s/dracd.host config file",ETC_DIR);
+! 		exit(1);
+! 	  }
+! 
+! 	  fgets(host, 100, dracconf);
+! 	  p = strchr(host, '\n');
+! 	  if(p != NULL)
+! 		*p = '\0';
+! 	  fclose(dracconf);
+! 
+! 	  if( drachost = (host) )
+! 	  {
+! 		  struct sockaddr_in sin;
+! 		  int sinlen = sizeof (struct sockaddr_in);
+! 		  char *client = getpeername (0,(struct sockaddr *) &sin,(void *) &sinlen) ?
+! 			"UNKNOWN" : inet_ntoa (sin.sin_addr);
+! 
+! 		  lastdrac = time(0);
+! 
+! 		  if (dracauth(drachost, inet_addr(client), &err) != 0)
+! 			  syslog (LOG_INFO, err);
+! 		  else
+! 			  syslog (LOG_INFO, "dracd: authorized ip %s", client);
+! 	  }
+!   }
+! }
+! #endif /* DRAC_AUTH */
+! 
+  /* Main program */
+  
+  int main (int argc,char *argv[])
+***************
+*** 1501,1506 ****
+--- 1555,1563 ----
+  	      lasterror ());
+        return;
+      }
++ 	#ifdef DRAC_AUTH
++ 	drac_auth();
++ 	#endif /* DRAC_AUTH */
+  				/* change in number of messages? */
+      if (existsquelled || (nmsgs != stream->nmsgs)) {
+        PSOUT ("* ");
diff --git a/mail/imap-uw/files/patch-src-osdep-unix-env_unix.c b/mail/imap-uw/files/patch-src-osdep-unix-env_unix.c
index 61e0b8367438..f67309ed7fea 100644
--- a/mail/imap-uw/files/patch-src-osdep-unix-env_unix.c
+++ b/mail/imap-uw/files/patch-src-osdep-unix-env_unix.c
@@ -1,11 +1,19 @@
---- src/osdep/unix/env_unix.c.orig	Mon Sep 13 23:31:19 2004
-+++ src/osdep/unix/env_unix.c	Fri Nov 25 20:44:01 2005
-@@ -44,7 +44,7 @@
- static short anonymous = NIL;	/* is anonymous */
- static short blackBox = NIL;	/* is a black box */
- static short closedBox = NIL;	/* is a closed box */
--static short restrictBox = NIL;	/* is a restricted box */
-+static short restrictBox = -1;	/* is a restricted box */
- static short has_no_life = NIL;	/* is a cretin with no life */
- 				/* flock() emulator is a no-op */
- static short disableFcntlLock = NIL;
+*** src/osdep/unix/env_unix.c.orig	Tue May 29 22:29:52 2007
+--- src/osdep/unix/env_unix.c	Mon Jul 23 17:50:43 2007
+***************
+*** 79,85 ****
+  static short anonymous = NIL;	/* is anonymous */
+  static short blackBox = NIL;	/* is a black box */
+  static short closedBox = NIL;	/* is a closed box (uses chroot() jail) */
+! static short restrictBox = NIL;	/* is a restricted box */
+  static short has_no_life = NIL;	/* is a cretin with no life */
+  static short hideDotFiles = NIL;/* hide files whose names start with . */
+  				/* advertise filesystem root */
+--- 79,85 ----
+  static short anonymous = NIL;	/* is anonymous */
+  static short blackBox = NIL;	/* is a black box */
+  static short closedBox = NIL;	/* is a closed box (uses chroot() jail) */
+! static short restrictBox = -1;	/* is a restricted box */
+  static short has_no_life = NIL;	/* is a cretin with no life */
+  static short hideDotFiles = NIL;/* hide files whose names start with . */
+  				/* advertise filesystem root */
diff --git a/mail/imap-uw/pkg-plist b/mail/imap-uw/pkg-plist
index 3c2bc4812eb5..05e001580846 100644
--- a/mail/imap-uw/pkg-plist
+++ b/mail/imap-uw/pkg-plist
@@ -18,7 +18,6 @@ libexec/mlock
 %%PORTDOCS%%%%DOCSDIR%%/calendar.txt
 %%PORTDOCS%%%%DOCSDIR%%/commndmt.txt
 %%PORTDOCS%%%%DOCSDIR%%/draft/README
-%%PORTDOCS%%%%DOCSDIR%%/draft/compare.txt
 %%PORTDOCS%%%%DOCSDIR%%/draft/i18n.txt
 %%PORTDOCS%%%%DOCSDIR%%/draft/sort.txt
 %%PORTDOCS%%%%DOCSDIR%%/drivers.txt
@@ -27,13 +26,12 @@ libexec/mlock
 %%PORTDOCS%%%%DOCSDIR%%/internal.txt
 %%PORTDOCS%%%%DOCSDIR%%/locking.txt
 %%PORTDOCS%%%%DOCSDIR%%/md5.txt
+%%PORTDOCS%%%%DOCSDIR%%/mixfmt.txt
 %%PORTDOCS%%%%DOCSDIR%%/naming.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1731.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1732.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1733.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2061.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2062.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2086.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2087.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2088.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2177.txt
@@ -42,12 +40,7 @@ libexec/mlock
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2193.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2195.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2221.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2222.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2234.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2245.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2342.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2359.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2595.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2683.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2971.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3348.txt
@@ -57,6 +50,22 @@ libexec/mlock
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3516.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3656.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3691.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4234.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4314.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4315.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4422.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4466.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4467.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4468.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4469.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4505.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4549.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4551.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4616.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4731.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4752.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4790.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/draft
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%