CVS commit: pkgsrc/mail/neomutt

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Dec 21 12:22:13 UTC 2017

Modified Files:
        pkgsrc/mail/neomutt: Makefile PLIST distinfo options.mk

Log Message:
neomutt: update to 20171215.

The previous release was the last one supporting autotools,
so switch to autosetup build. Adapt options.

2017-12-15  Richard Russon  <rich%flatcap.org@localhost>
* Bug Fixes
  - Fix some regressions in the previous release


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/mail/neomutt/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/neomutt/PLIST
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mail/neomutt/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mail/neomutt/options.mk

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.39 pkgsrc/mail/neomutt/Makefile:1.40
--- pkgsrc/mail/neomutt/Makefile:1.39   Wed Dec 13 17:54:48 2017
+++ pkgsrc/mail/neomutt/Makefile        Thu Dec 21 12:22:13 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2017/12/13 17:54:48 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2017/12/21 12:22:13 wiz Exp $
 
-DISTNAME=              neomutt-20171208
+DISTNAME=              neomutt-20171215
 CATEGORIES=            mail
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=neomutt/}
 GITHUB_TAG=            ${DISTNAME}
@@ -10,14 +10,17 @@ HOMEPAGE=           https://www.neomutt.org/
 COMMENT=               Fork of mutt with integrated community patches
 LICENSE=               gnu-gpl-v2 OR gnu-gpl-v3 # or newer
 
-USE_TOOLS+=            autoconf automake autoreconf msgfmt gmake
+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
 
-GNU_CONFIGURE=         yes
+HAS_CONFIGURE=         yes
 EXTRACT_USING=         bsdtar
-CONFIGURE_ARGS+=       --enable-notmuch
-#CONFIGURE_ARGS+=      CFLAGS="-g -O0"
+CONFIGURE_ARGS+=       --notmuch
+CONFIGURE_ARGS+=       --prefix=${PREFIX}
+CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
 
 EGDIR=                 ${PREFIX}/share/examples/neomutt
 CONF_FILES=            ${EGDIR}/neomuttrc ${PKG_SYSCONFDIR}/neomuttrc
@@ -35,9 +38,6 @@ CONFIGURE_ENV+=               SENDMAIL=/usr/sbin/send
 
 .include "options.mk"
 
-pre-configure:
-       cd ${WRKSRC} && autoreconf -fiv
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/mail/neomutt/PLIST
diff -u pkgsrc/mail/neomutt/PLIST:1.15 pkgsrc/mail/neomutt/PLIST:1.16
--- pkgsrc/mail/neomutt/PLIST:1.15      Wed Dec 13 17:54:48 2017
+++ pkgsrc/mail/neomutt/PLIST   Thu Dec 21 12:22:13 2017
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.15 2017/12/13 17:54:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2017/12/21 12:22:13 wiz Exp $
 bin/neomutt
-lib/neomutt/pgpewrap
-lib/neomutt/pgpring
-lib/neomutt/smime_keys
+libexec/neomutt/pgpewrap
+libexec/neomutt/pgpring
+libexec/neomutt/smime_keys
 man/man1/neomutt.1
 man/man1/pgpewrap_neomutt.1
 man/man1/pgpring_neomutt.1
@@ -18,13 +18,18 @@ share/doc/neomutt/LICENSE.md
 share/doc/neomutt/PGP-Notes.txt
 share/doc/neomutt/README.SSL
 share/doc/neomutt/README.md
+share/doc/neomutt/advancedusage.html
 share/doc/neomutt/colorschemes/neonwolf-256.neomuttrc
 share/doc/neomutt/colorschemes/solarized-dark-256.neomuttrc
 share/doc/neomutt/colorschemes/vombatidae.neomuttrc
 share/doc/neomutt/colorschemes/zenburn.neomuttrc
+share/doc/neomutt/configuration.html
+share/doc/neomutt/gettingstarted.html
 share/doc/neomutt/hcache-bench/README.md
 share/doc/neomutt/hcache-bench/neomutt-hcache-bench.sh
 share/doc/neomutt/hcache-bench/neomuttrc
+share/doc/neomutt/index.html
+share/doc/neomutt/intro.html
 share/doc/neomutt/keybase/LICENSE
 share/doc/neomutt/keybase/README.md
 share/doc/neomutt/keybase/attachmentView.png
@@ -43,8 +48,13 @@ share/doc/neomutt/logo/neomutt-64.png
 share/doc/neomutt/logo/neomutt.svg
 share/doc/neomutt/lua/test_lua-api_runner.neomuttrc
 share/doc/neomutt/lua/test_lua-api_spec.lua
+share/doc/neomutt/manual.html
 share/doc/neomutt/manual.txt
 share/doc/neomutt/mime.types
+share/doc/neomutt/mimesupport.html
+share/doc/neomutt/miscellany.html
+share/doc/neomutt/optionalfeatures.html
+share/doc/neomutt/reference.html
 share/doc/neomutt/samples/Mush.rc
 share/doc/neomutt/samples/Pine.rc
 share/doc/neomutt/samples/Tin.rc
@@ -59,7 +69,9 @@ share/doc/neomutt/samples/sample.neomutt
 share/doc/neomutt/samples/sample.neomuttrc-tlr
 share/doc/neomutt/samples/smime.rc
 share/doc/neomutt/samples/smime_keys_test.pl
+share/doc/neomutt/security.html
 share/doc/neomutt/smime-notes.txt
+share/doc/neomutt/tuning.html
 share/doc/neomutt/vim-keys/README.md
 share/doc/neomutt/vim-keys/vim-keys.rc
 share/examples/neomutt/neomuttrc

Index: pkgsrc/mail/neomutt/distinfo
diff -u pkgsrc/mail/neomutt/distinfo:1.29 pkgsrc/mail/neomutt/distinfo:1.30
--- pkgsrc/mail/neomutt/distinfo:1.29   Wed Dec 13 17:54:48 2017
+++ pkgsrc/mail/neomutt/distinfo        Thu Dec 21 12:22:13 2017
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.29 2017/12/13 17:54:48 wiz Exp $
+$NetBSD: distinfo,v 1.30 2017/12/21 12:22:13 wiz Exp $
 
-SHA1 (neomutt-20171208.tar.gz) = 557b1cd07c7f244943104e66e40b34a395dc6d15
-RMD160 (neomutt-20171208.tar.gz) = aeb9bbdca22b1478cf854c62a41f7b1dad3eeccb
-SHA512 (neomutt-20171208.tar.gz) = e4f8a5f01d96d6f82959fe583634585deee28cf146c768e5049281b273c5b76b91ee01c9d9382a26f72a092c14341905129e73bf5c6ba19baae7823bc6680671
-Size (neomutt-20171208.tar.gz) = 2703917 bytes
+SHA1 (neomutt-20171215.tar.gz) = b3af4009df8c2db74ccfb46b75a4823f40e75cfa
+RMD160 (neomutt-20171215.tar.gz) = 66ea10f7af91136b709f62d8b83a6fc6b8981739
+SHA512 (neomutt-20171215.tar.gz) = 8098f537e8ef7d3f7aa87fc875c0dc079b996285b786fe6fc6bdf18154c1282b03a4e19dd6902a110616443ca2b23008c8c1f5c4a615c53b620b537c50dfb658
+Size (neomutt-20171215.tar.gz) = 2680191 bytes

Index: pkgsrc/mail/neomutt/options.mk
diff -u pkgsrc/mail/neomutt/options.mk:1.10 pkgsrc/mail/neomutt/options.mk:1.11
--- pkgsrc/mail/neomutt/options.mk:1.10 Tue Oct 10 08:27:28 2017
+++ pkgsrc/mail/neomutt/options.mk      Thu Dec 21 12:22:13 2017
@@ -1,13 +1,12 @@
-# $NetBSD: options.mk,v 1.10 2017/10/10 08:27:28 jperkin Exp $
+# $NetBSD: options.mk,v 1.11 2017/12/21 12:22:13 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.neomutt
 PKG_OPTIONS_REQUIRED_GROUPS=   display
-PKG_OPTIONS_GROUP.display=     slang ncurses ncursesw curses
+PKG_OPTIONS_GROUP.display=     curses ncurses ncursesw slang
 PKG_SUPPORTED_OPTIONS= debug gpgme gssapi idn ssl smime sasl
-PKG_SUPPORTED_OPTIONS+=        mutt-hcache tokyocabinet
-PKG_SUGGESTED_OPTIONS= ncursesw gpgme idn sasl smime ssl
-PKG_SUGGESTED_OPTIONS+=        gssapi
-PKG_SUGGESTED_OPTIONS+=        mutt-hcache tokyocabinet
+PKG_SUPPORTED_OPTIONS+=        tokyocabinet
+PKG_SUGGESTED_OPTIONS= gpgme gssapi idn ncursesw sasl smime ssl
+PKG_SUGGESTED_OPTIONS+=        tokyocabinet
 
 .include "../../mk/bsd.options.mk"
 
@@ -34,7 +33,7 @@ CONFIGURE_ARGS+=      --with-slang=${BUILDLIN
 .if !empty(PKG_OPTIONS:Mncurses)
 USE_NCURSES=           yes
 .  include "../../devel/ncurses/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-curses=${BUILDLINK_PREFIX.ncurses}
+CONFIGURE_ARGS+=       --with-ncurses=${BUILDLINK_PREFIX.ncurses}
 .endif
 
 ###
@@ -51,7 +50,7 @@ CONFIGURE_ARGS+=      --with-sasl=${BUILDLINK
 .  include "../../mk/curses.buildlink3.mk"
 OPSYSVARS+=                    BUILDLINK_PASSTHRU_DIRS
 BUILDLINK_PASSTHRU_DIRS.SunOS+=        /usr/xpg4
-CONFIGURE_ARGS.SunOS+=         --with-curses=/usr/xpg4
+CONFIGURE_ARGS.SunOS+=         --with-ncurses=/usr/xpg4
 LDFLAGS.SunOS+=                        -L/usr/xpg4/lib${LIBABISUFFIX}
 LDFLAGS.SunOS+=                        ${COMPILER_RPATH_FLAG}/usr/xpg4/lib${LIBABISUFFIX}
 .endif
@@ -76,7 +75,7 @@ SUBST_SED.curse=      -e 's,for lib in ncurse
 .  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-ssl=${SSLBASE:Q}
 .else
-CONFIGURE_ARGS+=       --without-ssl
+CONFIGURE_ARGS+=       --disable-ssl
 .endif
 
 ###
@@ -85,9 +84,9 @@ CONFIGURE_ARGS+=      --without-ssl
 PLIST_VARS+=           smime
 .if !empty(PKG_OPTIONS:Msmime)
 USE_TOOLS+=            perl:run
-REPLACE_PERL+=         *.pl */*.pl contrib/smime_keys
+REPLACE_PERL+=         */*.pl contrib/smime_keys
 .  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-smime
+CONFIGURE_ARGS+=       --smime
 PLIST.smime=           yes
 .else
 CONFIGURE_ARGS+=       --disable-smime
@@ -96,31 +95,24 @@ CONFIGURE_ARGS+=    --disable-smime
 ###
 ### Header cache
 ###
-.if !empty(PKG_OPTIONS:Mmutt-hcache)
-.  if !empty(PKG_OPTIONS:Mtokyocabinet)
-.  include "../../databases/tokyocabinet/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-tokyocabinet
-CONFIGURE_ARGS+=       --without-gdbm
-CONFIGURE_ARGS+=       --without-bdb
-.  else
+.if !empty(PKG_OPTIONS:Mtokyocabinet)
+.include "../../databases/tokyocabinet/buildlink3.mk"
+CONFIGURE_ARGS+=       --tokyocabinet
+CONFIGURE_ARGS+=       --disable-gdbm
+CONFIGURE_ARGS+=       --disable-bdb
+.else
 BDB_ACCEPTED=          db4 db5
 BUILDLINK_TRANSFORM+=  l:db:${BDB_TYPE}
-.  include "../../mk/bdb.buildlink3.mk"
-CONFIGURE_ARGS+=       --with-bdb
-CONFIGURE_ARGS+=       --without-gdbm
+.include "../../mk/bdb.buildlink3.mk"
+CONFIGURE_ARGS+=       --bdb
+CONFIGURE_ARGS+=       --disable-gdbm
 # BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate
 # since the real -I and -L flags are added by buildlink already.
 CONFIGURE_ENV+=                BDB_INCLUDE_DIR=${BDBBASE}/include
 CONFIGURE_ENV+=                BDB_LIB_DIR=${BDBBASE}/lib
 CONFIGURE_ENV+=                BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q}
-.  endif
-.else
-CONFIGURE_ARGS+=       --disable-hcache
 .endif
 
-#BUILD_DEPENDS+=               libxslt-[0-9]*:../../textproc/libxslt
-#BUILD_DEPENDS+=               docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-
 ###
 ### Internationalized Domain Names
 ###
@@ -128,14 +120,13 @@ CONFIGURE_ARGS+=  --disable-hcache
 .  include "../../devel/libidn/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-idn=${BUILDLINK_PREFIX.libidn}
 .else
-CONFIGURE_ARGS+=       --with-idn=no
+CONFIGURE_ARGS+=       --disable-idn
 .endif
 
 ###
 ### Enable debugging support
 ###
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=       --enable-debug
 CFLAGS+= -g
 .endif
 
@@ -144,8 +135,8 @@ CFLAGS+= -g
 ###
 .if !empty(PKG_OPTIONS:Mgpgme)
 .  include "../../security/gpgme/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-gpgme
-CONFIGURE_ARGS+=       --with-gpgme-prefix=${BUILDLINK_PREFIX.gpgme}
+CONFIGURE_ARGS+=       --gpgme
+CONFIGURE_ARGS+=       --with-gpgme=${BUILDLINK_PREFIX.gpgme}
 .else
 CONFIGURE_ARGS+=       --disable-gpgme
 .endif