On Fri, Sep 12, 2014 at 05:45:17PM +0200, frantisek holop wrote:
> lightly tested, please test and commit.
No objections portswise, but:
Running it (on a maildir inbox) shows some regressions:
- after every command, it prints something like 'Held 2 messages
in /home/kili/Mail/inbox'
- hitting return doesn't automatically proceed to the next message
(well, one could argue that it's easy to enter a '+', but this wasn't
necessary in past versions).
Also, I'd prefer colour support to be disabled by default (just personal
taste), but that's probably a matter of personal taste ;-)
Ciao,
Kili
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/s-nail/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile 21 Apr 2014 14:00:22 -0000 1.9
> +++ Makefile 12 Sep 2014 15:39:43 -0000
> @@ -2,11 +2,10 @@
>
> COMMENT= enhanced, MIME capable Berkeley Mail
>
> -DISTNAME= s-nail-14.4.5
> +DISTNAME= s-nail-14.7.6
> DISTFILES= ${DISTNAME:S/./_/g}.tar.gz
> CATEGORIES= mail
> HOMEPAGE= http://sdaoden.users.sourceforge.net/code.html#s-nail
> -REVISION= 0
>
> # BSD
> PERMIT_PACKAGE_CDROM= Yes
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/s-nail/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 8 Nov 2013 01:31:34 -0000 1.5
> +++ distinfo 12 Sep 2014 15:39:43 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (s-nail-14_4_5.tar.gz) = tKkKHjIUH786tSjw2KPiXhIQOqkQTjxqoXe4cwxpxmw=
> -SIZE (s-nail-14_4_5.tar.gz) = 396305
> +SHA256 (s-nail-14_7_6.tar.gz) = mrzI6ROwpI0bM/2cg+lRg6AdxlvkxSkBc3qBtkEHhmk=
> +SIZE (s-nail-14_7_6.tar.gz) = 512207
> Index: patches/patch-mk-mk_in
> ===================================================================
> RCS file: patches/patch-mk-mk_in
> diff -N patches/patch-mk-mk_in
> --- patches/patch-mk-mk_in 8 Nov 2013 01:31:34 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-mk-mk_in,v 1.2 2013/11/08 01:31:34 william Exp $
> ---- mk-mk.in.orig Sat Oct 19 16:19:39 2013
> -+++ mk-mk.in Thu Nov 7 07:16:49 2013
> -@@ -16,7 +16,7 @@ EXT_CFLAGS = -std=c89 -O2 -g \
> -
> - .SUFFIXES: .o .c .y
> - .c.o:
> -- @echo CC $(<); $(CC) $(CFLAGS) $(INCLUDES) -c $(<)
> -+ $(CC) $(CFLAGS) $(INCLUDES) -c $(<)
> - .c .y: ;
> -
> - all: echoes $(UAGENT)
> Index: patches/patch-nail_rc
> ===================================================================
> RCS file: /cvs/ports/mail/s-nail/patches/patch-nail_rc,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-nail_rc
> --- patches/patch-nail_rc 8 Nov 2013 01:31:34 -0000 1.3
> +++ patches/patch-nail_rc 12 Sep 2014 15:39:43 -0000
> @@ -1,14 +1,14 @@
> $OpenBSD: patch-nail_rc,v 1.3 2013/11/08 01:31:34 william Exp $
>
> ---- nail.rc.orig Sat Oct 19 16:19:39 2013
> -+++ nail.rc Thu Nov 7 07:14:25 2013
> -@@ -20,6 +20,9 @@ set append
> +--- nail.rc.orig Fri Aug 15 19:47:45 2014
> ++++ nail.rc Fri Sep 12 17:11:38 2014
> +@@ -37,6 +37,9 @@ set append
> # Ask for a message subject.
> set ask
>
> +# Use the traditional BSD Mail interface style.
> +set bsdcompat
> +
> - # Assume a CRT-like terminal and invoke a pager.
> - set crt
> -
> + # *bsdannounce* prints a header summary on folder change and thus
> complements
> + # *header* on a per-folder basis (it is meaningless unless *header* is set)
> + set bsdannounce
> Index: patches/patch-openssl_c
> ===================================================================
> RCS file: patches/patch-openssl_c
> diff -N patches/patch-openssl_c
> --- patches/patch-openssl_c 19 Apr 2014 15:57:17 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,19 +0,0 @@
> -$OpenBSD: patch-openssl_c,v 1.1 2014/04/19 15:57:17 sthen Exp $
> ---- openssl.c.orig Sat Apr 19 16:51:05 2014
> -+++ openssl.c Sat Apr 19 16:51:50 2014
> -@@ -123,14 +123,7 @@ ssl_rand_init(void)
> - char *cp, *x;
> - int state = 0;
> -
> -- if ((cp = value("ssl-rand-egd")) != NULL) {
> -- if ((x = file_expand(cp)) == NULL || RAND_egd(cp = x) == -1)
> -- fprintf(stderr, tr(245,
> -- "entropy daemon at \"%s\" not available\n"),
> -- cp);
> -- else
> -- state = 1;
> -- } else if ((cp = value("ssl-rand-file")) != NULL) {
> -+ if ((cp = value("ssl-rand-file")) != NULL) {
> - if ((x = file_expand(cp)) == NULL ||
> - RAND_load_file(cp = x, 1024) == -1)
> - fprintf(stderr, tr(246,
