From 28e896dbf776e7c58bd0f2c3a6ea2fa93aa1be91 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@gmail.com>
Date: Sun, 25 Mar 2018 15:23:29 -0400
Subject: [PATCH] neomutt: fix template based on upstream changes

---
 srcpkgs/neomutt/template | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index c9f5e2ef0f..dedccc8612 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -2,10 +2,10 @@
 pkgname=neomutt
 version=20180323
 revision=1
-wrksrc="${pkgname}-${pkgname}-${version}"
-build_style=gnu-configure
+wrksrc="neomutt-neomutt-${version}"
+build_style=configure
 configure_args="--ssl --gpgme --notmuch --gdbm --lua --sasl"
-hostmakedepends="docbook-xsl libxslt tcl w3m"
+hostmakedepends="docbook-xsl libxslt tcl perl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  libnotmuch-devel libressl-devel libsasl-devel lua-devel"
 depends="mime-types"
@@ -16,18 +16,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.neomutt.org"
 distfiles="https://github.com/neomutt/neomutt/archive/neomutt-${version}.tar.gz"
 checksum=4c498424cd6ded946c940f38df7cd01604a23059f258f05d979b2580eafc678b
-nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/5375 no longer gnu-configure, but needs /etc set correctly and also to know how to cross build documentation"
 
 # fix:
 if [ -n "${XBPS_CROSS_BASE}" ]; then
 	configure_args="${configure_args} --host=$XBPS_CROSS_TRIPLET"
 	configure_args="${configure_args} --build=$XBPS_TRIPLET"
-	configure_args="${configure_args} --with-lua=$XBPS_CROSS_BASE/"
-	configure_args="${configure_args} --with-ncurses=$XBPS_CROSS_BASE/"
-	configure_args="${configure_args} --with-notmuch=$XBPS_CROSS_BASE/"
-	configure_args="${configure_args} --with-ssl=$XBPS_CROSS_BASE/"
-	configure_args="${configure_args} --with-gdbm=$XBPS_CROSS_BASE/"
-	configure_args="${configure_args} --with-gpgme=$XBPS_CROSS_BASE/"
+	configure_args="${configure_args} --with-sysroot=$XBPS_CROSS_BASE"
 fi
 
 case "${XBPS_TARGET_MACHINE}" in
@@ -54,3 +48,4 @@ post_install() {
 # "Mutt" anywhere in the codebase. https://www.neomutt.org/2017/10/13/release
 # /etc/neomuttrc now exists, and there are no conflicts with regular mutt.
 # Due to this, an install.msg was added and all alternatives were removed.
+# Cross compiling was fixed in 20180323