CVS commit: pkgsrc/mail/mutt

["Matthias Scheler" <tron%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tron
Date:           Wed May 31 07:52:00 UTC 2017

Modified Files:
        pkgsrc/mail/mutt: Makefile distinfo
Removed Files:
        pkgsrc/mail/mutt: Makefile.common

Log Message:
Update "mutt" package to version 1.8.3. Changes since 1.8.2:
This is a bug-fix release.  Of note to Gmail users is a potential crash
fix when copy/moving messages to its Trash folder.


To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 pkgsrc/mail/mutt/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/mail/mutt/Makefile.common
cvs rdiff -u -r1.58 -r1.59 pkgsrc/mail/mutt/distinfo

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

Modified files:

Index: pkgsrc/mail/mutt/Makefile
diff -u pkgsrc/mail/mutt/Makefile:1.190 pkgsrc/mail/mutt/Makefile:1.191
--- pkgsrc/mail/mutt/Makefile:1.190     Wed Apr 19 06:34:44 2017
+++ pkgsrc/mail/mutt/Makefile   Wed May 31 07:52:00 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.190 2017/04/19 06:34:44 tron Exp $
+# $NetBSD: Makefile,v 1.191 2017/05/31 07:52:00 tron Exp $
 
-DISTNAME=              mutt-1.8.2
+DISTNAME=              mutt-1.8.3
 CATEGORIES=            mail
 MASTER_SITES=          ftp://ftp.mutt.org/pub/mutt/
 
@@ -9,6 +9,56 @@ HOMEPAGE=              http://www.mutt.org/
 COMMENT=               Text-based MIME mail client with PGP & S/MIME support
 LICENSE=               gnu-gpl-v2 OR gnu-gpl-v3 # or newer
 
-.include "Makefile.common"
+.include "../../mk/bsd.prefs.mk"
+
+USE_PKGLOCALEDIR=      yes
+USE_TOOLS+=            gmake msgfmt perl
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --with-docdir=${PREFIX}/share/doc/mutt
+CONFIGURE_ARGS+=       --without-included-gettext
+CONFIGURE_ARGS+=       --enable-external-dotlock
+CONFIGURE_ARGS+=       --enable-pop
+CONFIGURE_ARGS+=       --enable-imap
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
+# Force sendmail to /usr/sbin to avoid postfix's
+# ${LOCALBASE}/sbin/sendmail.  Should be enabled on all platforms which
+# support mailwrapper.
+CONFIGURE_ENV+=                SENDMAIL=/usr/sbin/sendmail
+.endif
+
+CONFIGURE_ARGS.SunOS+= --without-wc-funcs
+
+# There is a problem using /bin/sh on old NetBSD releases, so use /bin/ksh
+# there.
+#
+.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-5]*-*)
+CONFIGURE_ARGS+=       --with-exec-shell=/bin/ksh
+.endif
+
+.include "options.mk"
+
+LDFLAGS+=              ${_STRIPFLAG_CC}
+
+DOCDIR=                        ${PREFIX}/share/doc/mutt
+EGDIR=                 ${PREFIX}/share/examples/mutt
+CONF_FILES=            ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
+CONF_FILES+=           ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
+FILES_SUBST+=          DOCDIR=${DOCDIR}
+INSTALLATION_DIRS+=    ${DOCDIR} ${EGDIR}
+
+SUBST_CLASSES+=                paths
+SUBST_FILES.paths=     doc/Muttrc
+SUBST_VARS.paths+=     DOCDIR PREFIX
+SUBST_STAGE.paths=     pre-configure
+
+SPECIAL_PERMS+=        bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551
+INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} sysconfdir=${EGDIR}
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../textproc/libxslt/xsltproc-nonet.mk"
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/mutt/distinfo
diff -u pkgsrc/mail/mutt/distinfo:1.58 pkgsrc/mail/mutt/distinfo:1.59
--- pkgsrc/mail/mutt/distinfo:1.58      Wed May 10 12:29:13 2017
+++ pkgsrc/mail/mutt/distinfo   Wed May 31 07:52:00 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.58 2017/05/10 12:29:13 jperkin Exp $
+$NetBSD: distinfo,v 1.59 2017/05/31 07:52:00 tron Exp $
 
-SHA1 (mutt-1.8.2.tar.gz) = bdac1201de464d63f61a663f3dcf1ee4484dbbb3
-RMD160 (mutt-1.8.2.tar.gz) = 9df882078b1592fbe9a7bee91a4f11cac65e7c7c
-SHA512 (mutt-1.8.2.tar.gz) = a5db6154c6baf96e64e9b55b866052b1dae96166b9993fd9a55dc9801a525b50539d26b68d04983f70e9cc1927d95b5b9057f153ce579398e711a24bbd04869c
-Size (mutt-1.8.2.tar.gz) = 4118429 bytes
+SHA1 (mutt-1.8.3.tar.gz) = d70fddd30c6a0279017b99017e5366212878db56
+RMD160 (mutt-1.8.3.tar.gz) = 35dd25f1050050fec16bd2474025da8b03c722e3
+SHA512 (mutt-1.8.3.tar.gz) = 8cfb4b1d42add3e8b34ba140e606e57f98d98ca685538ecb159f584635c50a7b0afaf81e09361d52a39188d4bb59a7432d01d58d030a93b0d3d92f0ee4062048
+Size (mutt-1.8.3.tar.gz) = 4122012 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
 SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681
 SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044