Update pico to 3.0, part of the pine 4.00 distribution. Build libpico

with libtool, enabling a libpico shared object useable with pine.

9 files changed, 112 insertions, 109 deletions

diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index d23bdf80ce1..bbf683a6111 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,23 +1,25 @@
-# $NetBSD: Makefile,v 1.3 1998/06/27 03:29:04 tv Exp $
+# $NetBSD: Makefile,v 1.4 1998/07/19 03:37:46 tv Exp $
 #
 
-DISTNAME=	pine3.96
-PKGNAME=	pico-2.9
-WRKSRC=		${WRKDIR}/pine3.96
+DISTNAME=	pine4.00
+PKGNAME=	pico-3.0
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 
 MAINTAINER=	root@garbled.net
 
-CONFLICTS=	pine-3.96
+BUILD_DEPENDS=	${PREFIX}/bin/libtool:../../devel/libtool
+
+CONFLICTS=	pico-2.9
 
 do-build:
-	cd ${WRKSRC} && ./build neb
+	cd ${WRKSRC} && ./build neb CC="${PREFIX}/bin/libtool ${CC}" PREFIX=${PREFIX}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/pico/libpico.a ${PREFIX}/lib/libpico.a
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/pico ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/pilot ${PREFIX}/bin/
+	${PREFIX}/bin/libtool --mode=install ${INSTALL_DATA} \
+		${WRKSRC}/pico/libpico.la ${PREFIX}/lib/
+	${PREFIX}/bin/libtool --mode=install ${INSTALL_PROGRAM} \
+		${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/
 
diff --git a/editors/pico/files/md5 b/editors/pico/files/md5
index 383150f4563..4539b8cda85 100644
--- a/editors/pico/files/md5
+++ b/editors/pico/files/md5
@@ -1 +1 @@
-MD5 (pine3.96.tar.gz) = bf32b0bf1296ff2151e1bc7f546d43ab
+MD5 (pine4.00.tar.gz) = 4aa00d67b4060299e9edff744cab6f23
diff --git a/editors/pico/patches/patch-aa b/editors/pico/patches/patch-aa
index 6087b9ff3a6..65842af0c9d 100644
--- a/editors/pico/patches/patch-aa
+++ b/editors/pico/patches/patch-aa
@@ -1,45 +1,47 @@
---- 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)
+--- pico/makefile.neb.orig	Mon Jun 29 18:23:50 1998
++++ pico/makefile.neb	Sat Jul 18 23:21:15 1998
+@@ -30,18 +30,13 @@
+ RM=          rm -f
+ LN=          ln -s
+ MAKE=        make
+-OPTIMIZE=    # -O
++OPTIMIZE=    -O2
+ PROFILE=     # -pg
+-DEBUG=       -g -DDEBUG
++DEBUG=       # -g -DDEBUG
+ 
+ STDCFLAGS=	-Dneb -DJOB_CONTROL -DPOSIX -DMOUSE
+ CFLAGS=         $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS)
+ 
+-# switches for library building
+-LIBCMD=		ar
+-LIBARGS=	ru
+-RANLIB=		ranlib
+-
+ LIBS=		$(EXTRALIBES) -ltermcap
+ 
+ OFILES=		attach.o basic.o bind.o browse.o buffer.o \
+@@ -55,17 +50,17 @@
+ # dependencies for the Unix versions of pico and libpico.a
+ #
+ all:		pico pilot
+-pico pilot:	libpico.a
++pico pilot:	libpico.la
+ 
+ pico:		main.o
+-		$(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico
++		$(CC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
+ 
+ pilot:		pilot.o
+-		$(CC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot
++		$(CC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
+ 
+-libpico.a:	$(OFILES)
+-		$(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
+-		$(RANLIB) libpico.a
++libpico.la:	$(OFILES)
++		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
++			-version-info 0:0
  
-@@ -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
+ 		rm -f *.a *.o *~ pico_os.c os.h pico pilot
diff --git a/editors/pico/patches/patch-ab b/editors/pico/patches/patch-ab
index ea73b2fddef..ef462e65405 100644
--- a/editors/pico/patches/patch-ab
+++ b/editors/pico/patches/patch-ab
@@ -1,15 +1,11 @@
-*** 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);
-  }
-  
+--- pico/osdep/unix.orig	Sat Jul 18 20:21:36 1998
++++ pico/osdep/unix	Sat Jul 18 20:21:52 1998
+@@ -1268,7 +1268,7 @@
+ errstr(err)
+ int err;
+ {
+-    return((err >= 0 && err < sys_nerr) ? (char *)sys_errlist[err] : NULL);
++    return strerror(err);
+ }
+ 
+ 
diff --git a/editors/pico/patches/patch-ac b/editors/pico/patches/patch-ac
index 1ac1413d863..83df5ec0b5a 100644
--- a/editors/pico/patches/patch-ac
+++ b/editors/pico/patches/patch-ac
@@ -1,48 +1,45 @@
---- build.orig	Tue May 14 12:22:47 1996
-+++ build	Sat Jun  6 07:15:10 1998
-@@ -149,10 +149,2 @@
-         cd $PHOME
+--- build.orig	Sat Jul 18 20:22:16 1998
++++ build	Sat Jul 18 20:23:48 1998
+@@ -254,41 +254,20 @@
+ 	  esac
+ 	fi
+ 
 -        if [ -s c-client ] ; then rm -f c-client ; fi
+-        ln -s imap/c-client c-client
+-        if [ -s mtest    ] ; then rm -f mtest    ; fi
+-        ln -s imap/mtest mtest
 -        if [ -s imapd    ] ; then rm -f imapd    ; fi
--        ln -s imap/systype/c-client c-client
--        ln -s imap/systype/imapd imapd
+-        ln -s imap/imapd imapd
 -        echo "Making c-client library, mtest and imapd"
+-        eval echo make "$makeargs" "$K1" "$K2" $ccltarg
 -        cd $PHOME/imap
--        make $makeargs $maketarget
+-        eval make "$makeargs" "$K1" "$K2" $ccltarg
 -        echo ''
+-
          echo "Making Pico and Pilot"
-@@ -161,5 +153,2 @@
+         cd $PHOME/pico
+         eval echo make "$makeargs" -f makefile.$picotarg
+         eval make "$makeargs" -f makefile.$picotarg
          echo ''
+ 
 -        echo "Making Pine".
 -        cd $PHOME/pine
--        make $makeargs -f makefile.$maketarget
+-        eval echo make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg
+-        eval make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg
          cd $PHOME
-@@ -167,8 +156,7 @@
+         if [ ! -d bin ] ;  then    mkdir bin;        fi
          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 ../mtest/mtest ] ;    then ln ../mtest/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:"
+         echo ''
+-        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
index 59c8098e618..e3a8501e38b 100644
--- a/editors/pico/patches/patch-pine-bugtraq
+++ b/editors/pico/patches/patch-pine-bugtraq
@@ -12,17 +12,18 @@ 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);
+--- 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)
 
diff --git a/editors/pico/pkg/COMMENT b/editors/pico/pkg/COMMENT
index 96c02a2a8b2..ec8d234c3db 100644
--- a/editors/pico/pkg/COMMENT
+++ b/editors/pico/pkg/COMMENT
@@ -1 +1 @@
-Handy text editor that ships with Pine
+Text editor that ships with Pine, and Pine's text editing library.
diff --git a/editors/pico/pkg/DESCR b/editors/pico/pkg/DESCR
index c1db9fff07e..6d9a035cb32 100644
--- a/editors/pico/pkg/DESCR
+++ b/editors/pico/pkg/DESCR
@@ -1,2 +1,5 @@
 Pico is a simple text editor with limited searching, block cut and paste,
 and spell checking features.
+
+The pico pkg includes libpico, the library used by Pine for its display
+and text editing capabilities. 
diff --git a/editors/pico/pkg/PLIST b/editors/pico/pkg/PLIST
index 0c6abad5d6b..6e5bf625676 100644
--- a/editors/pico/pkg/PLIST
+++ b/editors/pico/pkg/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 1998/06/27 14:05:46 tv Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/07/19 03:37:47 tv Exp $
 bin/pico
 bin/pilot
+lib/libpico.a
+lib/libpico.so.0.0
 man/man1/pico.1
 man/man1/pilot.1