X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/7a5787d985fee44e8456f7b4e95628b1f4dcbda6..3cffa96b224eb5f7322209f48b96d541068ccda6:/packages/mutt/build.sh

diff --git a/packages/mutt/build.sh b/packages/mutt/build.sh
index bb9fd225..e0e6e32e 100644
--- a/packages/mutt/build.sh
+++ b/packages/mutt/build.sh
@@ -1,11 +1,10 @@
 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.8.3
+TERMUX_PKG_SRCURL=ftp://ftp.mutt.org/pub/mutt/mutt-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42
 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,29 +12,19 @@ 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:
 	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
-	$TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/mutt_md5 $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
 }