mutt: Add the new gnupg2 example file

[termux-packages] / packages / mutt / build.sh

diff --git a/packages/mutt/build.sh b/packages/mutt/build.sh
index bb9fd22..23e2d21 100644 (file)
--- a/packages/mutt/build.sh
+++ b/packages/mutt/build.sh
@@ -1,11 +1,11 @@
 TERMUX_PKG_HOMEPAGE=http://www.mutt.org/
 TERMUX_PKG_DESCRIPTION="Mail client with patches from neomutt"
-_MUTT_VERSION=1.6.0
-_NEOMUTT_PATCHES=20160416
-TERMUX_PKG_VERSION=${_MUTT_VERSION}.$_NEOMUTT_PATCHES
-TERMUX_PKG_SRCURL=ftp://ftp.mutt.org/pub/mutt/mutt-${_MUTT_VERSION}.tar.gz
+TERMUX_PKG_VERSION=1.7.2
+TERMUX_PKG_REVISION=6
+TERMUX_PKG_SRCURL=ftp://ftp.mutt.org/pub/mutt/mutt-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9
 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"
+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"
 # 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"
@@ -13,21 +13,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_step_post_extract_package () {
-       local PATCHES_TARNAME=neomutt-patches-${_NEOMUTT_PATCHES}.tar.gz
-       local PATCHES_TARPATH=$TERMUX_PKG_CACHEDIR/neomutt-patches-${_NEOMUTT_PATCHES}.tar.gz
-       if [ ! -f $PATCHES_TARPATH ]; then
-               curl --retry 3 -L -o $PATCHES_TARPATH https://github.com/neomutt/neomutt/releases/download/neomutt-${_NEOMUTT_PATCHES}/$PATCHES_TARNAME
-       fi
-
-       local PATCHES_DIR=$TERMUX_PKG_TMPDIR/neomutt-patches
-       mkdir -p $PATCHES_DIR
-       $TERMUX_TAR -xf $PATCHES_TARPATH --directory $PATCHES_DIR
-
-       cd $TERMUX_PKG_SRCDIR
-       patch --forward -p1 < $PATCHES_DIR/neomutt-${_NEOMUTT_PATCHES}/neomutt-${_NEOMUTT_PATCHES}.patch || true
-}
+TERMUX_PKG_CONFFILES="etc/mime.types etc/Muttrc"
 
 termux_step_post_configure () {
        # Build wants to run mutt_md5 and makedoc:
@@ -37,5 +23,9 @@ termux_step_post_configure () {
 }
 
 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
 }