CVS commit: pkgsrc/mail/neomutt

["Thomas Merkel" <tm%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tm
Date:           Thu Jan 16 13:52:39 UTC 2020

Modified Files:
        pkgsrc/mail/neomutt: Makefile distinfo
Added Files:
        pkgsrc/mail/neomutt/patches: patch-resize.c

Log Message:
neomutt: build fix on illumos/SmartOS


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/mail/neomutt/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/mail/neomutt/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/mail/neomutt/patches/patch-resize.c

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

Modified files:

Index: pkgsrc/mail/neomutt/Makefile
diff -u pkgsrc/mail/neomutt/Makefile:1.51 pkgsrc/mail/neomutt/Makefile:1.52
--- pkgsrc/mail/neomutt/Makefile:1.51   Wed Dec 18 13:47:58 2019
+++ pkgsrc/mail/neomutt/Makefile        Thu Jan 16 13:52:39 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2019/12/18 13:47:58 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2020/01/16 13:52:39 tm Exp $
 
 DISTNAME=              neomutt-20191129
+PKGREVISION=           1
 CATEGORIES=            mail
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=neomutt/}
 GITHUB_TAG=            ${PKGVERSION_NOREV}
@@ -15,12 +16,15 @@ USE_TOOLS+=         msgfmt gmake
 BUILD_DEPENDS+=                gettext-tools-[0-9]*:../../devel/gettext-tools
 BUILD_DEPENDS+=                libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=                docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+BUILD_DEPENDS+=                w3m-[0-9]*:../../www/w3m
 
 HAS_CONFIGURE=         yes
 EXTRACT_USING=         bsdtar
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
 
+CONFIGURE_ARGS.SunOS+= --disable-inotify
+
 EGDIR=                 ${PREFIX}/share/examples/neomutt
 CONF_FILES=            ${EGDIR}/neomuttrc ${PKG_SYSCONFDIR}/neomuttrc
 INSTALLATION_DIRS+=    ${EGDIR}

Index: pkgsrc/mail/neomutt/distinfo
diff -u pkgsrc/mail/neomutt/distinfo:1.38 pkgsrc/mail/neomutt/distinfo:1.39
--- pkgsrc/mail/neomutt/distinfo:1.38   Wed Dec 18 13:47:58 2019
+++ pkgsrc/mail/neomutt/distinfo        Thu Jan 16 13:52:39 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.38 2019/12/18 13:47:58 wiz Exp $
+$NetBSD: distinfo,v 1.39 2020/01/16 13:52:39 tm Exp $
 
 SHA1 (neomutt-20191129-20191129.tar.gz) = 067db7dcd11c19bf0ab6c51d4a1c09563b6fc803
 RMD160 (neomutt-20191129-20191129.tar.gz) = 36f94c043e00b81a2e240f989f6ac4375431cd84
 SHA512 (neomutt-20191129-20191129.tar.gz) = 5c39664820ed1a9ac00f5f158f8e96974a700df1edf8ba0615e761140c9ceba9b65ab7a9b87a31f5d6636c6b678b730483f3a15ea239144ce2ec36aa4b649f1d
 Size (neomutt-20191129-20191129.tar.gz) = 3227652 bytes
+SHA1 (patch-resize.c) = b747f878459950462d56e01bada2d01b49fca088

Added files:

Index: pkgsrc/mail/neomutt/patches/patch-resize.c
diff -u /dev/null pkgsrc/mail/neomutt/patches/patch-resize.c:1.3
--- /dev/null   Thu Jan 16 13:52:39 2020
+++ pkgsrc/mail/neomutt/patches/patch-resize.c  Thu Jan 16 13:52:39 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-resize.c,v 1.3 2020/01/16 13:52:39 tm Exp $
+
+Required to have the correct struct information for winsize.
+
+--- resize.c.orig      2019-11-29 15:02:20.000000000 +0000
++++ resize.c
+@@ -43,6 +43,7 @@
+ #include <ioctl.h>
+ #endif
+ #endif
++#include <termios.h>
+ 
+ /**
+  * mutt_get_winsize - Use an ioctl to get the window size