Update nmh to 1.7. I've been using this for the past few days without
problems (no-sasl) and lightly tested the sasl FLAVOR.
This version now supports OAuth, but that pulls in curl and nghttp2. I
have chosen to disable it. Is anyone planning on using this? If so, it
could probably be folded into the sasl FLAVOR.
Some executables have moved from libexec/ to libexec/nmh. I think this
is a bit cleaner, but it requires the user to adjust their
fetchmail/fdm/MTA config if they use slocal(1).
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/nmh/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile 15 Nov 2017 21:28:05 -0000 1.41
+++ Makefile 26 Nov 2017 10:53:27 -0000
@@ -2,23 +2,23 @@
COMMENT= new MH mail handling program
-DISTNAME= nmh-1.6
+DISTNAME= nmh-1.7
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SAVANNAH:=nmh/}
HOMEPAGE= http://www.nongnu.org/nmh/
-REVISION= 1
# BSD-like
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c crypto edit iconv ssl termcap
+WANTLIB= c crypto curses edit iconv ssl
-SYSCONFDIR= ${PREFIX}/lib/nmh
+SYSCONFDIR= ${PREFIX}/lib
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --libdir='$${exec_prefix}/libexec' \
--with-locking=fcntl \
--with-readline \
- --with-tls
+ --with-tls \
+ --without-oauth
LIB_DEPENDS = converters/libiconv
# needed for replyfilter
@@ -38,6 +38,8 @@ USE_GROFF = Yes
WANTLIB += sasl2
LIB_DEPENDS+= security/cyrus-sasl2
CONFIGURE_ARGS+= --with-cyrus-sasl
+.else
+CONFIGURE_ARGS+= --without-cyrus-sasl
.endif
NO_TEST= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/nmh/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 18 Jun 2014 05:51:47 -0000 1.9
+++ distinfo 26 Nov 2017 10:53:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (nmh-1.6.tar.gz) = KTOK4ryHIv6KWQS3tgGmOUO3Kwe2/NpT86NU7bamS8M=
-SIZE (nmh-1.6.tar.gz) = 1197272
+SHA256 (nmh-1.7.tar.gz) = zQXHyiyuUkrpn2umc0Y6XN7/Yt+T6FkTqpJ3roMEzkQ=
+SIZE (nmh-1.7.tar.gz) = 1391594
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/mail/nmh/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 18 Jun 2014 05:51:47 -0000 1.2
+++ patches/patch-configure 26 Nov 2017 10:53:27 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-configure,v 1.2 2014/06/18 05:51:47 pascal Exp $
---- configure.orig Sun Jun 15 22:34:17 2014
-+++ configure Mon Jun 16 10:04:04 2014
-@@ -6181,7 +6181,6 @@ fi
+Index: configure
+--- configure.orig
++++ configure
+@@ -6337,7 +6337,6 @@ fi
if test x"$with_readline" = xyes -o x"$with_readline" = xmaybe; then :
save_LIBS="$LIBS"
@@ -9,7 +10,7 @@ $OpenBSD: patch-configure,v 1.2 2014/06/
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing
readline" >&5
$as_echo_n "checking for library containing readline... " >&6; }
if ${ac_cv_search_readline+:} false; then :
-@@ -6206,7 +6205,7 @@ return readline ();
+@@ -6362,7 +6361,7 @@ return readline ();
return 0;
}
_ACEOF
Index: patches/patch-uip_rcvtty_c
===================================================================
RCS file: /cvs/ports/mail/nmh/patches/patch-uip_rcvtty_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-uip_rcvtty_c
--- patches/patch-uip_rcvtty_c 18 Jun 2014 05:51:47 -0000 1.2
+++ patches/patch-uip_rcvtty_c 26 Nov 2017 10:53:27 -0000
@@ -7,8 +7,9 @@ Backout recent breakage...
http://git.savannah.gnu.org/cgit/nmh.git/patch/?id=6443ed24f6c3b41186636a0b0fea93ebe9452047
---- uip/rcvtty.c.orig Mon Apr 14 13:41:27 2014
-+++ uip/rcvtty.c Wed Apr 16 07:59:10 2014
+Index: uip/rcvtty.c
+--- uip/rcvtty.c.orig
++++ uip/rcvtty.c
@@ -23,6 +23,8 @@
#ifdef HAVE_GETUTXENT
@@ -39,7 +40,7 @@ http://git.savannah.gnu.org/cgit/nmh.git
+ register FILE *uf;
+#endif
- if (nmh_init(argv[0], 1)) { return 1; }
+ if (nmh_init(argv[0], 2)) { return 1; }
@@ -162,8 +167,15 @@ main (int argc, char **argv)
}
@@ -59,7 +60,7 @@ http://git.savannah.gnu.org/cgit/nmh.git
#endif /* HAVE_GETUTXENT */
exit (RCV_MOK);
-@@ -274,7 +286,6 @@ header_fd (void)
+@@ -285,7 +297,6 @@ header_fd (void)
}
@@ -67,7 +68,7 @@ http://git.savannah.gnu.org/cgit/nmh.git
static void
alert (char *tty, int md)
{
-@@ -312,4 +323,3 @@ alert (char *tty, int md)
+@@ -323,4 +334,3 @@ alert (char *tty, int md)
close (td);
}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/nmh/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 18 Jun 2014 05:51:47 -0000 1.12
+++ pkg/PLIST 26 Nov 2017 10:53:27 -0000
@@ -17,7 +17,9 @@
@bin bin/mark
@bin bin/mhbuild
@bin bin/mhfixmsg
+@bin bin/mhical
@bin bin/mhlist
+@bin bin/mhlogin
bin/mhmail
@bin bin/mhn
@bin bin/mhparam
@@ -25,7 +27,6 @@ bin/mhmail
@bin bin/mhshow
@bin bin/mhstore
@bin bin/msgchk
-@bin bin/msh
@bin bin/new
@bin bin/next
@bin bin/packf
@@ -47,16 +48,20 @@ bin/sendfiles
@bin bin/whom
lib/nmh/
lib/nmh/MailAliases
+lib/nmh/bash_completion_nmh
lib/nmh/components
lib/nmh/digestcomps
lib/nmh/distcomps
lib/nmh/forwcomps
+lib/nmh/mhical.12hour
+lib/nmh/mhical.24hour
lib/nmh/mhl.body
lib/nmh/mhl.digest
lib/nmh/mhl.format
lib/nmh/mhl.forward
lib/nmh/mhl.headers
lib/nmh/mhl.reply
+lib/nmh/mhl.replywithoutbody
lib/nmh/mhn.defaults
lib/nmh/mhshow.marker
lib/nmh/mts.conf
@@ -64,6 +69,7 @@ lib/nmh/rcvdistcomps
lib/nmh/rcvdistcomps.outbox
lib/nmh/replcomps
lib/nmh/replgroupcomps
+lib/nmh/rmmproc.messageid
lib/nmh/scan.MMDDYY
lib/nmh/scan.YYYYMMDD
lib/nmh/scan.curses
@@ -75,21 +81,20 @@ lib/nmh/scan.size
lib/nmh/scan.time
lib/nmh/scan.timely
lib/nmh/scan.unseen
-@bin libexec/ap
-@bin libexec/conflict
-@bin libexec/dp
-@bin libexec/fmtdump
-@bin libexec/mhl
-@bin libexec/mhtest
-@bin libexec/mkstemp
-@bin libexec/post
-@bin libexec/rcvdist
-@bin libexec/rcvpack
-@bin libexec/rcvstore
-@bin libexec/rcvtty
-@bin libexec/slocal
-libexec/spost
-@bin libexec/viamail
+libexec/nmh/
+@bin libexec/nmh/ap
+@bin libexec/nmh/dp
+@bin libexec/nmh/fmtdump
+@bin libexec/nmh/mhl
+@bin libexec/nmh/mkstemp
+@bin libexec/nmh/post
+@bin libexec/nmh/rcvdist
+@bin libexec/nmh/rcvpack
+@bin libexec/nmh/rcvstore
+@bin libexec/nmh/rcvtty
+@bin libexec/nmh/slocal
+libexec/nmh/spost
+@bin libexec/nmh/viamail
@man man/man1/ali.1
@man man/man1/anno.1
@man man/man1/burst.1
@@ -109,8 +114,10 @@ libexec/spost
@man man/man1/mh-mkstemp.1
@man man/man1/mhbuild.1
@man man/man1/mhfixmsg.1
+@man man/man1/mhical.1
@man man/man1/mhl.1
@man man/man1/mhlist.1
+@man man/man1/mhlogin.1
@man man/man1/mhmail.1
@man man/man1/mhn.1
@man man/man1/mhparam.1
@@ -118,7 +125,6 @@ libexec/spost
@man man/man1/mhshow.1
@man man/man1/mhstore.1
@man man/man1/msgchk.1
-@man man/man1/msh.1
@man man/man1/new.1
@man man/man1/next.1
@man man/man1/packf.1
@@ -152,16 +158,15 @@ libexec/spost
@man man/man5/mh-tailor.5
@man man/man5/mh_profile.5
@man man/man5/mts.conf.5
+@man man/man7/MH.7
@man man/man7/mh-chart.7
@man man/man7/mh-mime.7
@man man/man7/nmh.7
@man man/man8/ap.8
-@man man/man8/conflict.8
@man man/man8/dp.8
@man man/man8/fmtdump.8
@man man/man8/post.8
share/doc/nmh/
-share/doc/nmh/COMPLETION-BASH
share/doc/nmh/COMPLETION-TCSH
share/doc/nmh/COMPLETION-ZSH
share/doc/nmh/COPYRIGHT
@@ -175,7 +180,6 @@ share/doc/nmh/README
share/doc/nmh/README-ATTACHMENTS
share/doc/nmh/README-HOOKS
share/doc/nmh/README-components
-share/doc/nmh/README-iCalendar
share/doc/nmh/README.SASL
share/doc/nmh/README.about
share/doc/nmh/README.developers
@@ -183,7 +187,8 @@ share/doc/nmh/README.manpages
share/doc/nmh/TODO
share/doc/nmh/VERSION
share/doc/nmh/contrib/
-share/doc/nmh/contrib/build_nmh
+share/doc/nmh/contrib/localpostproc
share/doc/nmh/contrib/ml
+share/doc/nmh/contrib/replaliases
share/doc/nmh/contrib/replyfilter
share/doc/nmh/contrib/vpick
