Apply patches provided by Jeremy C. Reed in PR pkg/21887 to make this

build and install cleanly under Linux.
Also improces DESCR.

4 files changed, 63 insertions, 6 deletions

diff --git a/editors/pico/DESCR b/editors/pico/DESCR
index d77be547f93..a7ee79e336f 100644
--- a/editors/pico/DESCR
+++ b/editors/pico/DESCR
@@ -1,5 +1,9 @@
-Pico is a simple text editor with limited searching, block cut and paste,
-and spell checking features.
+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.
+The pico package provides libpico, the library used by the Pine
+email client for its display and text editing capabilities.
+
+This also includes pilot(1), which is a simple, console-based,
+display-oriented file system navigator.  Pilot provides basic file
+manipulation commands.
diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index a46ac786b79..d4625ca54b9 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2003/06/02 01:20:07 jschauma Exp $
+# $NetBSD: Makefile,v 1.38 2003/06/18 00:58:12 jschauma Exp $
 
 DISTNAME=	pine4.53
 PKGNAME=	pico-4.4
@@ -23,6 +23,8 @@ USE_LIBTOOL=	YES
 BUILDNAME= so5
 .elif ${OPSYS} == "Darwin"
 BUILDNAME= osx
+.elif ${OPSYS} == "Linux"
+BUILDNAME= lnx
 .else
 BUILDNAME= neb
 .endif
@@ -45,4 +47,5 @@ do-install:
 	cd ${WRKSRC}/pico && \
 	${INSTALL_DATA} *.h ${PREFIX}/include/pico
 
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/pico/distinfo b/editors/pico/distinfo
index 8a83229913f..8fefd9a7636 100644
--- a/editors/pico/distinfo
+++ b/editors/pico/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2003/01/23 07:37:12 martti Exp $
+$NetBSD: distinfo,v 1.10 2003/06/18 00:58:12 jschauma Exp $
 
 SHA1 (pine4.53.tar.bz2) = 99aed9dd3173a00a8bfd986d96c292b287ace5b2
 Size (pine4.53.tar.bz2) = 2793349 bytes
@@ -8,3 +8,4 @@ SHA1 (patch-ac) = 5f648f4e34d78af439ed2ea4953543aab4bd232f
 SHA1 (patch-ad) = 1180abc4909f4120ec91ba14854da9445be3ac6a
 SHA1 (patch-ae) = f228f3c7f61be31a36730b252dfa37d611e8be4b
 SHA1 (patch-af) = ebc41187ea97f57f1553a6919c81c773013a1428
+SHA1 (patch-ag) = 7166128e46a10b879c44caea1207b84d13d1b0f4
diff --git a/editors/pico/patches/patch-ag b/editors/pico/patches/patch-ag
new file mode 100644
index 00000000000..64d32bce5aa
--- /dev/null
+++ b/editors/pico/patches/patch-ag
@@ -0,0 +1,49 @@
+$NetBSD: patch-ag,v 1.1 2003/06/18 00:58:12 jschauma Exp $
+
+--- pico/makefile.lnx.orig	Tue Oct 23 15:19:06 2001
++++ pico/makefile.lnx
+@@ -36,18 +36,14 @@
+ RM=          rm -f
+ LN=          ln -s
+ MAKE=        make
+-OPTIMIZE=    # -O
++OPTIMIZE=    -O2
+ PROFILE=     # -pg
+-DEBUG=       -g -DDEBUG
++DEBUG=       -g
+ 
+ STDCFLAGS=	-Dlnx -DJOB_CONTROL -DPOSIX -DMOUSE
+ CFLAGS=         $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS)
+ 
+ # switches for library building
+-LIBCMD=		ar
+-LIBARGS=	ru
+-RANLIB=		ranlib
+-
+ LIBS=		$(EXTRALDFLAGS) -lncurses
+ 
+ OFILES=		attach.o basic.o bind.o browse.o buffer.o \
+@@ -61,17 +57,17 @@ HFILES=		headers.h estruct.h edef.h efun
+ # 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 4:0
+ 
+ clean:
+ 		rm -f *.a *.o *~ pico_os.c os.h pico pilot