From 95e0997afbe8904d374fe1049cce42ae5529af34 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 9 Apr 2013 01:49:27 +0200
Subject: [PATCH] Update packages to be built with xbps-src/testing.

---
 srcpkgs/aalib/template                     |  2 +-
 srcpkgs/acl/template                       |  5 ++++-
 srcpkgs/alsa-lib/template                  |  2 +-
 srcpkgs/attr/template                      |  5 ++++-
 srcpkgs/avahi/template                     |  2 +-
 srcpkgs/bitcoin/template                   |  4 ++--
 srcpkgs/boost/template                     |  6 +++---
 srcpkgs/chroot-git/template                |  2 +-
 srcpkgs/chroot-glibc/template              |  2 +-
 srcpkgs/cloog/template                     |  2 +-
 srcpkgs/coreutils/template                 |  8 ++++----
 srcpkgs/cracklib/template                  |  4 ++--
 srcpkgs/cryptsetup/template                |  2 +-
 srcpkgs/dbus/dbus-devel.template           |  1 -
 srcpkgs/dbus/dbus-x11.template             |  2 +-
 srcpkgs/dbus/template                      | 12 ++++++------
 srcpkgs/ffmpeg-0.10x-compat/template       |  2 +-
 srcpkgs/flac/template                      |  2 +-
 srcpkgs/gcc/template                       |  4 ++--
 srcpkgs/gdbm/template                      |  4 ++--
 srcpkgs/git/template                       |  6 +++---
 srcpkgs/glib/template                      |  2 +-
 srcpkgs/glibc/template                     |  2 +-
 srcpkgs/gmp/template                       |  2 +-
 srcpkgs/gobject-introspection/template     |  2 +-
 srcpkgs/groff/template                     |  6 +++---
 srcpkgs/icu/template                       |  4 ++--
 srcpkgs/iproute2/template                  |  2 +-
 srcpkgs/iputils/template                   |  2 +-
 srcpkgs/irssi/template                     |  2 +-
 srcpkgs/kernel-rpi/template                |  4 ++--
 srcpkgs/kmod/template                      |  2 +-
 srcpkgs/libX11/template                    |  4 ++--
 srcpkgs/libXt/template                     |  2 +-
 srcpkgs/libarchive/bsdcpio.template        |  4 ++--
 srcpkgs/libarchive/bsdtar.template         |  4 ++--
 srcpkgs/libarchive/template                |  2 +-
 srcpkgs/libcaca/template                   |  2 +-
 srcpkgs/libcap/template                    |  8 ++++++--
 srcpkgs/libidn/libidn-devel.template       |  1 -
 srcpkgs/libidn/template                    |  4 ++--
 srcpkgs/libnl3/template                    |  2 +-
 srcpkgs/libpwquality/template              |  2 +-
 srcpkgs/libudev/template                   |  2 +-
 srcpkgs/libvorbis/template                 |  2 +-
 srcpkgs/libvpx/template                    |  2 +-
 srcpkgs/libxcb/template                    |  8 ++++----
 srcpkgs/libxml2/libxml2-devel.template     |  1 -
 srcpkgs/libxml2/template                   |  6 +++---
 srcpkgs/lvm2/template                      |  2 +-
 srcpkgs/mit-krb5/template                  |  7 ++++---
 srcpkgs/mtd-utils/template                 |  4 ++--
 srcpkgs/ncurses/template                   |  4 ++--
 srcpkgs/omxplayer/template                 |  2 +-
 srcpkgs/pam/pam-userdb.template            |  2 +-
 srcpkgs/pam/template                       |  7 ++++---
 srcpkgs/pcre/pcre-devel.template           |  2 +-
 srcpkgs/pcre/template                      |  2 +-
 srcpkgs/perl/template                      | 13 ++++++-------
 srcpkgs/pkg-config/template                |  2 +-
 srcpkgs/ppl/template                       |  2 +-
 srcpkgs/psmisc/template                    |  2 +-
 srcpkgs/pycrypto/template                  |  2 +-
 srcpkgs/python/template                    |  2 +-
 srcpkgs/python3/template                   |  2 +-
 srcpkgs/sed/template                       |  2 +-
 srcpkgs/shadow/template                    |  2 +-
 srcpkgs/sqlite/template                    |  4 ++--
 srcpkgs/systemd/template                   |  4 ++--
 srcpkgs/tcpdump/template                   |  2 +-
 srcpkgs/tiff/template                      |  2 +-
 srcpkgs/util-linux/libblkid-devel.template |  2 +-
 srcpkgs/vim/template                       | 10 +++++-----
 srcpkgs/wayland/template                   |  2 +-
 srcpkgs/wget/template                      |  2 +-
 srcpkgs/wpa_supplicant/template            |  2 +-
 srcpkgs/x264/template                      |  2 +-
 srcpkgs/xbps-src-utils/template            |  2 +-
 srcpkgs/xmlcatmgr/template                 |  4 ++--
 79 files changed, 136 insertions(+), 128 deletions(-)

diff --git a/srcpkgs/aalib/template b/srcpkgs/aalib/template
index 09a463d334d..6ab6f7fd8b6 100644
--- a/srcpkgs/aalib/template
+++ b/srcpkgs/aalib/template
@@ -12,7 +12,7 @@ distfiles="http://prdownloads.sourceforge.net/aa-project/${pkgname}-${version}.t
 checksum=0b214b98850f559e0a9ef7282de2ff336b094e1aacedefff3ffa50f07711db58
 wrksrc=aalib-1.4.0
 
-if [ -n "$XBPS_CROSS_BUILD" ]; then
+if [ -n "$CROSS_BUILD" ]; then
 	makedepends="automake"
 	pre_configure() {
 		sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.in
diff --git a/srcpkgs/acl/template b/srcpkgs/acl/template
index d0065ae7fae..efe2231360d 100644
--- a/srcpkgs/acl/template
+++ b/srcpkgs/acl/template
@@ -5,7 +5,6 @@ revision=5
 subpackages="acl-devel acl-progs"
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --libexecdir=/usr/lib"
-make_install_target="DIST_ROOT=${XBPS_DESTDIR}/${pkgname}-${version} install install-lib install-dev"
 makedepends="attr-devel"
 short_desc="Access Control List filesystem support"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,3 +12,7 @@ homepage="http://savannah.nongnu.org/projects/acl"
 license="LGPL-2.1"
 distfiles="${NONGNU_SITE}/acl/acl-${version}.src.tar.gz"
 checksum=06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225
+
+do_install() {
+	make DIST_ROOT=${DESTDIR} install install-lib install-dev
+}
diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template
index 8d71af45513..7ef76bb60da 100644
--- a/srcpkgs/alsa-lib/template
+++ b/srcpkgs/alsa-lib/template
@@ -19,7 +19,7 @@ long_desc="
  programming and provide higher level functionality as well as support for
  the older OSS API, providing binary compatibility for most OSS programs."
 
-if [ -n "$XBPS_CROSS_BUILD" ]; then
+if [ -n "$CROSS_BUILD" ]; then
 	# XXX python plugin
 	makedepends="automake pkg-config"
 	configure_args="--disable-python"
diff --git a/srcpkgs/attr/template b/srcpkgs/attr/template
index 35868bd97dc..85794f7b379 100644
--- a/srcpkgs/attr/template
+++ b/srcpkgs/attr/template
@@ -5,10 +5,13 @@ revision=6
 build_style=gnu-configure
 subpackages="attr-devel attr-progs"
 configure_args="--libdir=/usr/lib --libexecdir=/usr/lib"
-make_install_target="DIST_ROOT=${XBPS_DESTDIR}/${pkgname}-${version} install install-lib install-dev"
 short_desc="Extended attribute support library for ACL support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://savannah.nongnu.org/projects/attr"
 license="LGPL-2.1"
 distfiles="${NONGNU_SITE}/attr/attr-${version}.src.tar.gz"
 checksum=dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f
+
+do_install() {
+	make DIST_ROOT=${DESTDIR} install install-lib install-dev
+}
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 658f033ac0f..ed99bd34672 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -36,7 +36,7 @@ subpackages="avahi-autoipd avahi-discover avahi-compat-libs avahi-compat-libs-de
  avahi-ui-libs avahi-ui-libs-gtk3 avahi-ui-libs-devel avahi-utils
  avahi-ui-utils avahi-python-utils avahi-python"
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	# XXX glib, gtk, introspection and python
 	hostmakedepends="libtool automake gettext-devel glib-devel pkg-config intltool"
 	makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel"
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 034363431ed..fe76f0f361b 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -15,7 +15,7 @@ checksum=6d7f023a9df1a436c51de83f7cd751f162be9b4fb1c06da05545f9fba7cb2a98
 
 disable_debug=1
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	# XXX -qt subpkg
 	unset subpackages
 	akedepends="db-devel openssl-devel boost-devel miniupnpc-devel"
@@ -23,7 +23,7 @@ fi
 
 do_build() {
 	cd src
-	if [ -z "$XBPS_CROSS_BUILD" ]; then
+	if [ -z "$CROSS_BUILD" ]; then
 		# qt gui
 		qmake
 		# XXX wtf??? leveldb inherits this value and errors out
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 0ef4a26bd99..6cc6ac43d55 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -20,14 +20,14 @@ long_desc="
 
 disable_debug=yes
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	# XXX boost-jam and boost-python subpkgs.
 	subpackages="boost-build boost-devel"
 	makedepends="zlib-devel icu-devel>=49.1"
 fi
 
 do_build() {
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		echo "using gcc : arm : ${XBPS_CROSS_TRIPLET}-g++ ;" > \
 			tools/build/v2/user-config.jam
 	fi
@@ -44,7 +44,7 @@ do_install() {
 	elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
 		_bindir="bin.linuxarm"
 	fi
-	[ -z "$XBPS_CROSS_BUILD" ] && vinstall bjam 755 usr/bin
+	[ -z "$CROSS_BUILD" ] && vinstall bjam 755 usr/bin
 
 	# Install headers/libs
 	./bjam --prefix=${DESTDIR}/usr install
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index eb93a4cd9b2..ba544db11bd 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -22,7 +22,7 @@ if [ "$CHROOT_READY" ]; then
 	hostmakedepends="perl"
 fi
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	makedepends="zlib-devel"
 	configure_args="${configure_args}
 		ac_cv_fread_reads_directories=no
diff --git a/srcpkgs/chroot-glibc/template b/srcpkgs/chroot-glibc/template
index 5cb5534d511..e4ddbe97a7f 100644
--- a/srcpkgs/chroot-glibc/template
+++ b/srcpkgs/chroot-glibc/template
@@ -49,7 +49,7 @@ do_configure() {
 		# To build for soft float: --with-float=soft --without-fp.
 		_floatabi="--with-float=hard"
 	fi
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		_headers="--with-headers=/usr/$XBPS_CROSS_TRIPLET/include"
 	else
 		_headers="--with-headers=/usr/include"
diff --git a/srcpkgs/cloog/template b/srcpkgs/cloog/template
index 0bfdfc58ea2..64ad5aee6a4 100644
--- a/srcpkgs/cloog/template
+++ b/srcpkgs/cloog/template
@@ -14,6 +14,6 @@ license="GPL-2"
 distfiles="http://www.bastoul.net/cloog/pages/download/cloog-$version.tar.gz"
 checksum=f265f5069830c03d2919a7673c0963495437d6d79a8cbd3474cde2d4e3291e04
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	configure_args="${configure_args} --with-gmp-exec-prefix=$XBPS_CROSS_BASE"
 fi
diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template
index 3b1252ab65b..9a614261f80 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -15,12 +15,12 @@ hostmakedepends="perl"
 makedepends="gmp-devel acl-devel libcap-devel"
 depends="coreutils-doc-${version}_${revision}"
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	unset subpackages
 fi
 
 do_configure() {
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		_confargs="fu_cv_sys_stat_statfs2_bsize=yes \
 			gl_cv_func_working_mkstemp=yes
 			gl_cv_func_working_acl_get_file=yes"
@@ -36,7 +36,7 @@ do_configure() {
 }
 
 do_build() {
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		cp Makefile Makefile.orig
 		sed '/src_make_prime_list/d' Makefile.orig > Makefile
 		depbase=`echo src/make-prime-list.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
@@ -56,7 +56,7 @@ do_build() {
 do_install() {
 	make DESTDIR=${DESTDIR} install
 
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		rm -rf ${DESTDIR}/usr/share/info
 	fi
 }
diff --git a/srcpkgs/cracklib/template b/srcpkgs/cracklib/template
index de459593969..fb327eb2dc8 100644
--- a/srcpkgs/cracklib/template
+++ b/srcpkgs/cracklib/template
@@ -19,8 +19,8 @@ checksum="
  feaff49bfb513ec10b2618c00d2f7f60776ba93fcc5fa22dd3479dd9cad9f770
  9b323c100780f2a817ab3de082b8bfaa4478bfa174dcbd016810ed8be60cbe16"
 
-if [ "$XBPS_CROSS_BUILD" ]; then
-	hostmakedepends="automake gettext-devel python-devel"
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends="libtool automake gettext-devel python-devel"
 	pre_configure() {
 		sed -i "s|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g" -i configure.in
 		autoreconf -fi
diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index ef5559edd2d..c31e6244a37 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -14,7 +14,7 @@ homepage="http://code.google.com/p/cryptsetup"
 distfiles="https://cryptsetup.googlecode.com/files/$pkgname-$version.tar.bz2"
 checksum=dd9686fce5d3276b2eb2ac40d513a9b64850af8fff881442f2cfe87257ba2406
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="automake gettext-devel pkg-config libgcrypt-devel"
 	pre_configure() {
 		autoreconf -fi
diff --git a/srcpkgs/dbus/dbus-devel.template b/srcpkgs/dbus/dbus-devel.template
index 0fc6d9ba2f4..1d2519cf367 100644
--- a/srcpkgs/dbus/dbus-devel.template
+++ b/srcpkgs/dbus/dbus-devel.template
@@ -2,7 +2,6 @@
 #
 depends="expat-devel dbus-libs>=${version}"
 short_desc="${short_desc} -- development files"
-noarch=yes
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/dbus/dbus-x11.template b/srcpkgs/dbus/dbus-x11.template
index 8221a87e1f9..df412cc6acd 100644
--- a/srcpkgs/dbus/dbus-x11.template
+++ b/srcpkgs/dbus/dbus-x11.template
@@ -5,5 +5,5 @@ short_desc="${short_desc} -- X11 support"
 
 do_install() {
 	vmove usr/bin/dbus-launch usr/bin
-	vmove usr/share/man/man1/dbus-launch.1 usr/share/man/man1
+	vmove usr/share/man/man1/dbus-launch.1.gz usr/share/man/man1
 }
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index b8edf68e034..6f61a3c47fe 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -4,7 +4,7 @@ _systemd_version=197
 
 pkgname=dbus
 version=1.6.8
-revision=9
+revision=10
 short_desc="Message bus system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -22,9 +22,9 @@ hostmakedepends="pkg-config intltool gperf"
 makedepends="expat-devel libX11-devel libcap-devel"
 conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf"
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	_systemddir="$XBPS_CROSS_BASE"
-	hostmakedepends="automake gettext-devel ${hostmakedepends} libgcrypt-devel"
+	hostmakedepends+=" libtool automake gettext-devel libgcrypt-devel"
 else
 	_systemddir="/usr"
 fi
@@ -34,7 +34,7 @@ pre_configure() {
 	[ ! -d dbus-bootstrap ] && mkdir dbus-bootstrap
 	cd dbus-bootstrap
 
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		_confargs="--host=$XBPS_CROSS_TRIPLET
 			--with-libtool-sysroot=$XBPS_CROSS_BASE"
 	fi
@@ -46,7 +46,7 @@ pre_configure() {
 	make install
 
 	# Build a temporary systemd; we are only interested in libsystemd-login.
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		cd ${wrksrc}/systemd-${_systemd_version} && autoreconf -fi
 	fi
 
@@ -86,7 +86,7 @@ pre_configure() {
 do_configure() {
 	cd ${wrksrc}/dbus-${version}
 
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		autoreconf -fi
 		_confargs="--host=$XBPS_CROSS_TRIPLET
 			--with-libtool-sysroot=$XBPS_CROSS_BASE
diff --git a/srcpkgs/ffmpeg-0.10x-compat/template b/srcpkgs/ffmpeg-0.10x-compat/template
index 55c0597c43b..2aec472fed8 100644
--- a/srcpkgs/ffmpeg-0.10x-compat/template
+++ b/srcpkgs/ffmpeg-0.10x-compat/template
@@ -17,7 +17,7 @@ makedepends="alsa-lib-devel faad2-devel lame-devel libtheora-devel
  freetype-devel"
 
 do_configure() {
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		case "$XBPS_TARGET_MACHINE" in
 			arm*) _arch="arm";;
 			mips*) _arch="mips";;
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index f4c21678ad7..9ba1efe4d20 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -26,7 +26,7 @@ long_desc="
   * input plugins for various music players (Winamp, XMMS, and more in the
     works)"
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="automake pkg-config"
 	pre_configure() {
 		./autogen.sh
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 73ddf1107ca..05e37923e67 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -35,7 +35,7 @@ subpackages="${subpackages} libgcc libgo libssp libssp-devel libstdc++
  libobjc-devel  libgfortran libgfortran-devel gcc-fortran gcc-c++
  gcc-objc gcc-objc++ gcc-go"
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	# XXX enable default langs: objc, obj-c++, fortran and go.
 	subpackages="libgcc libssp libssp-devel libstdc++
 		libstdc++-devel libgomp libgomp-devel
@@ -48,7 +48,7 @@ do_configure() {
 	# Do not run fixincludes
 	sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
 
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		export CC="$XBPS_CROSS_TRIPLET-gcc --sysroot=$XBPS_CROSS_BASE"
 		export CC_FOR_TARGET="$CC"
 		export GCC="$CC"
diff --git a/srcpkgs/gdbm/template b/srcpkgs/gdbm/template
index 7997e112d3b..9d3c53ae5c8 100644
--- a/srcpkgs/gdbm/template
+++ b/srcpkgs/gdbm/template
@@ -15,8 +15,8 @@ long_desc="
  GNU dbm is a set of database routines that use extensible hashing.
  It works similar to the standard Unix dbm routines."
 
-if [ "$XBPS_CROSS_BUILD" ]; then
-	hostmakedepends="automake>=1.13.1_2 gettext-devel"
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends="libtool automake>=1.13.1_2 gettext-devel"
 	pre_configure() {
 		autoreconf -fi
 	}
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 7148fe4a52f..f53035e77e4 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -18,7 +18,7 @@ depends="ca-certificates"
 hostmakedepends="xmlto>=0.0.25_2 asciidoc perl"
 makedepends="openssl-devel libcurl-devel expat-devel python-devel"
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	subpackages="git-perl"
 	configure_args="${configure_args} --without-python
 			ac_cv_fread_reads_directories=no
@@ -28,13 +28,13 @@ if [ "$XBPS_CROSS_BUILD" ]; then
 fi
 
 post_build() {
-	if [ -z "$XBPS_CROSS_BUILD" ]; then
+	if [ -z "$CROSS_BUILD" ]; then
 		make ${makejobs} -C Documentation man
 	fi
 }
 
 post_install() {
-	if [ -z "$XBPS_CROSS_BUILD" ]; then
+	if [ -z "$CROSS_BUILD" ]; then
 		make NO_INSTALL_HARDLINKS=1 DESTDIR=${DESTDIR} install-doc
 	fi
 	vinstall contrib/completion/git-completion.bash 644 \
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index f0f8d357ea9..73157b5043f 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -14,7 +14,7 @@ license="LGPL-2.1"
 distfiles="${GNOME_SITE}/glib/2.36/glib-$version.tar.xz"
 checksum=455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	configure_args="${configure_args} glib_cv_long_long_format=I64
 			glib_cv_stack_grows=no glib_cv_rtldglobal_broken=no
 			glib_cv_uscore=no blib_cv_use_pid_surrogate=yes
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 330098bff05..a62bd636f86 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -44,7 +44,7 @@ do_configure() {
 		# To build for soft float: --with-float=soft --without-fp.
 		_floatabi="--with-float=hard"
 	fi
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		_headers="--with-headers=$XBPS_CROSS_BASE/include"
 	else
 		_headers="--with-headers=/usr/include"
diff --git a/srcpkgs/gmp/template b/srcpkgs/gmp/template
index e637d0a45eb..3cf303603a4 100644
--- a/srcpkgs/gmp/template
+++ b/srcpkgs/gmp/template
@@ -18,7 +18,7 @@ homepage="http://gmplib.org/"
 distfiles="ftp://ftp.gmplib.org/pub/gmp-${version}/gmp-${version}.tar.xz"
 checksum=4bd64d782fdeb61aeed45b434fca5246d66baa9de76f87cba30c38460d8834c2
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="automake"
 	pre_configure() {
 		autoreconf -fi
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 95ea00376b5..1d5b01a44e9 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-tests --disable-static"
 depends="python libgirepository-devel"
 hostmakedepends="pkg-config flex"
-makedepends="libfl-devel libffi-devel libglib-devel python-devel libxml2-devel cairo-devel"
+makedepends="libffi-devel libglib-devel python-devel libxml2-devel cairo-devel"
 fulldepends="libtool"
 short_desc="Introspection system for GObject-based libraries"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/srcpkgs/groff/template b/srcpkgs/groff/template
index 875e2e87680..184827264f1 100644
--- a/srcpkgs/groff/template
+++ b/srcpkgs/groff/template
@@ -12,12 +12,12 @@ distfiles="http://ftp.gnu.org/gnu/groff/groff-${version}.tar.gz"
 checksum=380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076
 subpackages="groff-doc"
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="perl bison groff"
 fi
 
 do_configure() {
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		sed -i \
 			-e '/^GROFFBIN=/s:=.*:=/usr/bin/groff:' \
 			-e '/^TROFFBIN=/s:=.*:=/usr/bin/troff:' \
@@ -31,7 +31,7 @@ do_configure() {
 }
 
 do_build() {
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		make TROFFBIN=troff GROFFBIN=groff GROFF_BIN_PATH= ${makejobs}
 	else
 		make ${makejobs}
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 9332692e92d..209c9b74ca0 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -31,7 +31,7 @@ long_desc="
  - Word, line and sentence breaks"
 
 pre_configure() {
-	if [ -n "$XBPS_CROSS_BUILD" ]; then
+	if [ -n "$CROSS_BUILD" ]; then
 		# Configure and build for host.
 		mkdir host-build
 		cd host-build
@@ -47,7 +47,7 @@ pre_configure() {
 }
 
 do_configure() {
-	if [ -n "$XBPS_CROSS_BUILD" ]; then
+	if [ -n "$CROSS_BUILD" ]; then
 		./configure ${CONFIGURE_SHARED_ARGS} \
 			--with-cross-build=${wrksrc}/host-icu
 	else
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 11c7a2ad494..854d5a255bd 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -24,7 +24,7 @@ do_configure() {
 }
 
 do_build() {
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		make CC="$XBPS_CROSS_TRIPLET-gcc" \
 			RANLIB="$XBPS_CROSS_TRIPLET-ranlib" \
 			AR="$XBPS_CROSS_TRIPLET-ar" \
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d11c718128f..b46b0b87408 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -14,7 +14,7 @@ distfiles="http://www.skbuff.net/iputils/${pkgname}-s${version}.tar.bz2"
 checksum=450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f
 
 do_build() {
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		make CC="$XBPS_CROSS_TRIPLET-gcc" LD="$XBPS_CROSS_TRIPLET-ld" \
 			USE_GNUTLS=no CCOPTOPT="$CFLAGS" ${makejobs} \
 			arping clockdiff ping ping6 rdisc tracepath tracepath6
diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 7e700808f7c..7ae6ddf7de1 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -15,7 +15,7 @@ license="GPL-2"
 distfiles="http://www.irssi.org/files/$pkgname-$version.tar.bz2"
 checksum=c12d16fb605103d7c256ddce44012dc396af57f3771e086d0387c195a052a0a6
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	# XXX perl module
 	hostmakedepends="pkg-config"
 	configure_args="${configure_args} --without-perl"
diff --git a/srcpkgs/kernel-rpi/template b/srcpkgs/kernel-rpi/template
index 2297f1605ea..57cf742b12e 100644
--- a/srcpkgs/kernel-rpi/template
+++ b/srcpkgs/kernel-rpi/template
@@ -34,7 +34,7 @@ mutable_files="
 /usr/lib/modules/${_kernver}/modules.devname"
 
 do_configure() {
-	if [ -n "$XBPS_CROSS_BUILD" ]; then
+	if [ -n "$CROSS_BUILD" ]; then
 		_args="CCPREFIX=${XBPS_CROSS_TRIPLET}- CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
 	fi
 
@@ -52,7 +52,7 @@ do_configure() {
 }
 
 do_build() {
-	if [ -n "$XBPS_CROSS_BUILD" ]; then
+	if [ -n "$CROSS_BUILD" ]; then
 		_args="CCPREFIX=${XBPS_CROSS_TRIPLET}- CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
 	fi
 	make ${makejobs} ${_args} ARCH=arm prepare
diff --git a/srcpkgs/kmod/template b/srcpkgs/kmod/template
index 744ee2e1465..e7d957da337 100644
--- a/srcpkgs/kmod/template
+++ b/srcpkgs/kmod/template
@@ -22,7 +22,7 @@ make_dirs="
 /usr/lib/depmod.d 0755 root root
 /usr/lib/modprobe.d 0755 root root"
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="automake pkg-config libxslt"
 	pre_configure() {
 		autoreconf -fi
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 0a10daee474..29b234ce25a 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -16,8 +16,8 @@ license="MIT"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 checksum=c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
 
-if [ "$XBPS_CROSS_BUILD" ]; then
-	hostmakedepends="pkg-config libtool automake xorg-util-macros ${makedepends}"
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" libtool automake xorg-util-macros xproto xtrans"
 	pre_configure() {
 		sed -e 's|$(srcdir)/||g' -i nls/Makefile.am
 		autoreconf -fi
diff --git a/srcpkgs/libXt/template b/srcpkgs/libXt/template
index a26ea702a8e..5a99ba88e8a 100644
--- a/srcpkgs/libXt/template
+++ b/srcpkgs/libXt/template
@@ -18,7 +18,7 @@ long_desc="
  widgets. It also provides functions for handling events, initializing
  windows, and interpreting resource files."
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="pkg-config xproto"
 	configure_args="CC_FOR_BUILD=cc CFLAGS_FOR_BUILD="
 fi
diff --git a/srcpkgs/libarchive/bsdcpio.template b/srcpkgs/libarchive/bsdcpio.template
index 58bfa0d418d..9de419bbd72 100644
--- a/srcpkgs/libarchive/bsdcpio.template
+++ b/srcpkgs/libarchive/bsdcpio.template
@@ -4,6 +4,6 @@ short_desc="BSD cpio(1) using libarchive"
 
 do_install() {
 	vmove usr/bin usr
-	vmove usr/share/man/man1/bsdcpio.1 usr/share/man/man1
-	vmove usr/share/man/man5/cpio.5 usr/share/man/man5
+	vmove usr/share/man/man1/bsdcpio.1.gz usr/share/man/man1
+	vmove usr/share/man/man5/cpio.5.gz usr/share/man/man5
 }
diff --git a/srcpkgs/libarchive/bsdtar.template b/srcpkgs/libarchive/bsdtar.template
index 257a47c6f1b..6b9eaa79c46 100644
--- a/srcpkgs/libarchive/bsdtar.template
+++ b/srcpkgs/libarchive/bsdtar.template
@@ -4,6 +4,6 @@ short_desc="BSD tar(1) using libarchive"
 
 do_install() {
 	vmove usr/bin/bsdtar usr/bin
-	vmove usr/share/man/man1/bsdtar.1 usr/share/man/man1
-	vmove usr/share/man/man5/tar.5 usr/share/man/man5
+	vmove usr/share/man/man1/bsdtar.1.gz usr/share/man/man1
+	vmove usr/share/man/man5/tar.5.gz usr/share/man/man5
 }
diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 930987ec2b1..34136308bb6 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -13,7 +13,7 @@ license="BSD"
 distfiles="http://www.libarchive.org/downloads/libarchive-${version}.tar.gz"
 checksum=eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="libtool automake"
 	pre_configure() {
 		./build/autogen.sh
diff --git a/srcpkgs/libcaca/template b/srcpkgs/libcaca/template
index e3d7a6c9731..286bee50f8a 100644
--- a/srcpkgs/libcaca/template
+++ b/srcpkgs/libcaca/template
@@ -12,7 +12,7 @@ license="WTFPL"
 distfiles="http://caca.zoy.org/files/libcaca/libcaca-0.99.beta18.tar.gz"
 checksum=77ea06633f4a6022dccd4f76c1823e167a40cb05308fc1c7ea0fa1f80f6c33a1
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="libtool automake pkg-config"
 	pre_configure() {
 		sed -i -e s,AM_CONFIG_HEADER,AC_CONFIG_HEADERS, configure.ac
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 3696f3ee21b..7e3a9fb4b40 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -3,7 +3,7 @@ pkgname=libcap
 version=2.22
 revision=8
 subpackages="$pkgname-devel $pkgname-pam $pkgname-progs"
-hostmakedepends="gperf perl pam-devel"
+hostmakedepends="gperf perl"
 makedepends="pam-devel attr-devel"
 short_desc="POSIX.1e capabilities suite"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,8 +13,12 @@ distfiles="ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.gz
 #distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/$pkgname-$version.tar.bz2"
 checksum=e1cae65d8febf2579be37c255d2e058715785ead481a4e6a4357a06aff84721f
 
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends=+= "pam-devel"
+fi
+
 do_build() {
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		make CC="$XBPS_CROSS_TRIPLET-gcc" BUILD_CC=gcc
 	else
 		make
diff --git a/srcpkgs/libidn/libidn-devel.template b/srcpkgs/libidn/libidn-devel.template
index d29f62dbb93..744cb5d6050 100644
--- a/srcpkgs/libidn/libidn-devel.template
+++ b/srcpkgs/libidn/libidn-devel.template
@@ -2,7 +2,6 @@
 #
 depends="libidn>=${version}"
 short_desc="${short_desc} - development files"
-noarch=yes
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/libidn/template b/srcpkgs/libidn/template
index 126cd31cd54..a28ebcb4547 100644
--- a/srcpkgs/libidn/template
+++ b/srcpkgs/libidn/template
@@ -1,10 +1,10 @@
 # Template build file for 'libidn'.
 pkgname=libidn
 version=1.26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-csharp --disable-java --disable-static --enable-threads=posix"
-makedepends="perl pkg-config"
+hostmakedepends="perl pkg-config"
 subpackages="${pkgname}-devel"
 short_desc="Internationalized string handling library"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/srcpkgs/libnl3/template b/srcpkgs/libnl3/template
index 8f98063b322..18cbcefc4e3 100644
--- a/srcpkgs/libnl3/template
+++ b/srcpkgs/libnl3/template
@@ -15,7 +15,7 @@ homepage="http://www.infradead.org/~tgr/libnl"
 distfiles="${homepage}/files/libnl-${version}.tar.gz"
 checksum=9750409c0fec8b27966a65d94c040647ee01753e0947b0d59577b815ee0e710d
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="automake flex"
 	makedepends="libfl-devel"
 	pre_configure() {
diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template
index c400f419072..093832290f9 100644
--- a/srcpkgs/libpwquality/template
+++ b/srcpkgs/libpwquality/template
@@ -15,7 +15,7 @@ license="GPL-2"
 distfiles="https://fedorahosted.org/releases/l/i/$pkgname/$pkgname-$version.tar.bz2"
 checksum=32cfbe302ade7e7271ed44bcae8aae3b6b55ca56ff642c4ece1752ffaa8003ee
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="automake gettext-devel"
 	pre_configure() {
 		autoreconf -fi
diff --git a/srcpkgs/libudev/template b/srcpkgs/libudev/template
index 28f7f54d537..e59c5361212 100644
--- a/srcpkgs/libudev/template
+++ b/srcpkgs/libudev/template
@@ -25,7 +25,7 @@ license="LGPL-2.1, GPL-2, MIT"
 distfiles="http://www.freedesktop.org/software/systemd/systemd-${version}.tar.xz"
 checksum=9a08baa8fa5c48f0aab683b2f771e4be75c3c852afc45e5cb4df06428ac8c217
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="libtool automake gettext-devel pkg-config intltool
 		gperf libxslt docbook-xsl libgcrypt-devel" 
 	pre_configure() {
diff --git a/srcpkgs/libvorbis/template b/srcpkgs/libvorbis/template
index 66778f177b7..b6e1e40773f 100644
--- a/srcpkgs/libvorbis/template
+++ b/srcpkgs/libvorbis/template
@@ -20,7 +20,7 @@ long_desc="
  The libvorbis package contains runtime libraries for use in programs
  that support Ogg Vorbis."
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="automake pkg-config"
 	pre_configure() {
 		sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac
diff --git a/srcpkgs/libvpx/template b/srcpkgs/libvpx/template
index 76fa756e4df..eac7d697e34 100644
--- a/srcpkgs/libvpx/template
+++ b/srcpkgs/libvpx/template
@@ -22,7 +22,7 @@ long_desc="
 do_configure() {
 	export LD="$CC" AS=
 
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		sed -e "s,generic-gnu,$XBPS_CROSS_TRIPLET," -i configure
 		_cross="--target=$XBPS_CROSS_TRIPLET"
 	fi
diff --git a/srcpkgs/libxcb/template b/srcpkgs/libxcb/template
index 083f4c5d148..b0b6806d0bd 100644
--- a/srcpkgs/libxcb/template
+++ b/srcpkgs/libxcb/template
@@ -5,8 +5,8 @@ revision=3
 subpackages="$pkgname-devel"
 build_style=gnu-configure
 configure_args="--disable-build-docs --disable-static"
-hostmakedepends="pkg-config python libxslt docbook-xsl xcb-proto>=1.8"
-makedepends="libXdmcp-devel libXau-devel"
+hostmakedepends="pkg-config python libxslt docbook-xsl"
+makedepends="xcb-proto>=1.8 libXdmcp-devel libXau-devel"
 short_desc="X protocol C-language Binding"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -14,8 +14,8 @@ homepage="http://xcb.freedesktop.org"
 distfiles="$homepage/dist/$pkgname-$version.tar.bz2"
 checksum=8857e62b3aae2976c7e10043643e45a85964fd1dcb4469dfde0d04d3d1b12c96
 
-if [ "$XBPS_CROSS_BUILD" ]; then
-	hostmakedepends+=" libtool automake "
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" libtool automake xcb-proto>=1.8"
 	pre_configure() {
 		sed -e "s|pthread-stubs ||" -i configure.ac
 		autoreconf -fi
diff --git a/srcpkgs/libxml2/libxml2-devel.template b/srcpkgs/libxml2/libxml2-devel.template
index 035363eba06..8b0e47a3c8f 100644
--- a/srcpkgs/libxml2/libxml2-devel.template
+++ b/srcpkgs/libxml2/libxml2-devel.template
@@ -1,6 +1,5 @@
 # Template file for 'libxml2-devel'.
 #
-noarch=yes
 depends="zlib-devel libxml2>=${version}"
 short_desc="${short_desc} -- development files"
 
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 505360a717a..48c73ea94b6 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -13,14 +13,14 @@ license="MIT"
 distfiles="http://xmlsoft.org/sources/$pkgname-$version.tar.gz"
 checksum=f2e2d0e322685193d1affec83b21dc05d599e17a7306d7b90de95bb5b9ac622a
 
-if [ "$XBPS_CROSS_BUILD" ]; then
-	hostmakedepends="automake gettext-devel"
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends="automake gettext-devel python-devel"
 	pre_configure() {
 		sed -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g" -i configure.in
 		autoreconf -fi
 	}
 	pre_build() {
-		sed -e "s|/usr/\(include/python2.7\)|$XBPS_CROSS_BUILD/\1|g" \
+		sed -e "s|/usr/\(include/python2.7\)|$XBPS_CROSS_BASE/\1|g" \
 			-e "s|/usr/\(lib/python2.7/site-packages\)|$XBPS_CROSS_BASE/\1|g" \
 			-i python/Makefile
 	}
diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template
index 59a31fd1957..a399dca7552 100644
--- a/srcpkgs/lvm2/template
+++ b/srcpkgs/lvm2/template
@@ -26,7 +26,7 @@ make_dirs="
  /etc/lvm/archive 0755 root root
  /etc/lvm/backup 0755 root root"
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	configure_args="${configure_args} ac_cv_func_malloc_0_nonnull=yes
 			ac_cv_func_realloc_0_nonnull=yes"
 fi
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 0cfcfaee242..92c857de8eb 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -10,7 +10,7 @@ configure_args="--disable-rpath --with-system-et
  --with-system-ss --with-system-db --enable-shared"
 depends="mit-krb5-client-${version}_${revision}"
 hostmakedepends="perl flex"
-makedepends="libfl-devel db-devel e2fsprogs-devel openssl-devel"
+makedepends="db-devel e2fsprogs-devel openssl-devel"
 subpackages="${pkgname}-devel ${pkgname}-libs ${pkgname}-client"
 conflicts="heimdal>=0"
 short_desc="MIT Kerberos 5 implementation"
@@ -20,8 +20,9 @@ homepage="http://web.mit.edu/Kerberos"
 distfiles="$homepage/dist/krb5/1.11/krb5-$version-signed.tar"
 checksum=fe37fb93b398db98a1b23f814673ea2ae4b90138f85e1a4027ef639456a78651
 
-if [ "$XBPS_CROSS_BUILD" ]; then
-	hostmakedepends="${hostmakedepends} e2fsprogs-devel"
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" e2fsprogs-devel"
+	makedepends+=" libfl-devel"
 	configure_args="${configure_args}
 			ac_cv_func_pthread_once=yes
 			ac_cv_func_pthread_rwlock_init=yes
diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index 83973b6ffa7..3c49b31d1e8 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -15,7 +15,7 @@ long_desc="
  (journaling flash file system) filesystems."
 
 do_build() {
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		make CROSS=${XBPS_CROSS_TRIPLET}- ${makejobs}
 	else
 		make ${makejobs}
@@ -23,7 +23,7 @@ do_build() {
 }
 
 do_install() {
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		make CROSS=${XBPS_CROSS_TRIPLET}- DESTDIR=${DESTDIR} install
 	else
 		make DESTDIR=${DESTDIR} install
diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template
index 70edc663c33..16287f3935f 100644
--- a/srcpkgs/ncurses/template
+++ b/srcpkgs/ncurses/template
@@ -17,7 +17,7 @@ long_desc="
  ecompiler infocmp, clear, tput, tset, and a termcap conversion tool captoinfo.
  Full manual pages are provided for the library and tools."
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	subpackages="ncurses-devel ncurses-libs"
 else
 	subpackages="ncurses-base ncurses-devel ncurses-libs ncurses-term"
@@ -54,7 +54,7 @@ do_build() {
 
 do_install() {
 	cd ${wrksrc}/ncursesw-build
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		sed -e "s#install : install.data install.libs#install: install.libs#g" -i misc/Makefile
 	fi
 	make DESTDIR=${DESTDIR} install
diff --git a/srcpkgs/omxplayer/template b/srcpkgs/omxplayer/template
index 8927e86a4d1..f949c46dcc1 100644
--- a/srcpkgs/omxplayer/template
+++ b/srcpkgs/omxplayer/template
@@ -27,7 +27,7 @@ do_build() {
 	_ffmpeg_inc="/usr/include/ffmpeg-0.10x-compat"
 	_ffmpeg_lib="/usr/lib/ffmpeg-0.10x-compat"
 	
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		# Create this in masterdir to make gcc to keep rpath.
 		mkdir -p /opt/vc/lib ${_ffmpeg_lib}
 
diff --git a/srcpkgs/pam/pam-userdb.template b/srcpkgs/pam/pam-userdb.template
index 5b3c8996653..b02a787df8e 100644
--- a/srcpkgs/pam/pam-userdb.template
+++ b/srcpkgs/pam/pam-userdb.template
@@ -4,5 +4,5 @@ short_desc="PAM module to authenticate against a db database"
 
 do_install() {
 	vmove usr/lib/security/pam_userdb.so usr/lib/security
-	vmove usr/share/man/man8/pam_userdb.8 usr/share/man/man8
+	vmove usr/share/man/man8/pam_userdb.8.gz usr/share/man/man8
 }
diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template
index 978c5a32d4a..5a8516a76e7 100644
--- a/srcpkgs/pam/template
+++ b/srcpkgs/pam/template
@@ -9,7 +9,7 @@ configure_args="--libdir=/usr/lib --sbindir=/usr/sbin
 depends="cracklib"
 subpackages="pam-devel pam-userdb pam-libs"
 hostmakedepends="flex"
-makedepends="libfl-devel cracklib-devel db-devel"
+makedepends="cracklib-devel db-devel"
 short_desc="A flexible mechanism for authenticating users"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org/pub/linux/libs/pam/"
@@ -27,8 +27,9 @@ conf_files="
 /etc/security/pam_env.conf
 /etc/security/time.conf"
 
-if [ "$XBPS_CROSS_BUILD" ]; then
-	hostmakedepends="flex automake gettext-devel pkg-config libtool"
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" automake gettext-devel pkg-config libtool"
+	makedepends+=" libfl-devel"
 	pre_configure() {
 		autoreconf -fi
 	}
diff --git a/srcpkgs/pcre/pcre-devel.template b/srcpkgs/pcre/pcre-devel.template
index 3b6fbb32f54..c91011f7df5 100644
--- a/srcpkgs/pcre/pcre-devel.template
+++ b/srcpkgs/pcre/pcre-devel.template
@@ -8,7 +8,7 @@ do_install() {
 	vmove usr/bin/pcre-config usr/bin
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/man/man1/pcre-config.1 usr/share/man/man1
+	vmove usr/share/man/man1/pcre-config.1.gz usr/share/man/man1
 	vmove usr/share/man/man3 usr/share/man
 	vmove usr/share/doc usr/share
 }
diff --git a/srcpkgs/pcre/template b/srcpkgs/pcre/template
index 2b12419b0bc..1b0d569db8b 100644
--- a/srcpkgs/pcre/template
+++ b/srcpkgs/pcre/template
@@ -16,7 +16,7 @@ license="BSD"
 distfiles="${SOURCEFORGE_SITE}/pcre/pcre-$version.tar.bz2"
 checksum=a913fb9bd058ef380a2d91847c3c23fcf98e92dc3b47cd08a53c021c5cde0f55
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="automake"
 	pre_configure() {
 		autoreconf -fi
diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index 7a59d2d331d..e27da169481 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -3,7 +3,7 @@ pkgname=perl
 version=5.16.3
 revision=2
 hostmakedepends="which less"
-makedepends="gdbm-devel db-devel"
+makedepends="zlib-devel bzip2-devel gdbm-devel db-devel"
 short_desc="Practical Extraction and Report Language"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.perl.org"
@@ -155,9 +155,8 @@ for _f in ${_provides}; do
 done
 unset _f _p _provides
 
-if [ "$XBPS_CROSS_BUILD" ]; then
-	hostmakedepends="${hostmakedepends} perl>=${version}"
-	makedepends="zlib-devel bzip2-devel ${makedepends}"
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" perl>=${version}"
 fi
 
 do_configure() {
@@ -175,7 +174,7 @@ do_configure() {
 		-Dman1dir=/usr/share/man/man1
 		-Dman3dir=/usr/share/man/man3"
 
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		# Copy target files
 		if [ ! -d $FILESDIR/$XBPS_CROSS_TRIPLET ]; then
 			msg_error "$pkgver: cannot be cross built for $XBPS_CROSS_TRIPLET, contact $maintainer.\n"
@@ -198,7 +197,7 @@ do_configure() {
 }
 
 do_build() {
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		export HOST_PERL=/usr/bin/perl
 		export PERL_TO_USE=$HOST_PERL
 		export HOST_PERL_LIBS=/usr/lib/perl5/core_perl
@@ -219,7 +218,7 @@ do_build() {
 }
 
 do_install() {
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		export HOST_PERL=/usr/bin/perl
 		export PERL_TO_USE=$HOST_PERL
 		export HOST_PERL_LIBS=/usr/lib/perl5/core_perl
diff --git a/srcpkgs/pkg-config/template b/srcpkgs/pkg-config/template
index c189c574281..da1838a98f3 100644
--- a/srcpkgs/pkg-config/template
+++ b/srcpkgs/pkg-config/template
@@ -11,7 +11,7 @@ license="GPL-2"
 distfiles="http://pkgconfig.freedesktop.org/releases/$pkgname-$version.tar.gz"
 checksum=6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845
 
-if [ -n "$XBPS_CROSS_BUILD" ]; then
+if [ -n "$CROSS_BUILD" ]; then
 	configure_args="${configure_args} glib_cv_long_long_format=I64
 		glib_cv_stack_grows=no glib_cv_rtldglobal_broken=no
 		glib_cv_uscore=no blib_cv_use_pid_surrogate=yes
diff --git a/srcpkgs/ppl/template b/srcpkgs/ppl/template
index 14cd97d7fd5..d29cdda146f 100644
--- a/srcpkgs/ppl/template
+++ b/srcpkgs/ppl/template
@@ -15,7 +15,7 @@ checksum=fd346687482ad51c1e98eb260bd61dd5a35a0cff5f580404380c88b0089a71b4
 
 disable_debug=yes
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="libtool automake"
 	pre_configure() {
 		autoreconf -fi
diff --git a/srcpkgs/psmisc/template b/srcpkgs/psmisc/template
index dd12ae69570..81953f0a8fd 100644
--- a/srcpkgs/psmisc/template
+++ b/srcpkgs/psmisc/template
@@ -11,7 +11,7 @@ license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=e112ccadd4694c98f5ea4a02cd6944fdc5a2a1985f20e2b3f74f4dbca83a2a31
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	configure_args="ac_cv_func_malloc_0_nonnull=yes
 			ac_cv_func_realloc_0_nonnull=yes
 			ac_cv_func_memcmp_working=yes"
diff --git a/srcpkgs/pycrypto/template b/srcpkgs/pycrypto/template
index 6bf2d972d36..7c51b5fb103 100644
--- a/srcpkgs/pycrypto/template
+++ b/srcpkgs/pycrypto/template
@@ -16,7 +16,7 @@ long_desc="
  base for writing Python programs that require cryptographic functions."
 
 pre_build() {
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		sed -e "s|'/usr/include/'|''|g" -i setup.py
 		_args="ac_cv_func_malloc_0_nonnull=yes"
 	fi
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 167823697d0..54be0b40dc8 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -22,7 +22,7 @@ _confargs="--with-threads --enable-ipv6 --with-signal-module --enable-shared
  --with-system-ffi --enable-unicode=ucs4 --with-system-expat
  --with-wctype-functions ac_cv_posix_semaphores_enabled=yes"
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	# cross build; have to build it in 2 stages: native and host.
 	do_configure() {
 		# Native build
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 8d11cee36fb..0d6c146abef 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -22,7 +22,7 @@ pre_configure() {
 	rm -r Modules/_ctypes/{darwin,libffi}*
 }
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	msg_error "$pkgname cannot be cross build.\n"
 fi
 
diff --git a/srcpkgs/sed/template b/srcpkgs/sed/template
index a85b4608f65..4d750774838 100644
--- a/srcpkgs/sed/template
+++ b/srcpkgs/sed/template
@@ -13,7 +13,7 @@ homepage="http://www.gnu.org/software/sed"
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 checksum=fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	configure_args="${configure_args} ac_cv_func_aclsort=yes"
 	LDFLAGS="-L${XBPS_CROSS_BASE}/lib -lacl"
 fi
diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index b508dbd2c13..f57b2ca9f33 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -36,7 +36,7 @@ conf_files="
 CFLAGS="-fPIE"
 LDFLAGS="-pie"
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="automake gettext-devel"
 	pre_configure() {
 		autoreconf -fi
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 762516fa9ed..90ddfdaeb60 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -19,7 +19,7 @@ do_configure() {
 		-DSQLITE_ENABLE_COLUMN_METADATA=1 \
 		-DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
 
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		_tcldir="--with-tcl=$XBPS_CROSS_BASE/lib"
 	fi
 
@@ -41,7 +41,7 @@ do_build() {
 	make ${makejobs}
 
 	cd ${wrksrc}/sqlite-autoconf-${_amalgamationver}/tea
-	[ -n "$XBPS_CROSS_BUILD" ] && sed -i "s|-L/usr/lib||g" Makefile
+	[ -n "$CROSS_BUILD" ] && sed -i "s|-L/usr/lib||g" Makefile
 	make ${makejobs}
 }
 
diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template
index e61d0b593ab..e41b10fa29d 100644
--- a/srcpkgs/systemd/template
+++ b/srcpkgs/systemd/template
@@ -41,7 +41,7 @@ conf_files="
  /etc/systemd/bootchart.conf
  /etc/udev/udev.conf"
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	# XXX add support to gudev, introspection and python.
 	unset subpackages
 	hostmakedepends="libtool automake gettext-devel pkg-config intltool
@@ -49,7 +49,7 @@ if [ "$XBPS_CROSS_BUILD" ]; then
 	makedepends="acl-devel pam-devel dbus-devel libcap-devel
 			libkmod-devel liblzma-devel cryptsetup-devel
 			libblkid-devel libgcrypt-devel libglib-devel"
-	configure_args="${configure_args} --without-python --disable-gudev
+	configure_args+=" --without-python --disable-gudev
 			--enable-introspection=no
 			ac_cv_func_malloc_0_nonnull=yes
 			ac_cv_func_realloc_0_nonnull=yes"
diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index 084800f7474..1c174911b02 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -12,6 +12,6 @@ homepage="http://www.tcpdump.org"
 distfiles="http://www.tcpdump.org/release/${pkgname}-${version}.tar.gz"
 checksum=efd08b610210d39977ec3175fa82dad9fbd33587930081be2a905a712dba4286
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	configure_args="${configure_args} ac_cv_linux_vers=$(uname -r 2>&1 | sed -n -e '$s/.* //' -e '$s/\..*//p') td_cv_buggygetaddrinfo=no"
 fi
diff --git a/srcpkgs/tiff/template b/srcpkgs/tiff/template
index 5a9c4cf3c2e..606ca1da4c8 100644
--- a/srcpkgs/tiff/template
+++ b/srcpkgs/tiff/template
@@ -13,7 +13,7 @@ homepage="http://www.remotesensing.org/libtiff/"
 distfiles="ftp://ftp.remotesensing.org/pub/libtiff/$pkgname-$version.tar.gz"
 checksum=ea1aebe282319537fb2d4d7805f478dd4e0e05c33d0928baba76a7c963684872
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="automake"
 	pre_configure() {
 		autoreconf -fi
diff --git a/srcpkgs/util-linux/libblkid-devel.template b/srcpkgs/util-linux/libblkid-devel.template
index 1d600dfb3f4..42530185215 100644
--- a/srcpkgs/util-linux/libblkid-devel.template
+++ b/srcpkgs/util-linux/libblkid-devel.template
@@ -7,5 +7,5 @@ short_desc="libblkid development files"
 do_install() {
 	vmove usr/include/blkid usr/include
 	vmove usr/lib/pkgconfig/blkid.pc usr/lib/pkgconfig
-	vmove usr/share/man/man3/libblkid.3 usr/share/man/man3
+	vmove usr/share/man/man3/libblkid.3.gz usr/share/man/man3
 }
diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 2c721f4af38..8998884dba6 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -16,7 +16,7 @@ license="GPL-2"
 nofetch=yes
 noextract=yes
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	# XXX x11 and gvim subpkgs.
 	subpackages="vim-common"
 	makedepends="ncurses-devel acl-devel"
@@ -28,7 +28,7 @@ do_fetch() {
 }
 
 pre_configure() {
-	if [ -z "$XBPS_CROSS_BUILD" ]; then
+	if [ -z "$CROSS_BUILD" ]; then
 		mkdir -p /tmp/vim-x11
 		cp -a $wrksrc/* /tmp/vim-x11
 		mv /tmp/vim-x11 $wrksrc/
@@ -46,7 +46,7 @@ do_configure() {
 		--with-tlib=ncursesw --with-ex-name=vim-ex
 		--with-view-name=vim-view"
 
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		crossargs="vim_cv_toupper_broken=no vim_cv_terminfo=yes
 			vim_cv_tty_group=world vim_cv_getcwd_broken=no
 			vim_cv_stat_ignores_slash=yes
@@ -59,7 +59,7 @@ do_configure() {
 	./configure ${CONFIGURE_SHARED_ARGS} ${sharedargs} \
 		--enable-gui=no --with-x=no
 
-	[ "$XBPS_CROSS_BUILD" ] && return 0
+	[ "$CROSS_BUILD" ] && return 0
 
 	# X11 version.
 	cd $wrksrc/vim-x11
@@ -74,7 +74,7 @@ do_configure() {
 
 do_build() {
 	cd $wrksrc && make ${makejobs}
-	[ "$XBPS_CROSS_BUILD" ] && return 0
+	[ "$CROSS_BUILD" ] && return 0
 
 	for f in vim-x11 gvim; do
 		cd $wrksrc/$f && make ${makejobs}
diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template
index 4c49e87565e..14d975932a7 100644
--- a/srcpkgs/wayland/template
+++ b/srcpkgs/wayland/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--disable-documentation --disable-static"
 hostmakedepends="pkg-config flex"
-makedepends="libfl-devel libffi-devel expat-devel"
+makedepends="libffi-devel expat-devel"
 subpackages="${pkgname}-devel"
 short_desc="Wayland protocol compositor"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index cd69cbd0d38..582500757cc 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -16,7 +16,7 @@ depends="ca-certificates"
 hostmakedepends="perl"
 makedepends="openssl-devel libidn-devel"
 
-if [ "$XBPS_CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	configure_args="${configure_args} --with-libssl-prefix=$XBPS_CROSS_BASE"
 fi
 
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index bd9fa031074..0578c31bd8b 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -18,7 +18,7 @@ do_build() {
 	sed -i 's|/usr/local|$(PREFIX)|g' Makefile
 	cp -f ${FILESDIR}/config .config
 
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		make CC="$XBPS_CROSS_TRIPLET-gcc" LD="$XBPS_CROSS_TRIPLET-ld" \
 			AR="$XBPS_CROSS_TRIPLET-ar" RANLIB="$XBPS_CROSS_TRIPLET-ranlib" \
 			PREFIX=/usr ${makejobs}
diff --git a/srcpkgs/x264/template b/srcpkgs/x264/template
index d2a673e5a73..38b8025137c 100644
--- a/srcpkgs/x264/template
+++ b/srcpkgs/x264/template
@@ -20,7 +20,7 @@ do_configure() {
 	if [ "$XBPS_TARGET_MACHINE" != "i686" -o "$XBPS_TARGET_MACHINE" != "x86_64" ]; then
 		_disable_asm="--disable-asm"
 	fi
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		_cross="--host=$XBPS_CROSS_TRIPLET"
 	fi
 	./configure --disable-swscale --enable-static --enable-pic \
diff --git a/srcpkgs/xbps-src-utils/template b/srcpkgs/xbps-src-utils/template
index a40abf9d9ca..159db2d7c42 100644
--- a/srcpkgs/xbps-src-utils/template
+++ b/srcpkgs/xbps-src-utils/template
@@ -27,7 +27,7 @@ do_fetch() {
 }
 
 do_configure() {
-	if [ "$XBPS_CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		_pcenv="env PKG_CONFIG_LIBDIR=/usr/$XBPS_CROSS_TRIPLET/lib/pkgconfig"
 	fi
 	${_pcenv} ./configure --prefix=/usr --etcdir=/etc
diff --git a/srcpkgs/xmlcatmgr/template b/srcpkgs/xmlcatmgr/template
index 8c619213348..62fe6a9399c 100644
--- a/srcpkgs/xmlcatmgr/template
+++ b/srcpkgs/xmlcatmgr/template
@@ -26,12 +26,12 @@ conf_files="
  /usr/share/sgml/catalog
  /usr/share/xml/catalog"
 
-if [ -n "$XBPS_CROSS_BUILD" ]; then
+if [ -n "$CROSS_BUILD" ]; then
 	makedepends="xmlcatmgr"
 fi
 
 pre_install() {
-	if [ -n "$XBPS_CROSS_BUILD" ]; then
+	if [ -n "$CROSS_BUILD" ]; then
 		_xmlcatmgr="xmlcatmgr"
 	else
 		_xmlcatmgr="./xmlcatmgr"