4 files changed, 14 insertions, 16 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 50303df349b3..adcbe92ce95b 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	imap
-PORTVERSION=	2002
-PORTREVISION=	1
+PORTVERSION=	2002c1
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/%SUBDIR%/ \
 		http://atreides.freenix.no/~anders/%SUBDIR%/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/mail/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. old
 PKGNAMESUFFIX=	-uw
 DISTNAME=	imap-${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
@@ -55,10 +55,8 @@ MAKE_ARGS+=	WITH_ENTOURAGE_BRAIN_DAMAGE=yes
 
 .include <bsd.port.pre.mk>
 
-pre-extract:
-	@${SH} ${PKGREQ}.rev ${LOCALBASE}/include/c-client/portrevision.h ${PORTVERSION}
-
 pre-build:
+	@${SH} ${PKGREQ}.rev ${LOCALBASE}/include/c-client/portrevision.h ${PORTVERSION}
 .if !defined(WITHOUT_SSL)
 	@${SH} ${PKGREQ}.ssl ${LOCALBASE}/include/c-client/portrevision.h yes
 .else
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index c864f0bfcb07..3a2fdb6ca5d8 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1 +1 @@
-MD5 (imap-2002.tar.Z) = ab5a7afb25cbd037b4490c42e0fe235e
+MD5 (imap-2002c1.tar.Z) = 90c255dcf3ee373e3fb174ea5d820f4d
diff --git a/mail/imap-uw/files/patch-ah b/mail/imap-uw/files/patch-ah
index e747d3ff21da..a5375f3474aa 100644
--- a/mail/imap-uw/files/patch-ah
+++ b/mail/imap-uw/files/patch-ah
@@ -1,5 +1,5 @@
---- src/ipopd/ipop3d.c.orig	Tue Dec 18 22:41:46 2001
-+++ src/ipopd/ipop3d.c	Wed Nov 27 05:09:13 2002
+--- src/ipopd/ipop3d.c.orig	Fri Jan 17 18:17:58 2003
++++ src/ipopd/ipop3d.c	Mon May 19 22:18:28 2003
 @@ -28,6 +28,11 @@
  #include <time.h>
  #include "c-client.h"
@@ -22,7 +22,7 @@
 +extern char *getenv ();
 +#endif /* DRAC_AUTH */
 +
- char *version = "2001.80";	/* server version */
+ char *version = "2003.83";	/* server version */
  short state = AUTHORIZATION;	/* server state */
  short critical = NIL;		/* non-zero if in critical code */
 @@ -88,7 +99,53 @@
@@ -80,7 +80,7 @@
  /* Main program */
  
  int main (int argc,char *argv[])
-@@ -207,9 +264,13 @@
+@@ -209,9 +266,13 @@
  	      syslog (LOG_INFO,"AUTHENTICATE %s failure host=%.80s",s,
  		      tcp_clienthost ());
  	    }
@@ -95,7 +95,7 @@
  	    else syslog (LOG_INFO,"Auth user=%.80s host=%.80s no mailbox",
  			 user,tcp_clienthost ());
  	  }
-@@ -246,9 +307,13 @@
+@@ -248,9 +309,13 @@
  	      PSOUT ("-ERR Missing APOP argument\015\012");
  	    else if (!(user = apop_login (challenge,s,t,argc,argv)))
  	      PSOUT ("-ERR Bad APOP\015\012");
@@ -110,7 +110,7 @@
  	    else syslog (LOG_INFO,"APOP user=%.80s host=%.80s no mailbox",
  			 user,tcp_clienthost ());
  	  }
-@@ -577,6 +642,9 @@
+@@ -580,6 +645,9 @@
  				/* attempt the login */
      if (server_login (user,pass,t,argc,argv)) {
        int ret = mbxopen ("INBOX");
diff --git a/mail/imap-uw/files/patch-ai b/mail/imap-uw/files/patch-ai
index 3202669b225b..e4b67eb6edaf 100644
--- a/mail/imap-uw/files/patch-ai
+++ b/mail/imap-uw/files/patch-ai
@@ -1,5 +1,5 @@
---- src/imapd/imapd.c.orig	Mon Nov 18 23:29:04 2002
-+++ src/imapd/imapd.c	Wed Nov 27 05:10:42 2002
+--- src/imapd/imapd.c.orig	Thu Apr  3 00:09:25 2003
++++ src/imapd/imapd.c	Mon May 19 22:20:56 2003
 @@ -29,6 +29,11 @@
  #include "c-client.h"
  #include <sys/stat.h>
@@ -22,7 +22,7 @@
 +extern char *getenv ();
 +#endif /* DRAC_AUTH */
 +
- char *version = "2002.332";	/* version number of this server */
+ char *version = "2003.337";	/* version number of this server */
  time_t alerttime = 0;		/* time of last alert */
  time_t sysalerttime = 0;	/* time of last system alert */
 @@ -238,7 +249,50 @@
@@ -77,7 +77,7 @@
  /* Main program */
  
  int main (int argc,char *argv[])
-@@ -1184,6 +1238,9 @@
+@@ -1189,6 +1243,9 @@
  	      lasterror ());
        return;
      }