Update of mail/nail to 10.8

pkgsrc changes.
* Use USE_INET6.

nail changes.

[10.8] released 6/28/04
* Support for IPv6 is not built by default anymore. There are just too
  many hosts on which it doesn't work while the IPv4 functions work
  fine. If you have use for IPv6 support and know that it works, enable
  it in the Makefile.
* autoconf and automake are no longer used for building. See the file
  'INSTALL' which describes the transition of existing build setups.
* The --enable-all-chars configuration option is no longer available. A
  run-time nail option variable 'print-all-chars' has been introduced
  instead.
* Nail can now handle folders in compressed mbox format. If a file name
  given on the command line or with the 'folder', 'copy', and 'save'
  commands ends with '.gz' or '.bz2', gzip(1) or bzip2(1) are executed
  when reading and writing to it. Likewise, if a folder 'name' does not
  exist, but either 'name.gz' or 'name.bz2' are found, the compressed
  folder is used. To make use of compressed folders, just compress the
  respective mbox format file.
* If the variable SHELL is not set, the default shell is now /bin/sh
  instead of csh.
* If the variable EDITOR is not set, the default editor is now 'ed', as
  specified by SUSv3.
* Introduced an 'ssl-verify-user@host' variable as an account-specific
  variant of 'ssl-verify'.
* Introduced an 'ssl-method-user@host' variable as an account-specific
  variant of 'ssl-method'.

5 files changed, 58 insertions, 25 deletions

diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index 3d0bf250a4f..e7d0a39d7da 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2004/04/19 10:17:01 cjep Exp $
+# $NetBSD: Makefile,v 1.11 2004/06/29 13:42:18 cjep Exp $
 
-DISTNAME=	nail-10.7
+DISTNAME=	nail-10.8
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nail/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,8 +11,21 @@ COMMENT=	BSD mail utility with MIME extensions
 
 USE_BUILDLINK3=	yes
 USE_PKGINSTALL=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-rcfile=${PKG_SYSCONFDIR}/nail.rc
+BUILD_DEFS+=	USE_INET6
+
+MAKE_ENV+=	"SYSCONFDIR=${PKG_SYSCONFDIR}"
+
+.include "../../mk/bsd.prefs.mk"
+
+# IPv6 support
+#
+.if ${USE_INET6} == "YES"
+MAKE_ENV+=	"IPv6=-DHAVE_IPv6_FUNCS"
+.endif
+
+.if (${OPSYS} == "SunOS")
+MAKE_ENV+=	"SENDMAIL=/usr/lib/sendmail"
+.endif
 
 EGDIR=		${PREFIX}/share/examples/nail
 
diff --git a/mail/nail/distinfo b/mail/nail/distinfo
index fc7bbdfc2ed..c886f28bb9c 100644
--- a/mail/nail/distinfo
+++ b/mail/nail/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2004/04/06 19:00:39 cjep Exp $
+$NetBSD: distinfo,v 1.6 2004/06/29 13:42:19 cjep Exp $
 
-SHA1 (nail-10.7.tar.bz2) = ebbb9c771fe78fa07f72b78995c7d5a2e1528025
-Size (nail-10.7.tar.bz2) = 155312 bytes
-SHA1 (patch-aa) = 5c244c8f89adf93dd5442222590a79624cda179b
-SHA1 (patch-ab) = 0b7e965a5ca3d06fda3d8555c57811f9be6e81dc
+SHA1 (nail-10.8.tar.bz2) = 0edd6189cf208acaf69baba81beecab291d43e94
+Size (nail-10.8.tar.bz2) = 139777 bytes
+SHA1 (patch-aa) = a6b8de381940828e67928ded2628c4c437ee64bb
+SHA1 (patch-ab) = 8a45700c0bbf13269743b3a82998f7cff902530f
 SHA1 (patch-ac) = 22393a31babfefa1f8712b3fc2749ecb565a156b
diff --git a/mail/nail/patches/patch-aa b/mail/nail/patches/patch-aa
index 969d3a46934..a08e2c7df15 100644
--- a/mail/nail/patches/patch-aa
+++ b/mail/nail/patches/patch-aa
@@ -1,13 +1,33 @@
-$NetBSD: patch-aa,v 1.2 2003/12/05 22:21:17 cjep Exp $
+$NetBSD: patch-aa,v 1.3 2004/06/29 13:42:19 cjep Exp $
 
---- 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 = @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 $@
+--- Makefile.orig	2004-06-28 18:57:40.000000000 +0100
++++ Makefile
+@@ -6,14 +6,14 @@
+ # See the file INSTALL if you need help.
+ #
+ 
+-PREFIX		= /usr/local
++PREFIX?=	 /usr/local
+ BINDIR		= $(PREFIX)/bin
+ MANDIR		= $(PREFIX)/share/man
+-SYSCONFDIR	= /etc
++SYSCONFDIR?=/etc
+ 
+ MAILRC		= $(SYSCONFDIR)/nail.rc
+-MAILSPOOL	= /var/mail
+-SENDMAIL	= /usr/lib/sendmail
++MAILSPOOL?= /var/mail
++SENDMAIL?= /usr/sbin/sendmail
+ 
+ DESTDIR		=
+ 
+@@ -41,7 +41,8 @@ SHELL		= /bin/sh
+ ###########################################################################
+ 
+ FEATURES	= -DMAILRC='"$(MAILRC)"' -DMAILSPOOL='"$(MAILSPOOL)"' \
+-			-DSENDMAIL='"$(SENDMAIL)"' $(IPv6)
++			-DSENDMAIL='"$(SENDMAIL)"' \
++			-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 \
diff --git a/mail/nail/patches/patch-ab b/mail/nail/patches/patch-ab
index 2537d38569a..79483b01ad7 100644
--- a/mail/nail/patches/patch-ab
+++ b/mail/nail/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2003/12/05 22:21:17 cjep Exp $
+$NetBSD: patch-ab,v 1.3 2004/06/29 13:42:19 cjep Exp $
 
---- mime.c.orig	2003-03-23 04:15:01.000000000 +0000
+--- mime.c.orig	2004-06-13 14:27:29.000000000 +0100
 +++ mime.c
-@@ -62,7 +62,7 @@ static char sccsid[]  = "@(#)mime.c	2.15
+@@ -62,7 +62,7 @@ static char sccsid[]  = "@(#)mime.c	2.18
   * 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 10f211271e9..a4dde236482 100644
--- a/mail/nail/patches/patch-ac
+++ b/mail/nail/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2003/12/05 22:21:17 cjep Exp $
+$NetBSD: patch-ac,v 1.3 2004/06/29 13:42:19 cjep Exp $
 
 --- nail.rc.orig	2002-10-27 01:12:25.000000000 +0100
 +++ nail.rc