Upgrade, 3.91 -> 3.95. This version is supposed to fix a lot of bugs.

Submitted by:	"Matthew N. Dodd" <winter@jurai.net>

15 files changed, 709 insertions, 7 deletions

diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index 2485a441af0d..43df8bc5f140 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -1,21 +1,23 @@
 # New ports collection makefile for:	pine
-# Version required:	3.91
+# Version required:	3.95
 # Date created:		03 September 1994
 # Whom:			mr
 #
-# $Id: Makefile,v 1.10 1995/05/18 08:55:37 asami Exp $
+# $Id: Makefile,v 1.11 1995/08/14 11:52:36 asami Exp $
 #
 
-DISTNAME=	pine3.91
-PKGNAME=	pine-3.91
+DISTNAME=	pine3.95
+PKGNAME=	pine-3.95
 CATEGORIES+=	mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
-EXTRACT_SUFX=	.tar.Z
 
 post-install:
+.if !defined(NOMANCOMPRESS)
 	gzip -9nf ${PREFIX}/man/man1/pine.1
 	gzip -9nf ${PREFIX}/man/man1/pico.1
+	gzip -9nf ${PREFIX}/man/man1/pilot.1
 	gzip -9nf ${PREFIX}/man/man8/imapd.8c
 	gzip -9nf ${PREFIX}/man/man8/ipopd.8c
+.endif
 
 .include <bsd.port.mk>
diff --git a/mail/pine4/distinfo b/mail/pine4/distinfo
index b5e79d3377b7..f9ca749622ff 100644
--- a/mail/pine4/distinfo
+++ b/mail/pine4/distinfo
@@ -1 +1 @@
-MD5 (pine3.91.tar.Z) = 86e08fe40d503d4e65febecd41531712
+MD5 (pine3.95.tar.gz) = e99dd57904a035571776d7dc0c632d46
diff --git a/mail/pine4/files/dot.pinerc.pgp.sample b/mail/pine4/files/dot.pinerc.pgp.sample
new file mode 100644
index 000000000000..1f7df9e4fe2b
--- /dev/null
+++ b/mail/pine4/files/dot.pinerc.pgp.sample
@@ -0,0 +1,16 @@
+# List of features; see Pine's Setup/options menu for the current set.
+# e.g. feature-list= select-without-confirm, signature-at-bottom
+# Default condition for all of the features is no-.
+feature-list=compose-send-offers-first-filter
+
+# This variable takes a list of programs that message text is piped into
+# after MIME decoding, prior to display.
+display-filters="-----BEGIN PGP" /usr/local/bin/pgpdecode
+
+# This defines a program that message text is piped into before MIME
+# encoding, prior to sending
+sending-filters=/usr/local/bin/pgpsign,
+        /usr/local/bin/pgpencrypt _RECIPIENTS_
+
+# hook, to get rid of the sucking 'quoted printable' ;-))
+# enable-8bit-esmtp-negotiation
diff --git a/mail/pine4/files/patch-ac b/mail/pine4/files/patch-ac
new file mode 100644
index 000000000000..df5cc47f5466
--- /dev/null
+++ b/mail/pine4/files/patch-ac
@@ -0,0 +1,412 @@
+*** pine/osdep/os-bsf.h.orig	Sat Jun 15 12:32:50 1996
+--- pine/osdep/os-bsf.h	Fri Jun 14 00:45:08 1996
+***************
+*** 0 ****
+--- 1,407 ----
++ /*----------------------------------------------------------------------
++   $Id: os-bsi.h,v 1.42 1996/06/05 17:12:38 mikes Exp $
++ 
++             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/bin/inews -h"	/* news posting cmd */
++ 
++ 
++ /*--------- Program employed by users to change their password ---------*/
++ #define	PASSWD_PROG	"/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 2
++ 
++ 
++ 
++ /*----------------------------------------------------------------------
++     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 */
++ 
++ 
diff --git a/mail/pine4/files/patch-af b/mail/pine4/files/patch-af
new file mode 100644
index 000000000000..4fd5a6603d6a
--- /dev/null
+++ b/mail/pine4/files/patch-af
@@ -0,0 +1,93 @@
+*** imap/ANSI/c-client/Makefile.orig	Wed May 29 22:33:17 1996
+--- imap/ANSI/c-client/Makefile	Fri Jun 14 00:10:52 1996
+***************
+*** 33,40 ****
+--- 33,42 ----
+  
+  ARCHIVE=c-client.a
++ SHLIB=libc-client.so.1.3
+  ARRC=ar rc
+  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
++ SOFILES=	${BINARIES:.o=.so}
+  CC=cc
+  CFLAGS=$(EXTRACFLAGS)
+***************
+*** 49,52 ****
+--- 51,57 ----
+  SHELL=/bin/sh
+  
++ # Need this for the shared library rule to work correctly
++ .SUFFIXES: .o .so
++ 
+  missing:
+  	@echo "You must specify what type of system"
+***************
+*** 120,123 ****
+--- 125,135 ----
+  		RSHPATH=/usr/bin/rsh CFLAGS="-g -O -pipe -DNFSKLUDGE $(EXTRACFLAGS)"
+  
++ bsf:	# FreeBSD
++ 	$(MAKE) mtest OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" \
++ 		STDPROTO=bezerkproto MAILSPOOL=/var/mail \
++ 		ACTIVEFILE=/usr/lib/news/active NEWSSPOOL=/usr/spool/news \
++ 		RSHPATH=/usr/bin/rsh CFLAGS="-O -pipe -DNFSKLUDGE $(EXTRACFLAGS)" \
++ 		LDFLAGS="-lcrypt"
++ 
+  cvx:	# Convex
+  	$(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \
+***************
+*** 395,401 ****
+  
+  clean:
+! 	$(RM) *.o linkage.[ch] mtest $(ARCHIVE) osdep.* CCTYPE CFLAGS LDFLAGS
+  
+! mtest: $(ARCHIVE) mtest.o
+  	$(CC) $(CFLAGS) -o mtest mtest.o $(ARCHIVE) $(LDFLAGS)
+  
+--- 407,413 ----
+  
+  clean:
+! 	$(RM) *.o *.so linkage.[ch] mtest $(SHLIB) $(ARCHIVE) osdep.* CCTYPE CFLAGS LDFLAGS
+  
+! mtest: $(ARCHIVE) $(SHLIB) mtest.o
+  	$(CC) $(CFLAGS) -o mtest mtest.o $(ARCHIVE) $(LDFLAGS)
+  
+***************
+*** 405,408 ****
+--- 417,427 ----
+  	$(RANLIB) $(ARCHIVE)
+  
++ $(SHLIB):	$(SOFILES)
++ 	ld -Bshareable -o $(SHLIB) $(SOFILES)
++ 	strip $(SHLIB)
++ 
++ .c.so:	osdep.h
++ 	$(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
++ 
+  # Dependencies
+  
+***************
+*** 445,448 ****
+--- 464,483 ----
+  	$(EXTRAOSDEFS) -c os_$(OS).c
+  	$(MV) os_$(OS).o osdep.o
++ 
++ osdep.so: mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
++ 	osdep.h env_unix.h tcp_unix.h \
++ 	os_$(OS).c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \
++ 	log_std.c log_sv4.c log_ssn.c log_ult.c \
++ 	gr_wait.c gr_wait4.c gr_waitp.c \
++ 	flock.c ingroups.c opendir.c scandir.c \
++ 	memmove.c memmove2.c memset.c \
++ 	write.c writev.c writevs.c \
++ 	tz_bsd.c tz_nul.c tz_sv4.c \
++ 	strerror.c strpbrk.c strstr.c strtok.c strtol.c strtoul.c
++ 	$(CC) -fpic -DPIC $(CFLAGS) -DSTDPROTO=$(STDPROTO) -DMAILSPOOL=\"$(MAILSPOOL)\" \
++ 	-DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
++ 	-DRSH=\"$(RSH)\" -DRSHPATH=\"$(RSHPATH)\" \
++ 	$(EXTRAOSDEFS) -c os_$(OS).c -o os_$(OS).so
++ 	$(MV) os_$(OS).so osdep.so
+  
+  osdep.h: os_$(OS).h linkage
diff --git a/mail/pine4/files/patch-ai b/mail/pine4/files/patch-ai
new file mode 100644
index 000000000000..d5647c91cb6f
--- /dev/null
+++ b/mail/pine4/files/patch-ai
@@ -0,0 +1,41 @@
+*** imap/ANSI/ipopd/Makefile.orig	Thu Mar 14 15:20:20 1996
+--- imap/ANSI/ipopd/Makefile	Fri Jun 14 00:13:07 1996
+***************
+*** 33,37 ****
+  
+  C = ../c-client
+! CCLIENTLIB = $C/c-client.a
+  SHELL = /bin/sh
+  
+--- 33,37 ----
+  
+  C = ../c-client
+! CCLIENTLIB = $C/libc-client.so.1.3
+  SHELL = /bin/sh
+  
+***************
+*** 40,44 ****
+  CC = `cat $C/CCTYPE`
+  CFLAGS = -I$C `cat $C/CFLAGS`
+! LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+  
+  ipopd: ipop2d ipop3d
+--- 40,44 ----
+  CC = `cat $C/CCTYPE`
+  CFLAGS = -I$C `cat $C/CFLAGS`
+! LDFLAGS = -L$C -lc-client `cat $C/LDFLAGS`
+  
+  ipopd: ipop2d ipop3d
+***************
+*** 55,59 ****
+  
+  $(CCLIENTLIB):
+! 	cd $C;make
+  
+  clean:
+--- 55,59 ----
+  
+  $(CCLIENTLIB):
+! 	cd $C;make $(OS)
+  
+  clean:
diff --git a/mail/pine4/files/patch-aj b/mail/pine4/files/patch-aj
new file mode 100644
index 000000000000..d824539dabd9
--- /dev/null
+++ b/mail/pine4/files/patch-aj
@@ -0,0 +1,41 @@
+*** imap/ANSI/imapd/Makefile.orig	Thu Mar 14 15:20:52 1996
+--- imap/ANSI/imapd/Makefile	Fri Jun 14 00:13:00 1996
+***************
+*** 33,37 ****
+  
+  C = ../c-client
+! CCLIENTLIB = $C/c-client.a
+  SHELL = /bin/sh
+  
+--- 33,37 ----
+  
+  C = ../c-client
+! CCLIENTLIB = $C/libc-client.so.1.3
+  SHELL = /bin/sh
+  
+***************
+*** 40,44 ****
+  CC = `cat $C/CCTYPE`
+  CFLAGS = -I$C `cat $C/CFLAGS`
+! LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+  
+  imapd: $(CCLIENTLIB) imapd.o
+--- 40,44 ----
+  CC = `cat $C/CCTYPE`
+  CFLAGS = -I$C `cat $C/CFLAGS`
+! LDFLAGS = -L$C -lc-client `cat $C/LDFLAGS`
+  
+  imapd: $(CCLIENTLIB) imapd.o
+***************
+*** 48,52 ****
+  
+  $(CCLIENTLIB):
+! 	cd $C;make
+  
+  clean:
+--- 48,52 ----
+  
+  $(CCLIENTLIB):
+! 	cd $C;make $(OS)
+  
+  clean:
diff --git a/mail/pine4/files/patch-ak b/mail/pine4/files/patch-ak
new file mode 100644
index 000000000000..222325cc2ddc
--- /dev/null
+++ b/mail/pine4/files/patch-ak
@@ -0,0 +1,25 @@
+*** imap/Makefile.orig	Wed May 29 22:33:10 1996
+--- imap/Makefile	Fri Jun 14 00:14:31 1996
+***************
+*** 48,52 ****
+  # 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=$@
+  
+--- 48,52 ----
+  # 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=$@
+  
+***************
+*** 82,85 ****
+--- 82,88 ----
+  bs2:
+  	$(MAKE) build SYSTYPE=ANSI OS=bsi
++ 
++ bsf:
++ 	$(MAKE) build OS=bsf PROCESS=an
+  
+  pt1:
diff --git a/mail/pine4/files/patch-al b/mail/pine4/files/patch-al
new file mode 100644
index 000000000000..1ab82cfcedb3
--- /dev/null
+++ b/mail/pine4/files/patch-al
@@ -0,0 +1,37 @@
+*** build.orig	Tue May 14 14:22:47 1996
+--- build	Fri Jun 14 00:09:03 1996
+***************
+*** 169,179 ****
+          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 ../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
+          echo "Done"
+          ;;
+--- 169,189 ----
+          if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
+          if [ -s ../c-client/mtest ] ; then ln ../c-client/mtest mtest ; fi
++         if [ -s ../c-client/libc-client.so.1.3 ] ; 
++ 		then ln ../c-client/libc-client.so.1.3 libc-client.so.1.3 ; fi
+          if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
++         if [ -s ../imap/systype/ipopd/ipop2d ] ;
++ 		then ln ../imap/systype/ipopd/ipop2d ipop2d ; fi
++         if [ -s ../imap/systype/ipopd/ipop3d ] ;
++ 		then ln ../imap/systype/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 ../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/mtest bin/imapd bin/pico bin/pilot \
+! 		bin/ipop2d bin/ipop3d \
+! 		bin/libc-client.so.1.3 bin/libpico.so.1.3 
+          echo "Done"
+          ;;
diff --git a/mail/pine4/files/pgpdecode b/mail/pine4/files/pgpdecode
new file mode 100644
index 000000000000..86d5a97daa04
--- /dev/null
+++ b/mail/pine4/files/pgpdecode
@@ -0,0 +1,14 @@
+#! /bin/sh
+# ---------- pgpdecode ---------
+# 21.03.96 Roland Rosenfeld <roland@spinnaker.rhein.de>
+#
+# Sun Mar 24 12:01:21 MET 1996 Andreas Klemm <andreas@knobel.gun.de>
+# The tmp files in the original version were world readable for
+# the short time of unpacking, setting suitable umask prevents this
+#
+umask 077
+trap "rm -f /tmp/pgpdecode.???.$$; exit" 0 1 2 15
+(pgp -f > /tmp/pgpdecode.txt.$$) 2>&1 | tee /tmp/pgpdecode.pgp.$$ 1>&2
+sed -e 's/^/| /' /tmp/pgpdecode.pgp.$$
+echo " "
+cat /tmp/pgpdecode.txt.$$
diff --git a/mail/pine4/files/pgpencrypt b/mail/pine4/files/pgpencrypt
new file mode 100644
index 000000000000..b727b6693153
--- /dev/null
+++ b/mail/pine4/files/pgpencrypt
@@ -0,0 +1,4 @@
+#!/bin/sh
+# ---------- pgpencrypt ---------
+# 21.03.96 Roland Rosenfeld <roland@spinnaker.rhein.de>
+pgp -feast $*
diff --git a/mail/pine4/files/pgpsign b/mail/pine4/files/pgpsign
new file mode 100644
index 000000000000..e56326cb1bf9
--- /dev/null
+++ b/mail/pine4/files/pgpsign
@@ -0,0 +1,4 @@
+#!/bin/sh
+# ---------- pgpsign ---------
+# 21.03.96 Roland Rosenfeld <roland@spinnaker.rhein.de>
+pgp -fast
diff --git a/mail/pine4/pkg-comment b/mail/pine4/pkg-comment
index 63ce3975802f..a6b5ae328789 100644
--- a/mail/pine4/pkg-comment
+++ b/mail/pine4/pkg-comment
@@ -1 +1 @@
-Pine 3.91 - Program for Internet News and E-mail
+Program for Internet E-mail and News
diff --git a/mail/pine4/pkg-descr b/mail/pine4/pkg-descr
index ceabf7e4d56f..1fa7653efe05 100644
--- a/mail/pine4/pkg-descr
+++ b/mail/pine4/pkg-descr
@@ -12,3 +12,7 @@ environment variable SPELL to "/usr/local/bin/ispell -l".
 An optional configuration file "pine.conf" can be put into /usr/local/etc 
 to set system wide defaults.  The format of this file is identical to the 
 .pinerc file that is auto-generated by pine in your home directory.
+
+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.
diff --git a/mail/pine4/pkg-plist b/mail/pine4/pkg-plist
index 22b343699aee..dc59303b2190 100644
--- a/mail/pine4/pkg-plist
+++ b/mail/pine4/pkg-plist
@@ -3,8 +3,17 @@ libexec/ipop2d
 libexec/ipop3d
 bin/mtest
 bin/pico
+bin/pilot
 bin/pine
+lib/libc-client.so.1.3
+lib/libpico.so.1.3
+@exec /sbin/ldconfig -m %B
+bin/pgpencrypt
+bin/pgpdecode
+bin/pgpsign
+etc/dot.pinerc.pgp.sample
 man/man1/pico.1.gz
+man/man1/pilot.1.gz
 man/man1/pine.1.gz
 man/man8/imapd.8c.gz
 man/man8/ipopd.8c.gz