20 files changed, 259 insertions, 216 deletions

diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index 3177aff6df71..2aa2acc93e40 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pine
-PORTVERSION=	4.33
-PORTREVISION=	1
+PORTVERSION=	4.40
 CATEGORIES=	mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/mail/pine4/distinfo b/mail/pine4/distinfo
index ad2d1388af35..23cfd9168cbf 100644
--- a/mail/pine4/distinfo
+++ b/mail/pine4/distinfo
@@ -1,2 +1,2 @@
-MD5 (pine4.33.tar.gz) = fb45dcfa1d3379031700da49236b2b9c
+MD5 (pine4.40.tar.gz) = 5173fecdd0cc7c3b7da7394817ae869f
 MD5 (pine-maildir-4.33) = e81b7754b07c3b2fc4493783a80447a9
diff --git a/mail/pine4/files/patch-aa b/mail/pine4/files/patch-aa
index 76a54207c123..b6de406f8fc8 100644
--- a/mail/pine4/files/patch-aa
+++ b/mail/pine4/files/patch-aa
@@ -1,6 +1,6 @@
---- pico/search.c.old	Tue Oct  5 01:49:41 1999
-+++ pico/search.c	Wed Feb 16 03:41:45 2000
-@@ -97,12 +97,15 @@
+--- pico/search.c.orig	Thu Jun 21 10:50:05 2001
++++ pico/search.c	Fri Sep 28 00:08:23 2001
+@@ -98,12 +98,15 @@
  int bc;
  int pc;
  {
@@ -20,7 +20,7 @@
      }
  
      return(bc == pc);
-@@ -804,7 +807,7 @@
+@@ -805,7 +808,7 @@
  int maxlength;	/* maximum chars in destination */
  
  {
diff --git a/mail/pine4/files/patch-ac b/mail/pine4/files/patch-ac
index c4407f440d4c..3dafa2865c23 100644
--- a/mail/pine4/files/patch-ac
+++ b/mail/pine4/files/patch-ac
@@ -54,25 +54,6 @@
   
   
 ***************
-*** 219,225 ****
-  /*----------------------------------------------------------------------
-     If no nntp-servers are defined, this program will be used to post news.
-   ----*/
-! #define SENDNEWS	"/usr/local/news/inews -h"
-  
-  
-  /*--------- Program employed by users to change their password ---------*/
---- 219,227 ----
-  /*----------------------------------------------------------------------
-     If no nntp-servers are defined, this program will be used to post news.
-   ----*/
-! #define SENDNEWS	"/usr/local/news/lib/inews -h"	/* For NN inews    */
-! /*#define SENDNEWS	"/usr/local/bin/inews -h"	/* For INN inews   */
-! /*#define SENDNEWS	"/usr/local/bin/inews -h"	/* For Cnews inews */
-  
-  
-  /*--------- Program employed by users to change their password ---------*/
-***************
 *** 268,274 ****
          8
          9 logs gross details of command execution
diff --git a/mail/pine4/files/patch-af b/mail/pine4/files/patch-af
index b3dd92a00229..0c01a932969c 100644
--- a/mail/pine4/files/patch-af
+++ b/mail/pine4/files/patch-af
@@ -1,6 +1,6 @@
---- 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 @@
+--- imap/src/osdep/unix/Makefile.orig	Wed Aug 29 12:15:15 2001
++++ imap/src/osdep/unix/Makefile	Fri Sep 28 00:08:24 2001
+@@ -97,7 +97,7 @@
  # Commands possibly overriden by the individual port
  
  ARRC=ar rc
@@ -9,7 +9,7 @@
  LN=ln -s
  RANLIB=ranlib
  
-@@ -92,7 +92,7 @@
+@@ -115,7 +115,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
@@ -18,7 +18,7 @@
  
  CAT=cat
  MAKE=make
-@@ -194,8 +194,9 @@
+@@ -217,8 +217,9 @@
  	 SPOOLDIR=/var \
  	 ACTIVEFILE=/usr/local/news/lib/active \
  	 RSHPATH=/usr/bin/rsh \
diff --git a/mail/pine4/files/patch-ai b/mail/pine4/files/patch-ai
index 5c2604e36c55..791e4e242b76 100644
--- a/mail/pine4/files/patch-ai
+++ b/mail/pine4/files/patch-ai
@@ -1,7 +1,26 @@
-*** pine/send.c.orig	Thu Feb  4 20:17:39 1999
---- pine/send.c	Tue Feb  9 21:34:37 1999
+*** pine/send.c.Dist	Mon Aug 27 10:54:33 2001
+--- pine/send.c	Fri Sep 28 00:19:47 2001
 ***************
-*** 7083,7095 ****
+*** 47,54 ****
+   ====*/
+  
+  #include "headers.h"
+! #include "../c-client/smtp.h"
+! #include "../c-client/nntp.h"
+  
+  
+  #ifndef TCPSTREAM
+--- 47,54 ----
+   ====*/
+  
+  #include "headers.h"
+! #include "c-client/smtp.h"
+! #include "c-client/nntp.h"
+  
+  
+  #ifndef TCPSTREAM
+***************
+*** 7689,7701 ****
   		body->subtype = cpystr("octet-stream");
   	    }
   
@@ -15,7 +34,7 @@
   	}
       }
   
---- 7083,7099 ----
+--- 7689,7705 ----
   		body->subtype = cpystr("octet-stream");
   	    }
   
@@ -34,7 +53,7 @@
       }
   
 ***************
-*** 8034,8040 ****
+*** 8659,8665 ****
   
   	switch (body->encoding) {	/* all else needs filtering */
   	  case ENC8BIT:			/* encode 8BIT into QUOTED-PRINTABLE */
@@ -42,7 +61,7 @@
   	    break;
   
   	  case ENCBINARY:		/* encode binary into BASE64 */
---- 8038,8045 ----
+--- 8663,8670 ----
   
   	switch (body->encoding) {	/* all else needs filtering */
   	  case ENC8BIT:			/* encode 8BIT into QUOTED-PRINTABLE */
@@ -52,7 +71,7 @@
   
   	  case ENCBINARY:		/* encode binary into BASE64 */
 ***************
-*** 8136,8142 ****
+*** 8761,8767 ****
   	     && !(so_puts(so, "Content-Transfer-Encoding: ")
   		  && so_puts(so, body_encodings[(body->encoding==ENCBINARY)
   						? ENCBASE64
@@ -60,7 +79,7 @@
   						  ? ENCQUOTEDPRINTABLE
   						  : (body->encoding <= ENCMAX)
   						    ? body->encoding
---- 8141,8147 ----
+--- 8766,8772 ----
   	     && !(so_puts(so, "Content-Transfer-Encoding: ")
   		  && so_puts(so, body_encodings[(body->encoding==ENCBINARY)
   						? ENCBASE64
diff --git a/mail/pine4/files/patch-aj b/mail/pine4/files/patch-aj
index abe75ff54ef4..1737ed6a020a 100644
--- a/mail/pine4/files/patch-aj
+++ b/mail/pine4/files/patch-aj
@@ -1,8 +1,8 @@
-*** imap/src/osdep/unix/os_bsi.h.orig	Thu Feb 13 07:25:33 1997
---- imap/src/osdep/unix/os_bsi.h	Fri Jul 10 00:12:36 1998
+*** imap/src/osdep/unix/os_bsi.h.orig	Tue Feb  6 14:29:32 2001
+--- imap/src/osdep/unix/os_bsi.h	Fri Sep 28 00:19:45 2001
 ***************
-*** 37,43 ****
---- 37,48 ----
+*** 22,28 ****
+--- 22,33 ----
   #include <unistd.h>
   #include <string.h>
   #include <sys/types.h>
diff --git a/mail/pine4/files/patch-ak b/mail/pine4/files/patch-ak
index 663064e9940c..51484a42bed7 100644
--- a/mail/pine4/files/patch-ak
+++ b/mail/pine4/files/patch-ak
@@ -1,9 +1,9 @@
-*** imap/Makefile.orig	Thu Jan 28 01:33:11 1999
---- imap/Makefile	Tue Feb  9 21:35:37 1999
+*** imap/Makefile.orig	Mon Jul  2 23:25:17 2001
+--- imap/Makefile	Fri Sep 28 00:19:45 2001
 ***************
-*** 379,390 ****
+*** 362,373 ****
+  	$(TOOLS)/$@ "$(LN)" src/ansilib c-client
   	$(TOOLS)/$@ "$(LN)" src/charset c-client
-  	sh -c '(test -d src/kerberos) && ($(LN) `pwd`/src/kerberos/* c-client) || true'
   	$(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
 ! 	$(TOOLS)/$@ "$(LN)" src/mtest mtest
 ! 	$(TOOLS)/$@ "$(LN)" src/ipopd ipopd
@@ -13,10 +13,10 @@
 ! build:	OSTYPE rebuild rebuildclean bundled
   
   OSTYPE:
-  	@echo Building c-client for $(OS)...
---- 379,390 ----
+  	@echo Building c-client for $(BUILDTYPE)...
+--- 362,373 ----
+  	$(TOOLS)/$@ "$(LN)" src/ansilib c-client
   	$(TOOLS)/$@ "$(LN)" src/charset c-client
-  	sh -c '(test -d src/kerberos) && ($(LN) `pwd`/src/kerberos/* c-client) || true'
   	$(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
 ! #	$(TOOLS)/$@ "$(LN)" src/mtest mtest
 ! #	$(TOOLS)/$@ "$(LN)" src/ipopd ipopd
@@ -26,4 +26,4 @@
 ! build:	OSTYPE rebuild rebuildclean # bundled
   
   OSTYPE:
-  	@echo Building c-client for $(OS)...
+  	@echo Building c-client for $(BUILDTYPE)...
diff --git a/mail/pine4/files/patch-al b/mail/pine4/files/patch-al
index 70f1eced6944..ceb7df18d738 100644
--- a/mail/pine4/files/patch-al
+++ b/mail/pine4/files/patch-al
@@ -1,82 +1,135 @@
---- 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
--        configuration files, /usr/local/lib/pine.conf and 
--        /usr/local/lib/pine.info. See the documentation for details.
-+        configuration files, /usr/local/etc/pine.conf and 
-+        /usr/local/etc/pine.info. See the documentation for details.
-+
+*** build.orig	Wed Aug  1 18:35:02 2001
+--- build	Thu Sep 27 23:55:58 2001
+***************
+*** 103,110 ****
+   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
+!         configuration files, /usr/local/lib/pine.conf and 
+!         /usr/local/lib/pine.info. See the documentation for details.
+   
+   pico   The standalone editor similar to the Pine message composer.
+          This is a very simple straight forward text editor.
+--- 103,111 ----
+   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
+!         configuration files, /usr/local/etc/pine.conf and 
+!         /usr/local/etc/pine.info. See the documentation for details.
+! 
+   
+   pico   The standalone editor similar to the Pine message composer.
+          This is a very simple straight forward text editor.
+***************
+*** 345,363 ****
+  	  echo "Including SSL functionality"
+  	fi
   
-  pico   The standalone editor similar to the Pine message composer.
-         This is a very simple straight forward text editor.
-@@ -304,17 +305,17 @@
- 	  echo "Including SSL functionality"
- 	fi
- 
--        if [ -s c-client ] ; then rm -f c-client ; fi
--        ln -s imap/c-client c-client
--        if [ -s mtest    ] ; then rm -f mtest    ; fi
--        ln -s imap/mtest mtest
--        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" "$SSL" "$K1" "$K2" $ccltarg
--        cd $PHOME/imap
--        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
-+#        if [ -s mtest    ] ; then rm -f mtest    ; fi
-+#        ln -s imap/mtest mtest
-+#        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" "$SSL" "$K1" "$K2" $ccltarg
-+#        cd $PHOME/imap
-+#        eval make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
-+#        echo ''
- 
-         echo "Making Pico and Pilot"
-         cd $PHOME/pico
-@@ -331,14 +332,14 @@
-         cd $PHOME/bin
-         rm -f pine mtest imapd pico pilot
-         if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
--        if [ -s ../mtest/mtest ] ;    then ln ../mtest/mtest mtest ; fi
--        if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
-+#        if [ -s ../mtest/mtest ] ;    then ln ../mtest/mtest mtest ; fi
-+#        if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
-         if [ -s ../pico/pico ] ;      then ln ../pico/pico pico ; fi
-         if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
-         cd $PHOME
-         echo ''
-         echo "Links to executables are in bin directory:"
--        size bin/pine bin/mtest bin/imapd bin/pico bin/pilot
-+        size bin/pine bin/pico bin/pilot
- 	case $maketarg in
- 	    mnt)    echo "Fixing stacksizes ..."
- 		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
-@@ -348,15 +349,15 @@
- 
- 
-     clean) # This only sort of works 
--        echo "Cleaning c-client and imapd"
--	cd $PHOME/imap
--	make clean
-+#        echo "Cleaning c-client and imapd"
-+#	cd $PHOME/imap
-+#	make clean
-         echo "Cleaning Pine"
-         cd $PHOME/pine
--        make -f makefile.ult clean
-+        make -f makefile.bsf clean
-         echo "Cleaning pico"
-         cd $PHOME/pico
--        make $makeargs -f makefile.ult clean
-+        make $makeargs -f makefile.bsf clean
-         echo "Done"
-         cd $PHOME
-         ;;
+!         if [ -s c-client ] ; then rm -f c-client ; fi
+!         ln -s imap/c-client c-client
+!         if [ -s mtest    ] ; then rm -f mtest    ; fi
+!         ln -s imap/mtest mtest
+!         if [ -s imapd    ] ; then rm -f imapd    ; fi
+!         ln -s imap/imapd imapd
+!         if [ -s ipopd    ] ; then rm -f ipopd    ; fi
+!         ln -s imap/ipopd ipopd
+!         echo "Making c-client library, mtest and imapd"
+!         eval echo make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
+!         cd $PHOME/imap
+!         eval make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
+!         echo ''
+  
+          echo "Making Pico and Pilot"
+          cd $PHOME/pico
+--- 346,364 ----
+  	  echo "Including SSL functionality"
+  	fi
+  
+! #        if [ -s c-client ] ; then rm -f c-client ; fi
+! #        ln -s imap/c-client c-client
+! #        if [ -s mtest    ] ; then rm -f mtest    ; fi
+! #        ln -s imap/mtest mtest
+! #        if [ -s imapd    ] ; then rm -f imapd    ; fi
+! #        ln -s imap/imapd imapd
+! #        if [ -s ipopd    ] ; then rm -f ipopd    ; fi
+! #        ln -s imap/ipopd ipopd
+! #        echo "Making c-client library, mtest and imapd"
+! #        eval echo make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
+! #        cd $PHOME/imap
+! #        eval make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
+! #        echo ''
+  
+          echo "Making Pico and Pilot"
+          cd $PHOME/pico
+***************
+*** 374,391 ****
+          cd $PHOME/bin
+          rm -f pine mtest imapd pico pilot rpload rpdump ipop2d ipop3d
+          if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
+!         if [ -s ../mtest/mtest ] ;    then ln ../mtest/mtest mtest    ; fi
+!         if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
+!         if [ -s ../ipopd/ipop2d ] ;   then ln ../ipopd/ipop2d ipop2d  ; fi
+!         if [ -s ../ipopd/ipop3d ] ;   then ln ../ipopd/ipop3d ipop3d  ; fi
+          if [ -s ../pico/pico ] ;      then ln ../pico/pico pico       ; fi
+          if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot     ; fi
+!         if [ -s ../pine/rpload ] ;    then ln ../pine/rpload rpload   ; fi
+!         if [ -s ../pine/rpdump ] ;    then ln ../pine/rpdump rpdump   ; fi
+          cd $PHOME
+          echo ''
+          echo "Links to executables are in bin directory:"
+!         size bin/pine bin/mtest bin/imapd bin/pico bin/pilot bin/rpdump bin/rpload bin/ipop2d bin/ipop3d
+  	case $maketarg in
+  	    mnt)    echo "Fixing stacksizes ..."
+  		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
+--- 375,392 ----
+          cd $PHOME/bin
+          rm -f pine mtest imapd pico pilot rpload rpdump ipop2d ipop3d
+          if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
+! #        if [ -s ../mtest/mtest ] ;    then ln ../mtest/mtest mtest    ; fi
+! #        if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
+! #        if [ -s ../ipopd/ipop2d ] ;   then ln ../ipopd/ipop2d ipop2d  ; fi
+! #        if [ -s ../ipopd/ipop3d ] ;   then ln ../ipopd/ipop3d ipop3d  ; fi
+          if [ -s ../pico/pico ] ;      then ln ../pico/pico pico       ; fi
+          if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot     ; fi
+! #        if [ -s ../pine/rpload ] ;    then ln ../pine/rpload rpload   ; fi
+! #        if [ -s ../pine/rpdump ] ;    then ln ../pine/rpdump rpdump   ; fi
+          cd $PHOME
+          echo ''
+          echo "Links to executables are in bin directory:"
+!         size bin/pine bin/pico bin/pilot
+  	case $maketarg in
+  	    mnt)    echo "Fixing stacksizes ..."
+  		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
+***************
+*** 421,435 ****
+  
+  
+      clean) # This only sort of works 
+!         echo "Cleaning c-client and imapd"
+! 	cd $PHOME/imap
+! 	make clean
+          echo "Cleaning Pine"
+          cd $PHOME/pine
+!         make -f makefile.ult clean
+          echo "Cleaning pico"
+          cd $PHOME/pico
+!         make $makeargs -f makefile.ult clean
+          echo "Done"
+          cd $PHOME
+          ;;
+--- 422,436 ----
+  
+  
+      clean) # This only sort of works 
+! #        echo "Cleaning c-client and imapd"
+! #	cd $PHOME/imap
+! #	make clean
+          echo "Cleaning Pine"
+          cd $PHOME/pine
+!         make -f makefile.bsf clean
+          echo "Cleaning pico"
+          cd $PHOME/pico
+!         make $makeargs -f makefile.bsf clean
+          echo "Done"
+          cd $PHOME
+          ;;
diff --git a/mail/pine4/files/patch-am b/mail/pine4/files/patch-am
index b285a5dedee5..4af762eaf8c7 100644
--- a/mail/pine4/files/patch-am
+++ b/mail/pine4/files/patch-am
@@ -1,7 +1,7 @@
-*** pine/pine.h.orig	Mon Feb 22 14:49:07 1999
---- pine/pine.h	Mon Feb 22 14:49:57 1999
+*** pine/pine.h.orig	Tue Aug  7 15:52:01 2001
+--- pine/pine.h	Fri Sep 28 00:19:46 2001
 ***************
-*** 2588,2594 ****
+*** 3120,3126 ****
   } ATABLE_S;
   
   
@@ -9,7 +9,7 @@
   #define	TAG_INVON	'\001'	/* Supported character attributes	  */
   #define	TAG_INVOFF	'\002'
   #define	TAG_BOLDON	'\003'
---- 2588,2594 ----
+--- 3120,3126 ----
   } ATABLE_S;
   
   
diff --git a/mail/pine4/files/patch-an b/mail/pine4/files/patch-an
index 2d9cc2dc5bea..8835c7ea1913 100644
--- a/mail/pine4/files/patch-an
+++ b/mail/pine4/files/patch-an
@@ -1,24 +1,7 @@
-*** pico/osdep/os-bsf.h.orig	Wed Jul  8 19:37:28 1998
---- pico/osdep/os-bsf.h	Fri Jul 10 12:57:37 1998
+*** pico/osdep/os-bsf.h.orig	Wed Feb  7 14:53:26 2001
+--- pico/osdep/os-bsf.h	Thu Sep 27 23:56:53 2001
 ***************
-*** 23,29 ****
-  
-  #define  USE_DIRENT
-  #include <sys/types.h>
-! #include <sys/dir.h>
-  #include <stdlib.h>
-  #include <string.h>
-  
---- 23,29 ----
-  
-  #define  USE_DIRENT
-  #include <sys/types.h>
-! #include <dirent.h>
-  #include <stdlib.h>
-  #include <string.h>
-  
-***************
-*** 152,158 ****
+*** 153,159 ****
   /*
    * Place where mail gets delivered (for pico's new mail checking)
    */
@@ -26,7 +9,7 @@
   
   /*
    * What and where the tool that checks spelling is located.  If this is
---- 152,158 ----
+--- 153,159 ----
   /*
    * Place where mail gets delivered (for pico's new mail checking)
    */
diff --git a/mail/pine4/files/patch-ap b/mail/pine4/files/patch-ap
index 2aa3d35d53c2..3618544b31e2 100644
--- a/mail/pine4/files/patch-ap
+++ b/mail/pine4/files/patch-ap
@@ -1,7 +1,7 @@
-*** pico/osdep/term.cap.orig	Sat Feb 28 02:14:53 1998
---- pico/osdep/term.cap	Wed Jul 15 01:58:58 1998
+*** pico/osdep/term.cap.orig	Thu Jun 21 10:48:09 2001
+--- pico/osdep/term.cap	Fri Sep 28 00:19:46 2001
 ***************
-*** 270,276 ****
+*** 280,286 ****
       _kppu		= tgetstr("kP", &p);
       _kppd		= tgetstr("kN", &p);
       _kphome		= tgetstr("kh", &p);
@@ -9,7 +9,7 @@
       _kpdel		= tgetstr("kD", &p);
       _kf1		= tgetstr("k1", &p);
       _kf2		= tgetstr("k2", &p);
---- 270,277 ----
+--- 280,287 ----
       _kppu		= tgetstr("kP", &p);
       _kppd		= tgetstr("kN", &p);
       _kphome		= tgetstr("kh", &p);
diff --git a/mail/pine4/files/patch-at b/mail/pine4/files/patch-at
index e7e64a79a9cc..18777941efcf 100644
--- a/mail/pine4/files/patch-at
+++ b/mail/pine4/files/patch-at
@@ -1,6 +1,6 @@
---- 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 @@
+--- pine/pine.hlp.orig	Fri Aug 17 11:11:25 2001
++++ pine/pine.hlp	Fri Sep 28 00:29:20 2001
+@@ -528,9 +528,9 @@
   executable     &lt;Unix search path&gt;/pine
   persnl cfg     ~/.pinerc
   except cfg     ~/.pinercex
@@ -13,18 +13,16 @@
  
   interrupted    ~/.pine-interrupted-mail
   debug          ~/.pine-debugN
-@@ -594,8 +594,8 @@
-  postponed#     ~/mail/postponed-msgs
+@@ -543,7 +543,7 @@
   sentmail#      ~/mail/sent-mail
   mailcap#       ~/.mailcap + /etc/mailcap
--                           + /usr/etc/mailcap + /usr/local/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 @@
+@@ -1001,9 +1001,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-->
@@ -36,7 +34,7 @@
  <HR WIDTH="75%">
  <!--chtml endif-->
  <P> 
-@@ -1142,7 +1142,7 @@
+@@ -1091,7 +1091,7 @@
  <OL>
    <LI> <A HREF="#intro">Introduction</A>
    <LI> <A HREF="#pine_help">Pine Help</A>
@@ -45,7 +43,7 @@
    <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 @@
+@@ -1201,9 +1201,9 @@
  at your site.)
  
  
diff --git a/mail/pine4/files/patch-au b/mail/pine4/files/patch-au
index 45136f7db8c7..cadbf04c6cb5 100644
--- a/mail/pine4/files/patch-au
+++ b/mail/pine4/files/patch-au
@@ -1,7 +1,7 @@
-*** doc/pine.1.orig	Thu Feb  4 20:42:05 1999
---- doc/pine.1	Tue Feb  9 22:11:26 1999
+*** doc/pine.1.orig	Fri Jun 22 16:47:06 2001
+--- doc/pine.1	Fri Sep 28 00:29:20 2001
 ***************
-*** 294,304 ****
+*** 329,339 ****
   .br
   /etc/mime.types	System-wide file ext. to MIME type mapping
   .br
@@ -13,7 +13,7 @@
   .br
   /tmp/.\\usr\\spool\\mail\\xxxx	Per-folder mailbox lock files.
   .br
---- 294,304 ----
+--- 329,339 ----
   .br
   /etc/mime.types	System-wide file ext. to MIME type mapping
   .br
diff --git a/mail/pine4/files/patch-ax b/mail/pine4/files/patch-ax
index 6348c9d01d96..3f630fe8fe74 100644
--- a/mail/pine4/files/patch-ax
+++ b/mail/pine4/files/patch-ax
@@ -1,5 +1,5 @@
---- pine/makefile.bsf.orig	Thu Aug 27 09:49:51 1998
-+++ pine/makefile.bsf	Wed Jul  5 22:10:10 2000
+--- pine/makefile.bsf.orig	Tue Jul  3 10:03:52 2001
++++ pine/makefile.bsf	Fri Sep 28 01:07:34 2001
 @@ -50,7 +50,7 @@
  PROFILE=     # -pg
  DEBUG=       -DDEBUG # -g
@@ -9,9 +9,9 @@
  PICODIR=     ../pico
  
  # Only need to uncomment next two lines if you run make from this directory
-@@ -61,12 +61,11 @@
+@@ -61,13 +61,12 @@
  LDAPOFILES=   addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
- 	      other.o pine.o takeaddr.o
+ 	      mailview.o other.o pine.o strings.o takeaddr.o
  
 -STDLIBS=     -ltermlib
 -LOCLIBS=     $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
@@ -22,8 +22,9 @@
 +LIBS=        $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
  
 -STDCFLAGS=   -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE
-+STDCFLAGS=   -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE -I/usr/local/include
 -CFLAGS=      $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
++STDCFLAGS=   -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE -I/usr/local/include
 +CFLAGS+=     $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
  	     $(STDCFLAGS)
  
+ OFILES=	addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \
diff --git a/mail/pine4/files/patch-az b/mail/pine4/files/patch-az
index ae3c4ec5d334..0cab09f4012a 100644
--- a/mail/pine4/files/patch-az
+++ b/mail/pine4/files/patch-az
@@ -9,26 +9,6 @@
  
  
  /*----------------------------------------------------------------------
---- 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 @@
-   ----------------------------------------------------------------------*/
- 
- #include "headers.h"
--#include "../c-client/imap4r1.h"
-+#include "c-client/imap4r1.h"
- 
- 
- /*
-@@ -299,7 +299,7 @@
- #endif
- 
-     /*------- Set up c-client drivers -------*/ 
--#include "../c-client/linkage.c"
-+#include "c-client/linkage.c"
- 
-     /*------- ... then tune the drivers just installed -------*/ 
- #ifdef	DOS
 --- 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 @@
@@ -40,16 +20,3 @@
  
  /*
   * Some common Command Bindings
---- pine/send.c.orig	Wed Jul  5 22:21:18 2000
-+++ pine/send.c	Wed Jul  5 22:21:37 2000
-@@ -47,8 +47,8 @@
-  ====*/
- 
- #include "headers.h"
--#include "../c-client/smtp.h"
--#include "../c-client/nntp.h"
-+#include "c-client/smtp.h"
-+#include "c-client/nntp.h"
- 
- 
- #ifndef TCPSTREAM
diff --git a/mail/pine4/files/patch-be b/mail/pine4/files/patch-be
new file mode 100644
index 000000000000..3d5efa25dc68
--- /dev/null
+++ b/mail/pine4/files/patch-be
@@ -0,0 +1,20 @@
+--- pine/pine.c.orig	Tue Aug  7 15:52:00 2001
++++ pine/pine.c	Fri Sep 28 00:51:54 2001
+@@ -40,7 +40,7 @@
+   ----------------------------------------------------------------------*/
+ 
+ #include "headers.h"
+-#include "../c-client/imap4r1.h"
++#include "c-client/imap4r1.h"
+ 
+ 
+ /*
+@@ -361,7 +361,7 @@
+ #endif
+ 
+     /*------- Set up c-client drivers -------*/ 
+-#include "../c-client/linkage.c"
++#include "c-client/linkage.c"
+     /*
+      * Lookups of long login names which don't exist are very slow in aix.
+      * This would normally get set in system-wide config if not needed.
diff --git a/mail/pine4/files/patch-bf b/mail/pine4/files/patch-bf
new file mode 100644
index 000000000000..8aa9d20176a2
--- /dev/null
+++ b/mail/pine4/files/patch-bf
@@ -0,0 +1,11 @@
+--- pine/rpload.c.Dist	Thu Jul 26 16:21:57 2001
++++ pine/rpload.c	Fri Sep 28 01:40:12 2001
+@@ -117,7 +117,7 @@
+     char       *local = NULL, *remote = NULL, *special_hdr = NULL;
+     RemoteType  rt, type = NotSet;
+ 
+-#include "../c-client/linkage.c"
++#include "c-client/linkage.c"
+ 
+     if(parse_args(argc, argv, &force, &trimsize, &local, &remote, &type)){
+ 	fprintf(stderr, ustr, argv[0]);
diff --git a/mail/pine4/files/patch-bg b/mail/pine4/files/patch-bg
new file mode 100644
index 000000000000..be529024802b
--- /dev/null
+++ b/mail/pine4/files/patch-bg
@@ -0,0 +1,11 @@
+--- pine/rpdump.c.Dist	Mon Jul 30 11:21:19 2001
++++ pine/rpdump.c	Fri Sep 28 01:46:43 2001
+@@ -114,7 +114,7 @@
+     RemoteType  rtype;
+     unsigned long i;
+ 
+-#include "../c-client/linkage.c"
++#include "c-client/linkage.c"
+ 
+     if(parse_args(argc, argv, &force, &local, &remote)){
+ 	fprintf(stderr, ustr, argv[0]);
diff --git a/mail/pine4/files/patch-reply.c b/mail/pine4/files/patch-reply.c
index 50b4a4a354b5..e829cd5c3a82 100644
--- a/mail/pine4/files/patch-reply.c
+++ b/mail/pine4/files/patch-reply.c
@@ -1,6 +1,6 @@
---- pine/reply.c.orig	Wed Jan 24 18:35:05 2001
-+++ pine/reply.c	Sun Feb 11 12:15:03 2001
-@@ -4967,23 +4967,24 @@
+--- pine/reply.c.orig	Tue Aug  7 15:52:03 2001
++++ pine/reply.c	Fri Sep 28 00:29:19 2001
+@@ -4997,23 +4997,24 @@
  char *
  generate_message_id()
  {