Updated to 4.2

* Use new distfile (from pine-4.43)
* Other changes unknown (there's no ChangeLog file)

6 files changed, 37 insertions, 36 deletions

diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index 0347ed1d418..9e2c5cce82d 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2001/10/10 13:36:58 martti Exp $
+# $NetBSD: Makefile,v 1.28 2001/12/15 08:31:08 martti Exp $
 #
 
-DISTNAME=	pine4.40
-PKGNAME=	pico-4.1
+DISTNAME=	pine4.43
+PKGNAME=	pico-4.2
 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 05104fa9e55..68d369079ee 100644
--- a/editors/pico/distinfo
+++ b/editors/pico/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/10/10 13:36:59 martti Exp $
+$NetBSD: distinfo,v 1.4 2001/12/15 08:31:08 martti Exp $
 
-SHA1 (pine4.40.tar.gz) = 90ed30803e6b25add43bf53ec260cdf313cfb77b
-Size (pine4.40.tar.gz) = 3435886 bytes
-SHA1 (patch-aa) = 20b23e6b24e9e8956504d83b62e3fec7937e921f
-SHA1 (patch-ab) = dc3e24b01783ddca38518496a65ea2a7286c1cfa
-SHA1 (patch-ac) = fa1d57736207000e0a702e9e5a1625b32f98595e
+SHA1 (pine4.43.tar.gz) = 733bc7797cf8de9f5d5cfd7aab7e4a7dc2127f79
+Size (pine4.43.tar.gz) = 3478028 bytes
+SHA1 (patch-aa) = 066b5f538d669e5986c91b1d9b88e307c6066527
+SHA1 (patch-ab) = 341ce106598c7bcead07fc18a2a557984339912d
+SHA1 (patch-ac) = 162250bf37092c9c24a0b18a1fca2e588cf66221
 SHA1 (patch-ad) = 1180abc4909f4120ec91ba14854da9445be3ac6a
-SHA1 (patch-ae) = 73e86b258329250f6a667dbec420c95a4db8c1d0
+SHA1 (patch-ae) = 2e027bdc0597abcd9bb4272744887c9e54a9efe8
diff --git a/editors/pico/patches/patch-aa b/editors/pico/patches/patch-aa
index c85fa7f510b..561609d8933 100644
--- a/editors/pico/patches/patch-aa
+++ b/editors/pico/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2000/11/09 03:34:14 hubertf Exp $
+$NetBSD: patch-aa,v 1.11 2001/12/15 08:31:08 martti Exp $
 
---- pico/makefile.neb.orig	Mon Jun 29 18:23:50 1998
-+++ pico/makefile.neb	Sun Sep 27 12:30:46 1998
-@@ -30,18 +30,13 @@
+--- pico/makefile.neb.orig	Tue Oct 23 22:19:07 2001
++++ pico/makefile.neb	Fri Dec 14 19:07:19 2001
+@@ -30,18 +30,14 @@
  RM=          rm -f
  LN=          ln -s
  MAKE=        make
@@ -10,20 +10,20 @@ $NetBSD: patch-aa,v 1.10 2000/11/09 03:34:14 hubertf Exp $
 +OPTIMIZE=    -O2
  PROFILE=     # -pg
 -DEBUG=       -g -DDEBUG
-+DEBUG=       -g # -g -DDEBUG
++DEBUG=       -g
  
  STDCFLAGS=	-Dneb -DJOB_CONTROL -DPOSIX -DMOUSE
  CFLAGS=         $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS)
  
--# switches for library building
+ # switches for library building
 -LIBCMD=		ar
 -LIBARGS=	ru
 -RANLIB=		ranlib
 -
- LIBS=		$(EXTRALIBES) -ltermcap
+ LIBS=		$(EXTRALDFLAGS) -ltermcap
  
  OFILES=		attach.o basic.o bind.o browse.o buffer.o \
-@@ -55,17 +50,17 @@
+@@ -55,17 +51,17 @@
  # dependencies for the Unix versions of pico and libpico.a
  #
  all:		pico pilot
diff --git a/editors/pico/patches/patch-ab b/editors/pico/patches/patch-ab
index 7abeb404cfa..c7265132d92 100644
--- a/editors/pico/patches/patch-ab
+++ b/editors/pico/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2001/10/10 13:36:59 martti Exp $
+$NetBSD: patch-ab,v 1.7 2001/12/15 08:31:08 martti Exp $
 
---- 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 @@
+--- pico/osdep/unix.orig	Tue Oct 30 18:43:21 2001
++++ pico/osdep/unix	Fri Dec 14 19:07:53 2001
+@@ -2586,7 +2586,7 @@
  errstr(err)
  int err;
  {
diff --git a/editors/pico/patches/patch-ac b/editors/pico/patches/patch-ac
index 35ba0836a93..1b9fb8754c4 100644
--- a/editors/pico/patches/patch-ac
+++ b/editors/pico/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2001/10/10 13:36:59 martti Exp $
+$NetBSD: patch-ac,v 1.7 2001/12/15 08:31:08 martti Exp $
 
---- build.orig	Thu Aug  2 03:35:02 2001
-+++ build	Mon Oct  8 09:52:25 2001
-@@ -345,30 +345,12 @@
+--- build.orig	Thu Nov  1 00:01:04 2001
++++ build	Fri Dec 14 19:09:32 2001
+@@ -332,31 +332,12 @@
  	  echo "Including SSL functionality"
  	fi
  
@@ -14,10 +14,11 @@ $NetBSD: patch-ac,v 1.6 2001/10/10 13:36:59 martti Exp $
 -        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
+-        echo "Making c-client library, imapd, and ipopd"
+-	echo $S1 $S2 $S3 $S4 $K1 > imap/SPECIALS
 -        cd $PHOME/imap
--        eval make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg
+-        eval echo eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
+-        eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
 -        echo ''
 -
          echo "Making Pico and Pilot"
@@ -26,14 +27,14 @@ $NetBSD: patch-ac,v 1.6 2001/10/10 13:36:59 martti Exp $
          eval make "$makeargs" -f makefile.$picotarg
          echo ''
  
--        echo "Making Pine".
+-        echo "Making Pine and rpload/rpdump".
 -        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
-@@ -384,8 +366,6 @@
+@@ -372,8 +353,6 @@
          if [ -s ../pine/rpdump ] ;    then ln ../pine/rpdump rpdump   ; fi
          cd $PHOME
          echo ''
diff --git a/editors/pico/patches/patch-ae b/editors/pico/patches/patch-ae
index 7ad7b46d77a..3a15ff62449 100644
--- a/editors/pico/patches/patch-ae
+++ b/editors/pico/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.4 2000/11/09 03:34:14 hubertf Exp $
+$NetBSD: patch-ae,v 1.5 2001/12/15 08:31:08 martti Exp $
 
---- pico/makefile.sol.orig	Tue Jun 30 00:23:56 1998
-+++ pico/makefile.sol	Thu Dec  2 17:54:23 1999
+--- pico/makefile.sol.orig	Tue Oct 23 22:19:09 2001
++++ pico/makefile.sol	Fri Dec 14 19:11:59 2001
 @@ -32,25 +32,13 @@
  RM=          rm -f
  LN=          ln -s
@@ -17,7 +17,7 @@ $NetBSD: patch-ae,v 1.4 2000/11/09 03:34:14 hubertf Exp $
 -# give that a try.  This is still using the Solaris compiler but
 -# leaving out the UCB compatibility includes and libraries.
 -LDCC= ./cc5.sol
-+DEBUG=       # -g -DDEBUG
++DEBUG=
  
  STDCFLAGS=	-Dconst= -Dsv4 -DPOSIX -DJOB_CONTROL -DMOUSE
  CFLAGS=         $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS)
@@ -27,7 +27,7 @@ $NetBSD: patch-ae,v 1.4 2000/11/09 03:34:14 hubertf Exp $
 -LIBARGS=	ru
 -RANLIB=		true
 -
- LIBS=		$(EXTRALIBES) -ltermlib
+ LIBS=		$(EXTRALDFLAGS) -ltermlib
  
  OFILES=		attach.o basic.o bind.o browse.o buffer.o \
 @@ -64,17 +52,17 @@