Thu Jan 16 13:52:39 2020 UTC ()
neomutt: build fix on illumos/SmartOS


(tm)
diff -r1.51 -r1.52 pkgsrc/mail/neomutt/Makefile
diff -r1.38 -r1.39 pkgsrc/mail/neomutt/distinfo
diff -r0 -r1.3 pkgsrc/mail/neomutt/patches/patch-resize.c
cvs diff -r1.51 -r1.52 pkgsrc/mail/neomutt/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/neomutt/Makefile 2019/12/18 13:47:58 1.51
+++ pkgsrc/mail/neomutt/Makefile 2020/01/16 13:52:39 1.52
@@ -1,36 +1,40 @@ @@ -1,36 +1,40 @@
1# $NetBSD: Makefile,v 1.51 2019/12/18 13:47:58 wiz Exp $ 1# $NetBSD: Makefile,v 1.52 2020/01/16 13:52:39 tm Exp $
2 2
3DISTNAME= neomutt-20191129 3DISTNAME= neomutt-20191129
 4PKGREVISION= 1
4CATEGORIES= mail 5CATEGORIES= mail
5MASTER_SITES= ${MASTER_SITE_GITHUB:=neomutt/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=neomutt/}
6GITHUB_TAG= ${PKGVERSION_NOREV} 7GITHUB_TAG= ${PKGVERSION_NOREV}
7 8
8MAINTAINER= wiz@NetBSD.org 9MAINTAINER= wiz@NetBSD.org
9HOMEPAGE= https://www.neomutt.org/ 10HOMEPAGE= https://www.neomutt.org/
10COMMENT= Fork of mutt with integrated community patches 11COMMENT= Fork of mutt with integrated community patches
11LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # or newer 12LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # or newer
12 13
13USE_TOOLS+= msgfmt gmake 14USE_TOOLS+= msgfmt gmake
14 15
15BUILD_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools 16BUILD_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
16BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 17BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
17BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 18BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 19BUILD_DEPENDS+= w3m-[0-9]*:../../www/w3m
18 20
19HAS_CONFIGURE= yes 21HAS_CONFIGURE= yes
20EXTRACT_USING= bsdtar 22EXTRACT_USING= bsdtar
21CONFIGURE_ARGS+= --prefix=${PREFIX} 23CONFIGURE_ARGS+= --prefix=${PREFIX}
22CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 24CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
23 25
 26CONFIGURE_ARGS.SunOS+= --disable-inotify
 27
24EGDIR= ${PREFIX}/share/examples/neomutt 28EGDIR= ${PREFIX}/share/examples/neomutt
25CONF_FILES= ${EGDIR}/neomuttrc ${PKG_SYSCONFDIR}/neomuttrc 29CONF_FILES= ${EGDIR}/neomuttrc ${PKG_SYSCONFDIR}/neomuttrc
26INSTALLATION_DIRS+= ${EGDIR} 30INSTALLATION_DIRS+= ${EGDIR}
27INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} DOTLOCK_GROUP= sysconfdir=${EGDIR} 31INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} DOTLOCK_GROUP= sysconfdir=${EGDIR}
28 32
29.include "../../mk/bsd.prefs.mk" 33.include "../../mk/bsd.prefs.mk"
30 34
31.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" 35.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
32# Force sendmail to /usr/sbin to avoid postfix's 36# Force sendmail to /usr/sbin to avoid postfix's
33# ${LOCALBASE}/sbin/sendmail. Should be enabled on all platforms which 37# ${LOCALBASE}/sbin/sendmail. Should be enabled on all platforms which
34# support mailwrapper. 38# support mailwrapper.
35CONFIGURE_ENV+= SENDMAIL=/usr/sbin/sendmail 39CONFIGURE_ENV+= SENDMAIL=/usr/sbin/sendmail
36.endif 40.endif
cvs diff -r1.38 -r1.39 pkgsrc/mail/neomutt/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/neomutt/distinfo 2019/12/18 13:47:58 1.38
+++ pkgsrc/mail/neomutt/distinfo 2020/01/16 13:52:39 1.39
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.38 2019/12/18 13:47:58 wiz Exp $ 1$NetBSD: distinfo,v 1.39 2020/01/16 13:52:39 tm Exp $
2 2
3SHA1 (neomutt-20191129-20191129.tar.gz) = 067db7dcd11c19bf0ab6c51d4a1c09563b6fc803 3SHA1 (neomutt-20191129-20191129.tar.gz) = 067db7dcd11c19bf0ab6c51d4a1c09563b6fc803
4RMD160 (neomutt-20191129-20191129.tar.gz) = 36f94c043e00b81a2e240f989f6ac4375431cd84 4RMD160 (neomutt-20191129-20191129.tar.gz) = 36f94c043e00b81a2e240f989f6ac4375431cd84
5SHA512 (neomutt-20191129-20191129.tar.gz) = 5c39664820ed1a9ac00f5f158f8e96974a700df1edf8ba0615e761140c9ceba9b65ab7a9b87a31f5d6636c6b678b730483f3a15ea239144ce2ec36aa4b649f1d 5SHA512 (neomutt-20191129-20191129.tar.gz) = 5c39664820ed1a9ac00f5f158f8e96974a700df1edf8ba0615e761140c9ceba9b65ab7a9b87a31f5d6636c6b678b730483f3a15ea239144ce2ec36aa4b649f1d
6Size (neomutt-20191129-20191129.tar.gz) = 3227652 bytes 6Size (neomutt-20191129-20191129.tar.gz) = 3227652 bytes
 7SHA1 (patch-resize.c) = b747f878459950462d56e01bada2d01b49fca088
File Added: pkgsrc/mail/neomutt/patches/Attic/patch-resize.c
$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