5 files changed, 32 insertions, 28 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 4d0797a8c02c..bb37abd016a3 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	imap
-PORTVERSION=	2004
+PORTVERSION=	2004a
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
@@ -72,9 +72,9 @@ do-install:
 		${WRKSRC}/mlock/mlock ${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/mtest/mtest ${PREFIX}/bin/mboxtest
 	${INSTALL_MAN} \
-		${WRKSRC}/src/imapd/imapd.8c ${PREFIX}/man/man8/imapd.8
+		${WRKSRC}/src/imapd/imapd.8 ${PREFIX}/man/man8/imapd.8
 	${INSTALL_MAN} \
-		${WRKSRC}/src/ipopd/ipopd.8c ${PREFIX}/man/man8/ipopd.8
+		${WRKSRC}/src/ipopd/ipopd.8 ${PREFIX}/man/man8/ipopd.8
 	${INSTALL_PROGRAM} ${WRKSRC}/dmail/dmail ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/mailutil/mailutil ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/tmail/tmail ${PREFIX}/bin/
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 7b718609f479..8a9ffae97a85 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,2 +1,2 @@
-MD5 (imap-2004.tar.Z) = ec3dafeeae320457a1d098157e9bf969
-SIZE (imap-2004.tar.Z) = 2220333
+MD5 (imap-2004a.tar.Z) = 34d2c66271302cd2f926094fb5e8705d
+SIZE (imap-2004a.tar.Z) = 2224181
diff --git a/mail/imap-uw/files/patch-ac b/mail/imap-uw/files/patch-ac
index e40384aa28a6..ad5a5cc6925d 100644
--- a/mail/imap-uw/files/patch-ac
+++ b/mail/imap-uw/files/patch-ac
@@ -1,19 +1,22 @@
---- src/imapd/Makefile.orig	Mon Nov 18 17:48:25 2002
-+++ src/imapd/Makefile	Wed Nov 27 02:28:00 2002
-@@ -18,10 +18,10 @@
+--- 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
+-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
  
  
-@@ -29,7 +29,9 @@
+@@ -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.
@@ -24,7 +27,7 @@
  
  
  
-@@ -38,28 +40,29 @@
+@@ -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.
@@ -39,13 +42,14 @@
  C = ../c-client
 -CCLIENTLIB = $C/c-client.a
 -CC = `cat $C/CCTYPE`
--CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(ENBD) \
--	-DANOFILE=\"$(ANO)\" -DALERTFILE=\"$(ALERT)\" \
+-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)\" -DUSERALERTFILE=\"$(USERALERT)\" \
++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)
diff --git a/mail/imap-uw/files/patch-ah b/mail/imap-uw/files/patch-ah
index c307a9d0c75f..c76ada11f9bb 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 Apr 27 21:50:29 2004
-+++ src/ipopd/ipop3d.c	Fri Jun  4 07:47:10 2004
+--- 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"
@@ -22,10 +22,10 @@
 +extern char *getenv ();
 +#endif /* DRAC_AUTH */
 +
- char *version = "2004.87";	/* server version */
+ char *version = "2004.88";	/* server version */
  short state = AUTHORIZATION;	/* server state */
  short critical = NIL;		/* non-zero if in critical code */
-@@ -88,7 +99,53 @@
+@@ -89,7 +100,53 @@
  int mbxopen (char *mailbox);
  long blat (char *text,long lines,unsigned long size);
  void rset ();
@@ -80,7 +80,7 @@
  /* Main program */
  
  int main (int argc,char *argv[])
-@@ -101,7 +158,7 @@
+@@ -102,7 +159,7 @@
      (((s = strrchr (argv[0],'/')) || (s = strrchr (argv[0],'\\'))) ?
       s+1 : argv[0]) : "ipop3d";
  				/* set service name before linkage */
@@ -89,7 +89,7 @@
  #include "linkage.c"
  				/* initialize server */
    server_init (pgmname,"pop3","pop3s",clkint,kodint,hupint,trmint);
-@@ -201,9 +258,13 @@
+@@ -205,9 +262,13 @@
  	      syslog (LOG_INFO,"AUTHENTICATE %s failure host=%.80s",s,
  		      tcp_clienthost ());
  	    }
@@ -104,7 +104,7 @@
  	    else syslog (LOG_INFO,"Auth user=%.80s host=%.80s no mailbox",
  			 user,tcp_clienthost ());
  	  }
-@@ -231,9 +292,13 @@
+@@ -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");
@@ -119,7 +119,7 @@
  	    else syslog (LOG_INFO,"APOP user=%.80s host=%.80s no mailbox",
  			 user,tcp_clienthost ());
  	  }
-@@ -564,6 +629,9 @@
+@@ -575,6 +640,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 73afa6495244..e01978c18b62 100644
--- a/mail/imap-uw/files/patch-ai
+++ b/mail/imap-uw/files/patch-ai
@@ -1,5 +1,5 @@
---- src/imapd/imapd.c.orig	Tue Apr 27 21:48:26 2004
-+++ src/imapd/imapd.c	Fri Jun  4 07:49:07 2004
+--- 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>
@@ -22,10 +22,10 @@
 +extern char *getenv ();
 +#endif /* DRAC_AUTH */
 +
- char *version = "2004.350";	/* version number of this server */
+ char *version = "2004.352";	/* version number of this server */
  time_t alerttime = 0;		/* time of last alert */
  time_t sysalerttime = 0;	/* time of last system alert */
-@@ -245,7 +256,50 @@
+@@ -246,7 +257,50 @@
    msg_string_next,		/* get next byte in string structure */
    msg_string_setpos		/* set position in string structure */
  };
@@ -77,7 +77,7 @@
  /* Main program */
  
  int main (int argc,char *argv[])
-@@ -1227,6 +1281,9 @@
+@@ -1251,6 +1305,9 @@
  	      lasterror ());
        return;
      }