Update c-client to that found in UW's imap-2000.

Update imap-uw to the latest version (imap-2000).
Update pine4 to the latest version (pine-4.31).
Despite the fact that the new releases of imap-uw and pine are
intended to improve security, the security warnings on the pine
and imap-uw ports have been left intact until they have proven
themselves.

21 files changed, 203 insertions, 376 deletions

diff --git a/mail/cclient/Makefile b/mail/cclient/Makefile
index b3512518a3eb..965547e37569 100644
--- a/mail/cclient/Makefile
+++ b/mail/cclient/Makefile
@@ -6,28 +6,24 @@
 #
 
 PORTNAME=	cclient
-PORTVERSION=	4.7c
+PORTVERSION=	4.8
 CATEGORIES=	mail devel
-MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/old/ \
-		ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/imap/old/ \
-		http://mirror.nucba.ac.jp/mirror/imap/old/
-DISTNAME=	imap-${PORTVERSION}2
+MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
+		ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/imap/%SUBDIR%/ \
+		http://mirror.nucba.ac.jp/mirror/%SUBDIR%/
+MASTER_SITE_SUBDIR= . old
+DISTNAME=	imap-2000a
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	kbyanc@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/imap-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 INSTALLS_SHLIB=	yes
-PAMAUTH?=	yes
-.if ${PAMAUTH} != "no"
-ALL_TARGET=	bfp
-.else
 ALL_TARGET=	bsf
-.endif
 
 SHLIBBASE=	c-client4
-SHLIBMAJ=	7
+SHLIBMAJ=	8
 SHLIBNAME=	lib${SHLIBBASE}.so.${SHLIBMAJ}
 MAKE_ENV=	SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
 PLIST_SUB=	SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
@@ -40,14 +36,10 @@ SHLIBNAME=	lib${SHLIBBASE}.so.${SHLIBMAJ}.0
 
 post-configure:
 	@${ECHO_MSG} ">> The c-client shared library will be named ${SHLIBNAME}"
-.if ${PAMAUTH} != "no"
-	@${ECHO_MSG} ">> Building with PAM support"
-	@${ECHO_MSG} ">> You can disable PAM support building with \"PAMAUTH=no\""
-.endif
 
 HEADERS=	dummy.h env.h env_unix.h fdstring.h flstring.h fs.h ftl.h \
 		imap4r1.h linkage.c linkage.h mail.h misc.h nl.h nntp.h \
-		osdep.h pop3.h rfc822.h smtp.h tcp.h utf8.h
+		osdep.h pop3.h rfc822.h smtp.h tcp.h utf8.h c-client.h
 
 do-install:
 	${MKDIR} ${PREFIX}/include/c-client
@@ -61,8 +53,5 @@ do-install:
 		${PREFIX}/lib/lib${SHLIBBASE}.a
 
 post-install:
-.if ${PAMAUTH} != "no"
-	@${CAT} ${FILESDIR}/MESSAGE.PAM
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/cclient/distinfo b/mail/cclient/distinfo
index 50ca6bd7a3f1..149c24093d91 100644
--- a/mail/cclient/distinfo
+++ b/mail/cclient/distinfo
@@ -1,2 +1 @@
-MD5 (imap-4.7c2.tar.Z) = 1a27c7684094a8c94baf294552467060
-MD5 (pine-4.20-maildir_3.patch) = 2f6cd0ed750321d074cc53171d308291
+MD5 (imap-2000a.tar.Z) = d642c114b55ffe2e172b8e1bef6a1a52
diff --git a/mail/cclient/files/MESSAGE.PAM b/mail/cclient/files/MESSAGE.PAM
deleted file mode 100644
index a5baa63b4f8d..000000000000
--- a/mail/cclient/files/MESSAGE.PAM
+++ /dev/null
@@ -1,9 +0,0 @@
-= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
-PAM authentication support is now compiled in by default; you may need to add
-the following lines to /etc/pam.conf:
-
-imap	auth	required	pam_unix.so			try_first_pass
-imap	account	required	pam_unix.so			try_first_pass
-pop	auth	required	pam_unix.so			try_first_pass
-pop	account	required	pam_unix.so			try_first_pass
-= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
diff --git a/mail/cclient/files/patch-ab b/mail/cclient/files/patch-ab
index 51802e3c8345..bb9510bbe527 100644
--- a/mail/cclient/files/patch-ab
+++ b/mail/cclient/files/patch-ab
@@ -1,6 +1,6 @@
---- src/osdep/unix/Makefile.orig	Mon Jul  3 22:32:37 2000
-+++ src/osdep/unix/Makefile	Mon Jul  3 22:33:30 2000
-@@ -86,7 +86,7 @@
+--- src/osdep/unix/Makefile.orig	Tue Oct 31 13:55:01 2000
++++ src/osdep/unix/Makefile	Sun Dec 17 23:19:06 2000
+@@ -74,7 +74,7 @@
  # Commands possibly overriden by the individual port
  
  ARRC=ar rc
@@ -9,17 +9,17 @@
  LN=ln -s
  RANLIB=ranlib
  
-@@ -104,7 +104,7 @@
+@@ -92,7 +92,7 @@
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
   unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
 -CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
 +CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
+ 
+ CAT=cat
  MAKE=make
- MV=mv
- RM=rm -rf
-@@ -119,6 +119,10 @@
-  PASSWDTYPE=$(PASSWDTYPE) SPECIALAUTHENTICATORS="$(SPECIALAUTHENTICATORS)"
+@@ -109,6 +109,10 @@
+  PASSWDTYPE=$(PASSWDTYPE) SPECIALAUTHENTICATORS='$(SPECIALAUTHENTICATORS)'
  BUILD=$(MAKE) build $(BUILDOPTIONS)
  
 +# Need this for the shared library rule to work correctly
@@ -29,33 +29,25 @@
  # Here if no make argument established
  
  missing: osdep.h
-@@ -178,6 +182,15 @@
- 	 BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst= -DNFSKLUDGE" \
- 	 RANLIB=true ARRC="ar -rc"
- 
-+bfp:	# FreeBSD Pluggable Authentication Modules
-+	$(BUILD) `cat EXTRASPECIALS` OS=bsi SIGTYPE=psx CHECKPW=pam \
-+	 SPOOLDIR=/var \
-+	 ACTIVEFILE=/usr/local/news/lib/active \
-+	 RSHPATH=/usr/bin/rsh \
-+	 LOCKPGM=$(PREFIX)/libexec/mlock \
-+	 BASECFLAGS="-DNFSKLUDGE" \
-+	 BASELDFLAGS="-lpam -lcrypt"
-+
- bs3:	# BSD/i386 3.0 or higher
- 	$(BUILD) `cat EXTRASPECIALS` OS=bsi CHECKPW=bsi LOGINPW=bsi \
- 	 SPOOLDIR=/var NEWSSPOOL=/var/news/spool \
-@@ -194,7 +207,8 @@
+@@ -189,13 +193,14 @@
+ 	 BASECFLAGS="-g -Dconst="
+ 
+ bsf:	# FreeBSD
+-	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
++	$(BUILD) `$(CAT) SPECIALS` OS=bsi CHECKPW=pam \
+ 	 SIGTYPE=psx CRXTYPE=nfs \
  	 SPOOLDIR=/var \
  	 ACTIVEFILE=/usr/local/news/lib/active \
  	 RSHPATH=/usr/bin/rsh \
--	 BASECFLAGS="-g -O -pipe -DNFSKLUDGE" \
+-	 BASECFLAGS="-g -O -pipe" \
+-	 BASELDFLAGS="-lcrypt"
 +	 LOCKPGM=$(PREFIX)/libexec/mlock \
 +	 BASECFLAGS="-DNFSKLUDGE" \
- 	 BASELDFLAGS="-lcrypt"
++	 BASELDFLAGS="-lpam -lcrypt"
  
  bsi:	# BSD/i386
-@@ -627,19 +641,31 @@
+ 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
+@@ -702,19 +707,31 @@
  
  # Build it!
  
@@ -67,7 +59,7 @@
  
  $(ARCHIVE): $(BINARIES)
  	sh -c '$(RM) $(ARCHIVE) || true'
- 	@cat ARCHIVE
+ 	@$(CAT) ARCHIVE
  	@$(SH) ARCHIVE
  
 +$(SHLIBNAME): $(SOFILES)
@@ -78,18 +70,18 @@
 +.endif
 +	ln -s $(SHLIBNAME) lib$(SHLIBBASE).so
 +
-+.c.so:	osdep.h
++.c.so: osdep.h
 +	$(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
 +
  # Cleanup
  
  clean:
- 	sh -c '$(RM) auths.c flockbsd.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
-+	$(RM) *.so $(SHLIBNAME)
+ 	sh -c '$(RM) auths.c crexcl.c flockbsd.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
++	sh -c '$(RM) *.so $(SHLIBNAME)'
  
  
  # Dependencies
-@@ -673,7 +699,7 @@
+@@ -748,7 +765,7 @@
  
  # OS-dependent
  
@@ -97,17 +89,18 @@
 +OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
  	osdep.h env_unix.h tcp_unix.h \
  	osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \
- 	auths.c flock.c flockbsd.c flcksafe.c fsync.c gethstid.c \
-@@ -685,7 +711,12 @@
+ 	auths.c crexcl.c flock.c flockbsd.c flcksafe.c fsync.c gethstid.c \
+@@ -760,7 +777,12 @@
  	write.c \
  	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
  	OSCFLAGS
+-	$(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c
 +
 +osdep.o: $(OSDEPS)
- 	$(CC) $(CFLAGS) `cat OSCFLAGS` -c osdep.c
++	$(CC) $(CFLAGS) `cat OSCFLAGS` -c osdep.c
 +
 +osdep.so: $(OSDEPS)
 +	$(CC) -fpic -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@
  
  osdep.c: osdepbas.c osdepckp.c osdeplog.c
- 	cat osdepbas.c osdepckp.c osdeplog.c > osdep.c
+ 	$(CAT) osdepbas.c osdepckp.c osdeplog.c > osdep.c
diff --git a/mail/cclient/files/patch-ac b/mail/cclient/files/patch-ac
index 464a98cd60ec..b748b8679ca8 100644
--- a/mail/cclient/files/patch-ac
+++ b/mail/cclient/files/patch-ac
@@ -1,19 +1,11 @@
---- Makefile.orig	Mon Nov 15 22:20:34 1999
-+++ Makefile	Sun Dec 19 14:52:58 1999
-@@ -49,6 +49,7 @@
- # art	AIX 2.2.1 for RT
- # asv	Altos SVR4
- # aux	A/UX
-+# bfp	FreeBSD with Pluggable Authentication Modules (PAM)
- # bs3	BSD/i386 3.0 and higher
- # bsd	generic BSD 4.3 (as in ancient 1980s version)
- # bsf	FreeBSD
-@@ -293,7 +294,7 @@
+--- Makefile.orig	Sun Dec 17 23:09:44 2000
++++ Makefile	Sun Dec 17 23:08:58 2000
+@@ -314,7 +314,7 @@
  
- # Note on SCO you may have to set LN to "ln".
+ # Make the IMAP Toolkit
  
--a32 a41 aix bs3 bsf bsi bso d-g d54 do4 drs epx gas gh9 ghp gs5 gso gsu gul hpp hpx lnp lyn mct mnt neb nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx sol sos uw2: an
-+a32 a41 aix bfp bs3 bsf bsi bso d-g d54 do4 drs epx gas gh9 ghp gs5 gso gsu gul hpp hpx lnp lyn mct mnt neb nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx sol sos uw2: an
- 	$(BUILD) OS=$@
+-all:	c-client rebuild bundled
++all:	c-client rebuild
  
- # If you use sv4, you may find that it works to move it to use the an process.
+ c-client:
+ 	@echo Not processed yet.  In a first-time build, you must specify
diff --git a/mail/cclient/files/patch-ad b/mail/cclient/files/patch-ad
deleted file mode 100644
index 5e64e3cffb45..000000000000
--- a/mail/cclient/files/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/osdep/unix/mx.c.orig	Tue Jul 18 22:11:50 2000
-+++ src/osdep/unix/mx.c	Tue Jul 18 22:13:55 2000
-@@ -882,6 +882,7 @@
-     if (f&fANSWERED) elt->answered = T;
-     if (f&fDRAFT) elt->draft = T;
-     elt->user_flags |= uf;
-+    set_mbx_protections (mailbox,tmp);
-     mx_unlockindex (astream);	/* unlock index */
-   }
-   else {
diff --git a/mail/cclient/pkg-plist b/mail/cclient/pkg-plist
index 78d81316f7e6..bbea227f080b 100644
--- a/mail/cclient/pkg-plist
+++ b/mail/cclient/pkg-plist
@@ -1,3 +1,4 @@
+include/c-client/c-client.h
 include/c-client/dummy.h
 include/c-client/env.h
 include/c-client/env_unix.h
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 03f5cd1c38f1..86883254299c 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -6,30 +6,25 @@
 #
 
 PORTNAME=	imap-uw
-PORTVERSION=	4.7c
+PORTVERSION=	4.8
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/mail/%SUBDIR%/ \
 		http://mirror.nucba.ac.jp/mirror/imap/%SUBDIR%/ \
 		ftp://ftp.uni-halle.de/pub/mail/pine/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
-DISTNAME=	imap-${PORTVERSION}
+DISTNAME=	imap-2000a
 EXTRACT_SUFX=	.tar.Z
-DISTFILES=	${DISTNAME}2${EXTRACT_SUFX} \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		imap-utils${EXTRACT_SUFX}
+ALL_TARGET=	bsf
 
-MAINTAINER=	imap-uw@freebsd.ady.ro
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	c-client4.7:${PORTSDIR}/mail/cclient
+LIB_DEPENDS=	c-client4.8:${PORTSDIR}/mail/cclient
 
 Y2K=		http://www.washington.edu/imap/IMAP-FAQs/faqs.xml#general1
 
-PAMAUTH?=	yes
-.if ${PAMAUTH} != "no"
-ALL_TARGET=	bfp
-.else
-ALL_TARGET=	bsf
-.endif
 MAN8=		ipopd.8 imapd.8
 
 .include <bsd.port.pre.mk>
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 13975bd017ca..93141a65f67b 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,2 +1,2 @@
-MD5 (imap-4.7c2.tar.Z) = 1a27c7684094a8c94baf294552467060
-MD5 (imap-utils.tar.Z) = 090ae9906ed1993d55ba88bb8b08a8f7
+MD5 (imap-2000a.tar.Z) = d642c114b55ffe2e172b8e1bef6a1a52
+MD5 (imap-utils.tar.Z) = 24df2e1530eba56407f1c035acb60bb6
diff --git a/mail/imap-uw/files/patch-ab b/mail/imap-uw/files/patch-ab
index 528cd9025a23..44a4727a76be 100644
--- a/mail/imap-uw/files/patch-ab
+++ b/mail/imap-uw/files/patch-ab
@@ -1,6 +1,6 @@
---- src/osdep/unix/Makefile.orig	Tue Nov 16 18:05:48 1999
-+++ src/osdep/unix/Makefile	Fri Jul  7 00:38:22 2000
-@@ -86,7 +86,7 @@
+--- src/osdep/unix/Makefile.orig	Tue Oct 31 13:55:01 2000
++++ src/osdep/unix/Makefile	Sun Dec 17 23:39:05 2000
+@@ -74,7 +74,7 @@
  # Commands possibly overriden by the individual port
  
  ARRC=ar rc
@@ -9,17 +9,17 @@
  LN=ln -s
  RANLIB=ranlib
  
-@@ -104,7 +104,7 @@
+@@ -92,7 +92,7 @@
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
   unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
 -CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
 +CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
+ 
+ CAT=cat
  MAKE=make
- MV=mv
- RM=rm -rf
-@@ -178,6 +178,15 @@
- 	 BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst= -DNFSKLUDGE" \
+@@ -175,6 +175,15 @@
+ 	 BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst=" \
  	 RANLIB=true ARRC="ar -rc"
  
 +bfp:	# FreeBSD Pluggable Authentication Modules
@@ -32,24 +32,28 @@
 +	 BASELDFLAGS="-lpam -lcrypt"
 +
  bs3:	# BSD/i386 3.0 or higher
- 	$(BUILD) `cat EXTRASPECIALS` OS=bsi CHECKPW=bsi LOGINPW=bsi \
- 	 SPOOLDIR=/var NEWSSPOOL=/var/news/spool \
-@@ -194,7 +203,8 @@
+ 	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
+ 	 CHECKPW=bsi LOGINPW=bsi CRXTYPE=nfs \
+@@ -190,12 +199,13 @@
+ 
+ bsf:	# FreeBSD
+ 	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
+-	 SIGTYPE=psx CRXTYPE=nfs \
++	 SIGTYPE=psx CRXTYPE=nfs CHECKPW=pam \
  	 SPOOLDIR=/var \
  	 ACTIVEFILE=/usr/local/news/lib/active \
  	 RSHPATH=/usr/bin/rsh \
--	 BASECFLAGS="-g -O -pipe -DNFSKLUDGE" \
+-	 BASECFLAGS="-g -O -pipe" \
+-	 BASELDFLAGS="-lcrypt"
 +	 LOCKPGM=$(PREFIX)/libexec/mlock \
 +	 BASECFLAGS="-DNFSKLUDGE" \
- 	 BASELDFLAGS="-lcrypt"
++	 BASELDFLAGS="-lpam -lcrypt"
  
  bsi:	# BSD/i386
-@@ -627,9 +637,9 @@
- 
- # Build it!
+ 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
+@@ -704,7 +714,7 @@
  
--build:	clean once $(ARCHIVE)
-+build:	clean all
+ build:	clean once $(ARCHIVE)
  
 -all:	$(ARCHIVE)
 +all:	onceenv
diff --git a/mail/imap-uw/files/patch-ac b/mail/imap-uw/files/patch-ac
index 5d635ea2d0a1..acdbce7da49e 100644
--- a/mail/imap-uw/files/patch-ac
+++ b/mail/imap-uw/files/patch-ac
@@ -1,7 +1,7 @@
---- src/imapd/Makefile.orig	Wed Nov  3 23:50:56 1999
-+++ src/imapd/Makefile	Fri Jul  7 00:31:53 2000
-@@ -31,9 +31,9 @@
- # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+--- src/imapd/Makefile.orig	Tue Oct 24 16:54:32 2000
++++ src/imapd/Makefile	Sun Dec 17 23:44:22 2000
+@@ -18,30 +18,25 @@
+ # CPYRIGHT, included with this Distribution.
  
  
 -ALERT=/etc/imapd.alert
@@ -11,16 +11,15 @@
 +ANO=$(PREFIX)/etc/anonymous.newsgroups
  SHELL= /bin/sh
  
- #  The "Manage Mail" menu item of Netscape Messager puts up an error message
-@@ -54,21 +54,16 @@
+ 
  # Get local definitions from c-client directory
  
  C = ../c-client
 -CCLIENTLIB = $C/c-client.a
 +#CCLIENTLIB = $C/c-client.a
  CC = `cat $C/CCTYPE`
--CFLAGS = -I$C `cat $C/CFLAGS` $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \
-+CFLAGS = `cat $C/CFLAGS` $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \
+-CFLAGS = -I$C `cat $C/CFLAGS` -DANOFILE=\"$(ANO)\" \
++CFLAGS = `cat $C/CFLAGS` -DANOFILE=\"$(ANO)\" \
  	-DALERTFILE=\"$(ALERT)\" -DUSERALERTFILE=\"$(USERALERT)\"
 -LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
 +LDFLAGS = $(EXTRALDFLAGS) `cat $C/LDFLAGS`
diff --git a/mail/imap-uw/files/patch-ad b/mail/imap-uw/files/patch-ad
index d5c962c5dfae..8e996395b886 100644
--- a/mail/imap-uw/files/patch-ad
+++ b/mail/imap-uw/files/patch-ad
@@ -1,6 +1,6 @@
---- Makefile.orig	Mon Nov 15 12:20:34 1999
-+++ Makefile	Fri Jul  7 00:35:00 2000
-@@ -49,6 +49,7 @@
+--- Makefile.orig	Thu Nov  2 13:04:11 2000
++++ Makefile	Mon Dec 18 01:13:25 2000
+@@ -43,6 +43,7 @@
  # art	AIX 2.2.1 for RT
  # asv	Altos SVR4
  # aux	A/UX
@@ -8,7 +8,7 @@
  # bs3	BSD/i386 3.0 and higher
  # bsd	generic BSD 4.3 (as in ancient 1980s version)
  # bsf	FreeBSD
-@@ -244,12 +245,12 @@
+@@ -272,12 +273,12 @@
  #	gradually-increasing intervals, starting at 2800-2900, and becoming
  #	permanent at 48,300.
  
@@ -23,24 +23,18 @@
  
  
  # Special make flags (e.g. to override make environment variables)
-@@ -285,15 +286,15 @@
+@@ -314,13 +315,7 @@
  
- all:	c-client rebuild bundled
+ # Make the IMAP Toolkit
  
+-all:	c-client rebuild bundled
+-
 -c-client:
 -	@echo Not processed yet.  In a first-time build, you must specify
 -	@echo the system type so that the sources are properly processed.
 -	@false
-+#c-client:
-+#	@echo Not processed yet.  In a first-time build, you must specify
-+#	@echo the system type so that the sources are properly processed.
-+#	@false
- 
+-
++all:	rebuild bundled
  
  # Note on SCO you may have to set LN to "ln".
  
--a32 a41 aix bs3 bsf bsi bso d-g d54 do4 drs epx gas gh9 ghp gs5 gso gsu gul hpp hpx lnp lyn mct mnt neb nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx sol sos uw2: an
-+a32 a41 aix bfp bs3 bsf bsi bso d-g d54 do4 drs epx gas gh9 ghp gs5 gso gsu gul hpp hpx lnp lyn mct mnt neb nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx sol sos uw2: an
- 	$(BUILD) OS=$@
- 
- # If you use sv4, you may find that it works to move it to use the an process.
diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index 7629c042bd04..d8567e516dab 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -9,19 +9,18 @@
 # directory to the pine4-ssl port.
 
 PORTNAME?=	pine
-PORTVERSION?= 	4.21
-PORTREVISION?=	1
+PORTVERSION?= 	4.31
 CATEGORIES=	mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 DISTNAME?=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER?=	pine@freebsd.ady.ro
+MAINTAINER?=	ports@FreeBSD.org
 
 Y2K=		http://www.washington.edu/pine/QandA/sysadmins.html#Millenium
 
 MAN1=		pine.1 pico.1 pilot.1
 
-LIB_DEPENDS=	c-client4.7:${PORTSDIR}/mail/cclient
+LIB_DEPENDS=	c-client4.8:${PORTSDIR}/mail/cclient
 
 # Define "WITH_LDAP" to include ldap support.
 # If the ldap port is installed somewhere other than /usr/local, define
diff --git a/mail/pine4/distinfo b/mail/pine4/distinfo
index 2c71984e0b32..87a06ae3afca 100644
--- a/mail/pine4/distinfo
+++ b/mail/pine4/distinfo
@@ -1 +1 @@
-MD5 (pine4.21.tar.gz) = 9252a061387de806f8aa1ced885d41f6
+MD5 (pine4.31.tar.gz) = a0a99a399a9667268ad1a62afdfa164e
diff --git a/mail/pine4/files/patch-af b/mail/pine4/files/patch-af
index 18bd351bff7e..831a742da849 100644
--- a/mail/pine4/files/patch-af
+++ b/mail/pine4/files/patch-af
@@ -1,36 +1,32 @@
-*** imap/src/osdep/unix/Makefile.orig	Wed Jan 27 01:19:19 1999
---- imap/src/osdep/unix/Makefile	Tue Feb  9 21:32:44 1999
-***************
-*** 82,88 ****
-  # Commands possibly overriden by the individual port
-  
-  ARRC=ar rc
-! CC=cc
-  LN=ln -s
-  RANLIB=ranlib
-  
---- 82,88 ----
-  # Commands possibly overriden by the individual port
-  
-  ARRC=ar rc
-! #CC=cc
-  LN=ln -s
-  RANLIB=ranlib
-  
-***************
-*** 100,106 ****
-   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
-   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-   unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
-! CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
-  MAKE=make
-  MV=mv
-  RM=rm -rf
---- 100,106 ----
-   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
-   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-   unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
-! CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
-  MAKE=make
-  MV=mv
-  RM=rm -rf
+--- imap/src/osdep/unix/Makefile.orig	Tue Oct 31 13:56:45 2000
++++ imap/src/osdep/unix/Makefile	Mon Dec 18 01:59:06 2000
+@@ -74,7 +74,7 @@
+ # Commands possibly overriden by the individual port
+ 
+ ARRC=ar rc
+-CC=cc
++#CC=cc
+ LN=ln -s
+ RANLIB=ranlib
+ 
+@@ -92,7 +92,7 @@
+  dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
+  rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
+  unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
+-CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
++CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
+ 
+ CAT=cat
+ MAKE=make
+@@ -194,8 +194,9 @@
+ 	 SPOOLDIR=/var \
+ 	 ACTIVEFILE=/usr/local/news/lib/active \
+ 	 RSHPATH=/usr/bin/rsh \
+-	 BASECFLAGS="-g -O -pipe" \
+-	 BASELDFLAGS="-lcrypt"
++	 LOCKPGM=$(PREFIX)/libexec/mlock \
++	 BASECFLAGS="-DNFSKLUDGE" \
++	 BASELDFLAGS="-lpam -lcrypt"
+ 
+ bsi:	# BSD/i386
+ 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
diff --git a/mail/pine4/files/patch-al b/mail/pine4/files/patch-al
index e47b0ff84392..70f1eced6944 100644
--- a/mail/pine4/files/patch-al
+++ b/mail/pine4/files/patch-al
@@ -1,6 +1,6 @@
---- build.orig	Mon Nov 15 14:16:25 1999
-+++ build	Wed Jul  5 21:22:26 2000
-@@ -80,8 +80,9 @@
+--- build.orig	Wed Nov  8 12:31:25 2000
++++ build	Mon Dec 18 02:12:09 2000
+@@ -95,8 +95,9 @@
   pine   The Pine mailer. Once compiled this should work just fine on
          your system with no other files than this binary, and no
          modifications to your system. Optionally you may create two
@@ -12,8 +12,8 @@
   
   pico   The standalone editor similar to the Pine message composer.
          This is a very simple straight forward text editor.
-@@ -277,17 +278,17 @@
- 	  esac
+@@ -304,17 +305,17 @@
+ 	  echo "Including SSL functionality"
  	fi
  
 -        if [ -s c-client ] ; then rm -f c-client ; fi
@@ -23,9 +23,9 @@
 -        if [ -s imapd    ] ; then rm -f imapd    ; fi
 -        ln -s imap/imapd imapd
 -        echo "Making c-client library, mtest and imapd"
--        eval echo make "$makeargs" "$K1" "$K2" $ccltarg
+-        eval echo make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
 -        cd $PHOME/imap
--        eval make "$makeargs" "$K1" "$K2" $ccltarg
+-        eval make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
 -        echo ''
 +#        if [ -s c-client ] ; then rm -f c-client ; fi
 +#        ln -s imap/c-client c-client
@@ -34,14 +34,14 @@
 +#        if [ -s imapd    ] ; then rm -f imapd    ; fi
 +#        ln -s imap/imapd imapd
 +#        echo "Making c-client library, mtest and imapd"
-+#        eval echo make "$makeargs" "$K1" "$K2" $ccltarg
++#        eval echo make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
 +#        cd $PHOME/imap
-+#        eval make "$makeargs" "$K1" "$K2" $ccltarg
++#        eval make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
 +#        echo ''
  
          echo "Making Pico and Pilot"
          cd $PHOME/pico
-@@ -304,14 +305,14 @@
+@@ -331,14 +332,14 @@
          cd $PHOME/bin
          rm -f pine mtest imapd pico pilot
          if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
@@ -59,7 +59,7 @@
  	case $maketarg in
  	    mnt)    echo "Fixing stacksizes ..."
  		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
-@@ -321,15 +322,15 @@
+@@ -348,15 +349,15 @@
  
  
      clean) # This only sort of works 
diff --git a/mail/pine4/files/patch-as b/mail/pine4/files/patch-as
index 5bb66b9d8953..0a5cc4d1d2e2 100644
--- a/mail/pine4/files/patch-as
+++ b/mail/pine4/files/patch-as
@@ -1,22 +1,3 @@
-*** pine/init.c.orig	Tue Jan 26 21:57:56 1999
---- pine/init.c	Tue Feb  9 22:14:08 1999
-***************
-*** 326,332 ****
-  
-  /*----------------------------------------------------------------------
-  These are the variables that control a number of pine functions.  They
-! come out of the .pinerc and the /usr/local/lib/pine.conf files.  Some can
-  be set by the user while in Pine.  Eventually all the local ones should
-  be so and maybe the global ones too.
-  
---- 326,332 ----
-  
-  /*----------------------------------------------------------------------
-  These are the variables that control a number of pine functions.  They
-! come out of the .pinerc and the @@PREFIX@@/etc/pine.conf files.  Some can
-  be set by the user while in Pine.  Eventually all the local ones should
-  be so and maybe the global ones too.
-
 *** pico/edef.h.orig	Thu Apr 23 02:53:44 1998
 --- pico/edef.h	Tue Feb  9 22:14:08 1999
 ***************
diff --git a/mail/pine4/files/patch-at b/mail/pine4/files/patch-at
index 4a8564a88065..e7e64a79a9cc 100644
--- a/mail/pine4/files/patch-at
+++ b/mail/pine4/files/patch-at
@@ -1,101 +1,59 @@
-*** pine/pine.hlp.orig	Fri Feb  5 01:07:54 1999
---- pine/pine.hlp	Tue Feb  9 22:10:02 1999
-***************
-*** 455,463 ****
-  
-   executable     &lt;Unix search path&gt;/pine
-   persnl cfg     ~/.pinerc
-!  global cfg     /usr/local/lib/pine.conf
-!  fixed cfg      /usr/local/lib/pine.conf.fixed
-!  local help     /usr/local/lib/pine.info
-  
-   interrupted    ~/.pine-interrupted-mail
-   debug          ~/.pine-debugN
---- 455,463 ----
-  
-   executable     &lt;Unix search path&gt;/pine
-   persnl cfg     ~/.pinerc
-!  global cfg     @@PREFIX@@/etc/pine.conf
-!  fixed cfg      @@PREFIX@@/etc/pine.conf.fixed
-!  local help     @@PREFIX@@/etc/pine.info
-  
-   interrupted    ~/.pine-interrupted-mail
-   debug          ~/.pine-debugN
-***************
-*** 469,476 ****
-   postponed#     ~/mail/postponed-msgs
-   sentmail#      ~/mail/sent-mail
-   mailcap#       ~/.mailcap + /etc/mailcap
-!                            + /usr/etc/mailcap + /usr/local/etc/mailcap
-!  mimetypes#     ~/.mime.types + /etc/mime.types + /usr/local/lib/mime.types
-  
-   news-spool	varies across Unix flavors, e.g. /usr/spool/news or /var/news
-   active-news	varies across Unix flavors, e.g. /usr/lib/news/active
---- 469,476 ----
-   postponed#     ~/mail/postponed-msgs
-   sentmail#      ~/mail/sent-mail
-   mailcap#       ~/.mailcap + /etc/mailcap
-!                            + /usr/etc/mailcap + @@PREFIX@@/etc/mailcap
-!  mimetypes#     ~/.mime.types + /etc/mime.types + @@PREFIX@@/etc/mime.types
-  
-   news-spool	varies across Unix flavors, e.g. /usr/spool/news or /var/news
-   active-news	varies across Unix flavors, e.g. /usr/lib/news/active
-***************
-*** 856,864 ****
-  this link now to send a message to it:<BR>
-  <A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
-  <!--chtml endif-->
-! <!--chtml if [ -r /usr/local/lib/pine.info ]-->
-  <HR WIDTH="75%">Local Support Contacts:<P>
-! <!--#include file="/usr/local/lib/pine.info"-->
-  <HR WIDTH="75%">
-  <!--chtml endif-->
-  <P> 
---- 856,864 ----
-  this link now to send a message to it:<BR>
-  <A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
-  <!--chtml endif-->
-! <!--chtml if [ -r @@PREFIX@@/etc/pine.info ]-->
-  <HR WIDTH="75%">Local Support Contacts:<P>
-! <!--#include file="@@PREFIX@@/etc/pine.info"-->
-  <HR WIDTH="75%">
-  <!--chtml endif-->
-  <P> 
-***************
-*** 945,951 ****
-  <OL>
-    <LI> <A HREF="#intro">Introduction</A>
-    <LI> <A HREF="#pine_help">Pine Help</A>
-! <!--chtml if [ -r /usr/local/lib/pine.info ]-->
-    <LI> <A HREF="#local_support">Local Support Contacts</A>
-  <!--chtml endif-->
-    <LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
---- 945,951 ----
-  <OL>
-    <LI> <A HREF="#intro">Introduction</A>
-    <LI> <A HREF="#pine_help">Pine Help</A>
-! <!--chtml if [ -r @@PREFIX@@/etc/pine.info ]-->
-    <LI> <A HREF="#local_support">Local Support Contacts</A>
-  <!--chtml endif-->
-    <LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
-***************
-*** 1052,1060 ****
-  at your site.)
-  
-  
-! <!--chtml if [ -r /usr/local/lib/pine.info ]-->
-  <H2><A NAME="local_support">Local Support Contacts</A></H2>
-! <!--#include file="/usr/local/lib/pine.info"-->
-  <!--chtml endif-->
-  
-  <H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>
---- 1052,1060 ----
-  at your site.)
-  
-  
-! <!--chtml if [ -r @@PREFIX@@/etc/pine.info ]-->
-  <H2><A NAME="local_support">Local Support Contacts</A></H2>
-! <!--#include file="@@PREFIX@@/etc/pine.info"-->
-  <!--chtml endif-->
-  
-  <H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>
+--- pine/pine.hlp.orig	Fri Dec  1 16:12:53 2000
++++ pine/pine.hlp	Mon Dec 18 02:20:21 2000
+@@ -580,9 +580,9 @@
+  executable     &lt;Unix search path&gt;/pine
+  persnl cfg     ~/.pinerc
+  except cfg     ~/.pinercex
+- global cfg     /usr/local/lib/pine.conf
+- fixed cfg      /usr/local/lib/pine.conf.fixed
+- local help     /usr/local/lib/pine.info
++ global cfg     @@PREFIX@@/etc/pine.conf
++ fixed cfg      @@PREFIX@@/etc/pine.conf.fixed
++ local help     @@PREFIX@@/etc/pine.info
+ 
+  interrupted    ~/.pine-interrupted-mail
+  debug          ~/.pine-debugN
+@@ -594,8 +594,8 @@
+  postponed#     ~/mail/postponed-msgs
+  sentmail#      ~/mail/sent-mail
+  mailcap#       ~/.mailcap + /etc/mailcap
+-                           + /usr/etc/mailcap + /usr/local/etc/mailcap
+- mimetypes#     ~/.mime.types + /etc/mime.types + /usr/local/lib/mime.types
++                           + /usr/etc/mailcap + @@PREFIX@@/etc/mailcap
++ mimetypes#     ~/.mime.types + /etc/mime.types + @@PREFIX@@/etc/mime.types
+ 
+  news-spool	varies across Unix flavors, e.g. /usr/spool/news or /var/news
+  active-news	varies across Unix flavors, e.g. /usr/lib/news/active
+@@ -1052,9 +1052,9 @@
+ this link now to send a message to it:<BR>
+ <A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
+ <!--chtml endif-->
+-<!--chtml if [ -r /usr/local/lib/pine.info ]-->
++<!--chtml if [ -r @@PREFIX@@/etc/pine.info ]-->
+ <HR WIDTH="75%">Local Support Contacts:<P>
+-<!--#include file="/usr/local/lib/pine.info"-->
++<!--#include file="@@PREFIX@@/etc/pine.info"-->
+ <HR WIDTH="75%">
+ <!--chtml endif-->
+ <P> 
+@@ -1142,7 +1142,7 @@
+ <OL>
+   <LI> <A HREF="#intro">Introduction</A>
+   <LI> <A HREF="#pine_help">Pine Help</A>
+-<!--chtml if [ -r /usr/local/lib/pine.info ]-->
++<!--chtml if [ -r @@PREFIX@@/etc/pine.info ]-->
+   <LI> <A HREF="#local_support">Local Support Contacts</A>
+ <!--chtml endif-->
+   <LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
+@@ -1251,9 +1251,9 @@
+ at your site.)
+ 
+ 
+-<!--chtml if [ -r /usr/local/lib/pine.info ]-->
++<!--chtml if [ -r @@PREFIX@@/etc/pine.info ]-->
+ <H2><A NAME="local_support">Local Support Contacts</A></H2>
+-<!--#include file="/usr/local/lib/pine.info"-->
++<!--#include file="@@PREFIX@@/etc/pine.info"-->
+ <!--chtml endif-->
+ 
+ <H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>
diff --git a/mail/pine4/files/patch-aw b/mail/pine4/files/patch-aw
deleted file mode 100644
index ae3ad3c1e484..000000000000
--- a/mail/pine4/files/patch-aw
+++ /dev/null
@@ -1,12 +0,0 @@
---- imap/src/osdep/unix/env_unix.c.orig	Sun Oct 10 13:43:21 1999
-+++ imap/src/osdep/unix/env_unix.c	Wed Oct 13 20:11:32 1999
-@@ -825,7 +825,8 @@
- 	    }
- 	    close (pi[0]); close (pi[1]);
- 	  }
--	  if (lockEaccesError) {/* punt silently if paranoid site */
-+	  if (strncmp(base->lock,"/var/mail/",10) && lockEaccesError) {
-+	  /* punt silently if paranoid site */
- 	    sprintf (tmp,"Mailbox vulnerable - directory %.80s",hitch);
- 	    if (s = strrchr (tmp,'/')) *s = '\0';
- 	    strcat (tmp," must have 1777 protection");
diff --git a/mail/pine4/files/patch-az b/mail/pine4/files/patch-az
index ac90942e3645..ae3c4ec5d334 100644
--- a/mail/pine4/files/patch-az
+++ b/mail/pine4/files/patch-az
@@ -9,17 +9,6 @@
  
  
  /*----------------------------------------------------------------------
---- pine/abookcpy.c.orig	Wed Jul  5 22:13:36 2000
-+++ pine/abookcpy.c	Wed Jul  5 22:13:56 2000
-@@ -63,7 +63,7 @@
-     FILE       *fp;
-     int         trimsize;
- 
--#include "../c-client/linkage.c"
-+#include "c-client/linkage.c"
- 
-     trimsize = parse_args(argc, argv, &local, &remote);
- 
 --- pine/pine.c.orig	Wed Jul  5 22:16:28 2000
 +++ pine/pine.c	Mon Sep 20 16:17:58 1999
 @@ -40,7 +40,7 @@
@@ -40,17 +29,6 @@
  
      /*------- ... then tune the drivers just installed -------*/ 
  #ifdef	DOS
---- pine/adrbklib.c.orig	Wed Jul  5 22:18:28 2000
-+++ pine/adrbklib.c	Wed Jul  5 22:18:46 2000
-@@ -41,7 +41,7 @@
- 
- #include "headers.h"
- #include "adrbklib.h"
--#include "../c-client/imap4r1.h"  /* for LEVELSTATUS() */
-+#include "c-client/imap4r1.h"  /* for LEVELSTATUS() */
- 
- /*
-  * We don't want any end of line fixups to occur, so include "b" in DOS modes.
 --- pine/mailindx.c.orig	Wed Jul  5 22:19:38 2000
 +++ pine/mailindx.c	Wed Jul  5 22:19:49 2000
 @@ -50,7 +50,7 @@
diff --git a/mail/pine4/files/patch-ba b/mail/pine4/files/patch-ba
deleted file mode 100644
index 84b342953976..000000000000
--- a/mail/pine4/files/patch-ba
+++ /dev/null
@@ -1,20 +0,0 @@
-*** pine/newmail.c.orig	Mon Sep 25 15:07:01 2000
---- pine/newmail.c	Tue Sep 26 15:34:24 2000
-***************
-*** 342,348 ****
-  					   e->from->personal, NULL),
-  		   ps_global->ttyo->screen_cols);
-  	else
-! 	  sprintf(from + ((number > 1L) ? 18 : 6), "%s%s%s", 
-  		  e->from->mailbox,
-  		  e->from->host ? "@" : "",
-  		  e->from->host ? e->from->host : "");
---- 342,349 ----
-  					   e->from->personal, NULL),
-  		   ps_global->ttyo->screen_cols);
-  	else
-! 	  snprintf(from + ((number > 1L) ? 18 : 6), sizeof(from) - strlen(from),
-!                   "%s%s%s", 
-  		  e->from->mailbox,
-  		  e->from->host ? "@" : "",
-  		  e->from->host ? e->from->host : "");