Upgrade to 4.01.

Submitted by:	maintainer

6 files changed, 25 insertions, 27 deletions

diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index cea0b76aa656..73a7fc4684d1 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:	pine
 # http://www.washington.edu/pine/
-# Version required:     4.00
+# Version required:     4.01
 # Date created:		09 July 1998
 # Whom:			Adrian Penisoara <ady@freebsd.ady.ro>
 #
-# $Id$
+# $Id: Makefile,v 1.23 1998/07/18 05:48:37 ache Exp $
 #
 
-DISTNAME=       pine4.00
-PKGNAME=        pine-4.00
+DISTNAME=       pine4.01
+PKGNAME=        pine-4.01
 CATEGORIES=     mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 
@@ -23,7 +23,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.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
@@ -36,7 +36,7 @@ do-install:
 	${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} -d -o ${SHAREOWN} -g ${SHAREGRP} ${PREFIX}/share/doc/pine
 	${INSTALL_DATA} ${WRKSRC}/doc/tech-notes.txt ${PREFIX}/share/doc/pine
 .endif
 
diff --git a/mail/pine4/distinfo b/mail/pine4/distinfo
index 4539b8cda85b..3ed7fb6b81a1 100644
--- a/mail/pine4/distinfo
+++ b/mail/pine4/distinfo
@@ -1 +1 @@
-MD5 (pine4.00.tar.gz) = 4aa00d67b4060299e9edff744cab6f23
+MD5 (pine4.01.tar.gz) = e606a0b23ba7713c9480fb884032556b
diff --git a/mail/pine4/files/patch-ai b/mail/pine4/files/patch-ai
index dbf0aa6b88d0..2cd6237e6824 100644
--- a/mail/pine4/files/patch-ai
+++ b/mail/pine4/files/patch-ai
@@ -1,7 +1,7 @@
-*** pine/send.c.orig	Wed Jul  1 21:32:53 1998
---- pine/send.c	Fri Jul 10 00:51:41 1998
+*** pine/send.c.orig	Mon Jul 20 22:02:18 1998
+--- pine/send.c	Tue Jul 21 14:51:50 1998
 ***************
-*** 6616,6628 ****
+*** 6672,6684 ****
   		body->subtype = cpystr("octet-stream");
   	    }
   
@@ -15,7 +15,7 @@
   	}
       }
   
---- 6616,6632 ----
+--- 6672,6688 ----
   		body->subtype = cpystr("octet-stream");
   	    }
   
@@ -34,7 +34,7 @@
       }
   
 ***************
-*** 7439,7445 ****
+*** 7508,7514 ****
   
   	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 */
---- 7443,7450 ----
+--- 7512,7519 ----
   
   	switch (body->encoding) {	/* all else needs filtering */
   	  case ENC8BIT:			/* encode 8BIT into QUOTED-PRINTABLE */
@@ -52,7 +52,7 @@
   
   	  case ENCBINARY:		/* encode binary into BASE64 */
 ***************
-*** 7506,7512 ****
+*** 7575,7581 ****
         sprintf (*dst += strlen (*dst),"Content-Transfer-Encoding: %s\015\012",
   	       body_encodings[(body->encoding == ENCBINARY)
   				? ENCBASE64
@@ -60,7 +60,7 @@
   				    ? ENCQUOTEDPRINTABLE
   				    : (body->encoding <= ENCMAX)
   					? body->encoding : ENCOTHER]);
---- 7511,7517 ----
+--- 7580,7586 ----
         sprintf (*dst += strlen (*dst),"Content-Transfer-Encoding: %s\015\012",
   	       body_encodings[(body->encoding == ENCBINARY)
   				? ENCBASE64
diff --git a/mail/pine4/files/patch-am b/mail/pine4/files/patch-am
index f0ffb308313b..d7b703c731bc 100644
--- a/mail/pine4/files/patch-am
+++ b/mail/pine4/files/patch-am
@@ -1,7 +1,7 @@
-*** pine/pine.h.orig	Tue Jul  7 05:06:18 1998
---- pine/pine.h	Sun Jul 12 23:06:10 1998
+*** pine/pine.h.orig	Fri Jul 17 03:10:56 1998
+--- pine/pine.h	Tue Jul 21 14:53:05 1998
 ***************
-*** 2303,2309 ****
+*** 2304,2310 ****
   } ATABLE_S;
   
   
@@ -9,7 +9,7 @@
   #define	TAG_INVON	'\001'	/* Supported character attributes	  */
   #define	TAG_INVOFF	'\002'
   #define	TAG_BOLDON	'\003'
---- 2303,2309 ----
+--- 2304,2310 ----
   } ATABLE_S;
   
   
diff --git a/mail/pine4/files/patch-as b/mail/pine4/files/patch-as
index 09205ca4c9c3..b79b1e7d089d 100644
--- a/mail/pine4/files/patch-as
+++ b/mail/pine4/files/patch-as
@@ -1,18 +1,19 @@
-*** pine/init.c.orig	Sat Jun 27 00:01:05 1998
---- pine/init.c	Tue Jul 14 23:14:23 1998
+*** pine/init.c.orig	Thu Jul 16 21:22:22 1998
+--- pine/init.c	Tue Jul 21 15:36:43 1998
 ***************
 *** 579,584 ****
---- 579,586 ----
+--- 579,587 ----
       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  9 00:35:12 1998
---- pine/other.c	Tue Jul 14 21:37:09 1998
+*** pine/other.c.orig	Thu Jul 16 04:09:27 1998
+--- pine/other.c	Tue Jul 21 15:03:18 1998
 ***************
 *** 696,702 ****
   			 || (F) == F_DISABLE_DFLT_IN_BUG_RPT	\
diff --git a/mail/pine4/pkg-descr b/mail/pine4/pkg-descr
index f89eceffc92b..5bae954cf1d6 100644
--- a/mail/pine4/pkg-descr
+++ b/mail/pine4/pkg-descr
@@ -8,9 +8,6 @@ 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 
 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.