diff --git a/srcpkgs/autoconf213/template b/srcpkgs/autoconf213/template
index f9edf777c5d..2040c910e7d 100644
--- a/srcpkgs/autoconf213/template
+++ b/srcpkgs/autoconf213/template
@@ -20,7 +20,7 @@ long_desc="
  macro calls."
 
 do_configure() {
-	./configure ${CONFIGURE_SHARED_ARGS} --program-suffix='-2.13'
+	./configure ${configure_args} --program-suffix='-2.13'
 }
 
 do_build() {
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 4c857c6bec9..e5ce62ef640 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -33,20 +33,17 @@ pre_configure() {
 }
 
 do_configure() {
-	local args
-
 	if [ "$CROSS_BUILD" ]; then
-		args="--with-openssl=$XBPS_CROSS_BASE
+		configure_args+=" --with-openssl=$XBPS_CROSS_BASE
 			--with-gssapi=$XBPS_CROSS_BASE
-			--with-libxml2=$XBPS_CROSS_BASE
-			BUILD_CC=cc BUILD_CFLAGS=-Os"
+			--with-libxml2=$XBPS_CROSS_BASE"
 	fi
 
-	./configure ${CONFIGURE_SHARED_ARGS} --disable-static \
+	./configure ${configure_args} --disable-static \
 		--enable-threads --enable-largefile \
 		--with-libtool --enable-atomic --sysconfdir=/etc/named \
 		--enable-epoll --with-gost=no --enable-ipv6 \
-		--with-randomdev=/dev/urandom ${args}
+		--with-randomdev=/dev/urandom
 }
 
 do_build() {
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 3fadae6086a..4aaa76ecb3d 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -20,7 +20,7 @@ do_configure() {
 		CONFIGFLAG="--enable-64-bit-bfd --enable-multilib"
 	fi
 	if [ "$CROSS_BUILD" ]; then
-		# Do not use CONFIGURE_SHARED_ARGS nor build_style=gnu-configure,
+		# Do not use configure_args nor build_style=gnu-configure,
 		# avoiding --with-sysroot to $XBPS_CROSS_BASE.
 		CONFIGFLAG="--host=$XBPS_CROSS_TRIPLET --with-build-sysroot=$XBPS_CROSS_BASE"
 	fi
@@ -31,6 +31,7 @@ do_configure() {
 
 do_build() {
 	make ${makejobs}
+
 	# Rebuild libiberty.a with -fPIC
 	cp -a libiberty libiberty-pic
 	make -C libiberty-pic clean
diff --git a/srcpkgs/cdparanoia/template b/srcpkgs/cdparanoia/template
index cd9208d66a6..3f9e4dd414a 100644
--- a/srcpkgs/cdparanoia/template
+++ b/srcpkgs/cdparanoia/template
@@ -1,9 +1,10 @@
 # Template file for 'cdparanoia'.
 pkgname=cdparanoia
 version=10.2
-revision=4
+revision=5
 wrksrc="${pkgname}-III-${version}"
-makedepends="libtool automake"
+hostmakedepends="libtool automake"
+build_style=gnu-configure
 short_desc="CDDA reading utility with extra data verification features"
 homepage="https://www.xiph.org/paranoia/"
 license="GPL-2"
@@ -25,21 +26,13 @@ pre_configure() {
 	autoreconf -i
 }
 
-do_configure() {
-	./configure ${CONFIGURE_SHARED_ARGS}
-}
-
-do_build() {
-	make
-}
-
 do_install() {
 	make prefix=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man install
 }
 
 cdparanoia-devel_package() {
 	depends="cdparanoia>=${version}"
-	short_desc+=" -- development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
diff --git a/srcpkgs/chroot-binutils/template b/srcpkgs/chroot-binutils/template
index b7972168118..bc35ae49468 100644
--- a/srcpkgs/chroot-binutils/template
+++ b/srcpkgs/chroot-binutils/template
@@ -21,7 +21,7 @@ do_configure() {
 		CONFIGFLAG="--enable-64-bit-bfd --enable-multilib"
 	fi
 	if [ "$CROSS_BUILD" ]; then
-		# Do not use CONFIGURE_SHARED_ARGS nor build_style=gnu-configure,
+		# Do not use configure_args nor build_style=gnu-configure,
 		# avoiding --with-sysroot to $XBPS_CROSS_BASE.
 		CONFIGFLAG="--host=$XBPS_CROSS_TRIPLET --with-build-sysroot=$XBPS_CROSS_BASE"
 	fi
diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template
index 6847015841c..e4ce8dac1f4 100644
--- a/srcpkgs/chroot-distcc/template
+++ b/srcpkgs/chroot-distcc/template
@@ -15,14 +15,14 @@ bootstrap=yes
 do_configure() {
 	sed -i -e 's|^\(all: $(bin_PROGRAMS)\) pump include-server|\1|g' Makefile.in
 
-	./configure ${CONFIGURE_SHARED_ARGS} --with-included-popt \
+	./configure ${configure_args} --with-included-popt \
 		--without-avahi --without-gnome \
 		--without-gtk --disable-Werror \
 		ac_cv_path_PYTHON=/bin/false
 }
 
 do_build() {
-	make ${makejobs}
+	make ${make_build_args}
 }
 
 do_install() {
diff --git a/srcpkgs/chroot-glibc/template b/srcpkgs/chroot-glibc/template
index 2c21b38735e..d174e7128a4 100644
--- a/srcpkgs/chroot-glibc/template
+++ b/srcpkgs/chroot-glibc/template
@@ -35,12 +35,12 @@ do_configure() {
 		_floatabi="--with-float=hard"
 	fi
 	if [ "$CROSS_BUILD" ]; then
-		_headers="--with-headers=/usr/$XBPS_CROSS_TRIPLET/include"
+		_headers="--with-headers=$XBPS_CROSS_BASE/usr/include"
 	else
 		_headers="--with-headers=/usr/include"
 	fi
 
-	SHELL=/bin/bash ../configure ${CONFIGURE_SHARED_ARGS} \
+	SHELL=/bin/bash ../configure ${configure_args}
 		--enable-add-ons=ports,nptl,libidn \
 		--enable-multi-arch --enable-obsolete-rpc \
 		--enable-bind-now --enable-kernel=2.6.27 \
@@ -51,7 +51,8 @@ do_configure() {
 }
 
 do_build() {
-	cd build && make ${makejobs}
+	cd build
+	make ${makejobs}
 }
 
 do_install() {
@@ -59,7 +60,7 @@ do_install() {
 	mkdir -p ${DESTDIR}/etc
 	echo "include /etc/ld.so.conf.d/*.conf" > ${DESTDIR}/etc/ld.so.conf
 
-	cd ${wrksrc}/build
+	cd build
 	make SHELL=/bin/bash install_root=${DESTDIR} install
 
 	# ldd is a bash script, so make it run as such.
diff --git a/srcpkgs/chroot-texinfo/template b/srcpkgs/chroot-texinfo/template
index 7437b48606f..9c856749a9a 100644
--- a/srcpkgs/chroot-texinfo/template
+++ b/srcpkgs/chroot-texinfo/template
@@ -15,18 +15,20 @@ bootstrap=yes
 if [ "$IN_CHROOT" ]; then
 	makedepends="ncurses-devel"
 fi
+if [ "CROSS_BUILD" ]; then
+	hostmakedepends="ncurses-devel"
+fi
 
 do_configure() {
-	./configure ${CONFIGURE_SHARED_ARGS} --disable-nls
+	./configure ${configure_args} --disable-nls
 }
 
 do_build() {
 	if [ -d tools ]; then
-		make ${makejobs} -C tools/gnulib/lib && \
-			make ${makejobs} -C tools && make ${makejobs}
-	else
-		make ${makejobs}
+		make ${makejobs} -C tools/gnulib/lib
+		make ${makejobs} -C tools
 	fi
+	make ${makejobs}
 }
 
 do_install() {
diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template
index 413e579acac..732ea5e4ba4 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -13,18 +13,18 @@ checksum=adaa44bdab3fa5eb352e80d8a31fdbf957b78653d0c2cd30d63e161444288e18
 
 do_configure() {
 	if [ "$CROSS_BUILD" ]; then
-		_confargs="fu_cv_sys_stat_statfs2_bsize=yes \
+		configure_args+=" fu_cv_sys_stat_statfs2_bsize=yes
 			gl_cv_func_working_mkstemp=yes
-			gl_cv_func_working_acl_get_file=yes"
+			gl_cv_func_working_acl_get_file=yes "
 	fi
 	#
 	# Do not install kill: provided by util-linux.
 	# Do not install uptime: provided by procps-ng.
 	#
-	./configure ${CONFIGURE_SHARED_ARGS} \
+	./configure ${configure_args} \
 		--enable-install-program=hostname \
 		--enable-no-install-program=kill,uptime \
-		--disable-rpath ${_confargs}
+		--disable-rpath
 }
 
 do_build() {
@@ -32,12 +32,12 @@ do_build() {
 		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$||'`;\
-			gcc -std=gnu99  -I. -I./lib  -Ilib -I./lib -Isrc -I./src  \
+			cc -std=gnu99  -I. -I./lib  -Ilib -I./lib -Isrc -I./src  \
 			-fdiagnostics-show-option -funit-at-a-time -g -O2 -MT \
 			src/make-prime-list.o -MD -MP -MF $depbase.Tpo -c -o src/make-prime-list.o \
 			src/make-prime-list.c &&
 		mv -f $depbase.Tpo $depbase.Po
-		gcc -std=gnu99 -fdiagnostics-show-option -funit-at-a-time -g -O2 \
+		cc -std=gnu99 -fdiagnostics-show-option -funit-at-a-time -g -O2 \
 			-Wl,--as-needed  -o src/make-prime-list src/make-prime-list.o
 		cp Makefile Makefile.bak
 		sed -e '/hostname.1/d' Makefile.bak > Makefile
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index db7b8ef40cc..8cda6af5a4b 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -21,7 +21,7 @@ pre_configure() {
 }
 
 do_configure() {
-	./configure ${CONFIGURE_SHARED_ARGS} --libdir=/usr/lib \
+	./configure ${configure_args} --libdir=/usr/lib \
 		--enable-acl --enable-dbus --enable-raw-printing \
 		--enable-threads --with-logdir=/var/log/cups \
 		--with-docdir=/usr/share/cups/doc \
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 212d0e88d72..9db270f072e 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -28,7 +28,7 @@ makedepends="openssl-devel db-devel>=5.3 libldap-devel mit-krb5-devel pam-devel
  postgresql-libs-devel libmysqlclient-devel>=5.5.27 sqlite-devel"
 
 do_configure() {
-	./configure ${CONFIGURE_SHARED_ARGS} --disable-static --enable-shared \
+	./configure ${configure_args} --disable-static --enable-shared \
 		--enable-alwaystrue --enable-checkapop --enable-cram \
 		--enable-digest --disable-otp --disable-srp \
 		--disable-srp-setpass --disable-krb4 --enable-gssapi \
diff --git a/srcpkgs/db/template b/srcpkgs/db/template
index 92b1be52ffe..f29e961a186 100644
--- a/srcpkgs/db/template
+++ b/srcpkgs/db/template
@@ -12,7 +12,7 @@ checksum=ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8
 
 do_configure() {
 	cd build_unix
-	../dist/configure ${CONFIGURE_SHARED_ARGS} --enable-compat185 \
+	../dist/configure ${configure_args} --enable-compat185 \
 		--enable-cxx --enable-static --enable-dbm
 }
 
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index f545722603d..aa12c15f9a0 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -53,6 +53,8 @@ pre_configure() {
 	[ ! -d systemd-bootstrap ] && mkdir systemd-bootstrap
 	cd systemd-bootstrap
 
+	unset PKG_CONFIG_SYSROOT_DIR PKG_CONFIG_PATH
+
 	env PKG_CONFIG_LIBDIR=${wrksrc}/tmpbuild/usr/lib/pkgconfig \
 		../systemd-${_systemd_version}/configure ${_confargs} \
 		--prefix=/usr --disable-nls \
@@ -87,11 +89,9 @@ do_configure() {
 
 	if [ "$CROSS_BUILD" ]; then
 		autoreconf -fi
-		_confargs="--host=$XBPS_CROSS_TRIPLET
-			--with-libtool-sysroot=$XBPS_CROSS_BASE
-			PKG_CONFIG_LIBDIR=${_systemddir}/lib/pkgconfig"
+		export PKG_CONFIG_LIBDIR="${_systemddir}/lib/pkgconfig"
 	fi
-	./configure ${CONFIGURE_SHARED_ARGS} \
+	./configure ${configure_args} \
 		--disable-selinux --enable-userdb-cache --with-xml=expat \
 		--disable-dnotify --enable-inotify --with-dbus-user=dbus \
 		--disable-doxygen-docs --disable-xml-docs --disable-static \
@@ -100,7 +100,7 @@ do_configure() {
 		--with-system-pid-file=/run/dbus/pid \
 		--with-console-auth-dir=/run/console/ \
 		--with-systemdsystemunitdir=/usr/lib/systemd/system \
-		--enable-abstract-sockets --enable-systemd ${_confargs} \
+		--enable-abstract-sockets --enable-systemd \
 		ac_cv_have_abstract_sockets=yes
 }
 
diff --git a/srcpkgs/fftw/template b/srcpkgs/fftw/template
index 4a4a395294c..cd0f1174bf1 100644
--- a/srcpkgs/fftw/template
+++ b/srcpkgs/fftw/template
@@ -1,7 +1,7 @@
 # Template file for 'fftw'
 pkgname=fftw
 version=3.3.3
-revision=2
+revision=3
 short_desc="Library for computing the discrete Fourier transform (DFT)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -32,36 +32,36 @@ do_configure() {
 
 	# double precision
 	mkdir build-double
-	cd ${wrksrc}/build-double && \
-		../configure ${CONFIGURE_SHARED_ARGS} ${CARGS} ${_sse2}
+	cd ${wrksrc}/build-double
+	../configure ${configure_args} ${CARGS} ${_sse2}
 
 	# long double precission
 	mkdir ${wrksrc}/build-long-double
-	cd ${wrksrc}/build-long-double && \
-		../configure ${CONFIGURE_SHARED_ARGS} \
-		${CARGS} --enable-long-double
+	cd ${wrksrc}/build-long-double
+	../configure ${configure_args} ${CARGS} --enable-long-double
 
 	# single precission
 	mkdir ${wrksrc}/build-single
-	cd ${wrksrc}/build-single && \
-		../configure ${CONFIGURE_SHARED_ARGS} ${CARGS} \
-		--enable-float ${_sse}
+	cd ${wrksrc}/build-single
+	../configure ${configure_args} ${CARGS} --enable-float ${_sse}
 }
 
 do_build() {
 	for f in double long-double single; do
-		cd ${wrksrc}/build-${f} && make ${makejobs}
+		cd ${wrksrc}/build-${f}
+		make ${makejobs}
 	done
 }
 
 do_install() {
 	for f in double long-double single; do
-		cd ${wrksrc}/build-${f} && make DESTDIR=${DESTDIR} install
+		cd ${wrksrc}/build-${f}
+		make DESTDIR=${DESTDIR} install
 	done
 }
 
 libfftw_package() {
-	short_desc="${short_desc} - Runtime library"
+	short_desc+=" - Runtime library"
 	pkg_install() {
 		vmove "usr/lib/*.so*"
 	}
@@ -69,7 +69,7 @@ libfftw_package() {
 
 fftw-devel_package() {
 	depends="libfftw>=${version}"
-	short_desc="${short_desc} - Development files"
+	short_desc+=" - Development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
diff --git a/srcpkgs/foobillard++/template b/srcpkgs/foobillard++/template
index 72de2f94d14..66e39cf6eaa 100644
--- a/srcpkgs/foobillard++/template
+++ b/srcpkgs/foobillard++/template
@@ -20,7 +20,7 @@ do_configure() {
 	sed -i 's|"/data"|"/share/foobillardplus"|' src/language.c
 	sed -i 's|/opt/foobillardplus/bin/||' foobillardplus.desktop
 	sed -i 's|/opt/foobillardplus/||' foobillardplus.desktop
-	./configure ${CONFIGURE_SHARED_ARGS}
+	./configure ${configure_args}
 }
 
 do_build() {
diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 44df9554de5..d603c6edfe5 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -21,7 +21,7 @@ pre_configure() {
 
 do_configure() {
 	# configure ghostscript
-	./configure ${CONFIGURE_SHARED_ARGS} --enable-dynamic --with-ijs \
+	./configure ${configure_args} --enable-dynamic --with-ijs \
 		--with-jbig2dec --with-omni --with-x --with-drivers=ALL \
 		--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
 		--with-install-cups --enable-fontconfig --enable-freetype \
@@ -32,7 +32,7 @@ do_configure() {
 	sed -i -e "s|AM_PROG_CC_STDC|AC_PROG_CC|g" ijs/configure.ac
 	cd ijs
 	./autogen.sh
-	./configure ${CONFIGURE_SHARED_ARGS} --enable-shared --disable-static
+	./configure ${configure_args} --enable-shared --disable-static
 }
 
 do_build() {
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 218665aa2bb..7882def0890 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -17,7 +17,8 @@ force_debug_pkgs=yes
 do_configure() {
 	local _headers _floatabi
 
-	mkdir build && cd build
+	mkdir build
+	cd build
 
 	echo "slibdir=/usr/lib" > configparms
 	echo "bindir=/usr/bin" >> configparms
@@ -38,7 +39,7 @@ do_configure() {
 		_headers="--with-headers=/usr/include"
 	fi
 
-	../configure ${CONFIGURE_SHARED_ARGS} \
+	../configure ${configure_args} \
 		--bindir=/usr/bin --sbindir=/usr/sbin \
 		--enable-add-ons=ports,nptl,libidn --enable-obsolete-rpc \
 		--enable-multi-arch --enable-bind-now \
@@ -49,7 +50,8 @@ do_configure() {
 }
 
 do_build() {
-	cd build && make ${makejobs}
+	cd build
+	make ${makejobs}
 }
 
 do_install() {
@@ -57,7 +59,7 @@ do_install() {
 	mkdir -p ${DESTDIR}/etc
 	echo "include /etc/ld.so.conf.d/*.conf" > ${DESTDIR}/etc/ld.so.conf
 
-	cd ${wrksrc}/build
+	cd build
 	make install_root=${DESTDIR} install
 
 	# create /etc/default/libc-locales
diff --git a/srcpkgs/groff/template b/srcpkgs/groff/template
index 58c5e03fa77..c556f64b55a 100644
--- a/srcpkgs/groff/template
+++ b/srcpkgs/groff/template
@@ -26,7 +26,7 @@ do_configure() {
 			doc/Makefile.in \
 			doc/Makefile.sub
 	fi
-	./configure ${CONFIGURE_SHARED_ARGS} --without-x --disable-rpath
+	./configure ${configure_args} --without-x --disable-rpath
 }
 
 do_build() {
diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index aa02bfb568b..32163b9998c 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,7 +1,7 @@
 # Template file for 'grub'
 pkgname=grub
 version="2.00"
-revision=9
+revision=10
 short_desc="GRand Unified Bootloader 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -13,35 +13,41 @@ makedepends="flex libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel"
 
 do_configure() {
-	local sharedargs="--enable-device-mapper --enable-cache-stats --enable-nls \
-		--enable-grub-mkfont --enable-grub-mount --disable-werror"
+	configure_args+=" --enable-device-mapper --enable-cache-stats --enable-nls
+		--enable-grub-mkfont --enable-grub-mount --disable-werror "
 
 	# fix unifont.bdf location so grub-mkfont can create *.pf2 files
 	sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/misc|' configure
 
 	# build BIOS version
-	mkdir $wrksrc/bios_build && cd $wrksrc/bios_build
-	../configure ${CONFIGURE_SHARED_ARGS} --with-platform=pc $sharedargs
+	mkdir $wrksrc/bios_build
+	cd $wrksrc/bios_build
+	../configure ${configure_args} --with-platform=pc
 
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		mkdir $wrksrc/efi_build && cd $wrksrc/efi_build
-		../configure ${CONFIGURE_SHARED_ARGS} --with-platform=efi \
-			--target="x86_64" --disable-efiemu $sharedargs
+		mkdir $wrksrc/efi_build
+		cd $wrksrc/efi_build
+		../configure ${configure_args} --with-platform=efi \
+			--target="x86_64" --disable-efiemu
 	fi
 }
 
 do_build() {
 	msg_normal "Building BIOS grub...\n"
-	cd $wrksrc/bios_build && make ${makejobs}
+	cd $wrksrc/bios_build
+	make ${makejobs}
+
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		msg_normal "Building EFI grub...\n"
-		cd $wrksrc/efi_build && make ${makejobs}
+		cd $wrksrc/efi_build
+		make ${makejobs}
 	fi
 }
 
 do_install() {
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		cd $wrksrc/efi_build && make DESTDIR=$DESTDIR/efi install
+		cd $wrksrc/efi_build
+		make DESTDIR=$DESTDIR/efi install
 		# Remove non-platform specific files
 		rm -rf ${DESTDIR}/efi/{boot,etc,usr/{share,bin,sbin}}
 		rm -f ${DESTDIR}/efi/usr/lib/grub/x86_64-efi/x86_64-*
@@ -49,7 +55,8 @@ do_install() {
 		mv ${DESTDIR}/efi/* ${DESTDIR}
 		rmdir ${DESTDIR}/efi
 	fi
-	cd $wrksrc/bios_build && make DESTDIR=$DESTDIR install
+	cd $wrksrc/bios_build
+	make DESTDIR=$DESTDIR install
 
 	# Required to compress info files.
 	vmkdir usr/share/info
@@ -73,7 +80,7 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 grub-x86_64-efi_package() {
 	noarch=yes
 	depends="grub>=$version dosfstools efibootmgr"
-	short_desc="${short_desc} -- x86_64 EFI support"
+	short_desc+=" - x86_64 EFI support"
 	pkg_install() {
 		vmove usr/lib/grub/x86_64-efi
 	}
@@ -85,7 +92,6 @@ grub_package() {
 	conf_files="/etc/default/grub /etc/grub.d/40_custom"
 	depends="os-prober"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template
index 0ef3b7b3998..2ed2525092b 100644
--- a/srcpkgs/gstreamer-vaapi/template
+++ b/srcpkgs/gstreamer-vaapi/template
@@ -20,10 +20,10 @@ do_configure() {
 	mkdir build-0.10 build-1.0
 
 	cd ${wrksrc}/build-0.10
-	../configure ${CONFIGURE_SHARED_ARGS} --disable-static --with-gstreamer-api=0.10
+	../configure ${configure_args} --disable-static --with-gstreamer-api=0.10
 
 	cd ${wrksrc}/build-1.0
-	../configure ${CONFIGURE_SHARED_ARGS} --disable-static --with-gstreamer-api=1.0
+	../configure ${configure_args} --disable-static --with-gstreamer-api=1.0
 }
 
 do_build() {
diff --git a/srcpkgs/gtk-vnc/template b/srcpkgs/gtk-vnc/template
index 622fcbb0265..74f8b18fd3a 100644
--- a/srcpkgs/gtk-vnc/template
+++ b/srcpkgs/gtk-vnc/template
@@ -19,26 +19,30 @@ post_extract() {
 
 do_configure() {
 	cd ${wrksrc}/gtk2-build
-	./configure ${CONFIGURE_SHARED_ARGS} --with-python \
-		--disable-static --with-gtk=2.0
+	./configure ${configure_args} --with-python --disable-static --with-gtk=2.0
 
 	cd ${wrksrc}/gtk3-build
-	./configure ${CONFIGURE_SHARED_ARGS} --with-python \
-		--disable-static --with-gtk=3.0
+	./configure ${configure_args} --with-python --disable-static --with-gtk=3.0
 }
 
 do_build() {
-	cd ${wrksrc}/gtk2-build && make ${makejobs}
-	cd ${wrksrc}/gtk3-build && make ${makejobs}
+	cd ${wrksrc}/gtk2-build
+	make ${makejobs}
+
+	cd ${wrksrc}/gtk3-build
+	make ${makejobs}
 }
 
 do_install() {
-	cd ${wrksrc}/gtk2-build && make DESTDIR=${DESTDIR} install
-	cd ${wrksrc}/gtk3-build && make DESTDIR=${DESTDIR} install
+	cd ${wrksrc}/gtk2-build
+	make DESTDIR=${DESTDIR} install
+
+	cd ${wrksrc}/gtk3-build
+	make DESTDIR=${DESTDIR} install
 }
 
 gtk2-vnc_package() {
-	short_desc="${short_desc} - GTK+2 port"
+	short_desc+=" - GTK+2 port"
 	pkg_install() {
 		vmove "usr/lib/libgtk-vnc-1.0.so*"
 		vmove usr/lib/girepository-1.0/GtkVnc-1.0.typelib
@@ -47,7 +51,7 @@ gtk2-vnc_package() {
 
 gtk2-vnc-devel_package() {
 	depends="gtk+-devel gtk-vnc-devel>=${version}"
-	short_desc="${short_desc} - GTK+2 development files"
+	short_desc+=" - GTK+2 development files"
 	pkg_install() {
 		vmove usr/include/gtk-vnc-1.0
 		#vmove usr/share/vala/vapi/gtk-vnc-1.0.vapi
@@ -57,7 +61,7 @@ gtk2-vnc-devel_package() {
 }
 
 gtk2-vnc-python_package() {
-	short_desc="${short_desc} - python bindings"
+	short_desc+=" - python bindings"
 	pkg_install() {
 		vmove usr/lib/python2.7
 	}
@@ -65,7 +69,7 @@ gtk2-vnc-python_package() {
 
 gtk-vnc-devel_package() {
 	depends="glib-devel gtk+3-devel gtk-vnc>=${version}"
-	short_desc="${short_desc} - development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include/gvnc-1.0
 		vmove usr/include/gtk-vnc-2.0
diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index d5ae75af4d0..4adf7d5ed04 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -21,12 +21,11 @@ do_configure() {
 	local i
 	for i in ppd/hpijs/*.ppd.gz ; do
 		rm -f ${i}.temp
-		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-			gzip > ${i}.temp || return 1
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | gzip > ${i}.temp
 		mv ${i}.temp ${i}
 	done
 
-	./configure ${CONFIGURE_SHARED_ARGS} --disable-gui-build \
+	./configure ${configure_args} --disable-gui-build \
 		--disable-foomatic-rip-hplip-install \
 		--enable-foomatic-ppd-install \
 		--enable-hpcups-install \
@@ -55,7 +54,6 @@ hplip_package() {
 	depends="python foomatic-db foomatic-db-engine desktop-file-utils"
 	conf_files="/etc/hp/hplip.conf"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 77faf15af4c..ae09988a306 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -30,7 +30,7 @@ long_desc="
  - Word, line and sentence breaks"
 
 pre_configure() {
-	if [ -n "$CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		# Configure and build for host.
 		mkdir host-build
 		cd host-build
@@ -46,12 +46,10 @@ pre_configure() {
 }
 
 do_configure() {
-	if [ -n "$CROSS_BUILD" ]; then
-		./configure ${CONFIGURE_SHARED_ARGS} \
-			--with-cross-build=${wrksrc}/host-icu
-	else
-		./configure ${CONFIGURE_SHARED_ARGS}
-	fi
+	if [ "$CROSS_BUILD" ]; then
+		_cross_args="--with-cross-build=${wrksrc}/host-icu"
+	fi	
+	./configure ${configure_args} ${_cross_args}
 }
 
 do_build() {
@@ -66,7 +64,7 @@ do_install() {
 
 icu-devel_package() {
 	depends="libstdc++-devel icu>=$version"
-	short_desc="${short_desc} - development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/icu
@@ -78,7 +76,7 @@ icu-devel_package() {
 }
 
 icu-libs_package() {
-	short_desc="${short_desc} -- shared libs"
+	short_desc+=" - shared libs"
 	pkg_install() {
 		vmove "usr/lib/*.so*"
 	}
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 532d522af13..9cc65acd19d 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -17,11 +17,8 @@ do_configure() {
 
 do_build() {
 	if [ "$CROSS_BUILD" ]; then
-		make CC="$XBPS_CROSS_TRIPLET-gcc" \
-			RANLIB="$XBPS_CROSS_TRIPLET-ranlib" \
-			AR="$XBPS_CROSS_TRIPLET-ar" \
-			LD="$XBPS_CROSS_TRIPLET-ld" \
-			DBM_INCLUDE="$XBPS_CROSS_BASE/include" \
+		make CC="$CC" RANLIB="$RANLIB" AR="$AR" LD="$LD" \
+			DBM_INCLUDE="$XBPS_CROSS_BASE/usr/include" \
 			${makejobs}
 	else
 		make ${makejobs}
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index 05fbbc59b1d..35408cbecfe 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -13,14 +13,9 @@ distfiles="http://www.skbuff.net/iputils/${pkgname}-s${version}.tar.bz2"
 checksum=450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f
 
 do_build() {
-	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
-	else
-		make USE_GNUTLS=no CCOPTOPT="${CFLAGS}" ${makejobs} \
-			arping clockdiff ping ping6 rdisc tracepath tracepath6
-	fi
+	make CC="$CC" LD="$LD" \
+		USE_GNUTLS=no CCOPTOPT="$CFLAGS" ${makejobs} \
+		arping clockdiff ping ping6 rdisc tracepath tracepath6
 }
 
 do_install() {
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 5634f8a1a5b..281a45ea0ee 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -17,11 +17,7 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make CC="$XBPS_CROSS_TRIPLET-gcc" BUILD_CC=gcc
-	else
-		make
-	fi
+	make CC="$CC" BUILD_CC=cc
 }
 
 do_install() {
@@ -34,7 +30,7 @@ do_install() {
 
 libcap-devel_package() {
 	depends="libcap>=${version}"
-	short_desc="${short_desc} -- development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/libcap.a
@@ -44,7 +40,7 @@ libcap-devel_package() {
 
 libcap-pam_package() {
 	conf_files="/etc/security/capability.conf"
-	short_desc="${short_desc} -- PAM module"
+	short_desc+=" - PAM module"
 	pkg_install() {
 		vmove usr/lib/security
 		vmove etc
@@ -52,7 +48,7 @@ libcap-pam_package() {
 }
 
 libcap-progs_package() {
-	short_desc="${short_desc} -- utilities"
+	short_desc+=" - utilities"
 	pkg_install() {
 		vmove usr/sbin
 		vmove usr/share
diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template
index 727b78847c7..05dfd00b515 100644
--- a/srcpkgs/libcec/template
+++ b/srcpkgs/libcec/template
@@ -10,7 +10,7 @@ license="GPL-2"
 distfiles="https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"
 checksum=f61378798d900d496ed3a5ff7747b0bb35bdfec9b5c4168dcea38396e3569bf1
 
-hostmakedepends="automake pkg-config"
+hostmakedepends="automake pkg-config libtool"
 makedepends="libudev-devel lockdev-devel"
 
 if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
@@ -22,23 +22,21 @@ pre_configure() {
 }
 
 do_configure() {
-	local _rpiargs
-
 	if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
-		_rpiargs="--enable-rpi"
+		configure_args+=" --enable-rpi "
 		if [ "$XBPS_CROSS_BASE" ]; then
-			_rpiargs+=" --with-rpi-include-path=${XBPS_CROSS_BASE}/opt/vc/include"
-			_rpiargs+=" --with-rpi-lib-path=${XBPS_CROSS_BASE}/opt/vc/lib"
+			configure_args+=" --with-rpi-include-path=${XBPS_CROSS_BASE}/opt/vc/include "
+			configure_args+=" --with-rpi-lib-path=${XBPS_CROSS_BASE}/opt/vc/lib "
 		else
-			_rpiargs+=" --with-rpi-include-path=/opt/vc/include"
-			_rpiargs+=" --with-rpi-lib-path=/opt/vc/lib"
+			configure_args+=" --with-rpi-include-path=/opt/vc/include "
+			configure_args+=" --with-rpi-lib-path=/opt/vc/lib "
 		fi
 	fi
-	./configure ${CONFIGURE_SHARED_ARGS} ${_rpiargs} LDFLAGS=
+	./configure ${configure_args} LDFLAGS=
 }
 
 do_build() {
-	make ${makejobs}
+	make ${make_build_args}
 }
 
 do_install() {
diff --git a/srcpkgs/libmms/template b/srcpkgs/libmms/template
index 86239a9c6e4..5d282592f47 100644
--- a/srcpkgs/libmms/template
+++ b/srcpkgs/libmms/template
@@ -15,7 +15,8 @@ long_desc="
  and mmsh protocols."
 
 do_configure() {
-	./configure ${CONFIGURE_SHARED_ARGS} CFLAGS="-fPIC -DPIC"
+	export CFLAGS="$CFLAGS -fPIC -DPIC"
+	./configure ${configure_args}
 }
 
 do_build() {
@@ -28,7 +29,7 @@ do_install() {
 
 libmms-devel_package() {
 	depends="libglib-devel libmms>=${version}"
-	short_desc="${short_desc} - development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
diff --git a/srcpkgs/lockdev/template b/srcpkgs/lockdev/template
index ee36bc09836..bcb9e4d8c8c 100644
--- a/srcpkgs/lockdev/template
+++ b/srcpkgs/lockdev/template
@@ -1,7 +1,7 @@
 # Template file for 'lockdev'
 pkgname=lockdev
 version=1.0.3
-revision=1
+revision=2
 short_desc="Run-time shared library for locking devices"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://packages.qa.debian.org/l/lockdev.html"
@@ -13,8 +13,8 @@ long_desc="
  _both_ FSSTND and SVr4 methods."
 
 do_build() {
-	make CC="$CC" shared CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC"
-	make CC="$CC" static CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC"
+	make ${make_build_args} shared CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC"
+	make ${make_build_args} static CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC"
 }
 
 do_install() {
@@ -27,7 +27,7 @@ do_install() {
 
 lockdev-devel_package() {
 	depends="lockdev>=$version"
-	short_desc="${short_desc} -- development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index c3e8d1dbf86..80354e4f294 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -25,7 +25,7 @@ pre_configure() {
 }
 
 do_configure() {
-	./configure ${CONFIGURE_SHARED_ARGS} --disable-static
+	./configure ${configure_args} --disable-static
 }
 
 do_build() {
diff --git a/srcpkgs/nasm/template b/srcpkgs/nasm/template
index 4ed8d846943..9be7482a51c 100644
--- a/srcpkgs/nasm/template
+++ b/srcpkgs/nasm/template
@@ -11,7 +11,7 @@ distfiles="http://www.nasm.us/pub/nasm/releasebuilds/${version}/nasm-${version}.
 checksum=c056e2abc83816892e448f9e9e95a3d21e9e096f44341b9d4853f62a443bba82
 
 do_configure() {
-	./configure ${CONFIGURE_SHARED_ARGS}
+	./configure ${configure_args}
 }
 
 do_build() {
diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template
index 3933f5f8c4f..16a02792284 100644
--- a/srcpkgs/ncurses/template
+++ b/srcpkgs/ncurses/template
@@ -30,16 +30,15 @@ do_configure() {
 	cp -f ${XBPS_CROSSPFDIR}/config.sub ${wrksrc}
 
 	# widec build
-	CFLAGS="$CFLAGS -fPIC" \
-		../configure ${CONFIGURE_SHARED_ARGS} \
+	export CFLAGS="$CFLAGS -fPIC"
+	../configure ${configure_args} \
 		--enable-widec --with-shared --without-debug \
 		--with-manpage-symlinks --without-ada --enable-ext-colors \
 		--without-tests
 
 	cd ${wrksrc}/ncurses-build
 	# non-widec build
-	CFLAGS="$CFLAGS -fPIC" \
-		../configure ${CONFIGURE_SHARED_ARGS} --with-shared \
+	../configure ${configure_args} --with-shared \
 		--without-debug --without-ada --without-tests
 }
 
diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index 8359617fe8f..e33d41bdf86 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -17,7 +17,7 @@ long_desc="
  SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6."
 
 do_configure() {
-	./configure ${CONFIGURE_SHARED_ARGS} --enable-ucd-snmp-compatibility \
+	./configure ${configure_args} --enable-ucd-snmp-compatibility \
 		--enable-ipv6 --with-python-modules --with-default-snmp-version="3" \
 		--with-sys-contact="root@localhost" --with-sys-location="Unknown" \
 		--with-logfile=/var/log/snmpd.log \
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index e4cb5e1f713..df04da18960 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -16,20 +16,18 @@ makedepends="libblkid-devel libmount-devel libtirpc-devel
  libblkid-devel sqlite-devel rpcbind"
 
 do_configure() {
-	local _args
-
-	_args="--with-statduser=nobody --enable-gss --enable-nfsv4
+	configure_args+=" --with-statduser=nobody --enable-gss --enable-nfsv4
 		--with-statedir=/var/lib/nfs --enable-libmount-mount
 		--with-gssglue --without-tcp-wrappers --enable-ipv6
-		--sbindir=/usr/sbin"
+		--sbindir=/usr/sbin "
 
 	if [ "$CROSS_BUILD" ]; then
-		./configure ${CONFIGURE_SHARED_ARGS} ${_args} \
+		./configure ${configure_args} \
 			--with-tirpcinclude=$XBPS_CROSS_BASE/usr/include/tirpc \
 			--with-krb5=$XBPS_CROSS_BASE \
 			CC_FOR_BUILD="$CC" CFLAGS_FOR_BUILD="$CFLAGS"
 	else
-		./configure ${CONFIGURE_SHARED_ARGS} ${_args}
+		./configure ${configure_args}
 	fi
 }
 
diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index ffdb611d6ea..1cb81e8d78d 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -13,13 +13,17 @@ checksum=aea6dd337da8781847c75b3b5b876e4de9c58520e0d77310679a979fc6402fa7
 long_desc="
  tcpdump is a powerful command-line packet analyzer."
 
-do_configure() {
+pre_configure() {
 	autoreconf -fi
-	export EXTRA_INCLUDES="$(pcre-config --cflags)"
-	export EXTRA_LIBS="$(pcre-config --libs)"
+}
 
-	./configure ${CONFIGURE_SHARED_ARGS} --with-pcap-includes=/usr/include/pcap \
-		--enable-ipv6 --enable-pcre
+do_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		configure_args+=" --with-pcap-includes=$XBPS_CROSS_BASE/usr/include/pcap "
+	else
+		configure_args+=" --with-pcap-includes=/usr/include/pcap "
+	fi
+	./configure ${configure_args} --enable-ipv6 --enable-pcre EXTRA_LIBS="-lpcre"
 }
 
 do_build() {
diff --git a/srcpkgs/perl-Crypt-Blowfish/template b/srcpkgs/perl-Crypt-Blowfish/template
index 94a9eee2778..7e3f3297f36 100644
--- a/srcpkgs/perl-Crypt-Blowfish/template
+++ b/srcpkgs/perl-Crypt-Blowfish/template
@@ -16,7 +16,7 @@ long_desc="
  to take full advantage of Crypt::CBC when desired.  Blowfish keys may be
  up to 448 bits (56 bytes) long."
 
-makedepends="perl"
+hostmakedepends="perl"
 
 perl-Crypt-Blowfish_package() {
 	depends="perl"
diff --git a/srcpkgs/procps-ng/template b/srcpkgs/procps-ng/template
index 5cb00b9c566..840c9bf3a0a 100644
--- a/srcpkgs/procps-ng/template
+++ b/srcpkgs/procps-ng/template
@@ -22,7 +22,7 @@ do_configure() {
 	echo ${version} > .tarball-version
 	./autogen.sh
 
-	./configure ${CONFIGURE_SHARED_ARGS} --exec-prefix=/ \
+	./configure ${configure_args} --exec-prefix=/ \
 		--prefix=/usr --libdir=/usr/lib --disable-static \
 		ac_cv_func_malloc_0_nonnull=yes \
 		ac_cv_func_realloc_0_nonnull=yes \
diff --git a/srcpkgs/pycrypto/template b/srcpkgs/pycrypto/template
index 3a5a3a3fbd4..e608c5397cd 100644
--- a/srcpkgs/pycrypto/template
+++ b/srcpkgs/pycrypto/template
@@ -14,12 +14,16 @@ long_desc="
  The Python cryptography toolkit is intended to provide a reliable and stable
  base for writing Python programs that require cryptographic functions."
 
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends="python"
+fi
+
 pre_build() {
 	if [ "$CROSS_BUILD" ]; then
 		sed -e "s|'/usr/include/'|''|g" -i setup.py
-		_args="ac_cv_func_malloc_0_nonnull=yes"
+		configure_args+=" ac_cv_func_malloc_0_nonnull=yes "
 	fi
-	./configure ${CONFIGURE_SHARED_ARGS} ${_args}
+	./configure ${configure_args}
 }
 
 pycrypto_package() {
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4b4b7738e2c..0ae679b9ec9 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -18,9 +18,9 @@ makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
 
 # Force posix semaphores by default; sem_open requires /dev/shm and
 # it's not mounted in chroot.
-_confargs="--with-threads --enable-ipv6 --with-signal-module --enable-shared
+configure_args+=" --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"
+ --with-wctype-functions ac_cv_posix_semaphores_enabled=yes "
 
 if [ "$CROSS_BUILD" ]; then
 	# cross build; have to build it in 2 stages: native and host.
@@ -37,8 +37,8 @@ if [ "$CROSS_BUILD" ]; then
 		sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
 		CFLAGS="$CFLAGS -I$XBPS_CROSS_BASE/include" \
 			LDFLAGS="$LDFLAGS -L$XBPS_CROSS_BASE/lib" \
-			./configure ${CONFIGURE_SHARED_ARGS} CC="$CC" LD="$CC" \
-			${_confargs} ac_cv_buggy_getaddrinfo=no
+			./configure ${configure_args} CC="$CC" LD="$CC" \
+			ac_cv_buggy_getaddrinfo=no
 	}
 	do_build() {
 		make HOSTPYTHON=./hostpython HOSTPGEN=./Parser/hostpgen \
@@ -58,7 +58,7 @@ else
 	do_configure() {
 		# Enable built-in SQLite3 module to load extensions (Arch fix FS#22122)
 		sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
-		CC="gcc" LD="gcc" ./configure ${CONFIGURE_SHARED_ARGS} ${_confargs}
+		CC="gcc" LD="gcc" ./configure ${configure_args}
 	}
 	do_build() {
 		make ${makejobs}
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index db1732be7ee..5077026a467 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -30,7 +30,7 @@ do_configure() {
 	# it's not mounted in chroot.
 	unset LD CC AR AS RANLIB
 
-	./configure ${CONFIGURE_SHARED_ARGS} --with-threads --enable-ipv6 \
+	./configure ${configure_args} --with-threads --enable-ipv6 \
 		--with-signal-module --enable-shared --with-system-ffi \
 		--enable-unicode=ucs4 --with-system-expat --with-computed-gotos \
 		--with-system-expat --with-dbmliborder=gdbm:ndbm \
diff --git a/srcpkgs/run-parts/template b/srcpkgs/run-parts/template
index 16999aa7571..d447425349d 100644
--- a/srcpkgs/run-parts/template
+++ b/srcpkgs/run-parts/template
@@ -10,8 +10,11 @@ license="GPL-2"
 distfiles="${DEBIAN_SITE}/main/d/debianutils/debianutils_${version}.tar.gz"
 checksum=0062d774306a6acc34d3b855a5c4eeb845653b0cd34dbb5c13aa00b4ecb8af22
 
+do_configure() {
+	./configure ${configure_args}
+}
+
 do_build() {
-	./configure ${CONFIGURE_SHARED_ARGS}
 	make ${makejobs} run-parts
 }
 
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 7f4f65e2f5b..f60339678b5 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -21,7 +21,7 @@ do_configure() {
 	cd ${wrksrc}/sqlite-autoconf-${_amalgamationver}
 	cp -f ${XBPS_CROSSPFDIR}/config.sub .
 
-	./configure ${CONFIGURE_SHARED_ARGS} --enable-threadsafe \
+	./configure ${configure_args} --enable-threadsafe \
 		--enable-readline --enable-dynamic-extensions
 }
 
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index abd41ba9e41..4b36bc8238a 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -10,13 +10,14 @@ distfiles="http://apache.rediris.es/subversion/subversion-${version}.tar.bz2"
 checksum=f8454c585f99afed764232a5048d9b8bfd0a25a9ab8e339ea69fe1204c453ef4
 
 # XXX enable kwallet when kdelibs is available.
-makedepends="pkg-config db-devel>=5.3 perl>=5.16 python-devel swig apr-util-devel
+hostmakedepends="pkg-config"
+makedepends="db-devel>=5.3 perl>=5.16 python-devel swig apr-util-devel
  libldap-devel gdbm-devel expat-devel apr-devel libuuid-devel
  sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel
  neon-devel apache-devel ca-certificates"
 
 do_configure() {
-	./configure ${CONFIGURE_SHARED_ARGS} \
+	./configure ${configure_args} \
 		--with-apxs --disable-javahl --disable-static \
 		--without-kwallet --with-gnome-keyring --with-editor=vim \
 		--disable-mod-activation
diff --git a/srcpkgs/tcl/template b/srcpkgs/tcl/template
index 48f3d23a7a6..a4bbf022d2c 100644
--- a/srcpkgs/tcl/template
+++ b/srcpkgs/tcl/template
@@ -13,13 +13,13 @@ checksum=354422b9c4791685499123b2dfe01faa98b555c08906c010cb4449ddc75dcade
 
 do_configure() {
 	if [ "${XBPS_MACHINE}" = "x86_64" ]; then
-		local args="--enable-64bits"
+		configure_args+=" --enable-64bits "
 	fi
 
-	./configure ${CONFIGURE_SHARED_ARGS} --enable-threads \
+	./configure ${configure_args} --enable-threads \
 		--without-tzdata --enable-man-symlinks \
 		--disable-static --disable-rpath \
-		tcl_cv_strtod_unbroken=ok $args
+		tcl_cv_strtod_unbroken=ok
 }
 
 do_build() {
diff --git a/srcpkgs/texinfo/template b/srcpkgs/texinfo/template
index cc4b66565a1..46df18a358f 100644
--- a/srcpkgs/texinfo/template
+++ b/srcpkgs/texinfo/template
@@ -11,21 +11,24 @@ homepage="http://www.gnu.org/software/texinfo/"
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 checksum=1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68
 
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends="ncurses-devel"
+fi
+
 do_configure() {
-        ./configure ${CONFIGURE_SHARED_ARGS}
+	./configure ${configure_args}
 }
 
 do_build() {
         if [ -d tools ]; then
-                make ${makejobs} -C tools/gnulib/lib && \
-                        make ${makejobs} -C tools && make ${makejobs}
-        else
-                make ${makejobs}
-        fi
+                make ${makejobs} -C tools/gnulib/lib
+		make ${makejobs} -C tools
+	fi
+	make ${makejobs}
 }
 
 do_install() {
-        make DESTDIR=${DESTDIR} install
+	make DESTDIR=${DESTDIR} install
 
 	rm -f ${DESTDIR}/usr/share/info/dir
 	# Compress manually info files.
diff --git a/srcpkgs/tk/template b/srcpkgs/tk/template
index 7d8d2e7e056..41a8943f38b 100644
--- a/srcpkgs/tk/template
+++ b/srcpkgs/tk/template
@@ -15,16 +15,16 @@ hostmakedepends="pkg-config"
 makedepends="tcl-devel libXext-devel libX11-devel libXScrnSaver-devel libXft-devel"
 
 do_configure() {
-	if [ "${XBPS_MACHINE}" = "x86_64" ]; then
-		local args="--enable-64bits"
+	if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ]; then
+		configure_args+=" --enable-64bits "
 	fi
 	if [ "$CROSS_BUILD" ]; then
-		local args="--with-tcl=$XBPS_CROSS_BASE/usr/lib"
+		configure_args+=" --with-tcl=$XBPS_CROSS_BASE/usr/lib "
 	fi
-	./configure ${CONFIGURE_SHARED_ARGS} --enable-threads \
+	./configure ${configure_args} --enable-threads \
 		--without-tzdata --enable-man-symlinks \
 		--disable-static --disable-rpath \
-		tk_cv_strtod_unbroken=ok $args
+		tk_cv_strtod_unbroken=ok
 }
 
 do_build() {
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 1cc75c52098..f6e70cd5a76 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -20,7 +20,7 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 do_configure() {
-	./configure ${CONFIGURE_SHARED_ARGS} \
+	./configure ${configure_args} \
 		--exec-prefix=/usr --libdir=/usr/lib \
 		--bindir=/usr/bin --sbindir=/usr/sbin \
 		--enable-libuuid --disable-makeinstall-chown \
diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 6dda99f03e1..dab341cd6a2 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -15,10 +15,6 @@ license="GPL-2"
 nofetch=yes
 noextract=yes
 
-if [ "$CROSS_BUILD" ]; then
-	makedepends="ncurses-devel acl-devel"
-fi
-
 do_fetch() {
 	local url="http://code.google.com/p/vim/"
 	hg clone -u v7-3-${_patchver} ${url} ${pkgname}-${version}
@@ -36,45 +32,40 @@ pre_configure() {
 }
 
 do_configure() {
-	local sharedargs="--disable-perlinterp --disable-pythoninterp
+	configure_args+=" --disable-perlinterp --disable-pythoninterp
 		--disable-rubyinterp --disable-cscope --disable-workshop
 		--disable-netbeans --disable-sniff --disable-gpm
 		--disable-hangulinput --disable-xim --enable-multibyte
 		--with-tlib=ncursesw --with-ex-name=vim-ex
-		--with-view-name=vim-view"
+		--with-view-name=vim-view "
 
 	if [ "$CROSS_BUILD" ]; then
-		crossargs="vim_cv_toupper_broken=no vim_cv_terminfo=yes
+		configure_args+=" 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
 			vim_cv_memmove_handles_overlap=yes"
-		sharedargs="${sharedargs} ${crossargs}"
 	fi
 
 	# Normal version.
 	cd $wrksrc
-	./configure ${CONFIGURE_SHARED_ARGS} ${sharedargs} \
-		--enable-gui=no --with-x=no
-
-	[ "$CROSS_BUILD" ] && return 0
+	./configure ${configure_args} --enable-gui=no --with-x=no
 
 	# X11 version.
 	cd $wrksrc/vim-x11
-	./configure ${CONFIGURE_SHARED_ARGS} ${sharedargs} \
-		--enable-gui=no --with-x
+	./configure ${configure_args} --enable-gui=no --with-x
 
 	# GTK+ version.
 	cd $wrksrc/gvim
-	./configure ${CONFIGURE_SHARED_ARGS} ${sharedargs} \
-		--enable-gui=gtk2 --with-x --with-vim-name=gvim
+	./configure ${configure_args} --enable-gui=gtk2 --with-x --with-vim-name=gvim
 }
 
 do_build() {
-	cd $wrksrc && make ${makejobs}
-	[ "$CROSS_BUILD" ] && return 0
+	cd $wrksrc
+	make ${makejobs}
 
 	for f in vim-x11 gvim; do
-		cd $wrksrc/$f && make ${makejobs}
+		cd $wrksrc/$f
+		make ${makejobs}
 	done
 
 }
@@ -82,7 +73,8 @@ do_build() {
 do_install() {
 	make DESTDIR=$DESTDIR install
 	# Create vim-ex symlink.
-	cd ${DESTDIR}/usr/bin && ln -sf vim vim-ex
+	cd ${DESTDIR}/usr/bin
+	ln -sf vim vim-ex
 	rm -f ${DESTDIR}/usr/bin/{ex,view}
 
 	find ${DESTDIR}/usr/share/man -type f -name evim.1 -delete
diff --git a/srcpkgs/wireless_tools/template b/srcpkgs/wireless_tools/template
index 55ed9b4c9a0..0671205771a 100644
--- a/srcpkgs/wireless_tools/template
+++ b/srcpkgs/wireless_tools/template
@@ -12,14 +12,7 @@ checksum=6fb80935fe208538131ce2c4178221bab1078a1656306bce8909c19887e2e5a1
 
 do_build() {
 	sed -e "s|CFLAGS=|CFLAGS+=|g" -i Makefile
-
-	if [ -n "$XBPS_CROSS_TRIPLET" ]; then
-		make CC="$XBPS_CROSS_TRIPLET-gcc" LD="$XBPS_CROSS_TRIPLET-ld" \
-			AR="$XBPS_CROSS_TRIPLET-ar" \
-			RANLIB="$XBPS_CROSS_TRIPLET-ranlib" ${makejobs}
-	else
-		make ${makejobs}
-	fi
+	make CC="$CC" LD="$LD" AR="$AR" RANLIB="$RANLIB" ${makejobs}
 }
 
 do_install() {
@@ -30,7 +23,7 @@ do_install() {
 
 wireless_tools-devel_package() {
 	depends="wireless_tools>=${version}"
-	short_desc="${short_desc} -- development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 	}
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index 0d49d332713..d0ac6532d7e 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -18,12 +18,10 @@ do_build() {
 	cp -f ${FILESDIR}/config .config
 
 	if [ "$CROSS_BUILD" ]; then
-		export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
-		export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
 		export CFLAGS="-I$XBPS_CROSS_BASE/usr/include/libnl3 $CFLAGS"
 	fi
 
-	make CC="$CC" LD="$LD" AR="$AR" RANLIB="$RANLIB" PREFIX=/usr ${makejobs}
+	make ${make_build_args} V=1 PREFIX=/usr
 }
 
 do_install() {
diff --git a/srcpkgs/xbmc/template b/srcpkgs/xbmc/template
index c27a4e65dac..d17f7f04fae 100644
--- a/srcpkgs/xbmc/template
+++ b/srcpkgs/xbmc/template
@@ -30,7 +30,7 @@ do_configure() {
 	# fix lsb_release dependency
 	sed -i -e 's:/usr/bin/lsb_release -d:/bin/true:' xbmc/utils/SystemInfo.cpp
 
-	./configure ${CONFIGURE_SHARED_ARGS} \
+	./configure ${configure_args} \
 		--disable-debug --enable-optimizations --enable-gl \
 		--enable-sdl --enable-vdpau --enable-vaapi --enable-joystick \
 		--enable-xrandr --enable-rsxs --enable-projectm --enable-x11 \
diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template
index df4ad743f5c..a78bda621c1 100644
--- a/srcpkgs/xfsprogs/template
+++ b/srcpkgs/xfsprogs/template
@@ -12,8 +12,8 @@ checksum=adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be
 
 do_configure() {
 	export DEBUG=-DNDEBUG
-	./configure ${CONFIGURE_SHARED_ARGS} \
-		--enable-readline=yes --enable-blkid=yes --enable-lib64=no
+	configure_args+=" --enable-readline=yes --enable-blkid=yes --enable-lib64=no "
+	./configure ${configure_args}
 }
 
 do_build() {