Update Pico to 3.6, Pine to 4.20. Also move pine.conf and pine.conf.fixed

to .../share/examples/pine and copy pine.conf to .../etc only if it doesn't
exist.

7 files changed, 25 insertions, 30 deletions

diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index 3fe5fd67c19..15a0f073bd5 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 1999/05/02 03:16:58 tv Exp $
+# $NetBSD: Makefile,v 1.16 1999/11/11 17:40:16 tv Exp $
 #
 
-DISTNAME=	pine4.10
-PKGNAME=	pico-3.5
+DISTNAME=	pine4.20
+PKGNAME=	pico-3.6
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 
diff --git a/editors/pico/files/md5 b/editors/pico/files/md5
index 4285ab5091d..2411ba9f96d 100644
--- a/editors/pico/files/md5
+++ b/editors/pico/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.9 1999/05/02 03:16:59 tv Exp $
+$NetBSD: md5,v 1.10 1999/11/11 17:40:17 tv Exp $
 
-MD5 (pine4.10.tar.gz) = f871e201b4070da1f060f35d3b8f2ccd
+MD5 (pine4.20.tar.gz) = 9b60a049e3575fc0b1a201f5f0105f14
diff --git a/editors/pico/files/patch-sum b/editors/pico/files/patch-sum
index 682fcccd742..97b4376bed6 100644
--- a/editors/pico/files/patch-sum
+++ b/editors/pico/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:44 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/11 17:40:17 tv Exp $
 
-MD5 (patch-aa) = 75f47ebd9508f1e72af26d07de76f8f9
-MD5 (patch-ab) = d0cbf4e7d1119fb5f040ae88a716d938
-MD5 (patch-ac) = e0c088a790d608c9ef0e387c552a0532
+MD5 (patch-aa) = cc2914e60f45e6c431f5225d75ad45df
+MD5 (patch-ab) = c3011e2ac8f241ae76ecbed1a7c88293
+MD5 (patch-ac) = be4c35a3c79a469da96ff1f1c1a9f17d
 MD5 (patch-ad) = cb38f893ce88b8a3a78b29af793e4c40
diff --git a/editors/pico/patches/patch-aa b/editors/pico/patches/patch-aa
index b09a82e37ba..21d82a54091 100644
--- a/editors/pico/patches/patch-aa
+++ b/editors/pico/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 1999/05/02 03:16:59 tv Exp $
+$NetBSD: patch-aa,v 1.9 1999/11/11 17:40:17 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.8 1999/05/02 03:16:59 tv Exp $
 -		$(RANLIB) libpico.a
 +libpico.la:	$(OFILES)
 +		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
-+			-version-info 2:0
++			-version-info 3:0
  
  clean:
  		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 d7107f57689..3179591bd6f 100644
--- a/editors/pico/patches/patch-ab
+++ b/editors/pico/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 10:40:33 agc Exp $
+$NetBSD: patch-ab,v 1.4 1999/11/11 17:40:17 tv Exp $
 
---- 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 @@
+--- pico/osdep/unix.orig	Mon Sep 13 15:35:36 1999
++++ pico/osdep/unix	Thu Nov 11 11:04:09 1999
+@@ -2301,7 +2301,7 @@
  errstr(err)
  int err;
  {
diff --git a/editors/pico/patches/patch-ac b/editors/pico/patches/patch-ac
index e0d8e4e35b6..d81ce5449bc 100644
--- a/editors/pico/patches/patch-ac
+++ b/editors/pico/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 1998/08/07 10:40:33 agc Exp $
+$NetBSD: patch-ac,v 1.4 1999/11/11 17:40:17 tv Exp $
 
---- build.orig	Sat Jul 18 20:22:16 1998
-+++ build	Sat Jul 18 20:23:48 1998
-@@ -254,41 +254,20 @@
+--- build.orig	Thu Nov 11 11:04:15 1999
++++ build	Thu Nov 11 11:13:47 1999
+@@ -276,28 +276,12 @@
  	  esac
  	fi
  
@@ -31,17 +31,12 @@ $NetBSD: patch-ac,v 1.3 1998/08/07 10:40:33 agc Exp $
          cd $PHOME
          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 ../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
+@@ -309,8 +293,6 @@
          if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
          cd $PHOME
          echo ''
 -        echo "Links to executables are in bin directory:"
 -        size bin/pine bin/mtest bin/imapd bin/pico bin/pilot
-         echo "Done"
-         ;;
- 
+ 	case $maketarg in
+ 	    mnt)    echo "Fixing stacksizes ..."
+ 		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
diff --git a/editors/pico/pkg/PLIST b/editors/pico/pkg/PLIST
index de320bc9be0..715e3910141 100644
--- a/editors/pico/pkg/PLIST
+++ b/editors/pico/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 1999/05/02 03:16:59 tv Exp $
+@comment $NetBSD: PLIST,v 1.10 1999/11/11 17:40:17 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.2.0
+lib/libpico.so.3.0
 man/man1/pico.1
 man/man1/pilot.1