5 files changed, 22 insertions, 22 deletions
diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa
index 6de3c8419d0..0795f12bbf4 100644
--- a/mail/imap-uw/patches/patch-aa
+++ b/mail/imap-uw/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2003/09/10 11:54:42 adam Exp $
+$NetBSD: patch-aa,v 1.14 2004/05/13 18:14:34 adam Exp $
 
---- Makefile.orig	2003-07-15 03:17:18.000000000 +0200
+--- Makefile.orig	2004-04-27 19:56:49.000000000 +0000
 +++ Makefile
-@@ -424,9 +424,9 @@ sslunix sslsco:
+@@ -446,9 +446,9 @@ sslunix sslsco:
  	@echo + In order to rectify this problem, you MUST build with:
  	@echo ++ SSLTYPE=$(SSLTYPE).nopwd
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab
index ffae53eaa44..ffd5009a134 100644
--- a/mail/imap-uw/patches/patch-ab
+++ b/mail/imap-uw/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.12 2003/09/10 11:54:42 adam Exp $
+$NetBSD: patch-ab,v 1.13 2004/05/13 18:14:34 adam Exp $
 
---- src/osdep/unix/Makefile.orig	2003-09-10 13:18:31.000000000 +0200
+--- src/osdep/unix/Makefile.orig	2004-05-13 14:54:30.000000000 +0000
 +++ src/osdep/unix/Makefile
-@@ -28,8 +28,6 @@ SSLTYPE=nopwd
+@@ -29,8 +29,6 @@ IP=4
  
  # Extended flags needed for SSL.  You may need to modify.
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.12 2003/09/10 11:54:42 adam Exp $
  SSLKEYS=$(SSLCERTS)
  SSLINCLUDE=$(SSLDIR)/include
  SSLLIB=$(SSLDIR)/lib
-@@ -47,7 +45,7 @@ SSLRSA= # -lRSAglue -lrsaref
+@@ -48,7 +46,7 @@ SSLRSA= # -lRSAglue -lrsaref
  
  SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
   -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\" -DSSL_KEY_DIRECTORY=\"$(SSLKEYS)\"
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.12 2003/09/10 11:54:42 adam Exp $
  
  
  # Extended flags needed for non-standard passwd types.  You may need to modify.
-@@ -91,14 +89,14 @@ LOCKPGM=/etc/mlock
+@@ -92,14 +90,14 @@ LOCKPGM=/etc/mlock
  # set certain other formats (e.g. mbx and mx) as the EMPTYPROTO since these
  # formats can never be empty files.
  
@@ -37,7 +37,7 @@ $NetBSD: patch-ab,v 1.12 2003/09/10 11:54:42 adam Exp $
  LN=ln -s
  RANLIB=ranlib
  
-@@ -381,9 +379,9 @@ gso:	# GCC Solaris
+@@ -391,9 +389,9 @@ gso:	os_sol.h	# GCC Solaris
  	 SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
  	 ACTIVEFILE=/usr/share/news/active \
  	 RSHPATH=/usr/bin/rsh \
@@ -49,7 +49,7 @@ $NetBSD: patch-ab,v 1.12 2003/09/10 11:54:42 adam Exp $
  
  gsu:	# GCC SUN-OS
  	$(BUILD) `$(CAT) SPECIALS` OS=sun \
-@@ -473,9 +471,9 @@ neb:	# NetBSD
+@@ -483,9 +481,9 @@ neb:	# NetBSD
  	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
  	 CRXTYPE=nfs \
  	 SPOOLDIR=/var \
@@ -61,7 +61,7 @@ $NetBSD: patch-ab,v 1.12 2003/09/10 11:54:42 adam Exp $
  	 BASELDFLAGS="-lcrypt"
  
  nec:	# NEC UX
-@@ -878,7 +876,7 @@ onceenv:
+@@ -908,7 +906,7 @@ onceenv:
  	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
  	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
  	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
diff --git a/mail/imap-uw/patches/patch-ai b/mail/imap-uw/patches/patch-ai
index d065d733b9f..bcd6c2bc8b8 100644
--- a/mail/imap-uw/patches/patch-ai
+++ b/mail/imap-uw/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2001/02/08 19:11:38 jlam Exp $
+$NetBSD: patch-ai,v 1.4 2004/05/13 18:14:34 adam Exp $
 
---- src/mtest/mtest.c.orig	Tue Oct 24 19:16:33 2000
+--- src/mtest/mtest.c.orig	2004-05-01 17:22:07.000000000 +0000
 +++ src/mtest/mtest.c
-@@ -36,6 +36,11 @@
+@@ -33,6 +33,11 @@
  
  /* Excellent reasons to hate ifdefs, and why my real code never uses them */
  
diff --git a/mail/imap-uw/patches/patch-al b/mail/imap-uw/patches/patch-al
index 5ea5db92f78..dfa397ab5c8 100644
--- a/mail/imap-uw/patches/patch-al
+++ b/mail/imap-uw/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.4 2003/07/30 09:29:59 adam Exp $
+$NetBSD: patch-al,v 1.5 2004/05/13 18:14:34 adam Exp $
 
---- src/c-client/auth_gss.c.orig	2003-03-05 06:24:17.000000000 +0100
-+++ src/c-client/auth_gss.c	2003-07-30 10:54:54.000000000 +0200
+--- src/c-client/auth_gss.c.orig	2004-03-15 19:59:22.000000000 +0000
++++ src/c-client/auth_gss.c
 @@ -18,6 +18,16 @@
   * CPYRIGHT, included with this Distribution.
   */
@@ -19,7 +19,7 @@ $NetBSD: patch-al,v 1.4 2003/07/30 09:29:59 adam Exp $
  
  long auth_gssapi_valid (void);
  long auth_gssapi_client (authchallenge_t challenger,authrespond_t responder,
-@@ -53,15 +63,32 @@
+@@ -56,15 +66,32 @@ long auth_gssapi_valid (void)
    OM_uint32 smn;
    gss_buffer_desc buf;
    gss_name_t name;
diff --git a/mail/imap-uw/patches/patch-am b/mail/imap-uw/patches/patch-am
index 5e2f45e168a..f3400b065e8 100644
--- a/mail/imap-uw/patches/patch-am
+++ b/mail/imap-uw/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.1 2003/09/13 18:31:34 kim Exp $
+$NetBSD: patch-am,v 1.2 2004/05/13 18:14:34 adam Exp $
 
---- src/osdep/unix/env_unix.c.orig	Wed Apr 16 20:14:42 2003
-+++ src/osdep/unix/env_unix.c	Sat Sep 13 14:07:00 2003
-@@ -804,7 +804,7 @@
+--- src/osdep/unix/env_unix.c.orig	2004-04-27 19:53:16.000000000 +0000
++++ src/osdep/unix/env_unix.c
+@@ -818,7 +818,7 @@ char *sysinbox ()
  {
    char tmp[MAILTMPLEN];
    if (!sysInbox) {		/* initialize if first time */