From 42eab4cf76f22c7db51ff82cbc6561287e625a14 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Fri, 29 Apr 2016 14:29:38 +0200
Subject: [PATCH] srcpkgs: XBPS_TARGET_ARCH -> XBPS_TARGET_MACHINE.

---
 srcpkgs/hwloc/template         | 2 +-
 srcpkgs/libcxxabi/template     | 3 ++-
 srcpkgs/libjpeg-turbo/template | 2 +-
 srcpkgs/perl/template          | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/hwloc/template b/srcpkgs/hwloc/template
index b3cb5ad4801..41a87ebbcd0 100644
--- a/srcpkgs/hwloc/template
+++ b/srcpkgs/hwloc/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="cairo-devel ncurses-devel libxml2-devel eudev-libudev-devel"
-case "$XBPS_TARGET_ARCH" in
+case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) makedepends+=" libnuma-devel";;
 esac
 short_desc="Portable abstraction of hierarchical hardware architectures"
diff --git a/srcpkgs/libcxxabi/template b/srcpkgs/libcxxabi/template
index eb25d3f9663..7bc41c072be 100644
--- a/srcpkgs/libcxxabi/template
+++ b/srcpkgs/libcxxabi/template
@@ -17,7 +17,8 @@ distfiles="http://www.llvm.org/releases/${version}/${pkgname}-${version}.src.tar
  http://www.llvm.org/releases/${version}/libcxx-${version}.src.tar.xz"
 checksum="c5ee0871aff6ec741380c4899007a7d97f0b791c81df69d25b744eebc5cee504
  36804511b940bc8a7cefc7cb391a6b28f5e3f53f6372965642020db91174237b"
-case "$XBPS_TARGET_ARCH" in
+
+case "$XBPS_TARGET_MACHINE" in
 	arm*) broken="Wierd EHABI defines break it"
 esac
 
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 5eccd0a5f5f..2d68dd74699 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -15,7 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e
 
 # SIMD uses FP instructions, disable on soft-float MIPS
-case "$XBPS_TARGET_ARCH" in
+case "$XBPS_TARGET_MACHINE" in
 	mips*hf) ;;
 	mips*) configure_args+=" --without-simd" ;;
 esac
diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index 11c7907ba16..155b262c4da 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -160,11 +160,11 @@ do_configure() {
 
 	if [ "$CROSS_BUILD" ]; then
 		cp -f ${FILESDIR}/cross/*.h .
-		cp -f ${FILESDIR}/cross/config.sh-${XBPS_TARGET_ARCH} config.sh
+		cp -f ${FILESDIR}/cross/config.sh-${XBPS_TARGET_MACHINE} config.sh
 		cp -f ${FILESDIR}/Configure.cross .
 
 		# substitute some required strings in generated config.sh
-		sed -e "s,@@XBPS_CROSS_ARCH@@,${XBPS_TARGET_ARCH},g" \
+		sed -e "s,@@XBPS_CROSS_ARCH@@,${XBPS_TARGET_MACHINE},g" \
 			-e "s,@@XBPS_CROSS_TRIPLET@@,${XBPS_CROSS_TRIPLET},g" \
 			-e "s,@@XBPS_CROSS_CFLAGS@@,${XBPS_CROSS_CFLAGS},g" \
 			-e "s,@@XBPS_CROSS_LDFLAGS@@,${XBPS_CROSS_LDFLAGS},g" \