Upgrade port to pine-4.02a.

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

10 files changed, 223 insertions, 34 deletions

diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index f8cb608810fc..d67059d2c339 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -1,17 +1,21 @@
 # New ports collection makefile for:	pine
 # http://www.washington.edu/pine/
-# Version required:     4.02
+# Version required:     4.02A
 # Date created:		09 July 1998
 # Whom:			Adrian Penisoara <ady@freebsd.ady.ro>
 #
-# $Id: Makefile,v 1.24 1998/07/21 13:45:58 asami Exp $
+# $Id: Makefile,v 1.25 1998/07/29 16:43:59 asami Exp $
 #
 
 DISTNAME=       pine4.02
-PKGNAME=        pine-4.02
+PKGNAME=        pine-4.02a
 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
@@ -23,7 +27,7 @@ do-build:
 
 do-install:
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		${WRKSRC}/bin/libpico.so.1.3 ${PREFIX}/lib/libpico.so.1.3
+		${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
@@ -37,6 +41,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/pine.1 ${PREFIX}/man/man1/pine.1
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \
+			${PREFIX}/share/doc/pine \
 			${PREFIX}/share/doc/pine/tech-notes
 	${INSTALL_DATA} ${WRKSRC}/doc/brochure.txt ${PREFIX}/share/doc/pine
 	${INSTALL_DATA} ${WRKSRC}/doc/tech-notes.txt ${PREFIX}/share/doc/pine
diff --git a/mail/pine4/distinfo b/mail/pine4/distinfo
index 9ddf8a40e7d0..0feef2c611e2 100644
--- a/mail/pine4/distinfo
+++ b/mail/pine4/distinfo
@@ -1 +1,2 @@
 MD5 (pine4.02.tar.gz) = 688979b5649473169bdbf22ea1c82fe7
+MD5 (pine4.02A.patch) = 96271a2a00293186941cad0c0175bd69
diff --git a/mail/pine4/files/patch-ac b/mail/pine4/files/patch-ac
index 67948f5b138b..17a90d0c2572 100644
--- a/mail/pine4/files/patch-ac
+++ b/mail/pine4/files/patch-ac
@@ -1,5 +1,22 @@
 *** 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
+--- pine/osdep/os-bsf.h	Wed Aug 12 22:22:02 1998
+***************
+*** 74,80 ****
+     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/lib/pine.conf.fixed file.
+   ----*/
+  /* #define NEVER_ALLOW_CHANGING_FROM /* probably not needed */
+  
+--- 74,80 ----
+     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.
+   ----*/
+  /* #define NEVER_ALLOW_CHANGING_FROM /* probably not needed */
+  
 ***************
 *** 87,93 ****
      NOTE: You'll also have to make sure the appropriate osdep/postreap.*
diff --git a/mail/pine4/files/patch-ai b/mail/pine4/files/patch-ai
index 2cd6237e6824..f12edfce77ae 100644
--- a/mail/pine4/files/patch-ai
+++ b/mail/pine4/files/patch-ai
@@ -1,7 +1,7 @@
-*** pine/send.c.orig	Mon Jul 20 22:02:18 1998
---- pine/send.c	Tue Jul 21 14:51:50 1998
+*** pine/send.c.orig	Wed Aug 12 19:00:10 1998
+--- pine/send.c	Wed Aug 12 19:49:04 1998
 ***************
-*** 6672,6684 ****
+*** 6673,6685 ****
   		body->subtype = cpystr("octet-stream");
   	    }
   
@@ -15,7 +15,7 @@
   	}
       }
   
---- 6672,6688 ----
+--- 6673,6689 ----
   		body->subtype = cpystr("octet-stream");
   	    }
   
@@ -34,7 +34,7 @@
       }
   
 ***************
-*** 7508,7514 ****
+*** 7499,7505 ****
   
   	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 */
---- 7512,7519 ----
+--- 7503,7510 ----
   
   	switch (body->encoding) {	/* all else needs filtering */
   	  case ENC8BIT:			/* encode 8BIT into QUOTED-PRINTABLE */
@@ -52,19 +52,19 @@
   
   	  case ENCBINARY:		/* encode binary into BASE64 */
 ***************
-*** 7575,7581 ****
-        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]);
---- 7580,7586 ----
-        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))
-  				    ? ENCQUOTEDPRINTABLE
-  				    : (body->encoding <= ENCMAX)
-  					? body->encoding : ENCOTHER]);
+*** 7582,7588 ****
+  	     && !(so_puts(so, "Content-Transfer-Encoding: ")
+  		  && so_puts(so, body_encodings[(body->encoding==ENCBINARY)
+  						? ENCBASE64
+! 						: (body->encoding == ENC8BIT)
+  						  ? ENCQUOTEDPRINTABLE
+  						  : (body->encoding <= ENCMAX)
+  						    ? body->encoding
+--- 7587,7593 ----
+  	     && !(so_puts(so, "Content-Transfer-Encoding: ")
+  		  && so_puts(so, body_encodings[(body->encoding==ENCBINARY)
+  						? ENCBASE64
+! 						: (body->encoding == ENC8BIT && F_OFF(F_ENABLE_8BIT, ps_global))
+  						  ? ENCQUOTEDPRINTABLE
+  						  : (body->encoding <= ENCMAX)
+  						    ? body->encoding
diff --git a/mail/pine4/files/patch-al b/mail/pine4/files/patch-al
index 21155aa3176c..0c13f35d583c 100644
--- a/mail/pine4/files/patch-al
+++ b/mail/pine4/files/patch-al
@@ -1,5 +1,5 @@
 *** build.orig	Mon Jun 15 20:35:10 1998
---- build	Sat Jul 11 02:32:20 1998
+--- build	Wed Aug 12 20:21:46 1998
 ***************
 *** 256,266 ****
   
@@ -49,12 +49,12 @@
 ! #       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.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.1.3
+!         size bin/pine bin/pico bin/pilot bin/libpico.so.2.0
           echo "Done"
           ;;
   
diff --git a/mail/pine4/files/patch-as b/mail/pine4/files/patch-as
index b79b1e7d089d..558ba1e5191b 100644
--- a/mail/pine4/files/patch-as
+++ b/mail/pine4/files/patch-as
@@ -24,3 +24,60 @@
   			 || (F) == F_AGG_SEQ_COPY)
   
 --- 696,701 ----
+*** pico/edef.h.orig	Thu Apr 23 02:53:44 1998
+--- pico/edef.h	Tue Jul 21 14:33:38 1998
+***************
+*** 59,65 ****
+  int	ComposerEditing = FALSE;	/* TRUE if message line is open */
+  int	revexist = FALSE;		/* does reverse video exist?	*/
+  char	modecode[] = "WCSEVO";		/* letters to represent modes	*/
+! long	gmode = MDWRAP;			/* global editor mode		*/
+  int     sgarbf  = TRUE;                 /* TRUE if screen is garbage	*/
+  int     mpresf  = FALSE;                /* TRUE if message in last line */
+  int	clexec	= FALSE;		/* command line execution flag	*/
+--- 59,65 ----
+  int	ComposerEditing = FALSE;	/* TRUE if message line is open */
+  int	revexist = FALSE;		/* does reverse video exist?	*/
+  char	modecode[] = "WCSEVO";		/* letters to represent modes	*/
+! long	gmode = MDWRAP | MDTCAPWINS;	/* global editor mode		*/
+  int     sgarbf  = TRUE;                 /* TRUE if screen is garbage	*/
+  int     mpresf  = FALSE;                /* TRUE if message in last line */
+  int	clexec	= FALSE;		/* command line execution flag	*/
+*** pico/main.c.orig	Thu Jul 16 11:30:47 1998
+--- pico/main.c	Tue Jul 21 14:33:38 1998
+***************
+*** 424,430 ****
+  	    gmode ^= MDSSPD;
+  	    break;
+  	  case 'q':			/* -q for termcap takes precedence */
+! 	    gmode ^= MDTCAPWINS;
+  	    break;
+  	  case 'w':			/* -w turn off word wrap */
+  	    gmode ^= MDWRAP;
+--- 424,430 ----
+  	    gmode ^= MDSSPD;
+  	    break;
+  	  case 'q':			/* -q for termcap takes precedence */
+! 	    gmode |= MDTCAPWINS;
+  	    break;
+  	  case 'w':			/* -w turn off word wrap */
+  	    gmode ^= MDWRAP;
+*** pico/pilot.c.orig	Thu Jul 16 11:30:46 1998
+--- pico/pilot.c	Tue Jul 21 14:33:38 1998
+***************
+*** 222,228 ****
+  	    sup_keyhelp = !sup_keyhelp;
+  	    break;
+  	  case 'q':			/* -q for termcap takes precedence */
+! 	    gmode ^= MDTCAPWINS;
+  	    break;
+  	  case 'z':			/* -z to suspend */
+  	    gmode ^= MDSSPD;
+--- 222,228 ----
+  	    sup_keyhelp = !sup_keyhelp;
+  	    break;
+  	  case 'q':			/* -q for termcap takes precedence */
+! 	    gmode |= MDTCAPWINS;
+  	    break;
+  	  case 'z':			/* -z to suspend */
+  	    gmode ^= MDSSPD;
diff --git a/mail/pine4/files/patch-at b/mail/pine4/files/patch-at
new file mode 100644
index 000000000000..a31467b0c625
--- /dev/null
+++ b/mail/pine4/files/patch-at
@@ -0,0 +1,82 @@
+*** pine/pine.hlp.orig	Wed Jul 22 01:04:04 1998
+--- pine/pine.hlp	Wed Aug 12 22:17:10 1998
+***************
+*** 750,758 ****
+  
+   executable     &lt;Unix search path&gt;/pine
+   persnl cfg     ~/.pinerc
+!  global cfg     /usr/local/lib/pine.conf
+!  fixed cfg      /usr/local/lib/pine.conf.fixed
+!  local help     /usr/local/lib/pine.info
+  
+   interrupted    ~/.pine-interrupted-mail
+   debug          ~/.pine-debugN
+--- 750,758 ----
+  
+   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
+  
+   interrupted    ~/.pine-interrupted-mail
+   debug          ~/.pine-debugN
+***************
+*** 1137,1145 ****
+  this link now to send a message to it:<BR>
+  <A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
+  <!--chtml endif-->
+! <!--chtml if [ -r /usr/local/lib/pine.info ]-->
+  <HR WIDTH="75%">Local Support Contacts:<P>
+! <!--#include file="/usr/local/lib/pine.info"-->
+  <HR WIDTH="75%">
+  <!--chtml endif-->
+  <P> 
+--- 1137,1145 ----
+  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 ]-->
+  <HR WIDTH="75%">Local Support Contacts:<P>
+! <!--#include file="/usr/local/etc/pine.info"-->
+  <HR WIDTH="75%">
+  <!--chtml endif-->
+  <P> 
+***************
+*** 1226,1232 ****
+  <OL>
+    <LI> <A HREF="#intro">Introduction</A>
+    <LI> <A HREF="#pine_help">Pine Help</A>
+! <!--chtml if [ -r /usr/local/lib/pine.info ]-->
+    <LI> <A HREF="#local_support">Local Support Contacts</A>
+  <!--chtml endif-->
+    <LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
+--- 1226,1232 ----
+  <OL>
+    <LI> <A HREF="#intro">Introduction</A>
+    <LI> <A HREF="#pine_help">Pine Help</A>
+! <!--chtml if [ -r /usr/local/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 ****
+  at your site.)
+  
+  
+! <!--chtml if [ -r /usr/local/lib/pine.info ]-->
+  <H2><A NAME="local_support">Local Support Contacts</A></H2>
+! <!--#include file="/usr/local/lib/pine.info"-->
+  <!--chtml endif-->
+  
+  <H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>
+--- 1333,1341 ----
+  at your site.)
+  
+  
+! <!--chtml if [ -r /usr/local/etc/pine.info ]-->
+  <H2><A NAME="local_support">Local Support Contacts</A></H2>
+! <!--#include file="/usr/local/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
new file mode 100644
index 000000000000..d3fa740c7d78
--- /dev/null
+++ b/mail/pine4/files/patch-au
@@ -0,0 +1,27 @@
+*** doc/pine.1.orig	Tue Jul 21 22:48:42 1998
+--- doc/pine.1	Wed Aug 12 22:03:31 1998
+***************
+*** 256,266 ****
+  .br
+  /etc/mime.types	System-wide file ext. to MIME type mapping
+  .br
+! /usr/local/lib/pine.info	Local pointer to system administrator.
+  .br
+! /usr/local/lib/pine.conf	System-wide configuration file.
+  .br
+! /usr/local/lib/pine.conf.fixed	 Non-overridable configuration file.
+  .br
+  /tmp/.\\usr\\spool\\mail\\xxxx	Per-folder mailbox lock files.
+  .br
+--- 256,266 ----
+  .br
+  /etc/mime.types	System-wide file ext. to MIME type mapping
+  .br
+! /usr/local/etc/pine.info	Local pointer to system administrator.
+  .br
+! /usr/local/etc/pine.conf	System-wide configuration file.
+  .br
+! /usr/local/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/pkg-descr b/mail/pine4/pkg-descr
index 5bae954cf1d6..3abe82994da6 100644
--- a/mail/pine4/pkg-descr
+++ b/mail/pine4/pkg-descr
@@ -6,7 +6,7 @@ needs of "power users" as well.  Pine uses Internet message protocols
 
 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).
+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 
@@ -18,5 +18,5 @@ pgpencode, and pgpsign.
 
 Pine on WWW: http://www.cac.washington.edu/pine/
 
-- Adrian Penisoara (Ady)
+Adrian Penisoara (Ady)
 pine@freebsd.ady.ro
diff --git a/mail/pine4/pkg-plist b/mail/pine4/pkg-plist
index b0140cdedc24..9eb87f0f573d 100644
--- a/mail/pine4/pkg-plist
+++ b/mail/pine4/pkg-plist
@@ -1,7 +1,7 @@
 bin/pico
 bin/pilot
 bin/pine
-lib/libpico.so.1.3
+lib/libpico.so.2.0
 @exec /sbin/ldconfig -m %B
 @unexec /sbin/ldconfig -R
 bin/pgpencrypt