Updated pico to 4.1 because the old distfile for pine wasn't available

any more. What's new in pico 4.1? I don't know...

4 files changed, 23 insertions, 39 deletions

diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index b174561462f..0347ed1d418 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2001/06/04 22:22:43 jtb Exp $
+# $NetBSD: Makefile,v 1.27 2001/10/10 13:36:58 martti Exp $
 #
 
-DISTNAME=	pine4.33
-PKGNAME=	pico-4.0
+DISTNAME=	pine4.40
+PKGNAME=	pico-4.1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/pine/
diff --git a/editors/pico/distinfo b/editors/pico/distinfo
index dc22914ce20..05104fa9e55 100644
--- a/editors/pico/distinfo
+++ b/editors/pico/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:01:04 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/10/10 13:36:59 martti Exp $
 
-SHA1 (pine4.33.tar.gz) = e93f1653d50ac3cbebf223dcd2f3d76c2fc27597
-Size (pine4.33.tar.gz) = 3333758 bytes
+SHA1 (pine4.40.tar.gz) = 90ed30803e6b25add43bf53ec260cdf313cfb77b
+Size (pine4.40.tar.gz) = 3435886 bytes
 SHA1 (patch-aa) = 20b23e6b24e9e8956504d83b62e3fec7937e921f
-SHA1 (patch-ab) = 9c62b04a377d0fb952ad5b380b35e69f7b426a02
-SHA1 (patch-ac) = 66e9f159445d6d77b9097a5d40b78f70bf05f06d
+SHA1 (patch-ab) = dc3e24b01783ddca38518496a65ea2a7286c1cfa
+SHA1 (patch-ac) = fa1d57736207000e0a702e9e5a1625b32f98595e
 SHA1 (patch-ad) = 1180abc4909f4120ec91ba14854da9445be3ac6a
 SHA1 (patch-ae) = 73e86b258329250f6a667dbec420c95a4db8c1d0
diff --git a/editors/pico/patches/patch-ab b/editors/pico/patches/patch-ab
index ab1bb745a87..7abeb404cfa 100644
--- a/editors/pico/patches/patch-ab
+++ b/editors/pico/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2000/11/09 03:34:14 hubertf Exp $
+$NetBSD: patch-ab,v 1.6 2001/10/10 13:36:59 martti Exp $
 
---- pico/osdep/unix.orig	Fri Sep 15 01:45:19 2000
-+++ pico/osdep/unix
-@@ -2300,7 +2300,7 @@
+--- pico/osdep/unix.orig	Fri Jul 13 21:37:32 2001
++++ pico/osdep/unix	Mon Oct  8 09:49:27 2001
+@@ -2336,7 +2336,7 @@
  errstr(err)
  int err;
  {
diff --git a/editors/pico/patches/patch-ac b/editors/pico/patches/patch-ac
index 9395b69dac8..35ba0836a93 100644
--- a/editors/pico/patches/patch-ac
+++ b/editors/pico/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2000/11/09 03:34:14 hubertf Exp $
+$NetBSD: patch-ac,v 1.6 2001/10/10 13:36:59 martti Exp $
 
---- build.orig	Tue Aug  1 00:28:01 2000
-+++ build
-@@ -303,17 +303,20 @@
+--- build.orig	Thu Aug  2 03:35:02 2001
++++ build	Mon Oct  8 09:52:25 2001
+@@ -345,30 +345,12 @@
  	  echo "Including SSL functionality"
  	fi
  
@@ -12,29 +12,17 @@ $NetBSD: patch-ac,v 1.5 2000/11/09 03:34:14 hubertf Exp $
 -        ln -s imap/mtest mtest
 -        if [ -s imapd    ] ; then rm -f imapd    ; fi
 -        ln -s imap/imapd imapd
+-        if [ -s ipopd    ] ; then rm -f ipopd    ; fi
+-        ln -s imap/ipopd ipopd
 -        echo "Making c-client library, mtest and imapd"
 -        eval echo make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
 -        cd $PHOME/imap
 -        eval make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
 -        echo ''
-+#
-+# Built in mail/imap-uw:
-+#
-+#       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/imapd imapd
-+#       echo "Making c-client library, mtest and imapd"
-+#       eval echo make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
-+#       cd $PHOME/imap
-+#       eval make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
-+#       echo ''
- 
+-
          echo "Making Pico and Pilot"
          cd $PHOME/pico
-@@ -321,10 +324,10 @@
+         eval echo make "$makeargs" -f makefile.$picotarg
          eval make "$makeargs" -f makefile.$picotarg
          echo ''
  
@@ -42,19 +30,15 @@ $NetBSD: patch-ac,v 1.5 2000/11/09 03:34:14 hubertf Exp $
 -        cd $PHOME/pine
 -        eval echo make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg
 -        eval make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg
-+#       echo "Making Pine".
-+#       cd $PHOME/pine
-+#       eval echo make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg
-+#       eval make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg
          cd $PHOME
          if [ ! -d bin ] ;  then    mkdir bin;        fi
          cd $PHOME/bin
-@@ -336,8 +339,6 @@
-         if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
+@@ -384,8 +366,6 @@
+         if [ -s ../pine/rpdump ] ;    then ln ../pine/rpdump rpdump   ; fi
          cd $PHOME
          echo ''
 -        echo "Links to executables are in bin directory:"
--        size bin/pine bin/mtest bin/imapd bin/pico bin/pilot
+-        size bin/pine bin/mtest bin/imapd bin/pico bin/pilot bin/rpdump bin/rpload bin/ipop2d bin/ipop3d
  	case $maketarg in
  	    mnt)    echo "Fixing stacksizes ..."
  		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot