pine updated to 4.33, and pico adjusted for new distfile

Patch supplied by martti.kuparinen@iki.fi in PR pkg/12222

Changes in 4.33
 *  NNTP authentication causes crash
 *  Attachment viewing broken
 *  Display-Filters and Url-Viewers with quoted arguments in config
    broken
 *  Reverse sorting doesn't work correctly with filters
 *  Some combinations of non-ascii characters in subject cause crash
 *  Add version information to PC-Pine
 *  Top line in news index was painted incorrectly at times
 *  Crash caused by debugging when > 1K config lines are present
 *  PC-Pine LDAP crash caused by using incorrect memory free routine
 *  Save size check was disabled in multi append

Changes in 4.32
 *  File attaching broken (double filename) in PC-Pine
 *  Postponing loses second reply-to address
 *  Obscure crash when sorting by Threads
 *  Temporary file vulnerabilities
 *  Crash when NNTP authentication aborted
 *  Make /secure work again (broken in 4.30)
 *  Setup printer list problems with $PRINTER
 *  Recognize Re[arbitrary stuff]: reply syntax
 *  Allow for attaching files on a Windows network drive

Changes in 4.31
 *  Crashes when sorting by Threads
 *  Text of last message could be invisible with header larger than 4096
    bytes
 *  Fixed a few buffer overflow possibilities
 *  Many problems if compiled without -DDEBUG
 *  Eliminated length restriction on address book comments
 *  Couldn't expand collections when selecting if combined-folder-display
    set
 *  List options set only in fixed config didn't work
 *  Filtering based solely on scores didn't work
 *  Filtering to non-existent folder didn't ask to create the folder
 *  Save to default folder didn't work if the folder didn't already exist
 *  Crash when using WhereIs in Setup/Kolor with color turned off
 *  News collections would sometimes show up doubled until restarting
 *  Crash when accepting default in shuffle folder list command
 *  PC-Pine didn't always save window position
 *  Last-folder-used rule didn't always save the name of first saved
    folder
 *  Rule editor address selector should allow multiple addresses
 *  Added Replicate command for Rules
 *  News validation doesn't validate against multiple news servers
 *  Reply to some text/html messages with attachments incorrectly set
    content-type to text/html
 *  mail-directory setting in pine.conf doesn't work

5 files changed, 19 insertions, 23 deletions

diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 5387850efed..7e2ee8bdb6f 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2000/12/18 18:09:11 jwise Exp $
+# $NetBSD: Makefile,v 1.41 2001/02/16 10:13:36 abs Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 
-DISTNAME=       pine4.30
-PKGNAME=        pine-4.30
+DISTNAME=       pine4.33
+PKGNAME=        pine-4.33
 CATEGORIES=     mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		ftp://ftp.fu-berlin.de/unix/mail/pine/
diff --git a/mail/pine/files/md5 b/mail/pine/files/md5
index 6d8ecd7acef..d6f002651d9 100644
--- a/mail/pine/files/md5
+++ b/mail/pine/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.11 2000/11/09 03:37:26 hubertf Exp $
+$NetBSD: md5,v 1.12 2001/02/16 10:13:37 abs Exp $
 
-MD5 (pine4.30.tar.gz) = 21e16ae355a3c78cbe128876e3e65350
+MD5 (pine4.33.tar.gz) = fb45dcfa1d3379031700da49236b2b9c
diff --git a/mail/pine/files/patch-sum b/mail/pine/files/patch-sum
index 56674d0b44d..07d465af523 100644
--- a/mail/pine/files/patch-sum
+++ b/mail/pine/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.7 2000/12/18 18:09:11 jwise Exp $
+$NetBSD: patch-sum,v 1.8 2001/02/16 10:13:37 abs Exp $
 
 MD5 (patch-aa) = f9bc943f36dfc5f2c3583bcbe7a1aba6
-MD5 (patch-ac) = 5b10cccaeecdc6163e452a0bc691b247
-MD5 (patch-al) = e079f418def13fb0386bd6faecf113b4
+MD5 (patch-ac) = 9f88664a90e9a9a989b6e6aadf939402
+MD5 (patch-al) = ec4b240b1113eeb0e979e4ff1f3f1209
 MD5 (patch-ao) = bf069e8f6c0e571c26a3f52fe2781b6b
diff --git a/mail/pine/patches/patch-ac b/mail/pine/patches/patch-ac
index 0424add9937..c615f2460f8 100644
--- a/mail/pine/patches/patch-ac
+++ b/mail/pine/patches/patch-ac
@@ -1,7 +1,5 @@
-$NetBSD: patch-ac,v 1.10 2000/12/18 18:09:11 jwise Exp $
-
---- pine/makefile.neb.orig	Thu Aug 27 18:50:02 1998
-+++ pine/makefile.neb
+--- pine/makefile.neb.orig	Fri Nov 10 02:57:03 2000
++++ pine/makefile.neb	Fri Feb 16 10:04:20 2001
 @@ -45,11 +45,16 @@
  RM=          rm -f
  LN=          ln -s
@@ -24,7 +22,7 @@ $NetBSD: patch-ac,v 1.10 2000/12/18 18:09:11 jwise Exp $
  # Only need to uncomment next two lines if you run make from this directory
 @@ -60,14 +65,13 @@
  LDAPOFILES=   addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
- 	      other.o pine.o takeaddr.o
+ 	      mailview.o other.o pine.o strings.o takeaddr.o
  
 -STDLIBS=     -ltermlib
 -LOCLIBS=     $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
@@ -69,6 +67,6 @@ $NetBSD: patch-ac,v 1.10 2000/12/18 18:09:11 jwise Exp $
 -send.o:							$(CCLIENTDIR)/smtp.h
 +context.o:						$(CCLIENTINC)/misc.h
 +send.o:							$(CCLIENTINC)/smtp.h
- $(LDAPOFILES):						$(LDAPLIBS)
+ #$(LDAPOFILES):						$(LDAPLIBS)
  
  helptext.c:	pine.hlp
diff --git a/mail/pine/patches/patch-al b/mail/pine/patches/patch-al
index 487a6342c83..cb74220fd2b 100644
--- a/mail/pine/patches/patch-al
+++ b/mail/pine/patches/patch-al
@@ -1,17 +1,15 @@
-$NetBSD: patch-al,v 1.7 2000/11/09 03:37:27 hubertf Exp $
-
---- build.orig	Tue Aug  1 00:28:01 2000
-+++ build
-@@ -198,7 +198,7 @@
-      mnt) makeargs="CC=gcc $makeargs" ;;
+--- build.orig	Thu Jan  4 20:13:11 2001
++++ build	Fri Feb 16 10:33:44 2001
+@@ -201,7 +201,7 @@
       bs3) makeargs="CC=shlicc $makeargs" ;;
+      nto) makeargs="CC=qcc $makeargs" ;;
       lyn) [ -f /CYGNUS.bash ] && . /CYGNUS.bash; makeargs="CC=gcc $makeargs" ;;
 -       *) makeargs="CC=cc $makeargs" ;;
 +       *) makeargs="CC=${LT}\ cc\ -g $makeargs" ;;
    esac
  fi
  
-@@ -303,23 +303,28 @@
+@@ -309,23 +309,28 @@
  	  echo "Including SSL functionality"
  	fi
  
@@ -57,7 +55,7 @@ $NetBSD: patch-al,v 1.7 2000/11/09 03:37:27 hubertf Exp $
  
          echo "Making Pine".
          cd $PHOME/pine
-@@ -336,8 +341,6 @@
+@@ -342,8 +347,6 @@
          if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
          cd $PHOME
          echo ''
@@ -66,7 +64,7 @@ $NetBSD: patch-al,v 1.7 2000/11/09 03:37:27 hubertf Exp $
  	case $maketarg in
  	    mnt)    echo "Fixing stacksizes ..."
  		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
-@@ -347,9 +350,9 @@
+@@ -353,9 +356,9 @@
  
  
      clean) # This only sort of works