X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/5b554458c2cc60b61b5740122162b2cd6e280f04..7ba308c293844e643e9cd1ec8955ea059bcbe539:/packages/mutt/build.sh

diff --git a/packages/mutt/build.sh b/packages/mutt/build.sh
index 16e4d9b9..2ca935ce 100644
--- a/packages/mutt/build.sh
+++ b/packages/mutt/build.sh
@@ -1,23 +1,45 @@
 TERMUX_PKG_HOMEPAGE=http://www.mutt.org/
-TERMUX_PKG_DESCRIPTION="Mail client"
-TERMUX_PKG_VERSION=1.6.0
+TERMUX_PKG_DESCRIPTION="Mail client with patches from neomutt"
+TERMUX_PKG_VERSION=1.9.5
+TERMUX_PKG_SHA256=bf617e64ae4e08a998bef8e42a965a211587e051f1437a3a4884b351a9385753
 TERMUX_PKG_SRCURL=ftp://ftp.mutt.org/pub/mutt/mutt-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libandroid-support, ncurses, gdbm, openssl, libsasl, gpgme"
-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"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-exec-shell=$TERMUX_PREFIX/bin/sh"
-# The mutt autoconf guesses no for working (v)snprintf and uses broken local versions - avoid that:
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" mutt_cv_c99_snprintf=yes mutt_cv_c99_vsnprintf=yes"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-gpgme"
-# TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-sasl"
-# bin/{flea,muttbug}: File bug against mutt:
-TERMUX_PKG_RM_AFTER_INSTALL="bin/flea bin/muttbug"
+TERMUX_PKG_DEPENDS="libandroid-support, ncurses, gdbm, openssl, libsasl, mime-support"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+mutt_cv_c99_snprintf=yes
+mutt_cv_c99_vsnprintf=yes
+--disable-gpgme
+--enable-compressed
+--enable-hcache
+--enable-imap
+--enable-pop
+--enable-sidebar
+--enable-smtp
+--with-exec-shell=$TERMUX_PREFIX/bin/sh
+--with-mailpath=$TERMUX_PREFIX/var/mail
+--without-idn
+--with-sasl
+--with-ssl
+"
+TERMUX_PKG_RM_AFTER_INSTALL="
+bin/flea
+bin/muttbug
+share/man/man1/muttbug.1
+share/man/man1/flea.1
+etc/mime.types
+"
+TERMUX_PKG_CONFFILES="etc/Muttrc"
 
 termux_step_post_configure () {
-	# Build wants to run mutt_md5 at build time:
-	gcc -D'uint32_t=unsigned int' -DMD5UTIL $TERMUX_PKG_SRCDIR/md5.c -o $TERMUX_PKG_BUILDDIR/mutt_md5
-	$TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/mutt_md5
+	# Build wants to run mutt_md5 and makedoc:
+	gcc -DHAVE_STDINT_H -DMD5UTIL $TERMUX_PKG_SRCDIR/md5.c -o $TERMUX_PKG_BUILDDIR/mutt_md5
+	gcc -DHAVE_STRERROR $TERMUX_PKG_SRCDIR/doc/makedoc.c -o $TERMUX_PKG_BUILDDIR/doc/makedoc
+	touch -d "next hour" $TERMUX_PKG_BUILDDIR/mutt_md5 $TERMUX_PKG_BUILDDIR/doc/makedoc
 }
 
 termux_step_post_make_install () {
-        cp $TERMUX_PKG_SRCDIR/doc/mutt.man $TERMUX_PREFIX/share/man/man1/mutt.1.man
+	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{,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
 }