srcpkgs: XBPS_TARGET_ARCH -> XBPS_TARGET_MACHINE.

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"

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
 

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

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" \