Update pico to 3.4 (from Pine 4.05)

7 files changed, 75 insertions, 47 deletions

diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index b9b1b4383ef..f3b909d4723 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 1998/09/10 03:38:45 tv Exp $
+# $NetBSD: Makefile,v 1.13 1998/11/13 15:56:24 tv Exp $
 #
 
-DISTNAME=	pine4.03
-PKGNAME=	pico-3.2
+DISTNAME=	pine4.05
+PKGNAME=	pico-3.4
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.washington.edu/pine/
 
 USE_LIBTOOL=	yes
 
-CONFLICTS=	pico-2.9 pine-3.96 pico-3.0
+CONFLICTS=	pico-2.9 pine-3.96 pico-3.0 pine-4.02 pico-3.2
 
 do-build:
 	cd ${WRKSRC} && ./build neb CC="${LIBTOOL} ${CC}" PREFIX=${PREFIX}
@@ -23,5 +23,10 @@ do-install:
 		${WRKSRC}/pico/pico ${WRKSRC}/pico/pilot ${PREFIX}/bin/
 	${INSTALL_MAN}     ${WRKSRC}/doc/pico.1 ${PREFIX}/man/man1/
 	${INSTALL_MAN}     ${WRKSRC}/doc/pilot.1 ${PREFIX}/man/man1/
+	${INSTALL_DATA_DIR} ${PREFIX}/include/pico
+	cd ${WRKSRC}/pico && \
+		${INSTALL_DATA} ebind.h edef.h efunc.h estruct.h headers.h \
+			msmenu.h os.h pico.h resource.h \
+			${PREFIX}/include/pico/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/pico/files/md5 b/editors/pico/files/md5
index 6a32e32f85a..588933917b4 100644
--- a/editors/pico/files/md5
+++ b/editors/pico/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.7 1998/09/10 03:38:45 tv Exp $
+$NetBSD: md5,v 1.8 1998/11/13 15:56:24 tv Exp $
 
-MD5 (pine4.03.tar.gz) = be35532537241176e3d01ce99d66780f
+MD5 (pine4.05.tar.gz) = 84dc37198853959188a551eb4ee8aa00
diff --git a/editors/pico/patches/patch-aa b/editors/pico/patches/patch-aa
index aebea1f822e..5e29eaf63ae 100644
--- a/editors/pico/patches/patch-aa
+++ b/editors/pico/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 1998/08/07 10:40:33 agc Exp $
+$NetBSD: patch-aa,v 1.7 1998/11/13 15:56:24 tv Exp $
 
 --- pico/makefile.neb.orig	Mon Jun 29 18:23:50 1998
-+++ pico/makefile.neb	Sat Jul 18 23:21:15 1998
++++ pico/makefile.neb	Sun Sep 27 12:30:46 1998
 @@ -30,18 +30,13 @@
  RM=          rm -f
  LN=          ln -s
@@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.6 1998/08/07 10:40:33 agc Exp $
 -		$(RANLIB) libpico.a
 +libpico.la:	$(OFILES)
 +		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
-+			-version-info 0:2
++			-version-info 1: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
new file mode 100644
index 00000000000..81d1fde0d12
--- /dev/null
+++ b/editors/pico/patches/patch-ad
@@ -0,0 +1,35 @@
+$NetBSD: patch-ad,v 1.1 1998/11/13 15:56:24 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 @@
+ 
+ 
+ /*----------------- 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
+ 
+ 
+ 
+@@ -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
new file mode 100644
index 00000000000..9dc4209e1b0
--- /dev/null
+++ b/editors/pico/patches/patch-ae
@@ -0,0 +1,14 @@
+$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/patches/patch-pine-bugtraq b/editors/pico/patches/patch-pine-bugtraq
deleted file mode 100644
index 3e2db891131..00000000000
--- a/editors/pico/patches/patch-pine-bugtraq
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-pine-bugtraq,v 1.3 1998/08/07 10:40:33 agc Exp $
-
-Date: Sat, 25 Apr 1998 14:24:43 +0200
-From: Michal Zalewski <lcamtuf@BOSS.STASZIC.WAW.PL>
-To: BUGTRAQ@NETSPACE.ORG
-Subject: pine/pico vt control characters bug
-
-Pico, an editor included with pine 3.96 package, handles vt control
-characters (eg. 0x9B) improperly, so it's possible to do almost anything
-when normal text file is viewed with pico. Example? Try viewing file
-containing only two characters: 0x9B and 0x63... That's not all, pico is
-called by pine when you're replying to mail message. Anyone may insert any
-control chars (using quoted-printable encoding) to his signature.
-
-Fix (edited for NetBSD's pkg system):
-
---- pico/display.c.orig	Fri Jun 19 13:19:53 1998
-+++ pico/display.c	Sat Jul 18 23:16:33 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))
- 
- 
- /*
-
-(should help, at least in above situation)
-
-_______________________________________________________________________
-Michal Zalewski [lcamtuf@boss.staszic.waw.pl] <= finger for pub PGP key
-Iterowac jest rzecza ludzka, wykonywac rekursywnie - boska [P. Deutsch]
-[echo "\$0&\$0">_;chmod +x _;./_] <=------=> [tel +48 (0) 22 813 25 86]
-
diff --git a/editors/pico/pkg/PLIST b/editors/pico/pkg/PLIST
index 4b6ff35d315..a278cefc25b 100644
--- a/editors/pico/pkg/PLIST
+++ b/editors/pico/pkg/PLIST
@@ -1,7 +1,17 @@
-@comment $NetBSD: PLIST,v 1.7 1998/07/22 02:45:46 tv Exp $
+@comment $NetBSD: PLIST,v 1.8 1998/11/13 15:56:25 tv Exp $
 bin/pico
 bin/pilot
+include/pico/ebind.h
+include/pico/edef.h
+include/pico/efunc.h
+include/pico/estruct.h
+include/pico/headers.h
+include/pico/msmenu.h
+include/pico/os.h
+include/pico/pico.h
+include/pico/resource.h
+@dirrm include/pico
 lib/libpico.a
-lib/libpico.so.0.2
+lib/libpico.so.1.0
 man/man1/pico.1
 man/man1/pilot.1