diff options
| -rw-r--r-- | mail/nail/Makefile | 4 | ||||
| -rw-r--r-- | mail/nail/distinfo | 12 | ||||
| -rw-r--r-- | mail/nail/patches/patch-aa | 22 | ||||
| -rw-r--r-- | mail/nail/patches/patch-ab | 6 | ||||
| -rw-r--r-- | mail/nail/patches/patch-ac | 19 |
5 files changed, 30 insertions, 33 deletions
diff --git a/mail/nail/Makefile b/mail/nail/Makefile index 03a80995d58..6da11d7767a 100644 --- a/mail/nail/Makefile +++ b/mail/nail/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2004/08/09 08:33:48 cjep Exp $ +# $NetBSD: Makefile,v 1.14 2004/08/16 15:34:25 cjep Exp $ -DISTNAME= nail-11.1 +DISTNAME= nail-11.2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nail/} EXTRACT_SUFX= .tar.bz2 diff --git a/mail/nail/distinfo b/mail/nail/distinfo index 7879d251592..b9209a684e1 100644 --- a/mail/nail/distinfo +++ b/mail/nail/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2004/08/09 08:33:48 cjep Exp $ +$NetBSD: distinfo,v 1.9 2004/08/16 15:34:25 cjep Exp $ -SHA1 (nail-11.1.tar.bz2) = 63f567e3743823a7e127e07245572147fb49d360 -Size (nail-11.1.tar.bz2) = 167257 bytes -SHA1 (patch-aa) = 16a3ef519d0c42a414feba819e11e5bab08dede4 -SHA1 (patch-ab) = 8a45700c0bbf13269743b3a82998f7cff902530f -SHA1 (patch-ac) = 22393a31babfefa1f8712b3fc2749ecb565a156b +SHA1 (nail-11.2.tar.bz2) = 74914c051e29e94094d0ba23d23997e3eba2f7df +Size (nail-11.2.tar.bz2) = 187472 bytes +SHA1 (patch-aa) = d6a394799fec7075a7e58c0c8c0f49393dfcb3fc +SHA1 (patch-ab) = fc028d32fb268e89ade8a5fba09611b3eb73bc29 +SHA1 (patch-ac) = f6d130cd5fa5d5ef0e8a500d2d60fdf5a5bbecc2 diff --git a/mail/nail/patches/patch-aa b/mail/nail/patches/patch-aa index bd770fb061c..0eaa329dad4 100644 --- a/mail/nail/patches/patch-aa +++ b/mail/nail/patches/patch-aa @@ -1,33 +1,33 @@ -$NetBSD: patch-aa,v 1.5 2004/08/09 08:33:48 cjep Exp $ +$NetBSD: patch-aa,v 1.6 2004/08/16 15:34:25 cjep Exp $ ---- Makefile.orig 2004-08-07 23:34:00.000000000 +0100 -+++ Makefile 2004-08-09 09:31:30.000000000 +0100 +--- Makefile.orig 2004-08-15 21:00:40.000000000 +0100 ++++ Makefile @@ -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 -SENDMAIL = /usr/lib/sendmail -+MAILSPOOL?= /var/mail -+SENDMAIL?= /usr/sbin/sendmail ++MAILSPOOL ?= /var/mail ++SENDMAIL ?= /usr/sbin/sendmail DESTDIR = -@@ -41,7 +41,8 @@ +@@ -43,7 +43,8 @@ SHELL = /bin/sh ########################################################################### FEATURES = -DMAILRC='"$(MAILRC)"' -DMAILSPOOL='"$(MAILSPOOL)"' \ - -DSENDMAIL='"$(SENDMAIL)"' $(IPv6) -+ -DSENDMAIL='"$(SENDMAIL)"' \ -+ -DMIMEPATH='"$(SYSCONFDIR)/mime.types"' $(IPv6) ++ -DSENDMAIL='"$(SENDMAIL)"' $(IPv6) \ ++ -DMIMEPATH='"$(SYSCONFDIR)/mime.types"' OBJ = aux.o base64.o cache.o cmd1.o cmd2.o cmd3.o cmdtab.o collect.o \ - dotlock.o edit.o fio.o getname.o getopt.o head.o imap.o lex.o list.o \ + dotlock.o edit.o fio.o getname.o getopt.o head.o hmac.o imap.o \ diff --git a/mail/nail/patches/patch-ab b/mail/nail/patches/patch-ab index 79483b01ad7..a2a8efd036d 100644 --- a/mail/nail/patches/patch-ab +++ b/mail/nail/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2004/06/29 13:42:19 cjep Exp $ +$NetBSD: patch-ab,v 1.4 2004/08/16 15:34:25 cjep Exp $ ---- mime.c.orig 2004-06-13 14:27:29.000000000 +0100 +--- mime.c.orig 2004-08-15 13:31:27.000000000 +0100 +++ mime.c -@@ -62,7 +62,7 @@ static char sccsid[] = "@(#)mime.c 2.18 +@@ -62,7 +62,7 @@ static char sccsid[] = "@(#)mime.c 2.20 * 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 a4dde236482..f8206232ce2 100644 --- a/mail/nail/patches/patch-ac +++ b/mail/nail/patches/patch-ac @@ -1,14 +1,11 @@ -$NetBSD: patch-ac,v 1.3 2004/06/29 13:42:19 cjep Exp $ +$NetBSD: patch-ac,v 1.4 2004/08/16 15:34:25 cjep Exp $ ---- nail.rc.orig 2002-10-27 01:12:25.000000000 +0100 +--- nail.rc.orig 2004-08-15 14:03:44.000000000 +0100 +++ nail.rc -@@ -4,6 +4,9 @@ - - # Sccsid @(#)nail.rc 2.1 (gritter) 9/1/02 - -+# Be xBSD compliant :) -+set bsdcompat +@@ -48,3 +48,6 @@ set newmail=noimap + # Hide some header fields which are uninteresting for most human readers. + ignore received in-reply-to message-id references + ignore mime-version content-transfer-encoding + - # Append rather than prepend to mailboxes. Do not unset - # or you will confuse other mail-handling programs! - set append ++# Be xBSD compliant ++set bsdcompat |