Update Pico to 3.5 and Pine to 4.10.

6 files changed, 25 insertions, 50 deletions

diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index 091b739becf..3fe5fd67c19 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 1999/02/20 22:48:28 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 1999/05/02 03:16:58 tv Exp $
 #
 
-DISTNAME=	pine4.05
-PKGNAME=	pico-3.4
+DISTNAME=	pine4.10
+PKGNAME=	pico-3.5
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 
diff --git a/editors/pico/files/md5 b/editors/pico/files/md5
index 588933917b4..4285ab5091d 100644
--- a/editors/pico/files/md5
+++ b/editors/pico/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.8 1998/11/13 15:56:24 tv Exp $
+$NetBSD: md5,v 1.9 1999/05/02 03:16:59 tv Exp $
 
-MD5 (pine4.05.tar.gz) = 84dc37198853959188a551eb4ee8aa00
+MD5 (pine4.10.tar.gz) = f871e201b4070da1f060f35d3b8f2ccd
diff --git a/editors/pico/patches/patch-aa b/editors/pico/patches/patch-aa
index 5e29eaf63ae..b09a82e37ba 100644
--- a/editors/pico/patches/patch-aa
+++ b/editors/pico/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 1998/11/13 15:56:24 tv Exp $
+$NetBSD: patch-aa,v 1.8 1999/05/02 03:16:59 tv Exp $
 
 --- pico/makefile.neb.orig	Mon Jun 29 18:23:50 1998
 +++ pico/makefile.neb	Sun Sep 27 12:30:46 1998
@@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.7 1998/11/13 15:56:24 tv Exp $
 -		$(RANLIB) libpico.a
 +libpico.la:	$(OFILES)
 +		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
-+			-version-info 1:0
++			-version-info 2:0
  
  clean:
  		rm -f *.a *.o *~ pico_os.c os.h pico pilot
diff --git a/editors/pico/patches/patch-ad b/editors/pico/patches/patch-ad
index 81d1fde0d12..f6a93cfa84c 100644
--- a/editors/pico/patches/patch-ad
+++ b/editors/pico/patches/patch-ad
@@ -1,35 +1,24 @@
-$NetBSD: patch-ad,v 1.1 1998/11/13 15:56:24 tv Exp $
+$NetBSD: patch-ad,v 1.2 1999/05/02 03:16:59 tv Exp $
 
---- pico/osdep/os-neb.h.orig	Wed Jun 24 17:57:46 1998
-+++ pico/osdep/os-neb.h	Sun Sep 27 17:36:40 1998
-@@ -41,8 +41,8 @@
+--- pico/osdep/os-neb.h.orig	Wed Feb  3 15:15:27 1999
++++ pico/osdep/os-neb.h	Fri Apr 23 16:19:54 1999
+@@ -54,8 +54,8 @@
  
  
- /*----------------- locale.h -------------------------------------------*/
--/* #include <locale.h>  /* To make matching and sorting work right */
--#define collator strucmp
-+#include <locale.h>  /* To make matching and sorting work right */
-+#define collator strcasecmp
+ /*--------------- signal.h ---------------------------------------------*/
+-/* #include <signal.h> */   /* sometimes both required, sometimes */
+-#include <sys/signal.h>  /* only one or the other */
++#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 */
+@@ -81,7 +81,7 @@
  
+ /*-------------- fcntl flag to set non-blocking IO ---------------------*/
+ /*#define	NON_BLOCKING_IO	O_NONBLOCK */		/* POSIX style */
+-/*#define	NON_BLOCKING_IO	FNDELAY */	/* good ol' bsd style  */
++#define	NON_BLOCKING_IO	FNDELAY	/* good ol' bsd style  */
  
-@@ -68,8 +68,8 @@
  
  
- /*-------------- A couple typedef's for integer sizes ------------------*/
--typedef unsigned int usign32_t;
--typedef unsigned short usign16_t;
-+typedef u_int32_t usign32_t;
-+typedef u_int16_t usign16_t;
- 
- 
- 
-@@ -155,7 +155,7 @@
- /*
-  * Place where mail gets delivered (for pico's new mail checking)
-  */
--#define MAILDIR		"/usr/spool/mail"
-+#define MAILDIR		"/var/mail"
- 
- /*
-  * What and where the tool that checks spelling is located.  If this is
diff --git a/editors/pico/patches/patch-ae b/editors/pico/patches/patch-ae
deleted file mode 100644
index 9dc4209e1b0..00000000000
--- a/editors/pico/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1998/11/13 15:56:24 tv Exp $
-
---- pico/display.c.orig	Fri Jun 19 13:19:53 1998
-+++ pico/display.c	Sun Sep 27 12:33:15 1998
-@@ -128,8 +128,7 @@
- VIDEO   **vscreen;                      /* Virtual screen. */
- VIDEO   **pscreen;                      /* Physical screen. */
- 
--#define	ISCONTROL(C)	((C) < 0x20 || (C) == 0x7F \
--			 || ((gmode & P_HICTRL) && ((C) > 0x7F && (C) < 0xA0)))
-+#define	ISCONTROL(C)	((C) < 0x20 || (C) == 0x7F || ((C) >= 0x80 && (C) < 0xA0))
- 
- 
- /*
diff --git a/editors/pico/pkg/PLIST b/editors/pico/pkg/PLIST
index a278cefc25b..de320bc9be0 100644
--- a/editors/pico/pkg/PLIST
+++ b/editors/pico/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 1998/11/13 15:56:25 tv Exp $
+@comment $NetBSD: PLIST,v 1.9 1999/05/02 03:16:59 tv Exp $
 bin/pico
 bin/pilot
 include/pico/ebind.h
@@ -12,6 +12,6 @@ include/pico/pico.h
 include/pico/resource.h
 @dirrm include/pico
 lib/libpico.a
-lib/libpico.so.1.0
+lib/libpico.so.2.0
 man/man1/pico.1
 man/man1/pilot.1