From f78a2224ccf8d2482927e903daed21d55fc70a4e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 19 Nov 2013 10:16:25 +0100
Subject: [PATCH] mutt: update to 1.5.22 (previous version +6 years old).

---
 srcpkgs/mutt/patches/cross.patch | 44 ++++++++++++++++++++++++++++++++
 srcpkgs/mutt/template            | 29 ++++++++++++++-------
 2 files changed, 64 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/mutt/patches/cross.patch

diff --git a/srcpkgs/mutt/patches/cross.patch b/srcpkgs/mutt/patches/cross.patch
new file mode 100644
index 0000000000..d0f96736db
--- /dev/null
+++ b/srcpkgs/mutt/patches/cross.patch
@@ -0,0 +1,44 @@
+--- doc/Makefile.in.orig	2013-11-19 10:10:58.977629650 +0100
++++ doc/Makefile.in	2013-11-19 10:12:15.468057050 +0100
+@@ -116,14 +116,14 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++COMPILE = cc $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS)
+ AM_V_CC = $(am__v_CC_@AM_V@)
+ am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+ am__v_CC_0 = @echo "  CC      " $@;
+ am__v_CC_1 = 
+-CCLD = $(CC)
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CCLD = cc
++LINK = $(CCLD) $(AM_CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo "  CCLD    " $@;
+@@ -159,7 +159,7 @@ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+ AMTAR = @AMTAR@
+ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+-AR = @AR@
++AR = ar
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+@@ -167,11 +167,11 @@ AWK = @AWK@
+ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+ CATALOGS = @CATALOGS@
+ CATOBJEXT = @CATOBJEXT@
+-CC = @CC@
++CC = cc
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
+-CPP = @CPP@
++CPP = cpp
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 36490d4314..7b23671ca8 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,17 +1,19 @@
 # Template file for 'mutt'
 pkgname=mutt
-version=1.4.2.3
-revision=3
+version=1.5.22
+revision=1
 build_style=gnu-configure
-configure_args="--enable-pop --enable-imap --with-ssl"
-homepage="http://www.mutt.org"
-distfiles="ftp://ftp.mutt.org/mutt/mutt-$version.tar.gz"
-hostmakedepends="perl"
-makedepends="ncurses-devel openssl-devel"
+configure_args="--enable-pop --enable-imap --enable-smtp
+ --enable-gpgme --with-idn --with-ssl --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr
+ --with-gdbm=${XBPS_CROSS_BASE}/usr mutt_cv_regex_broken=no"
+hostmakedepends="perl pkg-config libidn-devel"
+makedepends="ncurses-devel openssl-devel libidn-devel gpgme-devel mime-types"
 short_desc="The Mutt Mail Client"
 maintainer="Jan S. <jan.schreib@gmail.com>"
 license="GPL-2"
-checksum=1a4920e5efccd6a83932af4223cb568956158f62e9f595798acc4004aca6ace5
+homepage="http://www.mutt.org"
+distfiles="ftp://ftp.mutt.org/mutt/devel/mutt-$version.tar.gz"
+checksum=8feae890ed0758a5108bafaef27bd8fc9c378675acf25a3c620f2c7b7540f3a7
 
 pre_build() {
 	find -name Makefile -exec sed \
@@ -19,8 +21,17 @@ pre_build() {
 		-e 's,${prefix}/include,,g' -i {} \;
 }
 
+post_install() {
+	rm ${DESTDIR}/etc/Muttrc.dist
+	rm ${DESTDIR}/etc/mime.types{,.dist}
+	rm ${DESTDIR}/usr/bin/{flea,muttbug}
+	rm ${DESTDIR}/usr/share/man/man1/{flea,muttbug}.1
+	vinstall contrib/gpg.rc 644 etc Muttrc.gpg.dist
+}
+
 mutt_package() {
-	conf_files="/etc/Muttrc /etc/mime.types"
+	conf_files="/etc/Muttrc"
+	depends="mime-types"
 	pkg_install(){
 		vmove all
 	}