From 062657ddb497e4a581ac6bf10c399886d6c3fa16 Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Thu, 23 Jul 2015 13:16:51 +0200
Subject: [PATCH] mutt: fix cross-compile properly.

---
 srcpkgs/mutt/files/cross.patch | 44 ----------------------------------
 srcpkgs/mutt/template          | 13 ++++------
 2 files changed, 4 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/mutt/files/cross.patch

diff --git a/srcpkgs/mutt/files/cross.patch b/srcpkgs/mutt/files/cross.patch
deleted file mode 100644
index d0f96736dbe..00000000000
--- a/srcpkgs/mutt/files/cross.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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 c860430101c..6c5b8a0b502 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,9 +1,9 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=1.5.23
-revision=11
+revision=12
 build_style=gnu-configure
-configure_args="--enable-pop --enable-imap --enable-smtp
+configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn --with-ssl --with-sasl
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr
  --with-gdbm=${XBPS_CROSS_BASE}/usr mutt_cv_regex_broken=no"
@@ -24,11 +24,6 @@ build_options="trash sidebar"
 desc_option_trash="apply trash folder patch"
 desc_option_sidebar="apply sidebar patch"
 
-# Disable hcache for cross builds
-if [ -z "$CROSS_BUILD" ]; then
-	configure_args+=" --enable-hcache"
-fi
-
 pre_configure() {
 	if [ "$build_option_trash" ]; then
 		patch -sNp1 -i ${FILESDIR}/trashfolder-1.5.22.diff0
@@ -41,14 +36,14 @@ pre_configure() {
 	fi
 
 	autoreconf -fi
-	# apply cross.patch after autoreconf
-	patch -sNp0 -i ${FILESDIR}/cross.patch
 }
 
 pre_build() {
 	find -name Makefile -exec sed \
 		-e 's,-I/usr/include,,g' \
 		-e 's,${prefix}/include,,g' -i {} \;
+	make CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS= mutt_md5
+	make CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS= -C doc
 }
 
 post_install() {