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.

14 files changed, 161 insertions, 176 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 33d027f9cf4..05d5dad5deb 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2001/01/29 11:34:30 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2001/02/08 19:11:36 jlam Exp $
 
-DISTNAME=       imap-2000a
-PKGNAME=        imap-uw-2000a
+DISTNAME=       imap-2000c
+PKGNAME=        imap-uw-2000c
 CATEGORIES=     mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
@@ -10,10 +10,13 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.washington.edu/imap/
 
 USE_LIBTOOL=	# defined
+USE_SSL=	# defined
+NO_CONFIGURE=	# defined
 
 INST_PROG=	${LIBTOOL} ${INSTALL_PROGRAM}
 INST_LIB=	${LIBTOOL} ${INSTALL_DATA}
 INC_DIR=	${PREFIX}/include/c-client
+LIB_DIR=	${PREFIX}/lib
 DOC_DIR=	${PREFIX}/share/doc/imap-uw
 
 .include "../../mk/bsd.prefs.mk"
@@ -24,41 +27,86 @@ ALL_TARGET=	gso
 ALL_TARGET=	neb
 .endif
 
-NO_CONFIGURE=	# defined
+# CCLIENT_MBOX_FMT is the default format used by c-client programs for new
+# mailbox creation.  Check the UW IMAP documentation for more details
+# regarding the pros and cons of the various mailbox formats.
+#
+# Possible values: mbox, mbx, mh, mmdf, mtx, mx, news, phile, tenex, unix
+# Default: unix
+#
+CCLIENT_MBOX_FMT?=	unix
 
-USE_SSL=	# defined
-MAKE_ENV+=	SSLBASE="${SSLBASE}"
+CCLIENT_INCS=	c-client.h env.h env_unix.h flstring.h fs.h ftl.h	\
+		imap4r1.h linkage.c linkage.h mail.h misc.h netmsg.h	\
+		newsrc.h nl.h nntp.h osdep.h pop3.h rfc822.h smtp.h	\
+		tcp.h utf8.h
+CCLIENT_LIB=	libc-client.la
+CCLIENT_LIBS=	libc-client.a libc-client.la libc-client.so		\
+		libc-client.so.${CCLIENT_MAJOR}.${CCLIENT_MINOR}	\
+		libc-client.so.${CCLIENT_MAJOR}
+CCLIENT_MAJOR=	4
+CCLIENT_MINOR=	1
+CCLIENT_MFILES=	src/imapd/Makefile					\
+		src/ipopd/Makefile					\
+		src/mtest/Makefile					\
+		src/osdep/unix/Makefile
+
+PLIST_SUBST+=	CCLIENT_MAJOR="${CCLIENT_MAJOR}"
+PLIST_SUBST+=	CCLIENT_MINOR="${CCLIENT_MINOR}"
+
+MANFILES=	src/imapd/imapd.8c src/ipopd/ipopd.8c
+
+MAKE_ENV+=	SSLDIR="${SSLBASE}"
 MAKE_ENV+=	SSLCERTS="${SSLCERTS}"
+MAKE_ENV+=	CCLIENT_MAJOR="${CCLIENT_MAJOR}"
+MAKE_ENV+=	CCLIENT_MINOR="${CCLIENT_MINOR}"
+MAKE_ENV+=	CREATEPROTO=${IMAPUW_MBOX_FORMAT}proto
+
 ALL_TARGET+=	CC="${LIBTOOL} ${CC}"
 ALL_TARGET+=	EXTRACFLAGS="${CFLAGS}"
 ALL_TARGET+=	SPECIALAUTHENTICATORS="ssl"
 
-post-build:
-	${SED} -e 's|@PREFIX@|${PREFIX}|g' \
-		< ${WRKSRC}/src/imapd/imapd.8c > ${WRKDIR}/imapd.8
-	${SED} -e 's|@PREFIX@|${PREFIX}|g' \
-		< ${WRKSRC}/src/ipopd/ipopd.8c > ${WRKDIR}/ipopd.8
+post-extract:
+	#
+	# Change references to the built library to ${CCLIENT_LIB}.
+	#
+	cd ${WRKSRC}; for file in ${CCLIENT_MFILES}; do			\
+		${MV} -f $${file} $${file}.orig;			\
+		${SED}	-e "s|c-client.a|${CCLIENT_LIB}|g"		\
+			$${file}.orig > $${file};			\
+		${RM} -f $${file}.orig;					\
+	done
+	#
+	# Correct hardcoded paths in man pages.
+	#
+	cd ${WRKSRC}; for file in ${MANFILES}; do			\
+		f=`echo $${file} | ${SED} "s|\(.*\)\.\([0-9]\).*|\1.\2|"`; \
+		${SED}	-e "s|/usr/etc/imapd|${PREFIX}/libexec/imapd|g"	\
+			-e "s|/etc/rimapd|${PREFIX}/sbin/rimapd|g"	\
+			-e "s|/usr/etc/ipop2d|${PREFIX}/libexec/ipop2d|g" \
+			-e "s|/usr/etc/ipop3d|${PREFIX}/libexec/ipop3d|g" \
+			$${file} > $${f};				\
+	done
 
 do-install:
-	${INST_LIB} ${WRKSRC}/c-client/libimapuw.la ${PREFIX}/lib
+	${INSTALL_DATA_DIR} ${INC_DIR}
+	cd ${WRKSRC}/c-client; ${INSTALL_DATA} ${CCLIENT_INCS} ${INC_DIR}
+	${INST_LIB} ${WRKSRC}/c-client/${CCLIENT_LIB} ${LIB_DIR}
+	cd ${LIB_DIR}; for file in ${CCLIENT_LIBS}; do		\
+		f=`echo $${file} | ${SED} "s|libc-client|libimapuw|g"`;	\
+		[ -f $${file} ] && ${LN} -sf $${file} $${f};		\
+	done
 	${INST_PROG} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec
 	${INST_PROG} ${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec
 	${INST_PROG} ${WRKSRC}/ipopd/ipop3d ${PREFIX}/libexec
 	${INST_PROG} ${WRKSRC}/mtest/mtest ${PREFIX}/sbin
-	${LN} -sf ${PREFIX}/libexec/imapd ${PREFIX}/sbin/rimapd
-	${INSTALL_MAN} ${WRKDIR}/imapd.8 ${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKDIR}/ipopd.8 ${PREFIX}/man/man8
+	${LN} -sf ../../libexec/imapd ${PREFIX}/sbin/rimapd
+	${INSTALL_MAN} ${WRKSRC}/src/imapd/imapd.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/src/ipopd/ipopd.8 ${PREFIX}/man/man8
 	${LN} -sf ipopd.8 ${PREFIX}/man/man8/ipop2d.8
 	${LN} -sf ipopd.8 ${PREFIX}/man/man8/ipop3d.8
-	${INSTALL_DATA_DIR} ${DOC_DIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${DOC_DIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/RELNOTES ${DOC_DIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOC_DIR}
-	${INSTALL_DATA_DIR} ${INC_DIR}
-	for i in linkage.h mail.h rfc822.h misc.h imap4r1.h osdep.h smtp.h \
-		nntp.h env_unix.h fs.h ftl.h nl.h  tcp.h env.h linkage.c; \
-	do \
-		${INSTALL_DATA} ${WRKSRC}/c-client/$$i ${INC_DIR}; \
-	done
+	${CP} -R ${WRKSRC}/docs ${DOC_DIR}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOC_DIR}
+	${CHMOD} -R a=rX ${DOC_DIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/imap-uw/files/md5 b/mail/imap-uw/files/md5
index c3f0f5d4457..f895cda1fcf 100644
--- a/mail/imap-uw/files/md5
+++ b/mail/imap-uw/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.9 2000/12/13 21:26:54 tron Exp $
+$NetBSD: md5,v 1.10 2001/02/08 19:11:36 jlam Exp $
 
-MD5 (imap-2000a.tar.Z) = d642c114b55ffe2e172b8e1bef6a1a52
+MD5 (imap-2000c.tar.Z) = 90bdc0670812234a0589286798575980
diff --git a/mail/imap-uw/files/patch-sum b/mail/imap-uw/files/patch-sum
index 64a8bb9de9b..20814c2915b 100644
--- a/mail/imap-uw/files/patch-sum
+++ b/mail/imap-uw/files/patch-sum
@@ -1,12 +1,6 @@
-$NetBSD: patch-sum,v 1.11 2000/12/17 18:25:44 jlam Exp $
+$NetBSD: patch-sum,v 1.12 2001/02/08 19:11:36 jlam Exp $
 
-MD5 (patch-aa) = 751122d855e826ecb44a0e9892250212
-MD5 (patch-ab) = bb937534f987fe7a8a365c1ffcd8760d
-MD5 (patch-ac) = b105631b853f128cbae3e00a72bfbf78
-MD5 (patch-ad) = 6b10bb3e3475a2bad35c4f704b10f6a4
-MD5 (patch-ae) = 4520592ffac3f95511bc730f684fa3bb
-MD5 (patch-af) = 3301d969c79118ae742f824aa9d90812
-MD5 (patch-ag) = 0da043e9e17ea708ee15b71d4747ea93
-MD5 (patch-ah) = 0d0d8a769e951e4422163d0912d906a9
-MD5 (patch-ai) = 4757f3135f2fb6112419fadc44201e9f
-MD5 (patch-aj) = e3383e25f017220c5efcd4fdb2994a73
+MD5 (patch-ae) = 83a03c70c5024e31f64384daecaf0808
+MD5 (patch-ah) = 9af89542708cb3bb41c3edd5e73a112c
+MD5 (patch-ai) = a5a6e8903e6d2f29e291644b31b35484
+MD5 (patch-aj) = fc96c2926114c5a1d62460a599df5bdf
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
diff --git a/mail/imap-uw/pkg/PLIST b/mail/imap-uw/pkg/PLIST
index 35260586269..5aca1ddf379 100644
--- a/mail/imap-uw/pkg/PLIST
+++ b/mail/imap-uw/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.9 2001/01/04 15:10:48 agc Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/02/08 19:11:38 jlam Exp $
+include/c-client/c-client.h
 include/c-client/env.h
 include/c-client/env_unix.h
+include/c-client/flstring.h
 include/c-client/fs.h
 include/c-client/ftl.h
 include/c-client/imap4r1.h
@@ -8,17 +10,26 @@ include/c-client/linkage.c
 include/c-client/linkage.h
 include/c-client/mail.h
 include/c-client/misc.h
+include/c-client/netmsg.h
+include/c-client/newsrc.h
 include/c-client/nl.h
 include/c-client/nntp.h
 include/c-client/osdep.h
+include/c-client/pop3.h
 include/c-client/rfc822.h
 include/c-client/smtp.h
 include/c-client/tcp.h
+include/c-client/utf8.h
+lib/libc-client.a
+lib/libc-client.la
+lib/libc-client.so
+lib/libc-client.so.${CCLIENT_MAJOR}
+lib/libc-client.so.${CCLIENT_MAJOR}.${CCLIENT_MINOR}
 lib/libimapuw.a
 lib/libimapuw.la
 lib/libimapuw.so
-lib/libimapuw.so.4
-lib/libimapuw.so.4.1
+lib/libimapuw.so.${CCLIENT_MAJOR}
+lib/libimapuw.so.${CCLIENT_MAJOR}.${CCLIENT_MINOR}
 libexec/imapd
 libexec/ipop2d
 libexec/ipop3d
@@ -28,8 +39,12 @@ man/man8/ipop3d.8
 man/man8/ipopd.8
 sbin/mtest
 sbin/rimapd
+share/doc/imap-uw/BUILD
+share/doc/imap-uw/CONFIG
 share/doc/imap-uw/FAQ
 share/doc/imap-uw/RELNOTES
+share/doc/imap-uw/SSLBUILD
+share/doc/imap-uw/Y2K
 share/doc/imap-uw/bugs.txt
 share/doc/imap-uw/calendar.txt
 share/doc/imap-uw/drivers.txt
@@ -39,5 +54,28 @@ share/doc/imap-uw/internal.txt
 share/doc/imap-uw/locking.txt
 share/doc/imap-uw/md5.txt
 share/doc/imap-uw/naming.txt
+share/doc/imap-uw/rfc/rfc1731.txt
+share/doc/imap-uw/rfc/rfc1732.txt
+share/doc/imap-uw/rfc/rfc1733.txt
+share/doc/imap-uw/rfc/rfc2060.txt
+share/doc/imap-uw/rfc/rfc2061.txt
+share/doc/imap-uw/rfc/rfc2062.txt
+share/doc/imap-uw/rfc/rfc2086.txt
+share/doc/imap-uw/rfc/rfc2087.txt
+share/doc/imap-uw/rfc/rfc2088.txt
+share/doc/imap-uw/rfc/rfc2177.txt
+share/doc/imap-uw/rfc/rfc2180.txt
+share/doc/imap-uw/rfc/rfc2192.txt
+share/doc/imap-uw/rfc/rfc2193.txt
+share/doc/imap-uw/rfc/rfc2195.txt
+share/doc/imap-uw/rfc/rfc2221.txt
+share/doc/imap-uw/rfc/rfc2222.txt
+share/doc/imap-uw/rfc/rfc2234.txt
+share/doc/imap-uw/rfc/rfc2245.txt
+share/doc/imap-uw/rfc/rfc2342.txt
+share/doc/imap-uw/rfc/rfc2359.txt
+share/doc/imap-uw/rfc/rfc2595.txt
+share/doc/imap-uw/rfc/rfc2683.txt
+@dirrm share/doc/imap-uw/rfc
 @dirrm share/doc/imap-uw
 @dirrm include/c-client