Update of mail/nail to version 11.0

Changes:
[11.0] released 7/30/04
* IMAP support has been added. It should considered to be in beta state
  now, but should not have any disturbing effects on other code unless
  it is actually used. (So the version jump does not require vendors to
  continue to ship older releases.)
  To get started with IMAP, see the manual page for the 'account',
  'folder', and 'imap' commands, and for the 'folder' variable, as
  well as the EXAMPLES and NOTES sections.
* Support for SMTP AUTH LOGIN was added (contributed by John Fawcett).
* It is now possible to encrypt SMTP with SSL/TLS, using the STARTTLS
  method as well as with the SMTPS variant.
* New 'account' command to set groups of variables.
* Line and column limits (used e.g. for the header summary) are updated
  when the size of the terminal is changed (handling SIGWINCH).
* If saving an outgoing message to the folder given in the 'record'
  variable fails, the message is not sent but put in 'dead.letter'
  instead. This rarely happens with local record folders, but is of
  concern if 'record' refers to an IMAP mailbox.
* For addresses specified with the ~b, ~c, ~h, and ~t tilde escapes
  or by the 'editheaders' method, if a comma, parenthesis, angle bracket,
  or quoting character appears, only the comma is accepted as an address
  separator. Otherwise, whitespace separates addresses as elsewhere. This
  allows the insertion of comments in recipient addresses and more closely
  matches the behavior of System V mailx. (Thanks to Ryan Lovett and Hilko
  Bengen.)
* An internal version of getopt() is now used to properly work around
  system defects such as the option reordering on GNU libc based
  systems. If you really prefer the libc version, remove getopt.o from
  the list of objects in the Makefile. (Note that nail already worked
  around the glibc problem, so unless _your_ patches changed its
  behavior, use the new internal getopt() to remain compatible.)
* The undocumented facility to pass sendmail options on the command
  line of nail has been removed because it was not compatible with
  POSIX and System V. If you need to pass options to sendmail, create
  a shell script which invokes it appropriately and let the nail
  variable 'sendmail' point to its location.
* Fixed the text of some usage messages (thanks to Christian Reiber).

3 files changed, 13 insertions, 13 deletions

diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index e7d0a39d7da..9377ddaa3ad 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2004/06/29 13:42:18 cjep Exp $
+# $NetBSD: Makefile,v 1.12 2004/08/02 13:05:13 cjep Exp $
 
-DISTNAME=	nail-10.8
+DISTNAME=	nail-11.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nail/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/nail/distinfo b/mail/nail/distinfo
index c886f28bb9c..aec3b138fd7 100644
--- a/mail/nail/distinfo
+++ b/mail/nail/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2004/06/29 13:42:19 cjep Exp $
+$NetBSD: distinfo,v 1.7 2004/08/02 13:05:13 cjep Exp $
 
-SHA1 (nail-10.8.tar.bz2) = 0edd6189cf208acaf69baba81beecab291d43e94
-Size (nail-10.8.tar.bz2) = 139777 bytes
-SHA1 (patch-aa) = a6b8de381940828e67928ded2628c4c437ee64bb
+SHA1 (nail-11.0.tar.bz2) = 6b04a306a9f5f3a3f77d7de1cae9e79873716f3d
+Size (nail-11.0.tar.bz2) = 153169 bytes
+SHA1 (patch-aa) = 7905819c52e186fd697edd13bb427a7d5f3111e6
 SHA1 (patch-ab) = 8a45700c0bbf13269743b3a82998f7cff902530f
 SHA1 (patch-ac) = 22393a31babfefa1f8712b3fc2749ecb565a156b
diff --git a/mail/nail/patches/patch-aa b/mail/nail/patches/patch-aa
index a08e2c7df15..0ede32e1738 100644
--- a/mail/nail/patches/patch-aa
+++ b/mail/nail/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2004/06/29 13:42:19 cjep Exp $
+$NetBSD: patch-aa,v 1.4 2004/08/02 13:05:13 cjep Exp $
 
---- Makefile.orig	2004-06-28 18:57:40.000000000 +0100
-+++ Makefile
+--- Makefile.orig	2004-07-30 10:52:49.000000000 +0100
++++ Makefile	2004-08-02 14:00:53.000000000 +0100
 @@ -6,14 +6,14 @@
  # See the file INSTALL if you need help.
  #
  
 -PREFIX		= /usr/local
-+PREFIX?=	 /usr/local
++PREFIX?= /usr/local
  BINDIR		= $(PREFIX)/bin
  MANDIR		= $(PREFIX)/share/man
 -SYSCONFDIR	= /etc
-+SYSCONFDIR?=/etc
++SYSCONFDIR?= /etc
  
  MAILRC		= $(SYSCONFDIR)/nail.rc
 -MAILSPOOL	= /var/mail
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.3 2004/06/29 13:42:19 cjep Exp $
  
  DESTDIR		=
  
-@@ -41,7 +41,8 @@ SHELL		= /bin/sh
+@@ -41,7 +41,8 @@
  ###########################################################################
  
  FEATURES	= -DMAILRC='"$(MAILRC)"' -DMAILSPOOL='"$(MAILSPOOL)"' \
@@ -30,4 +30,4 @@ $NetBSD: patch-aa,v 1.3 2004/06/29 13:42:19 cjep Exp $
 +			-DMIMEPATH='"$(SYSCONFDIR)/mime.types"' $(IPv6)
  
  OBJ = aux.o base64.o cmd1.o cmd2.o cmd3.o cmdtab.o collect.o \
- 	dotlock.o edit.o fio.o getname.o head.o lex.o list.o \
+ 	dotlock.o edit.o fio.o getname.o getopt.o head.o imap.o lex.o list.o \