Update to version 4.05.

PR:		7993, 8151
Submitted by:	maintainer

17 files changed, 273 insertions, 90 deletions

diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index d67059d2c339..bcc104fe965b 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -1,33 +1,46 @@
 # New ports collection makefile for:	pine
 # http://www.washington.edu/pine/
-# Version required:     4.02A
+# Version required:     4.05
 # Date created:		09 July 1998
 # Whom:			Adrian Penisoara <ady@freebsd.ady.ro>
 #
-# $Id: Makefile,v 1.25 1998/07/29 16:43:59 asami Exp $
+# $Id: Makefile,v 1.26 1998/08/13 06:49:09 jkoshy Exp $
 #
 
-DISTNAME=       pine4.02
-PKGNAME=        pine-4.02a
+DISTNAME=       pine4.05
+PKGNAME=        pine-4.05
 CATEGORIES=     mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	${DISTNAME}A.patch
-PATCH_DIST_STRIP= -p1
-
 MAINTAINER=	pine@freebsd.ady.ro
 
 NO_LATEST_LINK= yes
 
 MAN1= 		pine.1 pico.1 pilot.1
 
+post-patch:
+	for i in ${WRKSRC}/doc/pine.1 \
+		${WRKSRC}/pine/init.c \
+		${WRKSRC}/pine/pine.hlp \
+		${WRKSRC}/pine/mailcap.c \
+		${WRKSRC}/pine/osdep/os-bsf.h ; do \
+		${MV} $$i $$i.sed ; \
+		${SED} -e "s:@@PREFIX@@:${PREFIX}:g" \
+			$$i.sed >$$i ; \
+		${RM} $$i.sed ; \
+	done
+	for i in ${WRKSRC}/doc/tech-notes.txt \
+		${WRKSRC}/doc/tech-notes/*.html ; do \
+		${MV} $$i $$i.sed ; \
+		${SED} -e "s:/usr/local/lib/:${PREFIX}/etc/:g" \
+			$$i.sed >$$i ; \
+		${RM} $$i.sed ; \
+	done
+
 do-build:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./build bsf)
 
 do-install:
-	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		${WRKSRC}/bin/libpico.so.2.0 ${PREFIX}/lib/libpico.so.2.0
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pico ${PREFIX}/bin/pico
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pilot ${PREFIX}/bin/pilot
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin/pine
@@ -50,6 +63,11 @@ do-install:
 .endif
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib/
+	${PREFIX}/bin/pine -P ${PREFIX}/etc/pine.conf -conf >${WRKSRC}/pine.conf
+	${INSTALL_DATA} ${WRKSRC}/pine.conf ${PREFIX}/etc/pine.conf
+	@${ECHO} "	- - - - - - - - - - - - - - - - - - - - - - - - -"
+	@${ECHO} "	If Pine exits with \"Received abort signal\" try"
+	@${ECHO} "	disabling the \"quell-folder-internal-msg\" feature"
+	@${ECHO} "	- - - - - - - - - - - - - - - - - - - - - - - - -"
 
 .include <bsd.port.mk>
diff --git a/mail/pine4/distinfo b/mail/pine4/distinfo
index 0feef2c611e2..c4f77574f639 100644
--- a/mail/pine4/distinfo
+++ b/mail/pine4/distinfo
@@ -1,2 +1 @@
-MD5 (pine4.02.tar.gz) = 688979b5649473169bdbf22ea1c82fe7
-MD5 (pine4.02A.patch) = 96271a2a00293186941cad0c0175bd69
+MD5 (pine4.05.tar.gz) = 84dc37198853959188a551eb4ee8aa00
diff --git a/mail/pine4/files/patch-ac b/mail/pine4/files/patch-ac
index 17a90d0c2572..cc5c780d92ee 100644
--- a/mail/pine4/files/patch-ac
+++ b/mail/pine4/files/patch-ac
@@ -1,5 +1,5 @@
-*** pine/osdep/os-bsf.h.orig	Fri Jun 26 09:19:54 1998
---- pine/osdep/os-bsf.h	Wed Aug 12 22:22:02 1998
+*** pine/osdep/os-bsf.h.orig	Wed Aug 12 00:50:27 1998
+--- pine/osdep/os-bsf.h	Sat Sep 12 17:26:37 1998
 ***************
 *** 74,80 ****
      default-composer-hdrs or customized-hdrs to get at it. Instead of
@@ -13,7 +13,7 @@
      default-composer-hdrs or customized-hdrs to get at it. Instead of
      defining NEVER_ALLOW_CHANGING_FROM, an easier way of preventing From
      changing is to put the feature "no-allow-changing-from" in the
-!    /usr/local/etc/pine.conf.fixed file.
+!    @@PREFIX@@/etc/pine.conf.fixed file.
    ----*/
   /* #define NEVER_ALLOW_CHANGING_FROM /* probably not needed */
   
@@ -35,6 +35,25 @@
   
   
 ***************
+*** 160,167 ****
+  
+  
+  /*----- System-wide config file ----------------------------------------*/
+! #define SYSTEM_PINERC             "/usr/local/lib/pine.conf"
+! #define SYSTEM_PINERC_FIXED       "/usr/local/lib/pine.conf.fixed"
+  
+  
+  
+--- 160,167 ----
+  
+  
+  /*----- System-wide config file ----------------------------------------*/
+! #define SYSTEM_PINERC             "@@PREFIX@@/etc/pine.conf"
+! #define SYSTEM_PINERC_FIXED       "@@PREFIX@@/etc/pine.conf.fixed"
+  
+  
+  
+***************
 *** 219,225 ****
   /*----------------------------------------------------------------------
      If no nntp-servers are defined, this program will be used to post news.
diff --git a/mail/pine4/files/patch-ai b/mail/pine4/files/patch-ai
index f12edfce77ae..8ef03dd5c162 100644
--- a/mail/pine4/files/patch-ai
+++ b/mail/pine4/files/patch-ai
@@ -1,7 +1,7 @@
-*** pine/send.c.orig	Wed Aug 12 19:00:10 1998
---- pine/send.c	Wed Aug 12 19:49:04 1998
+*** pine/send.c.orig	Tue Sep 15 22:12:31 1998
+--- pine/send.c	Sun Sep 20 00:41:41 1998
 ***************
-*** 6673,6685 ****
+*** 6736,6748 ****
   		body->subtype = cpystr("octet-stream");
   	    }
   
@@ -15,7 +15,7 @@
   	}
       }
   
---- 6673,6689 ----
+--- 6736,6752 ----
   		body->subtype = cpystr("octet-stream");
   	    }
   
@@ -34,7 +34,7 @@
       }
   
 ***************
-*** 7499,7505 ****
+*** 7573,7579 ****
   
   	switch (body->encoding) {	/* all else needs filtering */
   	  case ENC8BIT:			/* encode 8BIT into QUOTED-PRINTABLE */
@@ -42,7 +42,7 @@
   	    break;
   
   	  case ENCBINARY:		/* encode binary into BASE64 */
---- 7503,7510 ----
+--- 7577,7584 ----
   
   	switch (body->encoding) {	/* all else needs filtering */
   	  case ENC8BIT:			/* encode 8BIT into QUOTED-PRINTABLE */
@@ -52,7 +52,7 @@
   
   	  case ENCBINARY:		/* encode binary into BASE64 */
 ***************
-*** 7582,7588 ****
+*** 7656,7662 ****
   	     && !(so_puts(so, "Content-Transfer-Encoding: ")
   		  && so_puts(so, body_encodings[(body->encoding==ENCBINARY)
   						? ENCBASE64
@@ -60,7 +60,7 @@
   						  ? ENCQUOTEDPRINTABLE
   						  : (body->encoding <= ENCMAX)
   						    ? body->encoding
---- 7587,7593 ----
+--- 7661,7667 ----
   	     && !(so_puts(so, "Content-Transfer-Encoding: ")
   		  && so_puts(so, body_encodings[(body->encoding==ENCBINARY)
   						? ENCBASE64
diff --git a/mail/pine4/files/patch-ak b/mail/pine4/files/patch-ak
index cac104b7427b..41522f17feee 100644
--- a/mail/pine4/files/patch-ak
+++ b/mail/pine4/files/patch-ak
@@ -1,7 +1,7 @@
-*** imap/Makefile.orig	Wed Apr 29 02:38:46 1998
---- imap/Makefile	Sat Jul 11 01:58:29 1998
+*** imap/Makefile.orig	Sat Aug  8 05:32:23 1998
+--- imap/Makefile	Thu Sep  3 19:36:35 1998
 ***************
-*** 250,261 ****
+*** 253,264 ****
   	$(TOOLS)/$@ "$(LN)" src/charset c-client
   	$(LN) `pwd`/src/kerberos/* c-client
   	$(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
@@ -14,7 +14,7 @@
   
   OSTYPE:
   	@echo Building c-client for $(OS)...
---- 250,261 ----
+--- 253,264 ----
   	$(TOOLS)/$@ "$(LN)" src/charset c-client
   	$(LN) `pwd`/src/kerberos/* c-client
   	$(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
diff --git a/mail/pine4/files/patch-al b/mail/pine4/files/patch-al
index 0c13f35d583c..5276f237842a 100644
--- a/mail/pine4/files/patch-al
+++ b/mail/pine4/files/patch-al
@@ -1,7 +1,26 @@
-*** build.orig	Mon Jun 15 20:35:10 1998
---- build	Wed Aug 12 20:21:46 1998
+*** build.orig	Fri Sep  4 03:01:15 1998
+--- build	Sun Sep 20 00:52:36 1998
 ***************
-*** 256,266 ****
+*** 80,87 ****
+   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.
+--- 80,87 ----
+   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.
+***************
+*** 274,284 ****
   
           if [ -s c-client ] ; then rm -f c-client ; fi
           ln -s imap/c-client c-client
@@ -13,7 +32,7 @@
           eval echo make "$makeargs" "$K1" "$K2" $ccltarg
           cd $PHOME/imap
           eval make "$makeargs" "$K1" "$K2" $ccltarg
---- 256,266 ----
+--- 274,284 ----
   
           if [ -s c-client ] ; then rm -f c-client ; fi
           ln -s imap/c-client c-client
@@ -26,7 +45,7 @@
           cd $PHOME/imap
           eval make "$makeargs" "$K1" "$K2" $ccltarg
 ***************
-*** 281,294 ****
+*** 299,312 ****
           cd $PHOME/bin
           rm -f pine mtest imapd pico pilot
           if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
@@ -41,7 +60,7 @@
           echo "Done"
           ;;
   
---- 281,296 ----
+--- 299,312 ----
           cd $PHOME/bin
           rm -f pine mtest imapd pico pilot
           if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
@@ -49,17 +68,15 @@
 ! #       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.2.0 ] ;
-+               then ln ../pico/libpico.so.2.0 libpico.so.2.0 ; fi
           cd $PHOME
           echo ''
           echo "Links to executables are in bin directory:"
-!         size bin/pine bin/pico bin/pilot bin/libpico.so.2.0
+!         size bin/pine bin/pico bin/pilot
           echo "Done"
           ;;
   
 ***************
-*** 299,308 ****
+*** 317,326 ****
   	make clean
           echo "Cleaning Pine"
           cd $PHOME/pine
@@ -70,7 +87,7 @@
           echo "Done"
           cd $PHOME
           ;;
---- 301,310 ----
+--- 317,326 ----
   	make clean
           echo "Cleaning Pine"
           cd $PHOME/pine
diff --git a/mail/pine4/files/patch-am b/mail/pine4/files/patch-am
index d7b703c731bc..2776fc672446 100644
--- a/mail/pine4/files/patch-am
+++ b/mail/pine4/files/patch-am
@@ -1,7 +1,7 @@
-*** pine/pine.h.orig	Fri Jul 17 03:10:56 1998
---- pine/pine.h	Tue Jul 21 14:53:05 1998
+*** pine/pine.h.orig	Wed Sep 16 07:14:56 1998
+--- pine/pine.h	Sun Sep 20 00:43:14 1998
 ***************
-*** 2304,2310 ****
+*** 2346,2352 ****
   } ATABLE_S;
   
   
@@ -9,7 +9,7 @@
   #define	TAG_INVON	'\001'	/* Supported character attributes	  */
   #define	TAG_INVOFF	'\002'
   #define	TAG_BOLDON	'\003'
---- 2304,2310 ----
+--- 2346,2352 ----
   } ATABLE_S;
   
   
diff --git a/mail/pine4/files/patch-as b/mail/pine4/files/patch-as
index 558ba1e5191b..95af82964f76 100644
--- a/mail/pine4/files/patch-as
+++ b/mail/pine4/files/patch-as
@@ -1,17 +1,34 @@
-*** pine/init.c.orig	Thu Jul 16 21:22:22 1998
---- pine/init.c	Tue Jul 21 15:36:43 1998
+*** pine/init.c.orig	Wed Sep  2 20:39:42 1998
+--- pine/init.c	Wed Sep 16 21:08:19 1998
 ***************
-*** 579,584 ****
---- 579,587 ----
+*** 319,325 ****
+  
+  /*----------------------------------------------------------------------
+  These are the variables that control a number of pine functions.  They
+! come out of the .pinerc and the /usr/local/lib/pine.conf files.  Some can
+  be set by the user while in Pine.  Eventually all the local ones should
+  be so and maybe the global ones too.
+  
+--- 319,325 ----
+  
+  /*----------------------------------------------------------------------
+  These are the variables that control a number of pine functions.  They
+! come out of the .pinerc and the @@PREFIX@@/etc/pine.conf files.  Some can
+  be set by the user while in Pine.  Eventually all the local ones should
+  be so and maybe the global ones too.
+  
+***************
+*** 578,583 ****
+--- 578,586 ----
+  #ifdef	DF_SMTP_SERVER
       GLO_SMTP_SERVER		= parse_list(DF_SMTP_SERVER, 1, NULL);
   #endif
-  
++ 
 +     F_TURN_ON(F_TCAP_WINS,ps);
 +     F_TURN_ON(F_QUELL_INTERNAL_MSG,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 16 04:09:27 1998
 --- pine/other.c	Tue Jul 21 15:03:18 1998
 ***************
diff --git a/mail/pine4/files/patch-at b/mail/pine4/files/patch-at
index a31467b0c625..b106669054fc 100644
--- a/mail/pine4/files/patch-at
+++ b/mail/pine4/files/patch-at
@@ -1,7 +1,7 @@
-*** pine/pine.hlp.orig	Wed Jul 22 01:04:04 1998
---- pine/pine.hlp	Wed Aug 12 22:17:10 1998
+*** pine/pine.hlp.orig	Wed Sep 16 23:30:24 1998
+--- pine/pine.hlp	Sun Sep 20 00:45:54 1998
 ***************
-*** 750,758 ****
+*** 835,843 ****
   
    executable     &lt;Unix search path&gt;/pine
    persnl cfg     ~/.pinerc
@@ -11,18 +11,37 @@
   
    interrupted    ~/.pine-interrupted-mail
    debug          ~/.pine-debugN
---- 750,758 ----
+--- 835,843 ----
   
    executable     &lt;Unix search path&gt;/pine
    persnl cfg     ~/.pinerc
-!  global cfg     /usr/local/etc/pine.conf
-!  fixed cfg      /usr/local/etc/pine.conf.fixed
-!  local help     /usr/local/etc/pine.info
+!  global cfg     @@PREFIX@@/etc/pine.conf
+!  fixed cfg      @@PREFIX@@/etc/pine.conf.fixed
+!  local help     @@PREFIX@@/etc/pine.info
   
    interrupted    ~/.pine-interrupted-mail
    debug          ~/.pine-debugN
 ***************
-*** 1137,1145 ****
+*** 849,856 ****
+   postponed#     ~/mail/postponed-msgs
+   sentmail#      ~/mail/sent-mail
+   mailcap#       ~/.mailcap + /etc/mailcap
+!                            + /usr/etc/mailcap + /usr/local/etc/mailcap
+!  mimetypes#     ~/.mime.types + /etc/mime.types + /usr/local/lib/mime.types
+  
+   news-spool	varies across Unix flavors, e.g. /usr/spool/news or /var/news
+   active-news	varies across Unix flavors, e.g. /usr/lib/news/active
+--- 849,856 ----
+   postponed#     ~/mail/postponed-msgs
+   sentmail#      ~/mail/sent-mail
+   mailcap#       ~/.mailcap + /etc/mailcap
+!                            + /usr/etc/mailcap + @@PREFIX@@/etc/mailcap
+!  mimetypes#     ~/.mime.types + /etc/mime.types + @@PREFIX@@/etc/mime.types
+  
+   news-spool	varies across Unix flavors, e.g. /usr/spool/news or /var/news
+   active-news	varies across Unix flavors, e.g. /usr/lib/news/active
+***************
+*** 1404,1412 ****
   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-->
@@ -32,18 +51,18 @@
   <HR WIDTH="75%">
   <!--chtml endif-->
   <P> 
---- 1137,1145 ----
+--- 1404,1412 ----
   this link now to send a message to it:<BR>
   <A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
   <!--chtml endif-->
-! <!--chtml if [ -r /usr/local/etc/pine.info ]-->
+! <!--chtml if [ -r @@PREFIX@@/etc/pine.info ]-->
   <HR WIDTH="75%">Local Support Contacts:<P>
-! <!--#include file="/usr/local/etc/pine.info"-->
+! <!--#include file="@@PREFIX@@/etc/pine.info"-->
   <HR WIDTH="75%">
   <!--chtml endif-->
   <P> 
 ***************
-*** 1226,1232 ****
+*** 1493,1499 ****
   <OL>
     <LI> <A HREF="#intro">Introduction</A>
     <LI> <A HREF="#pine_help">Pine Help</A>
@@ -51,16 +70,16 @@
     <LI> <A HREF="#local_support">Local Support Contacts</A>
   <!--chtml endif-->
     <LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
---- 1226,1232 ----
+--- 1493,1499 ----
   <OL>
     <LI> <A HREF="#intro">Introduction</A>
     <LI> <A HREF="#pine_help">Pine Help</A>
-! <!--chtml if [ -r /usr/local/etc/pine.info ]-->
+! <!--chtml if [ -r @@PREFIX@@/etc/pine.info ]-->
     <LI> <A HREF="#local_support">Local Support Contacts</A>
   <!--chtml endif-->
     <LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
 ***************
-*** 1333,1341 ****
+*** 1600,1608 ****
   at your site.)
   
   
@@ -70,13 +89,13 @@
   <!--chtml endif-->
   
   <H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>
---- 1333,1341 ----
+--- 1600,1608 ----
   at your site.)
   
   
-! <!--chtml if [ -r /usr/local/etc/pine.info ]-->
+! <!--chtml if [ -r @@PREFIX@@/etc/pine.info ]-->
   <H2><A NAME="local_support">Local Support Contacts</A></H2>
-! <!--#include file="/usr/local/etc/pine.info"-->
+! <!--#include file="@@PREFIX@@/etc/pine.info"-->
   <!--chtml endif-->
   
   <H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>
diff --git a/mail/pine4/files/patch-au b/mail/pine4/files/patch-au
index d3fa740c7d78..273abc813055 100644
--- a/mail/pine4/files/patch-au
+++ b/mail/pine4/files/patch-au
@@ -1,7 +1,7 @@
-*** doc/pine.1.orig	Tue Jul 21 22:48:42 1998
---- doc/pine.1	Wed Aug 12 22:03:31 1998
+*** doc/pine.1.orig	Wed Sep  2 21:31:57 1998
+--- doc/pine.1	Sat Sep 12 21:58:23 1998
 ***************
-*** 256,266 ****
+*** 271,281 ****
   .br
   /etc/mime.types	System-wide file ext. to MIME type mapping
   .br
@@ -13,15 +13,15 @@
   .br
   /tmp/.\\usr\\spool\\mail\\xxxx	Per-folder mailbox lock files.
   .br
---- 256,266 ----
+--- 271,281 ----
   .br
   /etc/mime.types	System-wide file ext. to MIME type mapping
   .br
-! /usr/local/etc/pine.info	Local pointer to system administrator.
+! @@PREFIX@@/etc/pine.info	Local pointer to system administrator.
   .br
-! /usr/local/etc/pine.conf	System-wide configuration file.
+! @@PREFIX@@/etc/pine.conf	System-wide configuration file.
   .br
-! /usr/local/etc/pine.conf.fixed	 Non-overridable configuration file.
+! @@PREFIX@@/etc/pine.conf.fixed	 Non-overridable configuration file.
   .br
   /tmp/.\\usr\\spool\\mail\\xxxx	Per-folder mailbox lock files.
   .br
diff --git a/mail/pine4/files/patch-av b/mail/pine4/files/patch-av
new file mode 100644
index 000000000000..efa915e4e2bf
--- /dev/null
+++ b/mail/pine4/files/patch-av
@@ -0,0 +1,44 @@
+*** pine/mailcap.c.orig	Wed Aug 19 03:47:42 1998
+--- pine/mailcap.c	Sat Sep 12 22:00:48 1998
+***************
+*** 61,67 ****
+  
+     Mime types makes mime assign attachment types according
+     to file name extensions found in a system wide file
+!    ``/usr/local/lib/mime.types'' and a user specific file
+     ``~/.mime.types'' . These files specify file extensions
+     that will be connected to a mime type.
+     ******************************************************* 
+--- 61,67 ----
+  
+     Mime types makes mime assign attachment types according
+     to file name extensions found in a system wide file
+!    ``@@PREFIX@@/etc/mime.types'' and a user specific file
+     ``~/.mime.types'' . These files specify file extensions
+     that will be connected to a mime type.
+     ******************************************************* 
+***************
+*** 96,106 ****
+  #define MC_PATH_SEPARATOR ':'
+  #define	MC_USER_FILE	  NULL
+  #define MC_STDPATH         \
+! 		".mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap"
+  #define MT_PATH_SEPARATOR ':'
+  #define	MT_USER_FILE	  NULL
+  #define MT_STDPATH         \
+! 		".mime.types:/etc/mime.types:/usr/local/lib/mime.types"
+  #endif /* !DOS */
+  
+  #ifdef	_WINDOWS
+--- 96,106 ----
+  #define MC_PATH_SEPARATOR ':'
+  #define	MC_USER_FILE	  NULL
+  #define MC_STDPATH         \
+! 		".mailcap:/etc/mailcap:/usr/etc/mailcap:@@PREFIX@@/etc/mailcap"
+  #define MT_PATH_SEPARATOR ':'
+  #define	MT_USER_FILE	  NULL
+  #define MT_STDPATH         \
+! 		".mime.types:/etc/mime.types:@@PREFIX@@/etc/mime.types"
+  #endif /* !DOS */
+  
+  #ifdef	_WINDOWS
diff --git a/mail/pine4/files/pgpdecode b/mail/pine4/files/pgpdecode
index 86d5a97daa04..40625939c37c 100644
--- a/mail/pine4/files/pgpdecode
+++ b/mail/pine4/files/pgpdecode
@@ -6,9 +6,46 @@
 # The tmp files in the original version were world readable for
 # the short time of unpacking, setting suitable umask prevents this
 #
+# Wed Sep 16 21:35:43 WST 1997 Anthony Di Pietro <anthony@dino.omen.com.au>
+# Modified to work with both PGP v2 and PGP v5.
+# Now uses mktemp to prevent symlink attack and tmp races.
+
 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.$$
+
+MYNAME=`basename $0`
+
+STDOUT=`mktemp -q /tmp/${MYNAME}.XXXXXX`
+if [ $? -ne 0 ]
+then
+  echo "$0: Can't create temporary file to decode message."
+  exit 1
+fi
+
+trap "rm -f $STDOUT ; exit" 0 1 2 15
+
+STDERR=`mktemp -q /tmp/${MYNAME}.XXXXXX`
+if [ $? -ne 0 ]
+then
+  echo "$0: Can't create temporary file to decode message."
+  exit 1
+fi
+
+trap "rm -f $STDOUT $STDERR; exit" 0 1 2 15
+
+if [ -x /usr/local/bin/pgpv ]
+then
+  pgpv 2>&1 > $STDOUT |tee $STDERR > /dev/tty
+else
+  pgp -f 2>&1 > $STDOUT |tee $STDERR > /dev/tty
+fi
+
+cat $STDERR | \
+grep -v '^No files specified.  Using stdin.$' | \
+grep -v '^Opening file \"stdout\" type text.$' | \
+grep -v '^Opening file \"stdout\" type binary.$' | \
+grep -v '^Opening file \"/dev/null\" type text.$' | \
+grep -v '^Opening file \"/dev/null\" type binary.$' | \
+grep -v '^$'| \
+sed -e 's/^/| /'
+echo ""
+cat $STDOUT
diff --git a/mail/pine4/files/pgpencrypt b/mail/pine4/files/pgpencrypt
index b727b6693153..3baa1d2739eb 100644
--- a/mail/pine4/files/pgpencrypt
+++ b/mail/pine4/files/pgpencrypt
@@ -1,4 +1,11 @@
 #!/bin/sh
 # ---------- pgpencrypt ---------
 # 21.03.96 Roland Rosenfeld <roland@spinnaker.rhein.de>
-pgp -feast $*
+# Wed 16 Sep 1998 23:46:43 WST Anthony Di Pietro <anthony@dino.omen.com.au>
+# Modified to work with both PGP v2 and PGP v5.
+if [ -x /usr/local/bin/pgpe ]
+then
+  pgpe -s -a -r $*
+else
+  pgp -feast $*
+fi
diff --git a/mail/pine4/files/pgpsign b/mail/pine4/files/pgpsign
index e56326cb1bf9..6eff395c89c0 100644
--- a/mail/pine4/files/pgpsign
+++ b/mail/pine4/files/pgpsign
@@ -1,4 +1,11 @@
 #!/bin/sh
 # ---------- pgpsign ---------
 # 21.03.96 Roland Rosenfeld <roland@spinnaker.rhein.de>
-pgp -fast
+# Wed 16 Sep 1998 23:48:51 WST Anthony Di Pietro <anthony@dino.omen.com.au>
+# Modified to work with both PGP v2 and PGP v5.
+if [ -x /usr/local/bin/pgps ]
+then
+  pgps -a -t
+else
+  pgp -fast
+fi
diff --git a/mail/pine4/pkg-comment b/mail/pine4/pkg-comment
index a461a7071699..378f2afd7abf 100644
--- a/mail/pine4/pkg-comment
+++ b/mail/pine4/pkg-comment
@@ -1 +1 @@
-Pine(tm) -- a Program for Internet News & Email
+PINE(tm) -- a Program for Internet News & Email
diff --git a/mail/pine4/pkg-descr b/mail/pine4/pkg-descr
index 3abe82994da6..20052897b94f 100644
--- a/mail/pine4/pkg-descr
+++ b/mail/pine4/pkg-descr
@@ -8,15 +8,15 @@ 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 -- please use the "imap-uw" port for this).
 
-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.
+An optional set of configuration files can be put into /usr/local/etc 
+to set system wide defaults. Have a look at the documentation installed
+in /usr/local/share/doc/pine/ for more details.
 
 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/
+Pine on WWW: http://www.washington.edu/pine/
 
 Adrian Penisoara (Ady)
 pine@freebsd.ady.ro
diff --git a/mail/pine4/pkg-plist b/mail/pine4/pkg-plist
index 0e1e9a5d3d5e..1aba49cd348e 100644
--- a/mail/pine4/pkg-plist
+++ b/mail/pine4/pkg-plist
@@ -1,13 +1,12 @@
 bin/pico
 bin/pilot
 bin/pine
-lib/libpico.so.2.0
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
 bin/pgpencrypt
 bin/pgpdecode
 bin/pgpsign
 etc/dot.pinerc.pgp.sample
+@exec %D/bin/pine -P %D/etc/pine.conf -conf >%D/etc/pine.conf.tmp
+@exec /bin/mv %D/etc/pine.conf.tmp %D/etc/pine.conf
 share/doc/pine/brochure.txt
 share/doc/pine/tech-notes.txt
 share/doc/pine/tech-notes/background.html