Updated to 4.43. Changes since 4.40:

*  Answered flag not set in some circumstances when replying
*  PC-Pine command line argument -passfile to change the name of the
   password file. This should be a fully-qualified filename.
*  Replying to a message may close the folder containing the message
*  Pine fails to compile in non-DEBUG mode.
*  PC-Pine crashes in some dialogs when run in Dialog Box mode.
*  Setup/Signature prefers literal-signature by default
*  Composer justify command handles nested quoting better
*  Increased efficiency for remote configurations (no temporary files)
*  New tokens SIZECOMMA (similar to 4.33 SIZE) and SIZENARROW for index-format
*  Select by size (thanks to Martin Gallwey)
*  New feature quell-content-id for working around Outlook XP problem
*  New PC-Pine feature quell-ssl-largeblocks for working around OS
   SSL-problems
*  Better color interoperability between PC-Pine and Unix Pine with
   16-color xterm
*  New PC-Pine dialog to aid in locating configuration file if none found
*  Save from local folder to simple name in remote collection fails
*  Crash when selecting folders by Properties (Unseen...) in local collection
*  Crash when talking to POP3 servers which have the EXPIRE capability
*  Crash when talking to SMTP server which offers STARTTLS
*  Crash when accessing remote config if there is a TLS failure
*  Crash when index-format includes SCORE token, a score rule includes
   an AllText pattern, and the folder being scored is remote
*  Delivery Status Notification (DSN) broken
*  Editing reply-indent-string was broken when using Windows dialog boxes
*  Entire folder is re-filtered when Save is typed and save-will-advance is set

5 files changed, 41 insertions, 38 deletions

diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index deb20b7863b..d938136fbd1 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.54 2001/11/27 03:12:54 hubertf Exp $
+# $NetBSD: Makefile,v 1.55 2001/12/15 08:31:38 martti Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 
-DISTNAME=       pine4.40
-PKGNAME=        pine-4.40
+DISTNAME=       pine4.43
+PKGNAME=        pine-4.43
 CATEGORIES=     mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		ftp://ftp.fu-berlin.de/unix/mail/pine/
@@ -18,7 +18,7 @@ BUILD_DEFS+=	PINE_USE_LDAP
 
 # This pkg doesn't build pico or libpico; the pico pkg does that part.
 DEPENDS+=	pico>=4.1:../../editors/pico
-DEPENDS+=	imap-uw>=2001.0:../../mail/imap-uw
+DEPENDS+=	imap-uw>=2001.1:../../mail/imap-uw
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/pine/distinfo b/mail/pine/distinfo
index f0261f9d8ec..35b442eddca 100644
--- a/mail/pine/distinfo
+++ b/mail/pine/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2001/11/13 10:38:58 agc Exp $
+$NetBSD: distinfo,v 1.6 2001/12/15 08:31:38 martti Exp $
 
-SHA1 (pine4.40.tar.gz) = 90ed30803e6b25add43bf53ec260cdf313cfb77b
-Size (pine4.40.tar.gz) = 3435886 bytes
-SHA1 (patch-aa) = 6bd983ef7f2e0d0b61b5f996bdc0a6ec06c29523
-SHA1 (patch-ac) = 369337c3b9719b7146b8bb5ee98c9f3f05e6e1bd
-SHA1 (patch-al) = 103428685f7808ed86b97b90908b3e8b2057cb4f
+SHA1 (pine4.43.tar.gz) = 733bc7797cf8de9f5d5cfd7aab7e4a7dc2127f79
+Size (pine4.43.tar.gz) = 3478028 bytes
+SHA1 (patch-aa) = 800f84f3c868e6d17798e9f98d8151bb734143b6
+SHA1 (patch-ac) = 409cfbcbbbdfa9aff67d52eb7877569dd07c6e9f
+SHA1 (patch-al) = 8d0c9ba6cab0794d592e6f0e9d188e062743c7ad
 SHA1 (patch-ao) = 0d8ba903d643147ae5771a7a053ab9be1e849766
diff --git a/mail/pine/patches/patch-aa b/mail/pine/patches/patch-aa
index 3f600b705c0..a21cb781b44 100644
--- a/mail/pine/patches/patch-aa
+++ b/mail/pine/patches/patch-aa
@@ -1,10 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2001/11/06 20:04:46 tv Exp $
+$NetBSD: patch-aa,v 1.13 2001/12/15 08:31:38 martti Exp $
 
---- pine/makefile.gs5.orig	Tue Jul  3 19:03:55 2001
-+++ pine/makefile.gs5	Mon Oct  8 10:04:40 2001
-@@ -47,9 +47,9 @@
- RM=          rm -f
- LN=          ln -s
+--- pine/makefile.gs5.orig	Tue Oct 23 22:24:47 2001
++++ pine/makefile.gs5	Fri Dec 14 19:24:02 2001
+@@ -49,7 +49,7 @@
  MAKE=        make
  OPTIMIZE=    # -O
  PROFILE=     # -pg
@@ -13,21 +11,19 @@ $NetBSD: patch-aa,v 1.12 2001/11/06 20:04:46 tv Exp $
  
  CCLIENTDIR=  ../c-client
  PICODIR=     ../pico
-@@ -71,10 +71,10 @@
+@@ -71,9 +71,9 @@
  # leaving out the UCB compatibility includes and libraries.
  # LDCC= $(PICODIR)/cc5.sol
  
 -STDLIBS=     -ltermlib
 -LOCLIBS=     $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
--LIBS=        $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
--             `cat $(CCLIENTDIR)/LDFLAGS`
+-LIBS=        $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
 +STDLIBS=     -lssl -lcrypto -ltermlib
 +LOCLIBS=     -lpico -lc-client
 +LIBS=        -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
-+              `cat $(CCLIENTDIR)/LDFLAGS`
+              `cat $(CCLIENTDIR)/LDFLAGS`
  
  STDCFLAGS=   -DSV4 -DSYSTYPE=\"GSO\" -DMOUSE
- CFLAGS=      $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
 @@ -95,7 +95,7 @@
  
  all:	pine rpload rpdump
diff --git a/mail/pine/patches/patch-ac b/mail/pine/patches/patch-ac
index 6c0b289e90d..a8b9f95fbc7 100644
--- a/mail/pine/patches/patch-ac
+++ b/mail/pine/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.15 2001/11/13 10:38:58 agc Exp $
+$NetBSD: patch-ac,v 1.16 2001/12/15 08:31:38 martti Exp $
 
---- pine/makefile.neb.orig	Tue Jul  3 19:03:58 2001
-+++ pine/makefile.neb	Mon Oct  8 10:05:52 2001
+--- pine/makefile.neb.orig	Tue Oct 23 22:24:49 2001
++++ pine/makefile.neb	Fri Dec 14 19:25:45 2001
 @@ -47,9 +47,11 @@
  MAKE=        make
  OPTIMIZE=    # -O
@@ -22,7 +22,7 @@ $NetBSD: patch-ac,v 1.15 2001/11/13 10:38:58 agc Exp $
  
 -STDLIBS=     -ltermlib
 -LOCLIBS=     $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
--LIBS=        $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
+-LIBS=        $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
 -             `cat $(CCLIENTDIR)/LDFLAGS`
 +STDLIBS=     -ltermlib -lssl -lcrypto -lcrypt
 +LOCLIBS=     -lpico -lc-client
@@ -31,7 +31,7 @@ $NetBSD: patch-ac,v 1.15 2001/11/13 10:38:58 agc Exp $
  STDCFLAGS=   -DNETBSD -DSYSTYPE=\"NEB\" -DMOUSE
  CFLAGS=      $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
 -	     $(STDCFLAGS)
-+	     $(STDCFLAGS)  -I${CCLIENTINC}
++	     $(STDCFLAGS) -I${CCLIENTINC}
  
  OFILES=	addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \
  	folder.o help.o helptext.o imap.o init.o mailcap.o mailcmd.o \
diff --git a/mail/pine/patches/patch-al b/mail/pine/patches/patch-al
index 49bc9d2779d..ab230ad1c15 100644
--- a/mail/pine/patches/patch-al
+++ b/mail/pine/patches/patch-al
@@ -1,12 +1,11 @@
-$NetBSD: patch-al,v 1.11 2001/11/06 20:04:47 tv Exp $
+$NetBSD: patch-al,v 1.12 2001/12/15 08:31:38 martti Exp $
 
---- build.orig	Thu Aug  2 03:35:02 2001
-+++ build	Mon Oct  8 10:11:41 2001
-@@ -344,27 +344,6 @@
- 	  esac
+--- build.orig	Thu Nov  1 00:01:04 2001
++++ build	Fri Dec 14 19:28:03 2001
+@@ -332,27 +332,6 @@
  	  echo "Including SSL functionality"
  	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
@@ -15,10 +14,11 @@ $NetBSD: patch-al,v 1.11 2001/11/06 20:04:47 tv 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"
@@ -27,10 +27,10 @@ $NetBSD: patch-al,v 1.11 2001/11/06 20:04:47 tv 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
-@@ -384,8 +363,6 @@
+@@ -372,8 +351,6 @@
          if [ -s ../pine/rpdump ] ;    then ln ../pine/rpdump rpdump   ; fi
          cd $PHOME
          echo ''
@@ -39,13 +39,20 @@ $NetBSD: patch-al,v 1.11 2001/11/06 20:04:47 tv Exp $
  	case $maketarg in
  	    mnt)    echo "Fixing stacksizes ..."
  		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
-@@ -421,9 +398,6 @@
+@@ -409,16 +386,9 @@
  
  
      clean) # This only sort of works 
+-        rm -f c-client mtest imapd ipopd
 -        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
+         echo "Done"
+         cd $PHOME
+         ;;