Update imap-uw to 2000c. This is a bugfix release over versions 2000a and

2000b.  Pkgsrc changes include:

	- Reduce the number of patches.
	- Install full set of headers for c-client.
	- Install library as libc-client.* and make compatibility links
	  from libc-client.* to libimapuw.*.  Other software that use the
	  c-client library seem to look for libc-client.*; no software looks
	  for libimapuw.*.
	- Install the IMAP RFCs along with the rest of the UW-IMAP
	  documentation.
	- Introduce a new compile-time knob, CCLIENT_MBOX_FMT, that controls
	  the default format for new mailboxes created by c-client programs.

10 files changed, 40 insertions, 135 deletions

diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa
deleted file mode 100644
index 2e5d083cdfc..00000000000
--- a/mail/imap-uw/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2000/12/17 18:25:44 jlam Exp $
-
---- Makefile.orig	Thu Nov  2 16:04:11 2000
-+++ Makefile
-@@ -285,7 +285,7 @@
- #SPECIALS=
- EXTRASPECIALS=
- # *** TEMPORARY FOR PINE BUILD ***
--GSSDIR=/usr/local
-+GSSDIR=${PREFIX}
- SPECIALS=GSSDIR=$(GSSDIR)
- # *** TEMPORARY FOR PINE BUILD ***
- 
-@@ -432,7 +432,7 @@
- 	@echo Building c-client for $(OS)...
- 	echo $(SPECIALS) $(EXTRASPECIALS) > c-client/SPECIALS
- 	$(CD) c-client;$(MAKE) $(OS) BUILDOPTIONS="$(BUILDOPTIONS)" \
--	 $(SPECIALS) $(EXTRASPECIALS)
-+	 $(SPECIALS) $(EXTRASPECIALS) PREFIX=$(PREFIX) CC="$(CC)"
- 	echo $(OS) > OSTYPE
- 	$(TOUCH) rebuild
- 
diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab
deleted file mode 100644
index 6a19bc6a587..00000000000
--- a/mail/imap-uw/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2000/11/09 03:35:34 hubertf Exp $
-
---- src/imapd/Makefile.orig	Wed Oct 25 01:54:32 2000
-+++ src/imapd/Makefile
-@@ -27,7 +27,7 @@
- # Get local definitions from c-client directory
- 
- C = ../c-client
--CCLIENTLIB = $C/c-client.a
-+CCLIENTLIB = $C/libimapuw.la
- CC = `cat $C/CCTYPE`
- CFLAGS = -I$C `cat $C/CFLAGS` -DANOFILE=\"$(ANO)\" \
- 	-DALERTFILE=\"$(ALERT)\" -DUSERALERTFILE=\"$(USERALERT)\"
diff --git a/mail/imap-uw/patches/patch-ac b/mail/imap-uw/patches/patch-ac
deleted file mode 100644
index 2403c318ff9..00000000000
--- a/mail/imap-uw/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2000/11/09 03:35:34 hubertf Exp $
-
---- src/ipopd/Makefile.orig	Wed Oct 25 01:55:07 2000
-+++ src/ipopd/Makefile
-@@ -19,7 +19,7 @@
- 
- 
- C = ../c-client
--CCLIENTLIB = $C/c-client.a
-+CCLIENTLIB = $C/libimapuw.la
- SHELL = /bin/sh
- 
- # Get local definitions from c-client directory
diff --git a/mail/imap-uw/patches/patch-ad b/mail/imap-uw/patches/patch-ad
deleted file mode 100644
index adc45a25098..00000000000
--- a/mail/imap-uw/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2000/11/09 03:35:34 hubertf Exp $
-
---- src/mtest/Makefile.orig	Wed Oct 25 01:55:39 2000
-+++ src/mtest/Makefile
-@@ -19,7 +19,7 @@
- 
- 
- C = ../c-client
--CCLIENTLIB = $C/c-client.a
-+CCLIENTLIB = $C/libimapuw.la
- SHELL = /bin/sh
- 
- # Get local definitions from c-client directory
diff --git a/mail/imap-uw/patches/patch-ae b/mail/imap-uw/patches/patch-ae
index 6b302d4d050..5df07c418ca 100644
--- a/mail/imap-uw/patches/patch-ae
+++ b/mail/imap-uw/patches/patch-ae
@@ -1,39 +1,38 @@
-$NetBSD: patch-ae,v 1.11 2000/11/09 03:35:34 hubertf Exp $
+$NetBSD: patch-ae,v 1.12 2001/02/08 19:11:37 jlam Exp $
 
---- src/osdep/unix/Makefile.orig	Wed Oct 25 01:59:24 2000
+--- src/osdep/unix/Makefile.orig	Tue Feb  6 15:03:59 2001
 +++ src/osdep/unix/Makefile
-@@ -87,7 +87,7 @@
+@@ -67,14 +67,14 @@
+ # set certain other formats (e.g. mbx and mx) as the EMPTYPROTO since these
+ # formats can never be empty files.
  
- # Normally no need to change any of these
+-CREATEPROTO=unixproto
++#CREATEPROTO=unixproto
+ EMPTYPROTO=unixproto
  
--ARCHIVE=c-client.a
-+ARCHIVE=libimapuw.la
- BINARIES=mail.o misc.o newsrc.o smanager.o osdep.o utf8.o siglocal.o \
-  dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
-  rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-@@ -112,7 +112,7 @@
- # Here if no make argument established
  
- missing: osdep.h
--	$(MAKE) all CC=`$(CAT) CCTYPE` CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
-+	$(MAKE) all CC="`$(CAT) CCTYPE`" CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
+ # Commands possibly overriden by the individual port
  
- osdep.h:
- 	@echo You must specify what type of system
-@@ -332,7 +332,7 @@
+ ARRC=ar rc
+-CC=cc
++#CC=cc
+ LN=ln -s
+ RANLIB=ranlib
+ 
+@@ -336,9 +336,9 @@
+ 	 SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
+ 	 ACTIVEFILE=/usr/share/news/active \
  	 RSHPATH=/usr/bin/rsh \
- 	 BASECFLAGS="-g -O2" \
+-	 BASECFLAGS="-g -O2" \
++	 BASECFLAGS="-O2" \
  	 BASELDFLAGS="-lsocket -lnsl -lgen" \
 -	 RANLIB=true CC=gcc
-+	 RANLIB=true CC="$(CC)"
++	 RANLIB=true
  
  gsu:	# GCC SUN-OS
  	$(BUILD) `$(CAT) SPECIALS` OS=sun \
-@@ -420,11 +420,12 @@
- 
- neb:	# NetBSD
+@@ -428,9 +428,9 @@
  	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
-+	 CC="$(CC)" \
  	 CRXTYPE=nfs \
  	 SPOOLDIR=/var \
 -	 ACTIVEFILE=/var/db/news/active \
@@ -44,12 +43,12 @@ $NetBSD: patch-ae,v 1.11 2000/11/09 03:35:34 hubertf Exp $
  	 BASELDFLAGS="-lcrypt"
  
  nec:	# NEC UX
-@@ -808,7 +809,7 @@
+@@ -823,7 +823,7 @@
  	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
  	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
  	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
 -	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
-+	echo "$(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info 4:1" > ARCHIVE
++	echo "$(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info $(CCLIENT_MAJOR):$(CCLIENT_MINOR)" > ARCHIVE
  	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
  	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
  	$(LN) os_$(OS).h osdep.h
diff --git a/mail/imap-uw/patches/patch-af b/mail/imap-uw/patches/patch-af
deleted file mode 100644
index 2e5cff92184..00000000000
--- a/mail/imap-uw/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.3 2000/05/19 03:58:57 jlam Exp $
-
---- src/imapd/imapd.8c.orig	Mon Oct 12 22:31:21 1998
-+++ src/imapd/imapd.8c	Tue May  2 15:41:45 2000
-@@ -3,7 +3,7 @@
- .SH NAME
- IMAPd \- Internet Message Access Protocol server
- .SH SYNOPSIS
--.B /usr/etc/imapd
-+.B @PREFIX@/libexec/imapd
- .SH DESCRIPTION
- .I imapd
- is a server which supports the
-@@ -26,7 +26,7 @@
- by many Unix-based clients.  To do this, the
- .I imapd
- binary must have a link to
--.I /etc/rimapd
-+.I @PREFIX@/sbin/rimapd
- since this is where this software expects it to be located.
- .SH "SEE ALSO"
- rsh(1C) ipopd(8C)
diff --git a/mail/imap-uw/patches/patch-ag b/mail/imap-uw/patches/patch-ag
deleted file mode 100644
index 74de46b0f14..00000000000
--- a/mail/imap-uw/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 11:09:38 agc Exp $
-
---- src/ipopd/ipopd.8c.orig	Sun Jul 19 11:09:53 1998
-+++ src/ipopd/ipopd.8c	Sun Jul 19 11:10:15 1998
-@@ -3,9 +3,9 @@
- .SH NAME
- IPOPd \- Post Office Protocol server
- .SH SYNOPSIS
--.B /usr/etc/ipop2d
-+.B @PREFIX@/libexec/ipop2d
- .PP
--.B /usr/etc/ipop3d
-+.B @PREFIX@/libexec/ipop3d
- .SH DESCRIPTION
- .I IPOP2d
- and
diff --git a/mail/imap-uw/patches/patch-ah b/mail/imap-uw/patches/patch-ah
index 169ba0808eb..b171f184e17 100644
--- a/mail/imap-uw/patches/patch-ah
+++ b/mail/imap-uw/patches/patch-ah
@@ -1,10 +1,15 @@
-$NetBSD: patch-ah,v 1.4 2000/11/09 03:35:34 hubertf Exp $
+$NetBSD: patch-ah,v 1.5 2001/02/08 19:11:37 jlam Exp $
 
---- src/osdep/unix/env_unix.c.orig	Wed Oct 25 01:40:48 2000
+--- src/osdep/unix/env_unix.c.orig	Thu Dec 21 01:12:13 2000
 +++ src/osdep/unix/env_unix.c
-@@ -1211,7 +1211,7 @@
+@@ -1273,8 +1273,12 @@
+   DRIVER *d;
    FILE *f = fopen (file,"r");
  				/* no file or ill-advised usage */
++  /*
++   * pkgsrc: don't require the "I accept the risk for..." outdated string at
++   * the top of /etc/c-client.cf.
++   */
    if (!(f && (s = fgets (tmp,MAILTMPLEN,f)) && (t = strchr (s,'\n')) &&
 -	(flag ||
 +	(1 ||
diff --git a/mail/imap-uw/patches/patch-ai b/mail/imap-uw/patches/patch-ai
index f510757351d..d065d733b9f 100644
--- a/mail/imap-uw/patches/patch-ai
+++ b/mail/imap-uw/patches/patch-ai
@@ -1,14 +1,14 @@
-$NetBSD: patch-ai,v 1.2 2000/11/09 03:35:34 hubertf Exp $
+$NetBSD: patch-ai,v 1.3 2001/02/08 19:11:38 jlam Exp $
 
---- src/mtest/mtest.c.orig	Wed Oct 25 01:16:33 2000
+--- src/mtest/mtest.c.orig	Tue Oct 24 19:16:33 2000
 +++ src/mtest/mtest.c
 @@ -36,6 +36,11 @@
  
  /* Excellent reasons to hate ifdefs, and why my real code never uses them */
  
-+#ifdef __NetBSD__
-+#undef unix
-+#define unix 1
++#if defined(__NetBSD__)		/* NetBSD no longer defines unix. */
++# undef unix
++# define unix 1
 +#endif
 +
  #ifndef unix
diff --git a/mail/imap-uw/patches/patch-aj b/mail/imap-uw/patches/patch-aj
index 2498616b927..558647f9916 100644
--- a/mail/imap-uw/patches/patch-aj
+++ b/mail/imap-uw/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.3 2000/12/17 18:25:44 jlam Exp $
+$NetBSD: patch-aj,v 1.4 2001/02/08 19:11:38 jlam Exp $
 
---- src/osdep/unix/Makefile.ssl.orig	Sat Oct 28 15:09:55 2000
+--- src/osdep/unix/Makefile.ssl.orig	Thu Feb  1 17:30:24 2001
 +++ src/osdep/unix/Makefile.ssl
 @@ -20,8 +20,8 @@
  
@@ -8,7 +8,7 @@ $NetBSD: patch-aj,v 1.3 2000/12/17 18:25:44 jlam Exp $
  
 -SSLDIR=/usr/local/ssl
 -SSLCERTS=$(SSLDIR)/certs
-+SSLDIR=${SSLBASE}
++#SSLDIR=/usr/local/ssl
 +#SSLCERTS=$(SSLDIR)/certs
  SSLINCLUDE=$(SSLDIR)/include
  SSLLIB=$(SSLDIR)/lib