X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/14a192d04d66822f52abbe1a7c509e00c694b93e..8b6572b37ad45bc9ec814f729329cba9cf599daa:/packages/mutt/build.sh

diff --git a/packages/mutt/build.sh b/packages/mutt/build.sh
index a768b35f..ee0bba39 100644
--- a/packages/mutt/build.sh
+++ b/packages/mutt/build.sh
@@ -1,9 +1,8 @@
 TERMUX_PKG_HOMEPAGE=http://www.mutt.org/
 TERMUX_PKG_DESCRIPTION="Mail client with patches from neomutt"
-TERMUX_PKG_VERSION=1.7.2
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_VERSION=1.8.0
 TERMUX_PKG_SRCURL=ftp://ftp.mutt.org/pub/mutt/mutt-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9
+TERMUX_PKG_SHA256=45841eda12804b460260adff8f3f39cc977744e832486a3c49e182eda967adab
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses, gdbm, openssl, libsasl"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-smtp --enable-imap --enable-pop --with-mailpath=$TERMUX_PREFIX/var/mail --with-ssl --enable-compressed --without-idn --enable-hcache --with-sasl --enable-sidebar"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-exec-shell=$TERMUX_PREFIX/bin/sh"
@@ -13,6 +12,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-gpgme"
 # TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-sasl"
 # bin/{flea,muttbug}: File bug against mutt:
 TERMUX_PKG_RM_AFTER_INSTALL="bin/flea bin/muttbug share/man/man1/muttbug.1 share/man/man1/flea.1"
+TERMUX_PKG_CONFFILES="etc/mime.types etc/Muttrc"
 
 termux_step_post_configure () {
 	# Build wants to run mutt_md5 and makedoc:
@@ -24,5 +24,7 @@ termux_step_post_configure () {
 termux_step_post_make_install () {
 	cp $TERMUX_PKG_SRCDIR/doc/mutt.man $TERMUX_PREFIX/share/man/man1/mutt.1.man
 	mkdir -p $TERMUX_PREFIX/share/examples/mutt/
-	cp $TERMUX_PKG_BUILDER_DIR/gpg.rc $TERMUX_PREFIX/share/examples/mutt/gpg.rc
+	cp $TERMUX_PKG_BUILDER_DIR/gpg{,2}.rc $TERMUX_PREFIX/share/examples/mutt/
+	mv $TERMUX_PREFIX/etc/mime.types.dist $TERMUX_PREFIX/etc/mime.types
+	mv $TERMUX_PREFIX/etc/Muttrc.dist $TERMUX_PREFIX/etc/Muttrc
 }