Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

--- pkgsrc/mail/nmh/Makefile	2014/09/06 16:07:43	1.84
+++ pkgsrc/mail/nmh/Makefile	2020/01/18 23:32:48	1.107
@@ -1,32 +1,22 @@
-# $NetBSD: Makefile,v 1.84 2014/09/06 16:07:43 schnoebe Exp $
+# $NetBSD: Makefile,v 1.107 2020/01/18 23:32:48 rillig Exp $
 
-DISTNAME=		nmh-1.6
+DISTNAME=		nmh-1.7.1
+PKGREVISION=		9
 CATEGORIES=		mail
-MASTER_SITES=		http://savannah.nongnu.org/download/nmh/
+MASTER_SITES=		https://download.savannah.nongnu.org/releases/nmh/
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.nongnu.org/nmh/
+MAINTAINER=		leot@NetBSD.org
+HOMEPAGE=		https://www.nongnu.org/nmh/
 COMMENT=		Cleaned up MH mailer suite
 LICENSE=		modified-bsd
 
-MAKE_JOBS_SAFE=		no
-
 CONFLICTS=		ja-mh-[0-9]*
 CONFLICTS+=		ja-mh6-[0-9]*
 
 USE_TOOLS+=		lex
-
-# We choose DOT_LOCKING in our patches because ".lock" files are
-# the most common locking mechanism supported by mail software.
-# It also works well over NFS.
-
-# Locks supported by `mail.local' are ".lock" and flock(2).
+USE_FEATURES+=		strnlen
 
 .include "../../mk/bsd.prefs.mk"
-# Avoids SEGV in nmh's private version of strcasecmp() under gcc4
-.if !empty(PKGSRC_COMPILER:Mgcc*)
-CFLAGS+=		-O1
-.endif
 
 .include "options.mk"
 
@@ -36,14 +26,15 @@ NMH_MTA?=		smtp
 GNU_CONFIGURE=		yes
 
 GNU_CONFIGURE_LIBDIR=	${PREFIX}/libexec/nmh
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
 CONFIGURE_ARGS+=	--with-mts=${NMH_MTA:Q}
+CONFIGURE_ARGS+=	--without-readline
 
 DOCDIR=			share/doc/nmh
 EGDIR=			${PREFIX}/share/examples/nmh
 INSTALLATION_DIRS=	${DOCDIR} ${EGDIR}
 
-BUILD_DEFS+=		NMH_MTA NMH_EDITOR NMH_PAGER NMH_HASH_BACKUP
+BUILD_DEFS+=		NMH_MTA NMH_EDITOR NMH_PAGER NMH_HASH_BACKUP PKG_SYSCONFBASE
 
 PKG_SYSCONFSUBDIR=	nmh
 CONF_FILES=		# empty
@@ -52,21 +43,28 @@ CONF_FILES=		# empty
 			digestcomps		\
 			distcomps		\
 			forwcomps		\
+			mhical.12hour		\
+			mhical.24hour		\
 			mhl.body		\
 			mhl.digest		\
 			mhl.format		\
 			mhl.forward		\
 			mhl.headers		\
 			mhl.reply		\
+			mhl.replywithoutbody	\
 			mhn.defaults		\
+			mhshow.marker		\
 			mts.conf		\
 			rcvdistcomps		\
 			rcvdistcomps.outbox	\
 			replcomps		\
 			replgroupcomps		\
+			rmmproc.messageid	\
 			scan.MMDDYY		\
 			scan.YYYYMMDD		\
+			scan.curses		\
 			scan.default		\
+			scan.highlighted	\
 			scan.mailx		\
 			scan.nomime		\
 			scan.size		\
@@ -76,17 +74,28 @@ CONF_FILES=		# empty
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
+# The configure script checks for arc4random(), but the program uses
+# arc4random_buf(); netbsd-5 (and presumably earlier) and some Darwin
+# versions has the one but not the other. Just disable it, because all
+# it's using the randomness for is message-ids.
+.if !empty(MACHINE_PLATFORM:MNetBSD-[1-5].*-*) || \
+    !empty(MACHINE_PLATFORM:MDarwin-[1-9].*-*) || \
+    !empty(MACHINE_PLATFORM:MDarwin-1[0-2].*-*)
+CONFIGURE_ENV+=		ac_cv_func_arc4random=no
+.endif
+
+TEST_TARGET=		check
+
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/mhn.defaults.dist \
 	    ${DESTDIR}${EGDIR}/mhn.defaults
 
-.include "../../mk/bsd.prefs.mk"
-
 .if ${OPSYS} == "Linux"
 .include "../../databases/gdbm_compat/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-ndbm='gdbm_compat -lgdbm'
 CONFIGURE_ARGS+=	--with-ndbmheader=ndbm.h
 .endif
 
-.include "../../mk/termcap.buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../mk/terminfo.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"