Initial addition of a handy text editor that ships with Pine.

Fixes pr 5548 by Tim Rightnour, some portlint cleanups.

9 files changed, 173 insertions, 0 deletions

diff --git a/editors/pico/Makefile b/editors/pico/Makefile
new file mode 100644
index 00000000000..0a453b5132b
--- /dev/null
+++ b/editors/pico/Makefile
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 1998/06/07 19:48:47 frueauf Exp $
+#
+
+DISTNAME=	pine3.96
+PKGNAME=	pico-2.9
+WRKSRC=		${WRKDIR}/pine3.96
+CATEGORIES=	editors
+MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
+
+MAINTAINER=	root@garbled.net
+
+CONFLICTS=	pine-3.96
+
+MAN1= 		pico.1
+
+do-build:
+	cd ${WRKSRC} && ./build neb
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/pico/libpico.a ${PREFIX}/lib/libpico.a
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/pico ${PREFIX}/bin/pico
+	${INSTALL_MAN}     ${WRKSRC}/doc/pico.1 ${PREFIX}/man/man1/pico.1
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/pico/files/md5 b/editors/pico/files/md5
new file mode 100644
index 00000000000..383150f4563
--- /dev/null
+++ b/editors/pico/files/md5
@@ -0,0 +1 @@
+MD5 (pine3.96.tar.gz) = bf32b0bf1296ff2151e1bc7f546d43ab
diff --git a/editors/pico/patches/patch-aa b/editors/pico/patches/patch-aa
new file mode 100644
index 00000000000..6087b9ff3a6
--- /dev/null
+++ b/editors/pico/patches/patch-aa
@@ -0,0 +1,45 @@
+--- pico/makefile.neb.orig	Fri Apr  5 11:07:56 1996
++++ pico/makefile.neb	Sat Jun  6 07:21:14 1998
+@@ -30,3 +30,3 @@
+ #includes symbol info for debugging 
+-DASHO=		-g
++DASHO=		-O2# -g
+ #for normal build
+@@ -35,3 +35,3 @@
+ STDCFLAGS=	-Dneb -DJOB_CONTROL -DANSI -DPOSIX -DMOUSE
+-CFLAGS=		$(EXTRACFLAGS) $(DASHO) $(STDCFLAGS)
++CFLAGS+=		$(EXTRACFLAGS) $(DASHO) $(STDCFLAGS)
+ 
+@@ -48,2 +48,5 @@
+ 
++# Lets be elite and not retype in the above
++SOFILES=	${OFILES:.o=.so}
++
+ CFILES=		attach.c ansi.c basic.c bind.c browse.c buffer.c \
+@@ -54,2 +57,4 @@
+ 
++# Need this for the shared library rule to work correctly
++.SUFFIXES: .o .so
+ 
+@@ -72,7 +77,12 @@
+ 
++libpico.so.1.3:	osdep.c osdep.h $(SOFILES)
++		ld -Bshareable -x -o libpico.so.1.3 $(SOFILES)
++ 
+ pico:		main.c libpico.a
+-		$(CC) $(CFLAGS) main.c libpico.a $(LIBS) -o pico
++		$(CC) $(CFLAGS) main.c -L. -lpico $(LIBS) -o pico
+ 
+ pilot:		pilot.c libpico.a
+-		$(CC) $(CFLAGS) pilot.c libpico.a $(LIBS) -o pilot
++		$(CC) $(CFLAGS) pilot.c -L. -lpico $(LIBS) -o pilot
++ 
++.c.so:		; $(CC) -fPIC -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
+ 
+@@ -82,3 +92,5 @@
+ 
++$(SOFILES):	$(HFILES)
++ 
+ clean:
+-		rm -f *.a *.o *~ osdep.c osdep.h pico pilot
++		rm -f *.a *.so.1.3 *.o *.so *~ osdep.c osdep.h pico pilot
diff --git a/editors/pico/patches/patch-ab b/editors/pico/patches/patch-ab
new file mode 100644
index 00000000000..ea73b2fddef
--- /dev/null
+++ b/editors/pico/patches/patch-ab
@@ -0,0 +1,15 @@
+*** pico/os_unix.c.orig	Wed Jun 12 15:47:21 1996
+--- pico/os_unix.c	Fri Jun 14 00:15:30 1996
+***************
+*** 1343,1347 ****
+      extern int  sys_nerr;
+  
+!     return((err >= 0 && err < sys_nerr) ? sys_errlist[err] : NULL);
+  }
+  
+--- 1343,1347 ----
+      extern int  sys_nerr;
+  
+!     return(((err >= 0) && (err < sys_nerr)) ? (char*)sys_errlist[err] : NULL);
+  }
+  
diff --git a/editors/pico/patches/patch-ac b/editors/pico/patches/patch-ac
new file mode 100644
index 00000000000..1ac1413d863
--- /dev/null
+++ b/editors/pico/patches/patch-ac
@@ -0,0 +1,48 @@
+--- build.orig	Tue May 14 12:22:47 1996
++++ build	Sat Jun  6 07:15:10 1998
+@@ -149,10 +149,2 @@
+         cd $PHOME
+-        if [ -s c-client ] ; then rm -f c-client ; fi
+-        if [ -s imapd    ] ; then rm -f imapd    ; fi
+-        ln -s imap/systype/c-client c-client
+-        ln -s imap/systype/imapd imapd
+-        echo "Making c-client library, mtest and imapd"
+-        cd $PHOME/imap
+-        make $makeargs $maketarget
+-        echo ''
+         echo "Making Pico and Pilot"
+@@ -161,5 +153,2 @@
+         echo ''
+-        echo "Making Pine".
+-        cd $PHOME/pine
+-        make $makeargs -f makefile.$maketarget
+         cd $PHOME
+@@ -167,8 +156,7 @@
+         cd $PHOME/bin
+-        rm -f pine mtest imapd pico pilot
+-        if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
+-        if [ -s ../c-client/mtest ] ; then ln ../c-client/mtest mtest ; fi
+-        if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
++        rm -f pico pilot
+         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
+         cd $PHOME
+@@ -176,3 +164,2 @@
+         echo "Links to executables are in bin directory:"
+-        size bin/pine bin/mtest bin/imapd bin/pico bin/pilot
+         echo "Done"
+@@ -182,11 +169,5 @@
+     clean) # This only sort of works 
+-        echo "Cleaning c-client and imapd"
+-	cd $PHOME/imap
+-	make clean
+-        echo "Cleaning Pine"
+-        cd $PHOME/pine
+-        make -f makefile.ult clean
+         echo "Cleaning pico"
+         cd $PHOME/pico
+-        make $makeargs -f makefile.ult clean
++        make $makeargs -f makefile.neb clean
+         echo "Done"
diff --git a/editors/pico/patches/patch-pine-bugtraq b/editors/pico/patches/patch-pine-bugtraq
new file mode 100644
index 00000000000..59c8098e618
--- /dev/null
+++ b/editors/pico/patches/patch-pine-bugtraq
@@ -0,0 +1,33 @@
+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	Sun Apr 26 00:16:06 1998
++++ pico/display.c	Sun Apr 26 00:17:12 1998
+@@ -266,7 +266,7 @@
+ 	}
+         while ((vtcol&0x07) != 0);
+     }
+-    else if (c.c < 0x20 || c.c == 0x7F) {
++    else if (c.c < 0x20 || c.c == 0x7F || c.c == 0x9B) {
+ 	ac.c = '^';
+         vtputc(ac);
+ 	ac.c = (c.c ^ 0x40);
+
+(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/COMMENT b/editors/pico/pkg/COMMENT
new file mode 100644
index 00000000000..96c02a2a8b2
--- /dev/null
+++ b/editors/pico/pkg/COMMENT
@@ -0,0 +1 @@
+Handy text editor that ships with Pine
diff --git a/editors/pico/pkg/DESCR b/editors/pico/pkg/DESCR
new file mode 100644
index 00000000000..c1db9fff07e
--- /dev/null
+++ b/editors/pico/pkg/DESCR
@@ -0,0 +1,2 @@
+Pico is a simple text editor with limited searching, block cut and paste,
+and spell checking features.
diff --git a/editors/pico/pkg/PLIST b/editors/pico/pkg/PLIST
new file mode 100644
index 00000000000..46b39978c05
--- /dev/null
+++ b/editors/pico/pkg/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 1998/06/07 19:48:47 frueauf Exp $
+bin/pico
+lib/libpico.a
+man/man1/pico.1