Pine 4.00 port

Submitted by: Adrian Penisoara <ady@freebsd.ady.ro>

15 files changed, 317 insertions, 609 deletions

diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index 864c342869ed..cea0b76aa656 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -1,25 +1,46 @@
 # New ports collection makefile for:	pine
 # http://www.washington.edu/pine/
-# Version required:     3.96
-# Date created:		03 September 1994
-# Whom:			mr
+# Version required:     4.00
+# Date created:		09 July 1998
+# Whom:			Adrian Penisoara <ady@freebsd.ady.ro>
 #
-# $Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp $
+# $Id$
 #
 
-DISTNAME=       pine3.96
-PKGNAME=        pine-3.96
+DISTNAME=       pine4.00
+PKGNAME=        pine-4.00
 CATEGORIES=     mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pine@freebsd.ady.ro
+
+NO_LATEST_LINK= yes
 
 MAN1= 		pine.1 pico.1 pilot.1
 
+do-build:
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./build bsf)
+
+do-install:
+	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+		 ${WRKSRC}/bin/libpico.so.1.3 ${PREFIX}/lib/libpico.so.1.3
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/pico ${PREFIX}/bin/pico
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/pilot ${PREFIX}/bin/pilot
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin/pine
+	${INSTALL_SCRIPT} ${FILESDIR}/pgpencrypt ${PREFIX}/bin/pgpencrypt
+	${INSTALL_SCRIPT} ${FILESDIR}/pgpdecode ${PREFIX}/bin/pgpdecode
+	${INSTALL_SCRIPT} ${FILESDIR}/pgpsign ${PREFIX}/bin/pgpsign
+	${INSTALL_DATA} ${FILESDIR}/dot.pinerc.pgp.sample \
+			${PREFIX}/etc/dot.pinerc.pgp.sample
+	${INSTALL_MAN} ${WRKSRC}/doc/pico.1 ${PREFIX}/man/man1/pico.1
+	${INSTALL_MAN} ${WRKSRC}/doc/pilot.1 ${PREFIX}/man/man1/pilot.1
+	${INSTALL_MAN} ${WRKSRC}/doc/pine.1 ${PREFIX}/man/man1/pine.1
+.if !defined(NOPORTDOCS)
+	${INSTALL_DATA} -d ${PREFIX}/share/doc/pine
+	${INSTALL_DATA} ${WRKSRC}/doc/tech-notes.txt ${PREFIX}/share/doc/pine
+.endif
+
 post-install:
-	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755 \
-		${PREFIX}/share/doc/pine
-	cd ${WRKSRC} && \
-		${INSTALL_DATA} doc/tech-notes.txt ${PREFIX}/share/doc/pine
+	${LDCONFIG} -m ${PREFIX}/lib/
 
 .include <bsd.port.mk>
diff --git a/mail/pine4/distinfo b/mail/pine4/distinfo
index 383150f45632..4539b8cda85b 100644
--- a/mail/pine4/distinfo
+++ b/mail/pine4/distinfo
@@ -1 +1 @@
-MD5 (pine3.96.tar.gz) = bf32b0bf1296ff2151e1bc7f546d43ab
+MD5 (pine4.00.tar.gz) = 4aa00d67b4060299e9edff744cab6f23
diff --git a/mail/pine4/files/patch-ac b/mail/pine4/files/patch-ac
index 40842ed0c9b0..67948f5b138b 100644
--- a/mail/pine4/files/patch-ac
+++ b/mail/pine4/files/patch-ac
@@ -1,411 +1,55 @@
-*** pine/osdep/os-bsf.h.orig	Tue Dec  3 16:36:18 1996
---- pine/osdep/os-bsf.h	Tue Dec  3 17:46:48 1996
+*** pine/osdep/os-bsf.h.orig	Fri Jun 26 09:19:54 1998
+--- pine/osdep/os-bsf.h	Sun Jul 12 23:38:28 1998
 ***************
-*** 0 ****
---- 1,406 ----
-+ /*----------------------------------------------------------------------
-+ 
-+             T H E    P I N E    M A I L   S Y S T E M
-+ 
-+    Laurence Lundblade and Mike Seibel
-+    Networks and Distributed Computing
-+    Computing and Communications
-+    University of Washington
-+    Administration Builiding, AG-44
-+    Seattle, Washington, 98195, USA
-+    Internet: lgl@CAC.Washington.EDU
-+              mikes@CAC.Washington.EDU
-+ 
-+    Please address all bugs and comments to "pine-bugs@cac.washington.edu"
-+ 
-+ 
-+    Pine and Pico are registered trademarks of the University of Washington.
-+    No commercial use of these trademarks may be made without prior written
-+    permission of the University of Washington.
-+ 
-+    Pine, Pico, and Pilot software and its included text are Copyright
-+    1989-1996 by the University of Washington.
-+ 
-+    The full text of our legal notices is contained in the file called
-+    CPYRIGHT, included with this distribution.
-+ 
-+ 
-+    Pine is in part based on The Elm Mail System:
-+     ***********************************************************************
-+     *  The Elm Mail System  -  Revision: 2.13                             *
-+     *                                                                     *
-+     * 			Copyright (c) 1986, 1987 Dave Taylor              *
-+     * 			Copyright (c) 1988, 1989 USENET Community Trust   *
-+     ***********************************************************************
-+  
-+ 
-+   ----------------------------------------------------------------------*/
-+ 
-+ #ifndef _OS_INCLUDED
-+ #define _OS_INCLUDED
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+ 
-+    This first section has some constants that you may want to change
-+    for your configuration.  This is the BSD/386 Gamma 4.1 version of the
-+    os.h file.
-+    Further down in the file are os-dependent things that need to be set up
-+    correctly for each os.  They aren't interesting, they just have to be
-+    right.  There are also a few constants down there that may be of
-+    interest to some.
-+ 
-+  ----*/
-+ 
-+ /*----------------------------------------------------------------------
-+    Define this if you want the disk quota to be checked on startup.
-+    Of course, this only makes sense if your system has quotas.  If it doesn't,
-+    there should be a dummy disk_quota() routine in os-xxx.c so that defining
-+    this won't be harmful anyway.
-+  ----*/
-+ /* #define USE_QUOTAS  /* comment out if you never want quotas checked */
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+    Define this if you want to allow the users to change their From header
-+    line when they send out mail.  The users will still have to configure
-+    either default-composer-hdrs or customized-hdrs to get at the From
-+    header, even if this is set.
-+  ----*/
-+ #define ALLOW_CHANGING_FROM  /* comment out to not allow changing From */
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+    Define this if you want to allow users to turn on the feature that
-+    enables sending to take place in a fork()'d child.  This may reduce
-+    the time on the user's wall clock it takes to post mail.
-+    NOTE: You'll also have to make sure the appropriate osdep/postreap.*
-+          file is included in the os-*.ic file for your system.
-+  ----*/
-+ #define BACKGROUND_POST  /* comment out to disable posting from child */
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+     Turn this on if you want to disable the keyboard lock function.
-+  ----*/
-+ /* #define NO_KEYBOARD_LOCK */
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+     Turn this on to trigger QP encoding of sent message text if it contains
-+   "From " at the beginning of a line or "." on a line by itself.
-+  ----*/
-+ /* #define ENCODE_FROMS */
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+     Timeouts (seconds)
-+  ----*/
-+ #define DF_MAILCHECK      "150" /* How often to check for new mail, by
-+ 				   default.  There's some expense in doing
-+ 				   this so it shouldn't be done too
-+ 				   frequently.  (Can be set in config
-+ 				   file now.)  */
-+ 
-+ /*----------------------------------------------------------------------
-+     Check pointing (seconds)
-+  ----*/
-+ #define CHECK_POINT_TIME (7*60) /* Check point the mail file (write changes
-+ 				   to disk) if more than CHECK_POINT_TIME
-+ 				   seconds have passed since the first
-+ 				   change was made.  Depending on what is
-+ 				   happening, we may wait up to three times
-+ 				   this long, since we don't want to do the
-+ 				   slow check pointing and irritate the user. */
-+                                      
-+ #define CHECK_POINT_FREQ   (12) /* Check point the mail file if there have been
-+                                    at least this many (status) changes to the
-+ 				   current mail file.  We may wait longer if
-+ 				   it isn't a good time to do the checkpoint. */
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+  In scrolling through text, the number of lines from the previous
-+  screen to overlap when showing the next screen.  Usually set to two.
-+  ----*/
-+ #define	DF_OVERLAP	"2"
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+  When scrolling screens, the number of lines from top and bottom of
-+  the screen to initiate single-line scrolling.
-+  ----*/
-+ #define	DF_MARGIN	"0"
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+  Default fill column for pine composer and maximum fill column.  The max
-+  is used to stop people from setting their custom fill column higher than
-+  that number.  Note that DF_FILLCOL is a string but MAX_FILLCOL is an integer.
-+  ----*/
-+ #define	DF_FILLCOL	"74"
-+ #define	MAX_FILLCOL	80
-+ 
-+ 
-+ 
-+ /*----- System-wide config file ----------------------------------------*/
-+ #define SYSTEM_PINERC             "/usr/local/etc/pine.conf"
-+ #define SYSTEM_PINERC_FIXED       "/usr/local/etc/pine.conf.fixed"
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+    The default folder names and folder directories (some for backwards
-+    compatibility).  Think hard before changing any of these.
-+  ----*/
-+ #define DF_DEFAULT_FCC            "sent-mail"
-+ #define DEFAULT_SAVE              "saved-messages"
-+ #define POSTPONED_MAIL            "postponed-mail"
-+ #define POSTPONED_MSGS            "postponed-msgs"
-+ #define INTERRUPTED_MAIL          ".pine-interrupted-mail"
-+ #define DEADLETTER                "dead.letter"
-+ #define DF_MAIL_DIRECTORY         "mail"
-+ #define INBOX_NAME                "INBOX"
-+ #define DF_SIGNATURE_FILE         ".signature"
-+ #define DF_ELM_STYLE_SAVE         "no"
-+ #define DF_HEADER_IN_REPLY        "no"
-+ #define DF_OLD_STYLE_REPLY        "no"
-+ #define DF_USE_ONLY_DOMAIN_NAME   "no"
-+ #define DF_FEATURE_LEVEL          "sapling"
-+ #define DF_SAVE_BY_SENDER         "no"
-+ #define DF_SORT_KEY               "arrival"
-+ #define DF_AB_SORT_RULE           "fullname-with-lists-last"
-+ #define DF_SAVED_MSG_NAME_RULE    "default-folder"
-+ #define DF_FCC_RULE               "default-fcc"
-+ #define DF_STANDARD_PRINTER       "lpr"
-+ #define ANSI_PRINTER              "attached-to-ansi"
-+ #define DF_ADDRESSBOOK            ".addressbook"
-+ #define DF_BUGS_FULLNAME          "Pine Developers"
-+ #define DF_BUGS_ADDRESS           "pine-bugs@cac.washington.edu"
-+ #define DF_SUGGEST_FULLNAME       "Pine Developers"
-+ #define DF_SUGGEST_ADDRESS        "pine-suggestions@cac.washington.edu"
-+ #define DF_PINEINFO_FULLNAME      "Pine-Info News Group"
-+ #define DF_PINEINFO_ADDRESS       "pine-info@cac.washington.edu"
-+ #define DF_LOCAL_FULLNAME         "Local Support"
-+ #define DF_LOCAL_ADDRESS          "postmaster"
-+ #define DF_KBLOCK_PASSWD_COUNT    "1"
-+ 
-+ /*----------------------------------------------------------------------
-+    The default printer when pine starts up for the first time with no printer
-+  ----*/
-+ #define DF_DEFAULT_PRINTER        ANSI_PRINTER
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+ 
-+    OS dependencies, BSD/386 Gamma 4.1 version.  See also the os-bsi.c files.
-+    The following stuff may need to be changed for a new port, but once
-+    the port is done, it won't change.  At the bottom of the file are a few
-+    constants that you may want to configure differently than they
-+    are configured, but probably not.
-+ 
-+  ----*/
-+ 
-+ 
-+ 
-+ /*----------------- Are we ANSI? ---------------------------------------*/
-+ #define ANSI		/* this is an ANSI compiler */
-+ 
-+ /*------ If our compiler doesn't understand type void ------------------*/
-+ /* #define void char     /* no void in compiler */
-+ 
-+ 
-+ 
-+ /*------- Some more includes that should usually be correct ------------*/
-+ #include <pwd.h>
-+ #include <sys/wait.h>
-+ #include <sys/stat.h>
-+ #include <fcntl.h>
-+ #include <netdb.h>
-+ 
-+ 
-+ 
-+ /*----------------- locale.h -------------------------------------------*/
-+ #include <locale.h>  /* To make matching and sorting work right */
-+ 
-+ 
-+ 
-+ /*----------------- time.h ---------------------------------------------*/
-+ #include <time.h>
-+ /* plain time.h isn't enough on some systems */
-+ /* #include <sys/time.h>  /* For struct timeval usually in time.h */ 
-+ 
-+ 
-+ 
-+ /*--------------- signal.h ---------------------------------------------*/
-+ #include <signal.h>      /* sometimes both required, sometimes */
-+ /* #include <sys/signal.h>  /* only one or the other */
-+ 
-+ #define SigType void     /* value returned by sig handlers is void */
-+ /* #define SigType int      /* value returned by sig handlers is int */
-+ 
-+ #define POSIX_SIGNALS    /* use POSIX signal semantics (ttyin.c) */
-+ /* #define SYSV_SIGNALS    /* use System-V signal semantics (ttyin.c) */
-+ 
-+ 
-+ 
-+ 
-+ /*-------------- A couple typedef's for integer sizes ------------------*/
-+ typedef unsigned int usign32_t;
-+ typedef unsigned short usign16_t;
-+ 
-+ 
-+ 
-+ /*-------------- qsort argument type -----------------------------------*/
-+ #define QSType void  /* qsort arg is of type void * */
-+ /* #define QSType char  /* qsort arg is of type char * */
-+ 
-+ 
-+ 
-+ /*-------------- fcntl flag to set non-blocking IO ---------------------*/
-+ #define	NON_BLOCKING_IO	O_NONBLOCK		/* POSIX style */
-+ /* #define	NON_BLOCKING_IO	FNDELAY		/* good ol' bsd style  */
-+ 
-+ 
-+ 
-+ /*------ how help text is referenced (always char ** on Unix) ----------*/
-+ #define HelpType char **
-+ #define NO_HELP (char **)NULL
-+ 
-+ 
-+ 
-+ /*
-+  * Choose one of the following three terminal drivers
-+  */
-+ 
-+ /*--------- Good 'ol BSD -----------------------------------------------*/
-+ /* #include <sgtty.h>      /* BSD-based systems */
-+ 
-+ /*--------- System V terminal driver -----------------------------------*/
-+ /* #define HAVE_TERMIO     /* this is for pure System V */
-+ /* #include <termio.h>     /* Sys V */
-+ 
-+ /*--------- POSIX terminal driver --------------------------------------*/
-+ #define HAVE_TERMIOS    /* this is an alternative */
-+ #include <termios.h>    /* POSIX */
-+ 
-+ 
-+ 
-+ /*-------- Use poll system call instead of select ----------------------*/
-+ /* #define USE_POLL        /* use the poll() system call instead of select() */
-+ 
-+ 
-+ 
-+ /*-------- Use terminfo database instead of termcap --------------------*/
-+ /* #define USE_TERMINFO    /* use terminfo instead of termcap */
-+ 
-+ 
-+ 
-+ /*-- What argument does wait(2) take? Define this if it is a union -----*/
-+ /* #define HAVE_WAIT_UNION  /* the arg to wait is a union wait * */
-+ 
-+ 
-+ 
-+ /*-------- Is window resizing available? -------------------------------*/
-+ #if defined(TIOCGWINSZ) && defined(SIGWINCH)
-+ #define RESIZING  /* SIGWINCH and friends */
-+ #endif
-+ 
-+ 
-+ 
-+ /*-------- If no vfork, use regular fork -------------------------------*/
-+ /* #define vfork fork  /* vfork is just a lightweight fork, so can use fork */
-+ 
-+ 
-+ 
-+ /*----- The usual sendmail configuration for sending mail on Unix ------*/
-+ #define SENDMAIL	"/usr/sbin/sendmail"
-+ #define SENDMAILFLAGS	"-bs -odb -oem"	/* send via smtp with backgroud
-+ 					   delivery and mail back errors */
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+    If no nntp-servers are defined, this program will be used to post news.
-+  ----*/
-+ #define SENDNEWS     "/usr/local/news/lib/inews -h"       /* news posting cmd */
-+ 
-+ 
-+ /*--------- Program employed by users to change their password ---------*/
-+ #define	PASSWD_PROG	"/usr/bin/passwd"
-+ 
-+ 
-+ /*-------------- A couple constants used to size arrays ----------------*/
-+ #include <sys/param.h>          /* Get it from param.h if available */
-+ #undef MAXPATH                  /* Sometimes defined in param.h differently */
-+ #define MAXPATH MAXPATHLEN      /* Longest pathname we ever expect */
-+ /* #define MAXPATH        (512)    /* Longest pathname we ever expect */
-+ #define MAXFOLDER      (64)     /* Longest foldername we ever expect */  
-+ 
-+ 
-+ /*-- Max screen pine will display on. Used to define some array sizes --*/
-+ #define MAX_SCREEN_COLS  (170) 
-+ #define MAX_SCREEN_ROWS  (200) 
-+ 
-+ 
-+ /*---- When no screen size can be discovered this is the size used -----*/
-+ #define DEFAULT_LINES_ON_TERMINAL	(24)
-+ #define DEFAULT_COLUMNS_ON_TERMINAL	(80)
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+     Where to put the output of pine in debug mode. Files are created
-+  in the user's home directory and have a number appended to them when
-+  there is more than one.
-+  ----*/
-+ #define DEBUGFILE	".pine-debug"
-+ 
-+ /*----------------------------------------------------------------------
-+     The number of debug files to save in the user's home diretory. The files
-+  are useful for figuring out what a user did when he complains that something
-+  went wrong. It's important to keep a bunch around, usually 4, so that the
-+  debug file in question will still be around when the problem gets 
-+  investigated. Users tend to go in and out of Pine a few times and there
-+  is one file for each pine invocation
-+  ----*/
-+ #define NUMDEBUGFILES 4
-+ 
-+ /*----------------------------------------------------------------------
-+    The default debug level to set (approximate meanings):
-+        1 logs only highest level events and errors
-+        2 logs events like file writes
-+        3
-+        4 logs each command
-+        5
-+        6 
-+        7 logs details of command execution (7 is highest to run any production)
-+        8
-+        9 logs gross details of command execution
-+  ----*/
-+ #define DEFAULT_DEBUG 0
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+     Various maximum field lengths, probably shouldn't be changed.
-+  ----*/
-+ #define MAX_FULLNAME     (100) 
-+ #define MAX_NICKNAME      (40)
-+ #define MAX_ADDRESS      (200)
-+ #define MAX_NEW_LIST     (500)  /* Max addrs to be added when creating list */
-+ #define MAX_SEARCH       (100)  /* Longest string to search for             */
-+ #define MAX_ADDR_EXPN   (1000)  /* Longest expanded addr                    */
-+ #define MAX_ADDR_FIELD (10000)  /* Longest fully-expanded addr field        */
-+ 
-+ 
-+ #endif /* _OS_INCLUDED */
-+ 
-+ 
+*** 87,93 ****
+     NOTE: You'll also have to make sure the appropriate osdep/postreap.*
+           file is included in the os-*.ic file for your system.
+   ----*/
+! /* #define BACKGROUND_POST  /* comment out to disable posting from child */
+  
+  
+  
+--- 87,93 ----
+     NOTE: You'll also have to make sure the appropriate osdep/postreap.*
+           file is included in the os-*.ic file for your system.
+   ----*/
+! #define BACKGROUND_POST     /* comment out to disable posting from child */
+  
+  
+  
+***************
+*** 219,225 ****
+  /*----------------------------------------------------------------------
+     If no nntp-servers are defined, this program will be used to post news.
+   ----*/
+! #define SENDNEWS	"/usr/local/news/inews -h"	/* news posting cmd */
+  
+  
+  /*--------- 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
+   ----*/
+! #define DEFAULT_DEBUG 2
+  
+  
+  
+--- 270,276 ----
+         8
+         9 logs gross details of command execution
+   ----*/
+! #define DEFAULT_DEBUG 0
+  
+  
+  
diff --git a/mail/pine4/files/patch-af b/mail/pine4/files/patch-af
index 7fbd6dc999e0..7301850f7074 100644
--- a/mail/pine4/files/patch-af
+++ b/mail/pine4/files/patch-af
@@ -1,37 +1,36 @@
-*** imap/ANSI/c-client/Makefile.orig	Sat Jun 22 01:25:45 1996
---- imap/ANSI/c-client/Makefile	Sun Jan 12 19:41:38 1997
+*** imap/src/osdep/unix/Makefile.orig	Thu Jul  9 00:49:11 1998
+--- imap/src/osdep/unix/Makefile	Sun Jul 12 22:10:04 1998
 ***************
-*** 36,43 ****
-  BINARIES=mail.o bezerk.o mtx.o tenex2.o mbox.o mh.o mmdf.o imap2.o pop3.o \
-  	news.o nntpcunx.o phile.o dummy.o smtp.o nntp.o rfc822.o misc.o \
-  	osdep.o sm_unix.o newsrc.o
+*** 75,81 ****
+  # Commands possibly overriden by the individual port
+  
+  ARRC=ar rc
 ! CC=cc
-! CFLAGS=$(EXTRACFLAGS)
-  DEFAULTDRIVERS=imap nntp pop3 mh tenex mtx mmdf bezerk news phile dummy
   LN=ln -s
-  MAKE=make
---- 36,43 ----
-  BINARIES=mail.o bezerk.o mtx.o tenex2.o mbox.o mh.o mmdf.o imap2.o pop3.o \
-  	news.o nntpcunx.o phile.o dummy.o smtp.o nntp.o rfc822.o misc.o \
-  	osdep.o sm_unix.o newsrc.o
+  RANLIB=ranlib
+  
+--- 75,81 ----
+  # Commands possibly overriden by the individual port
+  
+  ARRC=ar rc
 ! #CC=cc
-! #CFLAGS=$(EXTRACFLAGS)
-  DEFAULTDRIVERS=imap nntp pop3 mh tenex mtx mmdf bezerk news phile dummy
   LN=ln -s
-  MAKE=make
-***************
-*** 118,123 ****
---- 118,130 ----
-  		STDPROTO=bezerkproto MAILSPOOL=/var/mail \
-  		ACTIVEFILE=/usr/lib/news/active NEWSSPOOL=/usr/spool/news \
-  		RSHPATH=/usr/bin/rsh CFLAGS="-g -O -pipe -DNFSKLUDGE $(EXTRACFLAGS)"
-+ 
-+ bsf:	# FreeBSD
-+ 	$(MAKE) $(ARCHIVE) OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" \
-+ 		STDPROTO=bezerkproto MAILSPOOL=/var/mail \
-+ 		ACTIVEFILE=/usr/local/news/lib/active NEWSSPOOL=/var/news \
-+               RSHPATH=/usr/bin/rsh CFLAGS="${CFLAGS} -DNFSKLUDGE $(EXTRACFLAGS)" \
-+ 		LDFLAGS="-lcrypt"
+  RANLIB=ranlib
   
-  cvx:	# Convex
-  	$(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \
+***************
+*** 93,99 ****
+   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
+--- 93,99 ----
+   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
diff --git a/mail/pine4/files/patch-ai b/mail/pine4/files/patch-ai
index bd1b5bf4346c..dbf0aa6b88d0 100644
--- a/mail/pine4/files/patch-ai
+++ b/mail/pine4/files/patch-ai
@@ -1,66 +1,67 @@
-*** pine/send.c.orig	Tue Feb 25 00:57:38 1997
---- pine/send.c	Sun Jul 20 02:50:31 1997
+*** pine/send.c.orig	Wed Jul  1 21:32:53 1998
+--- pine/send.c	Fri Jul 10 00:51:41 1998
 ***************
-*** 5352,5364 ****
+*** 6616,6628 ****
   		body->subtype = cpystr("octet-stream");
   	    }
   
-  	    /*
-  	     * Apply maximal encoding regardless of previous
-  	     * setting.  This segment's either not text, or is 
-  	     * unlikely to be readable with > 30% of the
-  	     * text encoded anyway, so we might as well save space...
-  	     */
+! 	    /*
+! 	     * Apply maximal encoding regardless of previous
+! 	     * setting.  This segment's either not text, or is 
+! 	     * unlikely to be readable with > 30% of the
+! 	     * text encoded anyway, so we might as well save space...
+! 	     */
 ! 	    new_encoding = ENCBINARY;   /*  > 30% 8 bit chars */
   	}
       }
   
---- 5352,5367 ----
+--- 6616,6632 ----
   		body->subtype = cpystr("octet-stream");
   	    }
   
-+ 	    if(body->type == TYPETEXT)
-+ 	      new_encoding = ENC8BIT;
-+ 	    else
-  	    /*
-  	     * Apply maximal encoding regardless of previous
-  	     * setting.  This segment's either not text, or is 
-  	     * unlikely to be readable with > 30% of the
-  	     * text encoded anyway, so we might as well save space...
-  	     */
+! 	    if(body->type == TYPETEXT)
+!               /* Use ENC8BIT rather than ENCBINARY for TEXT */
+! 	      new_encoding = ENC8BIT;
+! 	    else
+! 	      /*
+! 	       * Apply maximal encoding regardless of previous
+! 	       * setting.  This segment's either not text, or is 
+! 	       * unlikely to be readable with > 30% of the
+! 	       * text encoded anyway, so we might as well save space...
+! 	       */
 ! 	      new_encoding = ENCBINARY;   /*  > 30% 8 bit chars */
   	}
       }
   
 ***************
-*** 6113,6119 ****
+*** 7439,7445 ****
   
   	switch (body->encoding) {	/* all else needs filtering */
   	  case ENC8BIT:			/* encode 8BIT into QUOTED-PRINTABLE */
-! 	    gf_link_filter(gf_8bit_qp);
+! 	    gf_link_filter(gf_8bit_qp, NULL);
   	    break;
   
   	  case ENCBINARY:		/* encode binary into BASE64 */
---- 6116,6123 ----
+--- 7443,7450 ----
   
   	switch (body->encoding) {	/* all else needs filtering */
   	  case ENC8BIT:			/* encode 8BIT into QUOTED-PRINTABLE */
-! 	    if(F_OFF(F_ENABLE_8BIT, ps_global))
-! 		gf_link_filter(gf_8bit_qp);
+! 	    if(F_OFF(F_ENABLE_8BIT, ps_global)) /* unless 8BIT enabled */
+! 		gf_link_filter(gf_8bit_qp, NULL);
   	    break;
   
   	  case ENCBINARY:		/* encode binary into BASE64 */
 ***************
-*** 6172,6178 ****
-        sprintf (*dst += strlen (*dst), "Content-Transfer-Encoding: %s\015\012",
+*** 7506,7512 ****
+        sprintf (*dst += strlen (*dst),"Content-Transfer-Encoding: %s\015\012",
   	       body_encodings[(body->encoding == ENCBINARY)
   				? ENCBASE64
 ! 				: (body->encoding == ENC8BIT)
   				    ? ENCQUOTEDPRINTABLE
   				    : (body->encoding <= ENCMAX)
   					? body->encoding : ENCOTHER]);
---- 6176,6182 ----
-        sprintf (*dst += strlen (*dst), "Content-Transfer-Encoding: %s\015\012",
+--- 7511,7517 ----
+        sprintf (*dst += strlen (*dst),"Content-Transfer-Encoding: %s\015\012",
   	       body_encodings[(body->encoding == ENCBINARY)
   				? ENCBASE64
 ! 				: (body->encoding == ENC8BIT && F_OFF(F_ENABLE_8BIT, ps_global))
diff --git a/mail/pine4/files/patch-aj b/mail/pine4/files/patch-aj
index 9a9d853c0b35..abe75ff54ef4 100644
--- a/mail/pine4/files/patch-aj
+++ b/mail/pine4/files/patch-aj
@@ -1,9 +1,9 @@
-*** imap/ANSI/c-client/os_bsi.h.bak	Wed Feb  7 12:01:07 1996
---- imap/ANSI/c-client/os_bsi.h	Sun Jul 20 01:47:23 1997
+*** 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
 ***************
-*** 36,42 ****
---- 36,47 ----
-  #include <stdlib.h>
+*** 37,43 ****
+--- 37,48 ----
+  #include <unistd.h>
   #include <string.h>
   #include <sys/types.h>
 + #ifdef __FreeBSD__
@@ -12,6 +12,6 @@
 + #else
   #include <sys/dir.h>
 + #endif
-  #include <sys/uio.h>		/* needed for writev() prototypes */
   #include <fcntl.h>
   #include <syslog.h>
+  #include <sys/file.h>
diff --git a/mail/pine4/files/patch-ak b/mail/pine4/files/patch-ak
index 6ca5d41436cc..cac104b7427b 100644
--- a/mail/pine4/files/patch-ak
+++ b/mail/pine4/files/patch-ak
@@ -1,50 +1,29 @@
-*** imap/Makefile.orig	Thu May 30 07:33:10 1996
---- imap/Makefile	Sun Jan 12 17:05:17 1997
+*** imap/Makefile.orig	Wed Apr 29 02:38:46 1998
+--- imap/Makefile	Sat Jul 11 01:58:29 1998
 ***************
-*** 47,53 ****
-  
-  # ANSI compiler ports.  Note for SCO you may have to set LN to "copy -rom"
-  
-! a32 a41 aix bsi d-g drs lnx lyn mct mnt neb nxt osf sc5 sco sgi slx sos:
-  	$(MAKE) build SYSTYPE=ANSI OS=$@
-  
-  # Non-ANSI compiler ports.
---- 47,53 ----
-  
-  # ANSI compiler ports.  Note for SCO you may have to set LN to "copy -rom"
-  
-! a32 a41 aix bsi bsf d-g drs lnx lyn mct mnt neb nxt osf sc5 sco sgi slx sos:
-  	$(MAKE) build SYSTYPE=ANSI OS=$@
-  
-  # Non-ANSI compiler ports.
-***************
-*** 82,87 ****
---- 82,90 ----
-  bs2:
-  	$(MAKE) build SYSTYPE=ANSI OS=bsi
-  
-+ bsf:
-+ 	$(MAKE) build OS=bsf PROCESS=an
-+ 
-  pt1:
-  	$(MAKE) build SYSTYPE=non-ANSI OS=ptx
-  
-***************
-*** 92,99 ****
-  	$(LN) $(SYSTYPE) systype
-  	cd $(SYSTYPE)/c-client; $(MAKE) $(OS)
-  	cd $(SYSTYPE)/ms;$(MAKE)
-! 	cd $(SYSTYPE)/ipopd;$(MAKE)
-! 	cd $(SYSTYPE)/imapd;$(MAKE)
-  
-  clean:
-  	$(RM) systype
---- 95,102 ----
-  	$(LN) $(SYSTYPE) systype
-  	cd $(SYSTYPE)/c-client; $(MAKE) $(OS)
-  	cd $(SYSTYPE)/ms;$(MAKE)
-! #       cd $(SYSTYPE)/ipopd;$(MAKE)
-! #       cd $(SYSTYPE)/imapd;$(MAKE)
-  
-  clean:
-  	$(RM) systype
+*** 250,261 ****
+  	$(TOOLS)/$@ "$(LN)" src/charset c-client
+  	$(LN) `pwd`/src/kerberos/* c-client
+  	$(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
+! 	$(TOOLS)/$@ "$(LN)" src/mtest mtest
+! 	$(TOOLS)/$@ "$(LN)" src/ipopd ipopd
+! 	$(TOOLS)/$@ "$(LN)" src/imapd imapd
+  	$(LN) $(TOOLS)/$@ .
+  
+! build:	OSTYPE rebuild rebuildclean bundled
+  
+  OSTYPE:
+  	@echo Building c-client for $(OS)...
+--- 250,261 ----
+  	$(TOOLS)/$@ "$(LN)" src/charset c-client
+  	$(LN) `pwd`/src/kerberos/* c-client
+  	$(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
+! #	$(TOOLS)/$@ "$(LN)" src/mtest mtest
+! #	$(TOOLS)/$@ "$(LN)" src/ipopd ipopd
+! #	$(TOOLS)/$@ "$(LN)" src/imapd imapd
+  	$(LN) $(TOOLS)/$@ .
+  
+! build:	OSTYPE rebuild rebuildclean # bundled
+  
+  OSTYPE:
+  	@echo Building c-client for $(OS)...
diff --git a/mail/pine4/files/patch-al b/mail/pine4/files/patch-al
index 2c6d35ba6a4d..21155aa3176c 100644
--- a/mail/pine4/files/patch-al
+++ b/mail/pine4/files/patch-al
@@ -1,37 +1,65 @@
-*** build.orig	Tue May 14 23:22:47 1996
---- build	Sun Jan 12 20:18:50 1997
+*** build.orig	Mon Jun 15 20:35:10 1998
+--- build	Sat Jul 11 02:32:20 1998
 ***************
-*** 167,180 ****
+*** 256,266 ****
+  
+          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" "$K1" "$K2" $ccltarg
+          cd $PHOME/imap
+          eval make "$makeargs" "$K1" "$K2" $ccltarg
+--- 256,266 ----
+  
+          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"
+          eval echo make "$makeargs" "$K1" "$K2" $ccltarg
+          cd $PHOME/imap
+          eval make "$makeargs" "$K1" "$K2" $ccltarg
+***************
+*** 281,294 ****
           cd $PHOME/bin
           rm -f pine mtest imapd pico pilot
           if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
--         if [ -s ../c-client/mtest ] ; then ln ../c-client/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/mtest bin/imapd bin/pico bin/pilot
           echo "Done"
           ;;
   
---- 167,179 ----
+--- 281,296 ----
           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 ../pico/pico ] ;      then ln ../pico/pico pico ; fi
           if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
-+         if [ -s ../pico/libpico.so.1.3 ] ;     
-+ 		then ln ../pico/libpico.so.1.3 libpico.so.1.3 ; fi
++         if [ -s ../pico/libpico.so.1.3 ] ;
++               then ln ../pico/libpico.so.1.3 libpico.so.1.3 ; fi
           cd $PHOME
           echo ''
           echo "Links to executables are in bin directory:"
+!         size bin/pine bin/pico bin/pilot bin/libpico.so.1.3
           echo "Done"
           ;;
   
 ***************
-*** 185,194 ****
+*** 299,308 ****
   	make clean
           echo "Cleaning Pine"
           cd $PHOME/pine
@@ -42,7 +70,7 @@
           echo "Done"
           cd $PHOME
           ;;
---- 184,193 ----
+--- 301,310 ----
   	make clean
           echo "Cleaning Pine"
           cd $PHOME/pine
diff --git a/mail/pine4/files/patch-am b/mail/pine4/files/patch-am
index 77328d9843ae..f0ffb308313b 100644
--- a/mail/pine4/files/patch-am
+++ b/mail/pine4/files/patch-am
@@ -1,7 +1,7 @@
-*** pine/pine.h.bak	Thu Jul 11 22:15:44 1996
---- pine/pine.h	Tue Dec  3 20:52:56 1996
+*** pine/pine.h.orig	Tue Jul  7 05:06:18 1998
+--- pine/pine.h	Sun Jul 12 23:06:10 1998
 ***************
-*** 2085,2091 ****
+*** 2303,2309 ****
   } ATABLE_S;
   
   
@@ -9,11 +9,11 @@
   #define	TAG_INVON	'\001'	/* Supported character attributes	  */
   #define	TAG_INVOFF	'\002'
   #define	TAG_BOLDON	'\003'
---- 2085,2091 ----
+--- 2303,2309 ----
   } ATABLE_S;
   
   
-! #define TAG_EMBED       '\001'  /* Announces embedded data in text string */
+! #define TAG_EMBED	'\001'	/* Announces embedded data in text string */
   #define	TAG_INVON	'\001'	/* Supported character attributes	  */
   #define	TAG_INVOFF	'\002'
   #define	TAG_BOLDON	'\003'
diff --git a/mail/pine4/files/patch-an b/mail/pine4/files/patch-an
index c0b69d687620..2d9cc2dc5bea 100644
--- a/mail/pine4/files/patch-an
+++ b/mail/pine4/files/patch-an
@@ -1,32 +1,36 @@
-*** pico/os_unix.h.orig	Thu Jun 13 00:47:23 1996
---- pico/os_unix.h	Thu Jan 29 21:29:51 1998
+*** 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
 ***************
-*** 122,133 ****
+*** 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 ****
   /*
    * Place where mail gets delivered (for pico's new mail checking)
    */
-  #if	defined(sv3) || defined(ct) || defined(isc) || defined(AUX) || defined(sgi)
-  #define	MAILDIR		"/usr/mail"
-  #else
-  #define	MAILDIR		"/usr/spool/mail"
-  #endif
-! 
+! #define MAILDIR		"/usr/spool/mail"
   
   /*
    * What and where the tool that checks spelling is located.  If this is
---- 122,136 ----
+--- 152,158 ----
   /*
    * Place where mail gets delivered (for pico's new mail checking)
    */
-+ #ifdef __FreeBSD__
-+ #define MAILDIR         "/var/mail"
-+ #else
-  #if	defined(sv3) || defined(ct) || defined(isc) || defined(AUX) || defined(sgi)
-  #define	MAILDIR		"/usr/mail"
-  #else
-  #define	MAILDIR		"/usr/spool/mail"
-  #endif
-! #endif
+! #define MAILDIR		"/var/mail"
   
   /*
    * What and where the tool that checks spelling is located.  If this is
diff --git a/mail/pine4/files/patch-ap b/mail/pine4/files/patch-ap
index 4a7155a3732d..2aa3d35d53c2 100644
--- a/mail/pine4/files/patch-ap
+++ b/mail/pine4/files/patch-ap
@@ -1,20 +1,20 @@
-*** pine/ttyout.c.bak	Thu Jul 11 05:45:56 1996
---- pine/ttyout.c	Thu Jan 29 22:17:48 1998
+*** pico/osdep/term.cap.orig	Sat Feb 28 02:14:53 1998
+--- pico/osdep/term.cap	Wed Jul 15 01:58:58 1998
 ***************
-*** 289,295 ****
-      _kppu              = tgetstr("kP", &ptr);
-      _kppd              = tgetstr("kN", &ptr);
-      _kphome            = tgetstr("kh", &ptr);
-!     _kpend             = tgetstr("kE", &ptr);
-      _kpdel             = tgetstr("kD", &ptr);
-      _kf1               = tgetstr("k1", &ptr);
-      _kf2               = tgetstr("k2", &ptr);
---- 289,296 ----
-      _kppu              = tgetstr("kP", &ptr);
-      _kppd              = tgetstr("kN", &ptr);
-      _kphome            = tgetstr("kh", &ptr);
-!     if((_kpend         = tgetstr("@7", &ptr)) == NULL)
-!       _kpend             = tgetstr("kE", &ptr);
-      _kpdel             = tgetstr("kD", &ptr);
-      _kf1               = tgetstr("k1", &ptr);
-      _kf2               = tgetstr("k2", &ptr);
+*** 270,276 ****
+      _kppu		= tgetstr("kP", &p);
+      _kppd		= tgetstr("kN", &p);
+      _kphome		= tgetstr("kh", &p);
+!     _kpend		= tgetstr("kH", &p);
+      _kpdel		= tgetstr("kD", &p);
+      _kf1		= tgetstr("k1", &p);
+      _kf2		= tgetstr("k2", &p);
+--- 270,277 ----
+      _kppu		= tgetstr("kP", &p);
+      _kppd		= tgetstr("kN", &p);
+      _kphome		= tgetstr("kh", &p);
+!     if((_kpend		= tgetstr("@7", &p)) == NULL)
+!       _kpend		= tgetstr("kH",&p);
+      _kpdel		= tgetstr("kD", &p);
+      _kf1		= tgetstr("k1", &p);
+      _kf2		= tgetstr("k2", &p);
diff --git a/mail/pine4/files/patch-aq b/mail/pine4/files/patch-aq
index d90d3d3f065c..73d73e206552 100644
--- a/mail/pine4/files/patch-aq
+++ b/mail/pine4/files/patch-aq
@@ -1,7 +1,7 @@
-*** pico/display.c.bak	Wed Jul 10 20:59:09 1996
---- pico/display.c	Thu Jan 29 23:06:07 1998
+*** pico/display.c.orig	Fri Jun 19 20:19:53 1998
+--- pico/display.c	Mon Jul 13 01:36:38 1998
 ***************
-*** 82,88 ****
+*** 77,83 ****
       {"^X", "Exit", KS_EXIT},		{"^J", "Justify", KS_JUSTIFY},
       {"^W", "Where is", KS_WHEREIS},	{"^V", "Next Pg", KS_NEXTPAGE},
       {"^U", NULL, KS_NONE},
@@ -9,7 +9,7 @@
       {"^T", "To Spell", KS_SPELLCHK}
   #else
       {"^D", "Del Char", KS_NONE}
---- 82,88 ----
+--- 77,83 ----
       {"^X", "Exit", KS_EXIT},		{"^J", "Justify", KS_JUSTIFY},
       {"^W", "Where is", KS_WHEREIS},	{"^V", "Next Pg", KS_NEXTPAGE},
       {"^U", NULL, KS_NONE},
@@ -17,8 +17,8 @@
       {"^T", "To Spell", KS_SPELLCHK}
   #else
       {"^D", "Del Char", KS_NONE}
-*** pico/ebind.h.bak	Fri Mar 15 10:41:58 1996
---- pico/ebind.h	Thu Jan 29 23:04:30 1998
+*** pico/ebind.h.orig	Sat Feb 28 02:10:31 1998
+--- pico/ebind.h	Mon Jul 13 01:36:39 1998
 ***************
 *** 145,151 ****
   	{CTRL|'O',		filewrite},
@@ -36,10 +36,10 @@
   	{CTRL|'T',		spell},
   #endif	/* SPELLER */
   	{CTRL|'U',		yank},
-*** pico/main.c.bak	Wed May 29 04:05:27 1996
---- pico/main.c	Thu Jan 29 23:04:30 1998
+*** pico/main.c.orig	Tue Apr 21 20:28:08 1998
+--- pico/main.c	Mon Jul 13 01:36:39 1998
 ***************
-*** 72,78 ****
+*** 66,72 ****
       { F9,  (CTRL|'K')},
       { F10, (CTRL|'U')},
       { F11, (CTRL|'C')},
@@ -47,7 +47,7 @@
       { F12, (CTRL|'T')}
   #else
       { F12, (CTRL|'D')}
---- 72,78 ----
+--- 66,72 ----
       { F9,  (CTRL|'K')},
       { F10, (CTRL|'U')},
       { F11, (CTRL|'C')},
diff --git a/mail/pine4/files/patch-as b/mail/pine4/files/patch-as
new file mode 100644
index 000000000000..09205ca4c9c3
--- /dev/null
+++ b/mail/pine4/files/patch-as
@@ -0,0 +1,25 @@
+*** pine/init.c.orig	Sat Jun 27 00:01:05 1998
+--- pine/init.c	Tue Jul 14 23:14:23 1998
+***************
+*** 579,584 ****
+--- 579,586 ----
+      GLO_SMTP_SERVER		= parse_list(DF_SMTP_SERVER, 1, NULL);
+  #endif
+  
++     F_TURN_ON(F_TCAP_WINS,ps);
++ 
+      /* Set the default mail directory */
+      build_path(buf, GLO_MAIL_DIRECTORY, "[]");
+      GLO_FOLDER_SPEC		= parse_list(buf, 1, NULL);
+*** pine/other.c.orig	Thu Jul  9 00:35:12 1998
+--- pine/other.c	Tue Jul 14 21:37:09 1998
+***************
+*** 696,702 ****
+  			 || (F) == F_DISABLE_DFLT_IN_BUG_RPT	\
+  			 || (F) == F_DISABLE_ALARM		\
+  			 || (F) == F_ALLOW_CHANGING_FROM	\
+- 			 || (F) == F_TCAP_WINS			\
+  			 || (F) == F_QUELL_PARTIAL_FETCH	\
+  			 || (F) == F_AGG_SEQ_COPY)
+  
+--- 696,701 ----
diff --git a/mail/pine4/pkg-comment b/mail/pine4/pkg-comment
index a6b5ae328789..a461a7071699 100644
--- a/mail/pine4/pkg-comment
+++ b/mail/pine4/pkg-comment
@@ -1 +1 @@
-Program for Internet E-mail and News
+Pine(tm) -- a Program for Internet News & Email
diff --git a/mail/pine4/pkg-descr b/mail/pine4/pkg-descr
index 1fa7653efe05..f89eceffc92b 100644
--- a/mail/pine4/pkg-descr
+++ b/mail/pine4/pkg-descr
@@ -1,12 +1,14 @@
-Pine for FreeBSD 2.x is a tool for reading, sending, and managing
-electronic messages.  It was designed specifically with novice
-computer users in mind, but can be tailored to accommodate the needs
-of "power users" as well.  Pine uses Internet message protocols (e.g.
-RFC-822, SMTP, MIME, IMAP, NNTP) and runs on Unix and PCs.  This
-package also includes the Pico editor, the IMAP daemon, a POP2 server, 
-and a POP3 server.
+Pine (Program for Internet News & Email) is a tool for reading, sending,
+and managing electronic messages.  It was designed specifically with
+novice computer users in mind, but can be tailored to accommodate the
+needs of "power users" as well.  Pine uses Internet message protocols
+(e.g. RFC-822, SMTP, MIME, IMAP, NNTP) and runs on Unix and PCs.
 
-If you want to use the spell checking feature of pine, set the
+Besides Pine this package includes the Pico editor, the Pilot file browser
+and also the IMAPv4r1 daemon and POP2/POP3 servers (these daemons are not
+built by default).
+
+If you want to use the spell checking feature of Pine, set the
 environment variable SPELL to "/usr/local/bin/ispell -l".
 
 An optional configuration file "pine.conf" can be put into /usr/local/etc 
@@ -16,3 +18,8 @@ to set system wide defaults.  The format of this file is identical to the
 Also included in dot.pinerc.pgp.sample are example entries needed to
 add to your .pinerc to activate the pgp add on scripts pgpdecode,
 pgpencode, and pgpsign.
+
+Pine on WWW: http://www.cac.washington.edu/pine/
+
+- Adrian Penisoara (Ady)
+pine@freebsd.ady.ro