Update of mail/nail to 10.6. Changes since 10.5:

* A nested MIME multipart message with a sub-part piped through an external
  program (such as HTML with w3m) caused nail to abort after SIGPIPE if the
  PAGER command terminated before reading the whole message.
* A 'next' command following a 'hold' command displays the next message
  after the one the 'hold' applies to (Bugreport by Mike Sipser). This
  might not be exactly what POSIX specifies, but it makes sense and is
  consistent with traditional behavior. If you actually favor 'next'
  not to advance after 'hold', contact me and I'll add a configuration
  option for this.
* If the value of the 'record' variable started with an environment
  variable reference such as '$HOME' or with a tilde and the 'outfolder'
  variable was set, it was not expanded correctly (Bugreport by Volker
  Kuhlmann).

7 files changed, 25 insertions, 24 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index fbdac4a4b12..22725514f00 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3985 2003/12/05 19:00:25 recht Exp $
+$NetBSD: CHANGES,v 1.3986 2003/12/05 22:21:17 cjep Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -4981,3 +4981,4 @@ Changes to the packages collection and infrastructure in 2003:
 	Added nikto-1.32 [xtraeme 2003-12-05]
 	Added gtk2-theme-switch-2.0.0rc2 [xtraeme 2003-12-05]
 	Added kodos-2.0 [recht 2003-12-05]
+	Update nail to 10.6 [cjep 2003-12-05] 
diff --git a/doc/TODO b/doc/TODO
index d8e995ebceb..73d5af36752 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.1128 2003/12/05 10:38:02 adam Exp $
+$NetBSD: TODO,v 1.1129 2003/12/05 22:21:17 cjep Exp $
 
 Suggested new packages
 ======================
@@ -269,7 +269,6 @@ Suggested package updates
 	o mtools-3.9.9
 	o multi-gnome-terminal-1.6.2
 	o multitail-2.9.3
-	o nail-10.6 [cjep]
 	o nano-1.2.2
 	o nap-1.5.2
 	o napshare-1.2
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index 54b54b8b5a8..1efd34f371c 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:46:35 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/05 22:21:17 cjep Exp $
 
-DISTNAME=	nail-10.5
+DISTNAME=	nail-10.6
 CATEGORIES=	mail
 MASTER_SITES=	http://omnibus.ruf.uni-freiburg.de/~gritter/archive/nail/
 
diff --git a/mail/nail/distinfo b/mail/nail/distinfo
index 297bf4cdfd5..0cdb0a0812e 100644
--- a/mail/nail/distinfo
+++ b/mail/nail/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2003/04/27 20:38:36 cjep Exp $
+$NetBSD: distinfo,v 1.4 2003/12/05 22:21:17 cjep Exp $
 
-SHA1 (nail-10.5.tar.gz) = 5a6669671200b7ba896371351cd7b646ef9682f6
-Size (nail-10.5.tar.gz) = 194123 bytes
-SHA1 (patch-aa) = c31048d0994efc5f26d88d07e348ad750aa44a2b
-SHA1 (patch-ab) = f9295585fed37e2a33debc49629afa2263ea699a
-SHA1 (patch-ac) = 72defa8a22e31244941154b5a7245fb1d698e88a
+SHA1 (nail-10.6.tar.gz) = 31e9e295297c46e8f21b3aae49076acfc7de15b3
+Size (nail-10.6.tar.gz) = 196354 bytes
+SHA1 (patch-aa) = 5c244c8f89adf93dd5442222590a79624cda179b
+SHA1 (patch-ab) = 0b7e965a5ca3d06fda3d8555c57811f9be6e81dc
+SHA1 (patch-ac) = 22393a31babfefa1f8712b3fc2749ecb565a156b
diff --git a/mail/nail/patches/patch-aa b/mail/nail/patches/patch-aa
index 367a88b0f1b..969d3a46934 100644
--- a/mail/nail/patches/patch-aa
+++ b/mail/nail/patches/patch-aa
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/09 10:37:17 cjep Exp $
+$NetBSD: patch-aa,v 1.2 2003/12/05 22:21:17 cjep Exp $
 
---- Makefile.in	Wed Nov 20 17:54:32 2002
-+++ Makefile.in.nb	Wed Nov 20 18:01:50 2002
-@@ -108,6 +108,7 @@
+--- Makefile.in.orig	2003-01-13 00:34:32.000000000 +0000
++++ Makefile.in
+@@ -107,7 +107,7 @@ smtp.o strings.o temp.o tty.o vars.o
+ nail_LDADD = $(LDADD)
  nail_DEPENDENCIES = 
  nail_LDFLAGS = 
- CFLAGS = @CFLAGS@
-+CFLAGS = -DMIMEPATH=\"@prefix@/etc/mime.types\"
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -DMIMEPATH=\"@prefix@/etc/mime.types\"
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/mail/nail/patches/patch-ab b/mail/nail/patches/patch-ab
index 50c8a5736da..2537d38569a 100644
--- a/mail/nail/patches/patch-ab
+++ b/mail/nail/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/12/09 10:37:17 cjep Exp $
+$NetBSD: patch-ab,v 1.2 2003/12/05 22:21:17 cjep Exp $
 
---- mime.c	Tue Sep 17 13:40:18 2002
-+++ mime.c.nb	Wed Nov 20 17:40:00 2002
-@@ -62,7 +62,7 @@
+--- mime.c.orig	2003-03-23 04:15:01.000000000 +0000
++++ mime.c
+@@ -62,7 +62,7 @@ static char sccsid[]  = "@(#)mime.c	2.15
   * You won't guess what these are for.
   */
  static const char basetable[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
diff --git a/mail/nail/patches/patch-ac b/mail/nail/patches/patch-ac
index d8ff99839cb..10f211271e9 100644
--- a/mail/nail/patches/patch-ac
+++ b/mail/nail/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/12/09 10:37:17 cjep Exp $
+$NetBSD: patch-ac,v 1.2 2003/12/05 22:21:17 cjep Exp $
 
---- nail.rc	Sun Sep  1 02:47:46 2002
-+++ nail.rc.nb	Wed Nov 20 17:31:35 2002
+--- nail.rc.orig	2002-10-27 01:12:25.000000000 +0100
++++ nail.rc
 @@ -4,6 +4,9 @@
  
  # Sccsid @(#)nail.rc	2.1 (gritter) 9/1/02