diff --git a/main/a2ps/APKBUILD b/main/a2ps/APKBUILD
index d5bb45a58261cf9ca1f388a2bab71046860ab035..72f35c7a472be4d66994c47869601126cb92523c 100644
--- a/main/a2ps/APKBUILD
+++ b/main/a2ps/APKBUILD
@@ -36,10 +36,14 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc/a2ps \
 		--includedir=/usr/include \
-		--disable-nls || return 1
+		--disable-nls \
+		|| return 1
 	make
 }
 
diff --git a/main/a52dec/APKBUILD b/main/a52dec/APKBUILD
index 69274feca4ffc7143b3973f6482e86c11886e5ff..16b63aaddfd9dcfb519716b93e06eb809d605554 100644
--- a/main/a52dec/APKBUILD
+++ b/main/a52dec/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 build () 
 { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-shared \
 		|| return 1
 	make || return 1
diff --git a/main/abiword/APKBUILD b/main/abiword/APKBUILD
index 5845ae2e2ca8fc0e02495c59099cd176ff2b26f7..e961420b04daba5e4c251e4e14a75f0207e43ff2 100644
--- a/main/abiword/APKBUILD
+++ b/main/abiword/APKBUILD
@@ -46,7 +46,10 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-shared \
 		--disable-static \
 		--enable-plugins \
diff --git a/main/acct/APKBUILD b/main/acct/APKBUILD
index 921cdca41439c88b941364e3619b620ece36e287..d0a7142f9b6628a0d6a5d925db0a0df3b2cd891b 100644
--- a/main/acct/APKBUILD
+++ b/main/acct/APKBUILD
@@ -25,10 +25,14 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
 	# seems like this makefile does not respect DESTDIR
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir="$pkgdir"/usr/share/man \
 		--infodir="$pkgdir"/usr/share/info \
-		--enable-linux-multiformat
+		--enable-linux-multiformat \
+		|| return 1
 
 	make LDADD="-lm lib/libgnu.la"	|| return 1
 }
diff --git a/main/acl/APKBUILD b/main/acl/APKBUILD
index bed3e6301c6d4a4bfd9c691013857bddec46c9cc..de8153af4a02afeef082ae561433125c04266c1a 100644
--- a/main/acl/APKBUILD
+++ b/main/acl/APKBUILD
@@ -29,7 +29,10 @@ build() {
 	unset PLATFORM
 	export OPTIMIZER="${CFLAGS}"
 	export DEBUG=-DNDEBUG
-	CONFIG_SHELL=/bin/sh ./configure --prefix=/usr \
+	CONFIG_SHELL=/bin/sh ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--libdir=/lib \
 		--libexecdir=/usr/lib \
 		--disable-gettext \
diff --git a/main/afpfs-ng/APKBUILD b/main/afpfs-ng/APKBUILD
index d5f94c37169996953cde8b5f64e2937dd15d621b..347b1494077a4af352ce755210c263887ad757ac 100644
--- a/main/afpfs-ng/APKBUILD
+++ b/main/afpfs-ng/APKBUILD
@@ -41,7 +41,10 @@ build() {
 	if [ "$ALPINE_LIBC" != "eglibc" ]; then
 		export LDFLAGS="$LDFLAGS -liconv"
 	fi
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/alpine/APKBUILD b/main/alpine/APKBUILD
index e379a371abd84a595aa5b43be73b2c4ba2d9768a..fe373753747df93c782aeb4776f62b725bee7d31 100644
--- a/main/alpine/APKBUILD
+++ b/main/alpine/APKBUILD
@@ -37,12 +37,16 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--without-passfile \
 		--without-tcl \
 		--disable-shared \
 		--with-system-pinerc=/etc/alpine.d/pine.conf \
-		--with-system-fixed-pinerc=/etc/alpine.d/pine.conf.fixed
+		--with-system-fixed-pinerc=/etc/alpine.d/pine.conf.fixed \
+		|| return 1
 	make
 }
 
diff --git a/main/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD
index 7b967df1ac9f37b72c8c3dedd28d243df1192de0..ab945f67f5d775450bf157049c0638d3d5dc2bfc 100644
--- a/main/alsa-lib/APKBUILD
+++ b/main/alsa-lib/APKBUILD
@@ -11,7 +11,10 @@ subpackages="$pkgname-dev"
 source="http://alsa.cybermirror.org/lib/$pkgname-$pkgver.tar.bz2"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-python \
 		--disable-static \
 		--disable-resmgr \
diff --git a/main/alsa-utils/APKBUILD b/main/alsa-utils/APKBUILD
index e9e60510b63e3feab6175c4c9c8054166e99f95c..ea0db53006795122cff4910e475976b4e01124d2 100644
--- a/main/alsa-utils/APKBUILD
+++ b/main/alsa-utils/APKBUILD
@@ -30,7 +30,10 @@ prepare() {
 
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-xmlto \
 		--disable-nls \
 		|| return 1
diff --git a/main/apache-mod-auth-kerb/APKBUILD b/main/apache-mod-auth-kerb/APKBUILD
index 9e4dfd66aed6dd1527d9350b000f2349404ae9b6..3ccc9f8e9215d15d0d66479a448294b9e7f08649 100644
--- a/main/apache-mod-auth-kerb/APKBUILD
+++ b/main/apache-mod-auth-kerb/APKBUILD
@@ -29,10 +29,14 @@ prepare() {
 
 build() {
 	cd $srcdir/$_pkgname-$pkgver
-		./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-krb5=/usr \
 		--without-krb4 \
-		--with-apache=/usr
+		--with-apache=/usr \
+		|| return 1
 	make -j1 || return 1
 }
 
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index db5d211c85d916a99984040c46f666539f8ca5c0..9b689ac91249c425969a443c652a90e637aca9ec 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -37,7 +37,10 @@ prepare() {
 
 build() {
 	cd "$srcdir"/httpd-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-layout=Alpine \
 		--enable-so \
 		--enable-suexec \
@@ -52,15 +55,19 @@ build() {
 		--with-pcre=/usr \
 		--enable-mods-shared=all \
 		--enable-mpms-shared=all \
-		--enable-ssl --with-ssl \
+		--enable-ssl \
+		--with-ssl \
 		--enable-proxy \
 		--enable-cache \
 		--enable-disk-cache \
 		--enable-mem-cache \
 		--enable-file-cache \
-		--enable-ldap --enable-authnz-ldap \
-		--enable-cgid --enable-cgi \
-		--enable-authn-anon --enable-authn-alias \
+		--enable-ldap \
+		--enable-authnz-ldap \
+		--enable-cgid \
+		--enable-cgi \
+		--enable-authn-anon \
+		--enable-authn-alias \
 		--disable-imagemap \
 		--enable-proxy-connect \
 		--enable-proxy-http \
diff --git a/main/apcupsd/APKBUILD b/main/apcupsd/APKBUILD
index eb04436737123a60c705ec39d08c1c8f39c1f05d..31a6d5a1ba821d63d685a14d7ac6b0a59e47c3c8 100644
--- a/main/apcupsd/APKBUILD
+++ b/main/apcupsd/APKBUILD
@@ -22,10 +22,14 @@ build() {
 	export LANG="C"
 
 	ac_cv_path_SHUTDOWN="/sbin/poweroff" \
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--enable-usb \
-		--enable-snmp
+		--enable-snmp \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD
index 313fe053dc7ed53f98b24ba0d7e184a73f1e77e3..f08d81db30074bdebab7aaf833b57e5ee536fb44 100644
--- a/main/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
@@ -17,7 +17,10 @@ source="http://www.apache.org/dist/apr/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-apr=/usr \
 		--with-ldap \
 		--with-pgsql \
diff --git a/main/apr/APKBUILD b/main/apr/APKBUILD
index 6c0546caf349f316fe834b5759a21705336b0f33..fe1bfb7e5a6cd4fdc4d8a27d1ec19ed0ed5a174b 100644
--- a/main/apr/APKBUILD
+++ b/main/apr/APKBUILD
@@ -21,10 +21,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--datadir=/usr/share \
 		--enable-nonportable-atomics \
-		--with-devrandom=/dev/urandom
+		--with-devrandom=/dev/urandom \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/argp-standalone/APKBUILD b/main/argp-standalone/APKBUILD
index 74765d5dec9601f445abf89d6e319bc37381aba1..485930bb310937ad79d09f2a88945f80f7600443 100644
--- a/main/argp-standalone/APKBUILD
+++ b/main/argp-standalone/APKBUILD
@@ -26,7 +26,11 @@ prepare() {
 }
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 package() {
diff --git a/main/aria2/APKBUILD b/main/aria2/APKBUILD
index 7ff9aeff502df23739ed5ffc0fc695c78056839e..466093ad9bd677f2d8c856e80023833ad65b436f 100644
--- a/main/aria2/APKBUILD
+++ b/main/aria2/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-nls \
 		--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
 		|| return 1
diff --git a/main/arpwatch/APKBUILD b/main/arpwatch/APKBUILD
index 6679be4dab2919d7e715634d2be9cca82e2dc870..94ce2ce64dac06610b597a1fcc855e9cc7016e9a 100644
--- a/main/arpwatch/APKBUILD
+++ b/main/arpwatch/APKBUILD
@@ -53,10 +53,14 @@ prepare() {
 build() {
 	cd $_builddir
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make -j1 || return 1
 }
 
diff --git a/main/asciidoc/APKBUILD b/main/asciidoc/APKBUILD
index 31657e05d6f955d7e2e36f63ddede6704407f2b1..60f233058ef38b4da919849be2193583594ac7fb 100644
--- a/main/asciidoc/APKBUILD
+++ b/main/asciidoc/APKBUILD
@@ -25,7 +25,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/aspell-en/APKBUILD b/main/aspell-en/APKBUILD
index be1621e2b3484133b0d494faccebe8af9fd82941..7f79a21b390701dd06cf625cb7c5249a6f6123b4 100644
--- a/main/aspell-en/APKBUILD
+++ b/main/aspell-en/APKBUILD
@@ -13,7 +13,10 @@ source="ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-$pkgver-0.tar.bz2"
 _builddir="$srcdir"/aspell6-en-$pkgver-0
 build () {
 	cd "$_builddir"
-	./configure || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/aspell/APKBUILD b/main/aspell/APKBUILD
index bbb75cf77f760f26a33c0409b56253c96f016028..7397ce1ace75dcc236335012e7484dfba2b3bc86 100644
--- a/main/aspell/APKBUILD
+++ b/main/aspell/APKBUILD
@@ -16,7 +16,11 @@ source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 
 	# we want add -lm to linker flag for libaspell so wil build that
 	# separately. this is just an ugly workaround
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index b994cdc79fbd1726b852c5590a4adc6cae266a59..69d3cadb22959d0a35a34b8dd77cfb1ee2fae86d 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -67,16 +67,27 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	SHA1SUM="$PWD"/build_tools/sha1sum-sh ./configure --prefix=/usr \
+	SHA1SUM="$PWD"/build_tools/sha1sum-sh ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--libdir=/usr/lib \
 		--localstatedir=/var \
-		--disable-xmldoc --with-gsm=internal \
-		--without-iconv --with-popt --with-z --with-newt \
-		--with-unixodbc --with-postgres --with-tds \
-		--with-dahdi --with-pri --with-tonezone \
+		--disable-xmldoc \
+		--with-gsm=internal \
+		--without-iconv \
+		--with-popt \
+		--with-z \
+		--with-newt \
+		--with-unixodbc \
+		--with-postgres \
+		--with-tds \
+		--with-dahdi \
+		--with-pri \
+		--with-tonezone \
 		--with-resample \
 		--with-sqlite3 \
 		--with-speex \
diff --git a/main/at-spi2-atk/APKBUILD b/main/at-spi2-atk/APKBUILD
index 217c70a6fe4f105e5418eae261a76c5e1493f201..6ff338f1de2cb7d099aab53e2d6661b26e003a5a 100644
--- a/main/at-spi2-atk/APKBUILD
+++ b/main/at-spi2-atk/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/at-spi2-core/APKBUILD b/main/at-spi2-core/APKBUILD
index 1442926c1cb9798cacd2345158b10ae2fc8c4dcd..0e5eb5ad2e0289906dce1de2eb7b3118c08c0a1a 100644
--- a/main/at-spi2-core/APKBUILD
+++ b/main/at-spi2-core/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	DATADIRNAME="share" ./configure --prefix=/usr \
+	DATADIRNAME="share" ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		|| return 1
diff --git a/main/aterm/APKBUILD b/main/aterm/APKBUILD
index e6b10ac440302a3eef137e8ea7f5aded08d475bb..0cab852435c8e29b711f61f2b607e3de6d0cb24a 100644
--- a/main/aterm/APKBUILD
+++ b/main/aterm/APKBUILD
@@ -16,12 +16,16 @@ build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
 	patch -p1 < ../uclibc.patch || return 1
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-transparency=yes \
 		--enable-background-image \
 		--enable-fading \
 		--enable-menubar \
-		--enable-graphics
+		--enable-graphics \
+		|| return 1
 	make || return 1
 	make prefix="$pkgdir"/usr install
 }
diff --git a/main/atk/APKBUILD b/main/atk/APKBUILD
index 510bb9be95e0329f4fa5f3f12da15d5c6abf9b6e..005aa371af061cbda95207ff698a2f428d6b8bf8 100644
--- a/main/atk/APKBUILD
+++ b/main/atk/APKBUILD
@@ -14,7 +14,10 @@ source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$p
 depends_dev="glib-dev"
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-introspection \
 		|| return 1
 	make || return 1
diff --git a/main/atkmm/APKBUILD b/main/atkmm/APKBUILD
index da8a981d2085749147a0a13f75f14fddd5e5e164..d2d64639c040d4733fdf19f9394c88476b2812f8 100644
--- a/main/atkmm/APKBUILD
+++ b/main/atkmm/APKBUILD
@@ -15,7 +15,11 @@ replaces="gtkmm"
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make
 }
 
diff --git a/main/attr/APKBUILD b/main/attr/APKBUILD
index a21e209ffa1d21ab7c67f453d8de77ebe798dc3d..c17cdd4f870659d739dbd75a6ebb4ba4b22bc335 100644
--- a/main/attr/APKBUILD
+++ b/main/attr/APKBUILD
@@ -32,6 +32,8 @@ build() {
 	export DEBUG=-DNDEBUG
 
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/ \
 		--exec-prefix=/ \
 		--sbindir=/bin \
@@ -42,7 +44,8 @@ build() {
 		--includedir=/usr/include \
 		--mandir=/usr/share/man \
 		--datadir=/usr/share \
-		--disable-gettext || return 1
+		--disable-gettext \
+		|| return 1
 	make LIBTOOL="libtool --tag=CC" || return 1
 }
 
diff --git a/main/audacious-plugins/APKBUILD b/main/audacious-plugins/APKBUILD
index 6f7ba5c0eaad632811db38cc7084cd053a171ebf..7ada85671169d8184a56115102da848886e871e2 100644
--- a/main/audacious-plugins/APKBUILD
+++ b/main/audacious-plugins/APKBUILD
@@ -75,7 +75,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/audacity/APKBUILD b/main/audacity/APKBUILD
index e2fbe3b8d51c4c1c414981731c6c9be1cd9cf7a7..8333048c5d1b331639059a07a85f395648f9d435 100644
--- a/main/audacity/APKBUILD
+++ b/main/audacity/APKBUILD
@@ -29,7 +29,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--with-libsndfile=system \
diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD
index 3536fbae888b81bb8cdd859c0fb9eb4018924a70..ff7366c1fceca879aeea47aff3079eee32cabc59 100644
--- a/main/augeas/APKBUILD
+++ b/main/augeas/APKBUILD
@@ -29,10 +29,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 	make tests || return 1
 }
diff --git a/main/aumix/APKBUILD b/main/aumix/APKBUILD
index 6a2f304cfa4be4d1dd575c300b4ba89e8ecabaf6..aef2bae5e9e1588cb6deed2008b858ff9ce1175c 100644
--- a/main/aumix/APKBUILD
+++ b/main/aumix/APKBUILD
@@ -18,11 +18,15 @@ prepare() {
 
 build() {
 	cd "$srcdir"/aumix-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--without-gtk1 \
 		--without-gtk \
-		--disable-nls
+		--disable-nls \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/autoconf/APKBUILD b/main/autoconf/APKBUILD
index e93797575a14e46d1c943d1aeec5e3027decaa75..b29fadad069c50505f1d7130517f2d787787ec94 100644
--- a/main/autoconf/APKBUILD
+++ b/main/autoconf/APKBUILD
@@ -24,7 +24,11 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	M4=/usr/bin/m4 ./configure --prefix=/usr
+	M4=/usr/bin/m4 ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/autoconf2.13/APKBUILD b/main/autoconf2.13/APKBUILD
index 0265210f70b2e22f6fd87d17e92c3ff8c557134f..f21a0dd0c482d1f725d604a552235142962a82b6 100644
--- a/main/autoconf2.13/APKBUILD
+++ b/main/autoconf2.13/APKBUILD
@@ -25,7 +25,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	M4=/usr/bin/m4 ./configure --prefix=/usr --program-suffix=-2.13
+	M4=/usr/bin/m4 ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--program-suffix=-2.13 \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/automake/APKBUILD b/main/automake/APKBUILD
index ce12dadc6d09937f3040837f3a35c669dc646cbd..96f2e24e416e3e7de99190560311e46a7d7d860b 100644
--- a/main/automake/APKBUILD
+++ b/main/automake/APKBUILD
@@ -13,7 +13,11 @@ subpackages="$pkgname-doc"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/avahi/APKBUILD b/main/avahi/APKBUILD
index 05b9a54098144fce5aaae66159774ec7b2e08e5d..bad49f3f6df09fd218f33440fccd306c033df853 100644
--- a/main/avahi/APKBUILD
+++ b/main/avahi/APKBUILD
@@ -33,7 +33,10 @@ build ()
 { 
 	cd "$srcdir/$pkgname-$pkgver"
 	# we dont build autoipd since dhcpcd does same job
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-autoipd \
@@ -47,7 +50,8 @@ build ()
 		--enable-compat-libdns_sd \
 		--enable-compat-howl \
 		--with-distro="gentoo" \
-		--with-systemdsystemunitdir=/lib/systemd/system
+		--with-systemdsystemunitdir=/lib/systemd/system \
+		|| return 1
 	make
 }
 
diff --git a/main/avfs/APKBUILD b/main/avfs/APKBUILD
index 47c5c0218e1cb958d4f0401994d88a9b0b2ccb1e..f4db7bb02f72329a5dac812bfe0bc1ced4a58c7b 100644
--- a/main/avfs/APKBUILD
+++ b/main/avfs/APKBUILD
@@ -22,7 +22,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --enable-fuse --enable-library --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--enable-fuse \
+		--enable-library \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/axel/APKBUILD b/main/axel/APKBUILD
index 1c2051c51f7be83a622edb94f27d7f8063af3607..e7b94c7c4096c5b9d42368502ecf9f0a650b338f 100644
--- a/main/axel/APKBUILD
+++ b/main/axel/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--etcdir=/etc \
 		--mandir=/usr/share/man \
 		--i18n=0 \
diff --git a/main/babl/APKBUILD b/main/babl/APKBUILD
index 2875aaf6784d16d56c7d493a72057196f15a2d43..e3ea93c136dc939100b436a20ce58b1caf6e047b 100644
--- a/main/babl/APKBUILD
+++ b/main/babl/APKBUILD
@@ -13,7 +13,11 @@ source="ftp://ftp.gimp.org/pub/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/bacula-client/APKBUILD b/main/bacula-client/APKBUILD
index 4b8956089d816541ee508d43563e1a07f3702b6d..0b69988b60af79119187136c81d5f0b26f4de937 100644
--- a/main/bacula-client/APKBUILD
+++ b/main/bacula-client/APKBUILD
@@ -44,24 +44,28 @@ prepare () {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-	 --sysconfdir=/etc/bacula \
-	 --localstatedir=/var \
-	 --mandir=/usr/share/man \
-	 --docdir=/usr/share/doc \
-	 --infodir=/usr/share/info \
-	 --with-pid-dir=/var/run \
-	 --with-subsys-dir=/var/lock/subsys \
-	 --with-logdir=/var/log/bacula \
-	 --enable-largefile \
-	 --enable-client-only \
-	 --enable-smartalloc \
-	 --disable-nls \
-	 --with-openssl=/usr/include/openssl \
-	 --with-scriptdir=/etc/bacula/scripts \
-	 --with-working-dir=/var/lib/bacula \
-	 --with-fd-user=root \
-	 --with-fd-group=root
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc/bacula \
+		--localstatedir=/var \
+		--mandir=/usr/share/man \
+		--docdir=/usr/share/doc \
+		--infodir=/usr/share/info \
+		--with-pid-dir=/var/run \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-logdir=/var/log/bacula \
+		--enable-largefile \
+		--enable-client-only \
+		--enable-smartalloc \
+		--disable-nls \
+		--with-openssl=/usr/include/openssl \
+		--with-scriptdir=/etc/bacula/scripts \
+		--with-working-dir=/var/lib/bacula \
+		--with-fd-user=root \
+		--with-fd-group=root \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index faa3e8f3764ebc52dc3e5974e37e101180a8d57a..433e0dd6bf4114877efa7f01ebc8a36f0fe23d45 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -50,31 +50,35 @@ prepare () {
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr \
-	 --sysconfdir=/etc/bacula \
-	 --localstatedir=/var \
-	 --mandir=/usr/share/man \
-	 --docdir=/usr/share/doc \
-	 --infodir=/usr/share/info \
-	 --with-pid-dir=/var/run \
-	 --with-subsys-dir=/var/lock/subsys \
-	 --with-logdir=/var/log/bacula \
-	 --enable-largefile \
-	 --enable-smartalloc \
-	 --disable-nls \
-	 --with-openssl=/usr/include/openssl \
-	 --with-postgresql \
-	 --with-mysql \
-	 --with-sqlite3 \
-	 --with-scriptdir=/etc/bacula/scripts \
-	 --with-working-dir=/var/lib/bacula \
-	 --with-dir-user=bacula \
-	 --with-dir-group=bacula \
-	 --with-archivedir=/var/lib/bacula/archive \
-	 --with-sd-user=bacula \
-	 --with-sd-group=bacula \
-	 --with-fd-user=root \
-	 --with-fd-group=root
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc/bacula \
+		--localstatedir=/var \
+		--mandir=/usr/share/man \
+		--docdir=/usr/share/doc \
+		--infodir=/usr/share/info \
+		--with-pid-dir=/var/run \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-logdir=/var/log/bacula \
+		--enable-largefile \
+		--enable-smartalloc \
+		--disable-nls \
+		--with-openssl=/usr/include/openssl \
+		--with-postgresql \
+		--with-mysql \
+		--with-sqlite3 \
+		--with-scriptdir=/etc/bacula/scripts \
+		--with-working-dir=/var/lib/bacula \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-archivedir=/var/lib/bacula/archive \
+		--with-sd-user=bacula \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=root \
+		|| return 1
 
 	make NO_ECHO= || return 1
 }
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index 525c55941c00b341f6d74d2e329bf567a999dc7f..c0f7b3ff7ddf3a25eadbe053f4a5bbfd047a4fbd 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -47,15 +47,18 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--bindir=/bin \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
 		--with-curses \
 		--disable-nls \
 		--enable-readline \
 		--without-bash-malloc \
 		--with-installed-readline \
-		--bindir=/bin \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
 		|| return 1
 	make y.tab.c && make || return 1
 }
diff --git a/main/bc/APKBUILD b/main/bc/APKBUILD
index 9625523f6d1ab5e9a1b04d59221adf7b95eacb3a..91fe8f95d998bcb427d61e698ca1dc06fb6048bf 100644
--- a/main/bc/APKBUILD
+++ b/main/bc/APKBUILD
@@ -26,10 +26,14 @@ prepare() {
 }
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/bdftopcf/APKBUILD b/main/bdftopcf/APKBUILD
index 64445e269b6ac9dcec94862149a345afe42a03b9..136f201aed05475f42d56ffba7f1f1dff70cfc98 100644
--- a/main/bdftopcf/APKBUILD
+++ b/main/bdftopcf/APKBUILD
@@ -15,9 +15,13 @@ source="http://xorg.freedesktop.org//releases/individual/app/bdftopcf-$pkgver.ta
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
-		--with-mapdir=/usr/share/fonts/util || return 1
+		--with-mapdir=/usr/share/fonts/util \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/beecrypt/APKBUILD b/main/beecrypt/APKBUILD
index 89922c4102e67c08d5c5235811f478e198da0be6..344cc0a4902e09e1aadbb734d4ca1f7c54d86ac6 100644
--- a/main/beecrypt/APKBUILD
+++ b/main/beecrypt/APKBUILD
@@ -26,13 +26,17 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--enable-threads \
 		--enable-shared \
 		--without-java \
 		--without-python \
-		--with-cplusplus=no
+		--with-cplusplus=no \
+		|| return 1
 	make libaltdir=/usr/lib || return 1
 }
 
diff --git a/main/bigreqsproto/APKBUILD b/main/bigreqsproto/APKBUILD
index 64937e21c142470e279e43a50470ddfcff0bbf89..da1424e9e7fe9ba6d5a37d258a745671c62a46e9 100644
--- a/main/bigreqsproto/APKBUILD
+++ b/main/bigreqsproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.t
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index 58add51e8eaccd0810c3a8bd920d46a47ffb8c4c..f4af2b90e8d1d5656c01379ce98dfee6dd4da5b1 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -48,7 +48,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc/bind \
 		--localstatedir=/var \
 		--with-openssl=/usr \
@@ -61,7 +64,8 @@ build() {
 		--with-libtool \
 		--with-randomdev=/dev/random \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index a2aa83b4823550207978479334bf181d7c3301cf..acc1ad434596393e8dfbde8700ea95ddf7d57be9 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -30,18 +30,20 @@ prepare() {
 build() {
 	cd "$_builddir"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--with-build-sysroot="${CBUILDROOT}" \
-		--build=${CBUILD} \
-		--host=${CHOST} \
 		--target=${CTARGET} \
 		--disable-multilib \
 		--enable-shared \
 		--enable-64-bit-bfd \
 		--disable-werror \
-		--disable-nls
+		--disable-nls \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/bison/APKBUILD b/main/bison/APKBUILD
index 6167d8c165c43587a5d634b2fb383e74de8faebe..1aeb4f08761c29696451b3e1c172811a65309497 100644
--- a/main/bison/APKBUILD
+++ b/main/bison/APKBUILD
@@ -18,16 +18,23 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--datadir=/usr/share \
 		--infodir=/usr/share/info \
-		--mandir=/usr/share/man
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
+	rm -rf "$pkgdir"/usr/lib/charset.alias
+	rmdir -p "$pkgdir"/usr/lib 2>/dev/null
+	return 0
 }
 
 md5sums="7be02eb973eccf388f1ae750fc09eed0  bison-2.7.1.tar.xz"
diff --git a/main/bitchx/APKBUILD b/main/bitchx/APKBUILD
index 41ac30f2737923f300700a4672a7b0dbb900b227..8cc9e96d6e6c8ae3509e1c4ee3af06fdde57235f 100644
--- a/main/bitchx/APKBUILD
+++ b/main/bitchx/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/bitlbee/APKBUILD b/main/bitlbee/APKBUILD
index ff4ce3930e4d92ac174c3138b59962d905e85ac8..8feeb01b08bc51d6643acfb01f259745e503c802 100644
--- a/main/bitlbee/APKBUILD
+++ b/main/bitlbee/APKBUILD
@@ -30,10 +30,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --ssl=openssl     \
-		--otr=plugin	  \
-		--prefix=/usr	 \
-		--etcdir=/etc/bitlbee || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--ssl=openssl \
+		--otr=plugin \
+		--prefix=/usr \
+		--etcdir=/etc/bitlbee \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/bluez-firmware/APKBUILD b/main/bluez-firmware/APKBUILD
index 70257c37551df5c6cb50645718438125927891cb..c2430d0b37c97318c2a6c54feb7a901f3cbf729a 100644
--- a/main/bluez-firmware/APKBUILD
+++ b/main/bluez-firmware/APKBUILD
@@ -12,7 +12,11 @@ source="http://bluez.sf.net/download/$pkgname-$pkgver.tar.gz"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --libdir=/lib || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--libdir=/lib \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/bluez-hcidump/APKBUILD b/main/bluez-hcidump/APKBUILD
index dea82e7586eb3e627c0fa43b9d377f03ba888473..316b562f5935fe967e3e9f4895e2c833c260d593 100644
--- a/main/bluez-hcidump/APKBUILD
+++ b/main/bluez-hcidump/APKBUILD
@@ -24,7 +24,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		|| return 1
 	make || return 1
diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD
index fde69fbdf2de25f7bd5e4e2ac92fc4d32b35e44f..e2209ae449dedb5730786970c2f737094d074a96 100644
--- a/main/bluez/APKBUILD
+++ b/main/bluez/APKBUILD
@@ -21,7 +21,10 @@ source="http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--mandir=/usr/share/man \
diff --git a/main/bridge-utils/APKBUILD b/main/bridge-utils/APKBUILD
index de02f9797e488ce504b62d451b181d999059b5d3..df74070e26b22cbcc7b10a92a5ceb47c06fd3ea9 100644
--- a/main/bridge-utils/APKBUILD
+++ b/main/bridge-utils/APKBUILD
@@ -14,7 +14,10 @@ source="http://downloads.sourceforge.net/project/bridge/bridge/bridge-utils-$pkg
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	autoconf
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--libdir=/usr/lib \
 		--includedir=/usr/include \
diff --git a/main/bwm-ng/APKBUILD b/main/bwm-ng/APKBUILD
index e4fcafbec1f6077c3499088d6a896c15dbe8b0fa..dd51782337abde992c3751855ba326acd99279e4 100644
--- a/main/bwm-ng/APKBUILD
+++ b/main/bwm-ng/APKBUILD
@@ -14,11 +14,15 @@ source="http://www.gropp.org/$pkgname/$pkgname-$pkgver.tar.gz"
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		 --with-libstatgrab \
-		 --with-procnetdev \
-		 --with-ncurses \
-		 --with-partitions
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--with-libstatgrab \
+		--with-procnetdev \
+		--with-ncurses \
+		--with-partitions \
+		|| return 1
 
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/main/c-ares/APKBUILD b/main/c-ares/APKBUILD
index 69c2c6056535951bff4e72b9d0286ce2f47d0593..4e9e7b105fe30eb594c7777c02279b2ea4d3851a 100644
--- a/main/c-ares/APKBUILD
+++ b/main/c-ares/APKBUILD
@@ -15,10 +15,14 @@ source="http://c-ares.haxx.se/download/${pkgname}-${pkgver}.tar.gz"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--enable-shared
+		--enable-shared \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/cabextract/APKBUILD b/main/cabextract/APKBUILD
index 13e03878fa23feb37f7438cf87b7422ba7c5bdd8..7933d58d1666c515d8079a57699c86e733868163 100644
--- a/main/cabextract/APKBUILD
+++ b/main/cabextract/APKBUILD
@@ -23,10 +23,14 @@ build ()
 {
 	cd $_builddir
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/cairo/APKBUILD b/main/cairo/APKBUILD
index 2193b2d5f60a5a3f566101efa375a2fccaf05568..107445de026bf4e0f649c9c0f601c6077ca46ea3 100644
--- a/main/cairo/APKBUILD
+++ b/main/cairo/APKBUILD
@@ -16,7 +16,10 @@ source="http://cairographics.org/releases/$pkgname-$pkgver.tar.xz"
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-ft \
@@ -28,7 +31,8 @@ build() {
 		--enable-xcb \
 		--enable-xlib-xrender \
 		--disable-xlib-xcb \
-		--disable-static || return 1
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/cairomm/APKBUILD b/main/cairomm/APKBUILD
index 3fd3bc2831a1b6a347886d25b6b5dbc37c34c74e..89cf14b2f60c0176877388386bb74b8d51c73e77 100644
--- a/main/cairomm/APKBUILD
+++ b/main/cairomm/APKBUILD
@@ -15,7 +15,11 @@ source="http://www.cairographics.org/releases/cairomm-$pkgver.tar.gz"
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/ccache/APKBUILD b/main/ccache/APKBUILD
index a5bac7a8799a1570134b9035b305d9c7d002f42e..2be0e0d464eaee082b6acc986a4dd3971f3e02d5 100644
--- a/main/ccache/APKBUILD
+++ b/main/ccache/APKBUILD
@@ -14,7 +14,11 @@ source="http://samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz"
 build () 
 { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/cciss_vol_status/APKBUILD b/main/cciss_vol_status/APKBUILD
index 4260569b1753597f9d77fdd31fb64f3b28184d53..182ee80cfb65bca4b24659c1350686ee27c7c149 100644
--- a/main/cciss_vol_status/APKBUILD
+++ b/main/cciss_vol_status/APKBUILD
@@ -21,10 +21,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/cdparanoia/APKBUILD b/main/cdparanoia/APKBUILD
index fc065c1772ecc3365f7324be591f4492b6e9fec6..10c37fc73a0c930c092b56bb5ea62d400181db4d 100644
--- a/main/cdparanoia/APKBUILD
+++ b/main/cdparanoia/APKBUILD
@@ -31,7 +31,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/cegui06/APKBUILD b/main/cegui06/APKBUILD
index 34adeb874d17ea4f99b603fe898cd7dc8cfd752c..bf4ffd770b687817b695f49b8522462d92079934 100644
--- a/main/cegui06/APKBUILD
+++ b/main/cegui06/APKBUILD
@@ -31,7 +31,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/celt051/APKBUILD b/main/celt051/APKBUILD
index 86e05c8f0dc4b7239185ce9a98d96da1b5169e89..48a1955a9e2bde8b9710005f84dba3df33292dd2 100644
--- a/main/celt051/APKBUILD
+++ b/main/celt051/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/cgdb/APKBUILD b/main/cgdb/APKBUILD
index 661e7a2fab08d38ae5dad9078c11542f4bef4399..0f24fa91ec87f922f2553adeba4f3f757b51532d 100644
--- a/main/cgdb/APKBUILD
+++ b/main/cgdb/APKBUILD
@@ -19,8 +19,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--libdir=/usr/lib || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--libdir=/usr/lib \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/charybdis/APKBUILD b/main/charybdis/APKBUILD
index 4845ee7ae551649217d136deb6c63e9a425b8ebf..6b519be8a35fb543eaac5805bf4a44f16b548e9e 100644
--- a/main/charybdis/APKBUILD
+++ b/main/charybdis/APKBUILD
@@ -29,15 +29,18 @@ prepare() {
 build() {
 	cd "$_builddir"
 	./configure \
-		--prefix=/usr                     \
-		--sysconfdir=/etc/charybdis       \
-		--localstatedir=/var              \
-		--libexecdir=/usr/lib             \
-		--disable-assert		  \
-		--enable-ssl			  \
-		--enable-ipv6                     \
-		--with-rundir=/var/run		  \
-		--with-program-prefix=charybdis- 
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc/charybdis \
+		--localstatedir=/var \
+		--libexecdir=/usr/lib \
+		--disable-assert \
+		--enable-ssl \
+		--enable-ipv6 \
+		--with-rundir=/var/run \
+		--with-program-prefix=charybdis- \
+		|| return 1
 	 make
 }
 
@@ -55,7 +58,6 @@ package() {
 	sed -i -e "s/\"modules\"/\"\/usr\/lib\/charybdis\/modules\"/g" $pkgdir/etc/$pkgname/example.conf
 	sed -i -e "s/\"modules\/autoload\"/\"\/usr\/lib\/charybdis\/modules\/autoload\"/g" "$pkgdir"/etc/$pkgname/example.conf
 	sed -i -e "s/usr\/local\/ircd\/modules/usr\/lib\/charybdis\/modules/g" "$pkgdir"/etc/$pkgname/reference.conf
-
 }
 
 md5sums="54245396b829f8d19d3958cde9c3bd65  charybdis-3.4.2.tar.bz2
diff --git a/main/check/APKBUILD b/main/check/APKBUILD
index e7b8c84831662769c52906faa82a7253b1356f11..f3c04742e250b76cd32869f229ebcc71308b44de 100644
--- a/main/check/APKBUILD
+++ b/main/check/APKBUILD
@@ -18,6 +18,8 @@ _builddir="$srcdir"/check-$pkgver
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		|| return 1
diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD
index 0dd4520282f06ed2e8f43050ce3f67a5d539cdcc..1e3e27d76ef96f643aefef06823307da0a0701e4 100644
--- a/main/chrony/APKBUILD
+++ b/main/chrony/APKBUILD
@@ -35,10 +35,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
-		--disable-readline
+		--disable-readline \
+		|| return 1
 
 	make all docs || return 1
 }
diff --git a/main/chrpath/APKBUILD b/main/chrpath/APKBUILD
index 29cb87b75b063f82bff9a054d621849e4e97e6d1..0b4dd29d29589073195357fe31e4612d61d19ca9 100644
--- a/main/chrpath/APKBUILD
+++ b/main/chrpath/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/cifs-utils/APKBUILD b/main/cifs-utils/APKBUILD
index 8f2ed90418ab67ed6e829ac6ca474dbe3c8b1d6f..79e98755df2bc55ad0a348de212ea7f7e2985103 100644
--- a/main/cifs-utils/APKBUILD
+++ b/main/cifs-utils/APKBUILD
@@ -26,7 +26,11 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr 
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make AM_CFLAGS="" || return 1
 }
 
diff --git a/main/cksfv/APKBUILD b/main/cksfv/APKBUILD
index cdf651fa9929d1a93d288e84d40e19267f9d3401..b02f8b9e192b5406a0a2496c4bd27f0335b73feb 100644
--- a/main/cksfv/APKBUILD
+++ b/main/cksfv/APKBUILD
@@ -14,7 +14,11 @@ source="http://zakalwe.fi/~shd/foss/cksfv/files/${pkgname}-${pkgver}.tar.bz2"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 	install -cD src/cksfv "$pkgdir"/usr/bin/cksfv
 	install -cD cksfv.1 "$pkgdir"/usr/share/man/man1/cksfv.1 
diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index 10d11ecd66f64c218354b290119c30b6db495fad..cb029bd8495a0268cd3d79ce72c4f1be9c986cff 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -34,7 +34,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--libdir=/usr/lib \
 		--sysconfdir=/etc/clamav \
 		--mandir=/usr/share/man \
@@ -44,7 +47,8 @@ build() {
 		--with-user=clamav \
 		--with-group=clamav \
 		--with-dbdir=/var/lib/clamav \
-		--enable-clamdtop 
+		--enable-clamdtop \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/clamsmtp/APKBUILD b/main/clamsmtp/APKBUILD
index 965129ad55a8dbc78d49458692072cd2dc7d0173..1bb0fe59ce554bdce945cb7835a2b44bbe36988a 100644
--- a/main/clamsmtp/APKBUILD
+++ b/main/clamsmtp/APKBUILD
@@ -19,10 +19,14 @@ source="http://thewalter.net/stef/software/clamsmtp/clamsmtp-$pkgver.tar.gz
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 
diff --git a/main/claws-mail/APKBUILD b/main/claws-mail/APKBUILD
index 41637dd72515a0b2844cae79e8fd4c96f387ba00..6ba16771dbe657ba665f8310741b94574d58acf5 100644
--- a/main/claws-mail/APKBUILD
+++ b/main/claws-mail/APKBUILD
@@ -51,7 +51,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-static \
 		--enable-enchant \
 		--enable-gnutls \
diff --git a/main/cloog/APKBUILD b/main/cloog/APKBUILD
index 22ad47ac312326c05251f88175be1124faa06816..cc9be30a8404337222623b6635abd39b75982d14 100644
--- a/main/cloog/APKBUILD
+++ b/main/cloog/APKBUILD
@@ -27,13 +27,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--build=${CBUILD} \
-		--host=${CHOST} \
 		--with-sysroot=${CBUILDROOT} \
 		--with-isl=system \
 		|| return 1
diff --git a/main/cmph/APKBUILD b/main/cmph/APKBUILD
index 93a788798931fbdac1ad2b9ca5aab1612cf2d106..d94d85bba52eec2306fb836552d6d40d7817de58 100644
--- a/main/cmph/APKBUILD
+++ b/main/cmph/APKBUILD
@@ -20,10 +20,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/collectd/APKBUILD b/main/collectd/APKBUILD
index e6340fb1f7c9b5507c1d5e8a24424e5984d59b49..8f1204c82eb60dcbd791f35274f5d47bc12493fa 100644
--- a/main/collectd/APKBUILD
+++ b/main/collectd/APKBUILD
@@ -38,7 +38,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc/collectd \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/compositeproto/APKBUILD b/main/compositeproto/APKBUILD
index 51a6cafced10014cf9c07a35f117131e67d9e0f2..5231d31ee1387e3a03aec7d7385c67bd04b2bcab 100644
--- a/main/compositeproto/APKBUILD
+++ b/main/compositeproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.t
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/confuse/APKBUILD b/main/confuse/APKBUILD
index c815c7aba3562c1bee607cc0667f6a5b1ad2a674..f25ae900c6aafa3e6a1f24330537c8ed037356b4 100644
--- a/main/confuse/APKBUILD
+++ b/main/confuse/APKBUILD
@@ -16,9 +16,13 @@ build() {
 	# drop -Werror
 	sed -i -e 's/-Werror//' */Makefile.* || die
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-shared \
-		--disable-nls
+		--disable-nls \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/conky/APKBUILD b/main/conky/APKBUILD
index 9861c583b277a3a4489ac808f2b9e1b66bfef21d..f719fd9a706cd289325a8c1c98b45ff9b3c80ee4 100644
--- a/main/conky/APKBUILD
+++ b/main/conky/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--enable-wlan \
 		--enable-rss \
diff --git a/main/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD
index c573aef53c86f1f7fd5e216a86c22c9c3144ab54..c94de67278c6f3ff4cabcecb975b932be464fb9c 100644
--- a/main/conntrack-tools/APKBUILD
+++ b/main/conntrack-tools/APKBUILD
@@ -19,7 +19,11 @@ source="http://www.netfilter.org/projects/conntrack-tools/files/$pkgname-$pkgver
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/consolekit/APKBUILD b/main/consolekit/APKBUILD
index 632ee1adcedd3cc5111b31d58105bf96bb85ab3a..91b4cfaf8fea4c1420ca19d77e3c51fad3651dab 100644
--- a/main/consolekit/APKBUILD
+++ b/main/consolekit/APKBUILD
@@ -29,7 +29,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/coova-chilli/APKBUILD b/main/coova-chilli/APKBUILD
index 3d33e22c81af760b5297d1c46130378b269da015..0cf146528f11ba37eec1342a117e55d39e2eae6f 100644
--- a/main/coova-chilli/APKBUILD
+++ b/main/coova-chilli/APKBUILD
@@ -33,7 +33,10 @@ prepare() {
 
 build() {
 	cd $_builddir
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -58,7 +61,8 @@ build() {
 		--enable-layer3 \
 		--enable-dhcpopt \
 		--enable-curl \
-		--enable-largelimits 
+		--enable-largelimits \
+		|| return 1
 	
 	export CFLAGS="$CFLAGS -Wno-error=unused-but-set-variable"
 	make -j1  || return 1
diff --git a/main/coreutils/APKBUILD b/main/coreutils/APKBUILD
index f41a27e22cc68df3a8e1dbf2ba506a0043511cca..5dbcc347e7fbecb86925b916c2a4de8314b015a4 100644
--- a/main/coreutils/APKBUILD
+++ b/main/coreutils/APKBUILD
@@ -16,7 +16,10 @@ source="http://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.xz"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/cpufreqd/APKBUILD b/main/cpufreqd/APKBUILD
index 803914dd2c9dc3923492e50fbf71fd20c1f268e3..cd3961e59b6267d58c5db81a5fa2e86f8518a00f 100644
--- a/main/cpufreqd/APKBUILD
+++ b/main/cpufreqd/APKBUILD
@@ -16,8 +16,12 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make LIBS=-lpthread || return 1
 }
 
diff --git a/main/cracklib/APKBUILD b/main/cracklib/APKBUILD
index 1a787df1b6712d3f64f1899be76de8e28e2d065b..e8b05ce05844ff6d740d3dc2fb34ebd3863f665d 100644
--- a/main/cracklib/APKBUILD
+++ b/main/cracklib/APKBUILD
@@ -22,13 +22,17 @@ build() {
 
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--without-python \
 		--disable-nls \
-		--with-default-dict
+		--with-default-dict \
+		|| return 1
 	make -j1 all || return 1
 }
 
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index 1c4fe7bc1b5f5471f0f37300f7fa3fe8abac438e..983667ee8a3fe6636e3c4a68742faf9b3686d4ac 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -13,7 +13,10 @@ source="http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--libdir=/lib \
 		--sbindir=/sbin \
 		--disable-static \
diff --git a/main/ctags/APKBUILD b/main/ctags/APKBUILD
index 49cd2225c9451f04c5271f418a9622805654d01b..efb396a9a2358a31741404a30a16799e24e65e72 100644
--- a/main/ctags/APKBUILD
+++ b/main/ctags/APKBUILD
@@ -15,10 +15,14 @@ source="http://prdownloads.sourceforge.net/ctags/$pkgname-$pkgver.tar.gz"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 	
 	install -m755 -D $pkgname "$pkgdir"/usr/bin/$pkgname
diff --git a/main/cups-filters/APKBUILD b/main/cups-filters/APKBUILD
index 11a6c3a35f409608ec891bab33bef6ffda2d21ad..bfc9df85a6719eb24169ea576535d801ad015e74 100644
--- a/main/cups-filters/APKBUILD
+++ b/main/cups-filters/APKBUILD
@@ -29,7 +29,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index 9f67ee05b78efe45a2908611c27160900ce78cc6..5ec9072e4eaa74d9ba8648a3cd472b18d6875ca3 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -35,7 +35,10 @@ prepare() {
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--with-logdir=/var/log/cups \
@@ -54,7 +57,8 @@ build() {
 		--enable-ssl=yes \
 		--enable-gnutls \
 		--with-pdftops=pdftops \
-		--with-optim="$CFLAGS"
+		--with-optim="$CFLAGS" \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD
index 2b56d520a35c27198b586aa9284702389ba639a9..d8cf8625b5790122b2f395c088fc740a279e1d55 100644
--- a/main/curl/APKBUILD
+++ b/main/curl/APKBUILD
@@ -25,11 +25,15 @@ prepare() {
 }
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--without-libidn \
 		--enable-ipv6 \
-		--disable-ldap
+		--disable-ldap \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/cvechecker/APKBUILD b/main/cvechecker/APKBUILD
index 75021efe80f32f30ab452ea3da49caab32a9fdac..11e4a1656ab34e31164bcb7368901219289790dc 100644
--- a/main/cvechecker/APKBUILD
+++ b/main/cvechecker/APKBUILD
@@ -29,7 +29,10 @@ prepare() {
 build() {
 	cd "$_builddir"
 	[ "$ALPINE_LIBC" != "eglibc" ] && export LIBS="-largp"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-sqlite3 \
diff --git a/main/cvs/APKBUILD b/main/cvs/APKBUILD
index 03c7b8f55c95fd312d426b6079e53c33ac5b6e81..773cf46fd0d67780eb04377ddaf87c516c437adb 100644
--- a/main/cvs/APKBUILD
+++ b/main/cvs/APKBUILD
@@ -16,7 +16,10 @@ source="http://ftp.gnu.org/non-gnu/cvs/source/feature/$pkgver/$pkgname-$pkgver.t
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 1ef87b3f79742e4fc5545745aba6629d2f4690d5..fdef95e0baefdad5a834e926ac30a3c90edf8b79 100644
--- a/main/cyrus-sasl/APKBUILD
+++ b/main/cyrus-sasl/APKBUILD
@@ -36,7 +36,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-anon \
@@ -49,7 +52,8 @@ build() {
 		--with-devrandom=/dev/urandom \
 		--without-ldap \
 		--with-saslauthd=/var/run/saslauthd \
-		--mandir=/usr/share/man || return 1
+		--mandir=/usr/share/man \
+		|| return 1
 	# parallell builds is broken
 	make -j1 || return 1
 }
diff --git a/main/dahdi-tools/APKBUILD b/main/dahdi-tools/APKBUILD
index 0c44555ddb150cfb70657b83dd4eaa23f0e35421..edc6bc2abdf8a42584734e24fcc8eeebac57f240 100644
--- a/main/dahdi-tools/APKBUILD
+++ b/main/dahdi-tools/APKBUILD
@@ -19,7 +19,10 @@ _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/damageproto/APKBUILD b/main/damageproto/APKBUILD
index 6a743ef3e9127d42eeb0f4593b581c8840032db9..0a40fbdadc2dce98400c0789953d9d97a82f3e1f 100644
--- a/main/damageproto/APKBUILD
+++ b/main/damageproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.t
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/dansguardian/APKBUILD b/main/dansguardian/APKBUILD
index 6de06f052c21c3fe56c8f0aebc08d264089b44ec..de981dbcfaa1fb26a9e8be516296129258ff1c5a 100644
--- a/main/dansguardian/APKBUILD
+++ b/main/dansguardian/APKBUILD
@@ -39,7 +39,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -47,7 +50,8 @@ build() {
 		--with-proxygroup=dansguar \
 		--with-logdir=/var/log/dansguardian \
 		--with-piddir=/var/run/ \
-		--enable-ntlm
+		--enable-ntlm \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/daq/APKBUILD b/main/daq/APKBUILD
index 303c7359bb6791330f82245447aac25dc8177fdf..5ade2931fbb30db9796fe019a86cfe874bf51580 100644
--- a/main/daq/APKBUILD
+++ b/main/daq/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/darkice/APKBUILD b/main/darkice/APKBUILD
index 1cea48cfaad05d4363d1c87deb453ea4c162a907..5edd7f17a76cddee47712f809a262f9de19024bf 100644
--- a/main/darkice/APKBUILD
+++ b/main/darkice/APKBUILD
@@ -18,10 +18,14 @@ source="http://darkice.googlecode.com/files/$pkgname-$pkgver.tar.gz
 _builddir=$srcdir/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc/darkice \
 		--without-aacplus \
-		--without-twolame 
+		--without-twolame \
+		|| return 1
 	make || return 1
 }
 package() {
diff --git a/main/db/APKBUILD b/main/db/APKBUILD
index 2da5fde9e9780c543dfc417ba991c5a024fac981..d1c333e854082952381e9e63f28f51495ca27e05 100644
--- a/main/db/APKBUILD
+++ b/main/db/APKBUILD
@@ -24,12 +24,16 @@ build () {
 	done
 
 	cd build_unix
-	../dist/configure --prefix=/usr \
+	../dist/configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--enable-compat185 \
 		--enable-shared \
 		--enable-cxx \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make LIBSO_LIBS=-lpthread || return 1
 }
 
diff --git a/main/dbus-glib/APKBUILD b/main/dbus-glib/APKBUILD
index 9942f6f872b1718e9f7c5fe20e5184d4669a6d13..cdfdd71a1ed11dc605d0eec22b2c6828b2ad6d8e 100644
--- a/main/dbus-glib/APKBUILD
+++ b/main/dbus-glib/APKBUILD
@@ -14,11 +14,15 @@ depends_dev="glib-dev dbus-dev"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-static=no \
-		--enable-bash-completion=no || return 1
+		--enable-bash-completion=no \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/dbus/APKBUILD b/main/dbus/APKBUILD
index 253ce4cfa298fa29b0f67bc32cdbae08d3e9c24b..6562bf2b26d4b6e7dc780e78e08f7b800503061c 100644
--- a/main/dbus/APKBUILD
+++ b/main/dbus/APKBUILD
@@ -19,7 +19,10 @@ source="http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--with-xml=expat \
@@ -31,7 +34,8 @@ build() {
 		--disable-dnotify \
 		--disable-tests \
 		--disable-asserts \
-		--with-x || return 1
+		--with-x \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/dconf/APKBUILD b/main/dconf/APKBUILD
index d29c495b8b92613c12a9802037a3b1726ab83f3f..14d7b0717eb0c45ccd0bbc2bf5a3c610f5be3544 100644
--- a/main/dconf/APKBUILD
+++ b/main/dconf/APKBUILD
@@ -30,8 +30,12 @@ prepare() {
 build () 
 { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--libexecdir=/usr/lib/dconf
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--libexecdir=/usr/lib/dconf \
+		|| return 1
 	make V=1
 }
 
diff --git a/main/desktop-file-utils/APKBUILD b/main/desktop-file-utils/APKBUILD
index 218b12951039c245c323ac4733c4d9c1f3cacc02..b095bc531178d8dcf614de269709536d4a6e83d9 100644
--- a/main/desktop-file-utils/APKBUILD
+++ b/main/desktop-file-utils/APKBUILD
@@ -15,7 +15,11 @@ build ()
 {
 	cd "$srcdir"/desktop-file-utils-$pkgver
 
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 15056385fa14af4a1ebf704eb17453d76c017323..0c0beb322a44f09a1bbc19a93869b9f4c858c351 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -31,7 +31,10 @@ build() {
 	cd "$srcdir/$pkgname-$_realver"
 	# fix ipv6
 	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc/dhcp \
 		--with-cli-pid-file=/var/run/dhcp/dhclient.pid \
 		--with-cli-lease-file=/var/lib/dhcp/dhclient.leases \
@@ -41,7 +44,8 @@ build() {
 		--enable-dhcpv6 \
 		--enable-paranoia \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/dhcpcd-dbus/APKBUILD b/main/dhcpcd-dbus/APKBUILD
index 79864853a25e99ba2de13aac3772f550c4c47e99..cc3c9e0c77117988ebe58573268f1c0a2fe80de8 100644
--- a/main/dhcpcd-dbus/APKBUILD
+++ b/main/dhcpcd-dbus/APKBUILD
@@ -14,7 +14,10 @@ source="http://roy.marples.name/downloads/dhcpcd/dhcpcd-dbus-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/$pkgname \
 		|| return 1
diff --git a/main/dhcpcd-ui/APKBUILD b/main/dhcpcd-ui/APKBUILD
index dd1ff56952fe3c55415f8fdecb32494e546d45e7..d2017c12f0daa7f9ffcf8e1dce48a99f25d72fdb 100644
--- a/main/dhcpcd-ui/APKBUILD
+++ b/main/dhcpcd-ui/APKBUILD
@@ -14,7 +14,11 @@ source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make
 }
 
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index e986414de00b1aa4f6b8b3aa3caf72e1bfdb2d10..ff0bfee4c214237e2fdf5c2f5f5703ca6618eabb 100644
--- a/main/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
@@ -16,7 +16,10 @@ source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --libexecdir=/lib/dhcpcd \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--libexecdir=/lib/dhcpcd \
 		--dbdir=/var/lib/dhcpcd \
 		|| return 1
 	make
diff --git a/main/dialog/APKBUILD b/main/dialog/APKBUILD
index 4e3200d576fa5256bf7b276604df5fa34e818442..e27d5658551109224827dd2e7b607e16792cc826 100644
--- a/main/dialog/APKBUILD
+++ b/main/dialog/APKBUILD
@@ -16,11 +16,15 @@ source="ftp://invisible-island.net/$pkgname/$pkgname-$_pkgver.tgz"
 
 build() {
 	cd "$srcdir/$pkgname-$_pkgver"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--with-ncursesw
+		--with-ncursesw \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/diffutils/APKBUILD b/main/diffutils/APKBUILD
index 2f72f36a8e035116623cbbe81dd2a7d8f4019707..218fed5e935676f875d5da86bce6c5cb77a7a044 100644
--- a/main/diffutils/APKBUILD
+++ b/main/diffutils/APKBUILD
@@ -30,9 +30,13 @@ prepare() {
 build() {
 	cd "$_builddir"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/dircproxy/APKBUILD b/main/dircproxy/APKBUILD
index 1bdbecf45e1fafdbc37a16d49b246398cfd77139..f308892ea486b5020f6d43226ae91822f8c2959f 100644
--- a/main/dircproxy/APKBUILD
+++ b/main/dircproxy/APKBUILD
@@ -24,10 +24,14 @@ build() {
 		patch -p1 -i $i || return 1
 	done
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install
 
diff --git a/main/distcc/APKBUILD b/main/distcc/APKBUILD
index 0ba9a0966d743738beeb18b6cccb5fb613a6899b..46d9249e8d7b06f7d4b1ccc7cfd32c7a61e7a0fe 100644
--- a/main/distcc/APKBUILD
+++ b/main/distcc/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--without-gtk \
 		--sysconfdir=/etc \
 		--disable-Werror \
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 4375832ea5eda3c073441938064e08e16b32372f..08f4a0fe54f274fcea0e9383364cf8e89cfc7ea6 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -37,7 +37,10 @@ prepare() {
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--localstatedir=/var \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
@@ -48,7 +51,8 @@ build() {
 		--with-mysql \
 		--with-sqlite \
 		--with-pgsql \
-		--with-ssl=openssl || return 1
+		--with-ssl=openssl \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/doxygen/APKBUILD b/main/doxygen/APKBUILD
index e4dbccd81662e37ef3f7c029a4ff54d0669a9c81..441e39af2bc418f05e13f310e271dfcf27ab7edd 100644
--- a/main/doxygen/APKBUILD
+++ b/main/doxygen/APKBUILD
@@ -35,7 +35,11 @@ prepare() {
 build() { 
 	cd "$_builddir"
 	export ECFLAGS="$CFLAGS" ECXXFLAGS="$CXXFLAGS" ELDFLAGS="$LDFLAGS"
-	./configure --prefix /usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/dpkg/APKBUILD b/main/dpkg/APKBUILD
index 556bbbf4b86ae2114635ac1807ade0b041bc314d..3c19ee557fd0e43b999b9529b950ab2475916de5 100644
--- a/main/dpkg/APKBUILD
+++ b/main/dpkg/APKBUILD
@@ -20,7 +20,10 @@ prepare() {
 
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-zlib \
 		--with-bzip2 \
 		--disable-dselect \
diff --git a/main/dri2proto/APKBUILD b/main/dri2proto/APKBUILD
index feb0c5ddc955faf9a731c1cc731e0618ec38580d..b70e46ac7da4ca86d98155a9e8b5fcf318d42a07 100644
--- a/main/dri2proto/APKBUILD
+++ b/main/dri2proto/APKBUILD
@@ -13,7 +13,11 @@ source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.t
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD
index 1894f9ee92a4d4c460cbd7bfac863f97f4821a84..003e0aa3d3532ba7625b8944cce9657a1fcb4fe2 100644
--- a/main/dropbear/APKBUILD
+++ b/main/dropbear/APKBUILD
@@ -24,7 +24,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		|| return 1
 	make PROGRAMS="$_progs" MULTI=1 || return 1
 }
diff --git a/main/dtach/APKBUILD b/main/dtach/APKBUILD
index 46cc03515dc56febf81699a3f9cfb933c15c7e5d..8ca74ae1647dd8b5d8e44903cf11c40a8898184e 100644
--- a/main/dtach/APKBUILD
+++ b/main/dtach/APKBUILD
@@ -14,7 +14,11 @@ subpackages="$pkgname-doc"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 	install -Dm755 "$srcdir"/dtach-0.8/dtach "$pkgdir"/usr/bin/dtach
 	install -Dm644 "$srcdir"/dtach-0.8/dtach.1 "$pkgdir"/usr/share/man/man1/dtach.1
diff --git a/main/dvgrab/APKBUILD b/main/dvgrab/APKBUILD
index 53294c37879db4028f535d30b4c519f9e321ac88..7e9157bf7b129c36c1a6c7cacc81cac368d7c88e 100644
--- a/main/dvgrab/APKBUILD
+++ b/main/dvgrab/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD
index 54caa74d8c7fa6d396712bd571f495b6498f1037..d3c3d824e33a70a7a9952466d0a147e864e96847 100644
--- a/main/e2fsprogs/APKBUILD
+++ b/main/e2fsprogs/APKBUILD
@@ -22,6 +22,8 @@ prepare() {
 build () { 
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--mandir=/usr/share/man \
 		--enable-elf-shlibs \
 		--disable-fsck \
@@ -29,7 +31,8 @@ build () {
 		--disable-libuuid \
 		--disable-libblkid \
 		--disable-tls \
-		--disable-nls
+		--disable-nls \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/eboard/APKBUILD b/main/eboard/APKBUILD
index a30231dbbd4e3c942206bd29a19b4370184cdc03..769e30a10ea0e47f903cf89d36f9d62e21226f7f 100644
--- a/main/eboard/APKBUILD
+++ b/main/eboard/APKBUILD
@@ -29,7 +29,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--man-prefix=/usr/share/man \
 		--extra-libs=dl \
 		|| return 1
diff --git a/main/eggdbus/APKBUILD b/main/eggdbus/APKBUILD
index 8ffbed9a98d5d2892a90a798dd82a50e1b3c9e57..25cb513260b8ee1a847c9bd22a5c9a0e3ad4e5ea 100644
--- a/main/eggdbus/APKBUILD
+++ b/main/eggdbus/APKBUILD
@@ -22,11 +22,15 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-static
+		--disable-static \
+		|| return 1
 
 	make -j1 || return 1
 }
diff --git a/main/eggdrop/APKBUILD b/main/eggdrop/APKBUILD
index fa6060c48e8508804311c7182b367a6d536af34b..b6eada515c4fa432064a317bee682e75f91b3e75 100644
--- a/main/eggdrop/APKBUILD
+++ b/main/eggdrop/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"	
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-tcllib=/usr/lib/libtcl8.6.so \
 		--with-tclinc=/usr/include/tcl.h \
 		|| return 1
diff --git a/main/eglibc/APKBUILD b/main/eglibc/APKBUILD
index 4d7711f3ed5cfe021d4dc2b7111a0382f43d9655..179e15c8bc5dcb217c82395972a488358fe7b07b 100644
--- a/main/eglibc/APKBUILD
+++ b/main/eglibc/APKBUILD
@@ -45,6 +45,8 @@ build() {
 	cd "$_builddir"/eglibc-build
 	export CFLAGS="$CFLAGS -fno-stack-protector"
 	../configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--build $CBUILD \
 		--host $CHOST \
 		--prefix=/usr \
diff --git a/main/elinks/APKBUILD b/main/elinks/APKBUILD
index 470d813cd9538719d75fd469a04d9a085b4f2b90..ddb3fbd85b89fd45f477eba95d13e898a1a30a29 100644
--- a/main/elinks/APKBUILD
+++ b/main/elinks/APKBUILD
@@ -21,11 +21,15 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--without-included-gettext
+		--without-included-gettext \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/email/APKBUILD b/main/email/APKBUILD
index b212a62c3b541013843750c5e13905fb8d66c9ed..801985511dd31067c4163b31d7678694348f7727 100644
--- a/main/email/APKBUILD
+++ b/main/email/APKBUILD
@@ -21,9 +21,12 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	
 	./configure \
-	        --prefix=/usr \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--mandir=/usr/share/man
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/email2trac/APKBUILD b/main/email2trac/APKBUILD
index 9681093f130bccd80d2a6eb9aacfadc060c1412a..e3979d4d2a5d4c65526019c410b2d13c32d37830 100644
--- a/main/email2trac/APKBUILD
+++ b/main/email2trac/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--with-trac_user=tracd \
 		|| return 1
diff --git a/main/enca/APKBUILD b/main/enca/APKBUILD
index 8e3e1095e22e0022fd08e5a0bb1c5944f9f956ee..166fe99d7c46e08e0cc81fb165a65f0163620b9c 100644
--- a/main/enca/APKBUILD
+++ b/main/enca/APKBUILD
@@ -22,13 +22,17 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--libexecdir=/usr/lib \
 		--enable-external \
-		--without-libiconv
+		--without-libiconv \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/enchant/APKBUILD b/main/enchant/APKBUILD
index 0ada5a430033602d5c7bd09a8f82ff120d92baec..9788bead6c132a2f975d98ab0945f5b894015887 100644
--- a/main/enchant/APKBUILD
+++ b/main/enchant/APKBUILD
@@ -14,7 +14,12 @@ source="http://www.abisource.com/downloads/$pkgname/$pkgver/$pkgname-$pkgver.tar
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --disable-static || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/encodings/APKBUILD b/main/encodings/APKBUILD
index 06b883e89562310d37b478109dc7b1e1288ddb61..3ad7a361fa4b382c63ba873305349f69eb1c4cd3 100644
--- a/main/encodings/APKBUILD
+++ b/main/encodings/APKBUILD
@@ -13,8 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/font/encodings-$pkgver.t
 
 build() { 
 	cd "$srcdir"/encodings-$pkgver
-	./configure --prefix=/usr \
-		--with-encodingsdir=/usr/share/fonts/encodings
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--with-encodingsdir=/usr/share/fonts/encodings \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/epdfview/APKBUILD b/main/epdfview/APKBUILD
index c4ff565b6312814390b9a279825197021595a70f..772197895bdd39133c195be1d792b0dc2314eb89 100644
--- a/main/epdfview/APKBUILD
+++ b/main/epdfview/APKBUILD
@@ -34,7 +34,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		|| return 1
diff --git a/main/epris/APKBUILD b/main/epris/APKBUILD
index f845f6a0ea9297c0531f8608812aa354ec1a8850..cb1da61d5579975390b9130250da050618cdd04c 100644
--- a/main/epris/APKBUILD
+++ b/main/epris/APKBUILD
@@ -15,10 +15,14 @@ source="http://epris.googlecode.com/files/epris-$pkgver.tar.gz"
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/ethtool/APKBUILD b/main/ethtool/APKBUILD
index 81709fb239d7788d42339eb1385a296b933bc4ed..878f11cb985be8b2db657c172c21ab8817770bf5 100644
--- a/main/ethtool/APKBUILD
+++ b/main/ethtool/APKBUILD
@@ -15,8 +15,12 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/evince/APKBUILD b/main/evince/APKBUILD
index d31a5291fa3026ad1504b81b32648fcab3879e94..2f231f67ece8ff4d5b8491ad1255dc206c92312b 100644
--- a/main/evince/APKBUILD
+++ b/main/evince/APKBUILD
@@ -44,13 +44,17 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--disable-nautilus \
 		--disable-scrollkeeper \
 		--enable-pixbuf \
 		--without-gconf \
-		--without-keyring || return 1
+		--without-keyring \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/exiv2/APKBUILD b/main/exiv2/APKBUILD
index 259758f7f09462914749b1dce18ab042fae023b2..43b413618c282906301c97797483c8cf57f865e4 100644
--- a/main/exiv2/APKBUILD
+++ b/main/exiv2/APKBUILD
@@ -15,7 +15,11 @@ source="http://www.exiv2.org/exiv2-$pkgver.tar.gz"
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/exo/APKBUILD b/main/exo/APKBUILD
index 4904b8045e8611cc9d5c7c8b69b9dfc3f9fc7601..8086a5628017adc239cb62de83e930cccf589559 100644
--- a/main/exo/APKBUILD
+++ b/main/exo/APKBUILD
@@ -15,7 +15,10 @@ source="http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/xfce4 \
 		--localstatedir=/var \
diff --git a/main/expat/APKBUILD b/main/expat/APKBUILD
index 50179e6003a2830b32c99ec04176da8ad6dfedc6..daf4313f6cd95ddee8c0262e9e720965c6ec63bc 100644
--- a/main/expat/APKBUILD
+++ b/main/expat/APKBUILD
@@ -25,8 +25,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-	--mandir=/usr/share/man
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/expect/APKBUILD b/main/expect/APKBUILD
index e9b8ead2194a21e0ff06c1c9cd3d83aff859a59e..13f2f44c7c973968f0b964ac2eb3366f6dd260dd 100644
--- a/main/expect/APKBUILD
+++ b/main/expect/APKBUILD
@@ -16,13 +16,17 @@ source="http://downloads.sourceforge.net/project/expect/Expect/$pkgver/$pkgname$
 _builddir="$srcdir"/$pkgname$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--mandir=/usr/share/man \
 		--with-tcl=/usr/lib \
 		--with-tclinclude=/usr/include \
-		--disable-rpath
+		--disable-rpath \
+		|| return 1
 	make || return 1
 }
 package() {
diff --git a/main/ez-ipupdate/APKBUILD b/main/ez-ipupdate/APKBUILD
index d4332416f05af046b64d2f3a10f91cc1fd92b5f5..f23e315b9e169917e379642a6621e740ca344dee 100644
--- a/main/ez-ipupdate/APKBUILD
+++ b/main/ez-ipupdate/APKBUILD
@@ -28,10 +28,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/f2fs-tools/APKBUILD b/main/f2fs-tools/APKBUILD
index 4e0a864e35987d139023f1cf84a410a508180151..625cba65d224610286438f391b856ea102a99d67 100644
--- a/main/f2fs-tools/APKBUILD
+++ b/main/f2fs-tools/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		|| return 1
 	make || return 1
 }
diff --git a/main/faac/APKBUILD b/main/faac/APKBUILD
index d33097469eedc8e0f433fcfa537ce6f2ff656999..de6769d156dfe6a28fe3e85d50e7aae2f515927d 100644
--- a/main/faac/APKBUILD
+++ b/main/faac/APKBUILD
@@ -31,7 +31,11 @@ prepare() {
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	./bootstrap || return 1
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/faad2/APKBUILD b/main/faad2/APKBUILD
index 8d4959daf0c610717e94d40468575bd1418f2770..78168f53e284c42f2626ef63515bac420092e09f 100644
--- a/main/faad2/APKBUILD
+++ b/main/faad2/APKBUILD
@@ -31,7 +31,11 @@ build() {
 		|| return 1
 
 	sh bootstrap || return 1
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD
index 2bd26f6247e80362a06a98b43c7e6498dac5fdda..d4d1ef208ccbb98a4f439cf6da438fec0b0925ad 100644
--- a/main/fakeroot/APKBUILD
+++ b/main/fakeroot/APKBUILD
@@ -31,10 +31,12 @@ build() {
 	[ "${CHOST#*musl}" != "$CHOST" ] && CFLAGS="-D_STAT_VER=0 $CFLAGS"
 
 	CONFIG_SHELL=/bin/sh \
-	./configure --prefix=/usr \
-                --build=${CBUILD} \
-                --host=${CHOST} \
-		--disable-static
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/farstream/APKBUILD b/main/farstream/APKBUILD
index 6989cfd17e6013919c78ed6be3f776cc0a02e8da..ca2be9549b64480461dd9f26853b2bf325ac484b 100644
--- a/main/farstream/APKBUILD
+++ b/main/farstream/APKBUILD
@@ -27,9 +27,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-				--enable-python \
-				--disable-static \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--enable-python \
+		--disable-static \
 	|| return 1
 	make || return 1
 }
diff --git a/main/farstream0.1/APKBUILD b/main/farstream0.1/APKBUILD
index e74e2def17942145e0a5ac73a47144723ed15ab3..8e73e5c42f0872a063478b0ae30336d6ff492bbe 100644
--- a/main/farstream0.1/APKBUILD
+++ b/main/farstream0.1/APKBUILD
@@ -30,7 +30,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-python \
 		|| return 1
 	make || return 1
diff --git a/main/fastjar/APKBUILD b/main/fastjar/APKBUILD
index 9b22db009d5607b1b3af6e923fcd948e47c82050..95c7aa133888690be4fc3550686845ce0fd4ed9d 100644
--- a/main/fastjar/APKBUILD
+++ b/main/fastjar/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/fcgi/APKBUILD b/main/fcgi/APKBUILD
index 72a76f53544aaa7925c08537e0f4b72fd6abf77e..2e2f13ac31947237b19904520a003269a72643ab 100644
--- a/main/fcgi/APKBUILD
+++ b/main/fcgi/APKBUILD
@@ -34,11 +34,15 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
 	export LIBS="-lm"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--enable-shared
+		--enable-shared \
+		|| return 1
 	# work around parallel build issue
 	make -C libfcgi libfcgi.la || return 1
 	make || return 1
diff --git a/main/fetchmail/APKBUILD b/main/fetchmail/APKBUILD
index 232830b013ba62cf2cbf731de9f602ae39b53dbc..63b73cf2529b7862b67565596346fc6275584a30 100644
--- a/main/fetchmail/APKBUILD
+++ b/main/fetchmail/APKBUILD
@@ -18,12 +18,16 @@ source="http://download.berlios.de/fetchmail/$pkgname-$pkgver.tar.bz2
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--with-ssl \
-		--disable-nls
+		--disable-nls \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD
index 9b6327c0db09e1e50693dac2d11666dfcb553db6..dcd9d12add83ed20eacd77af9c3f7819589e40ab 100644
--- a/main/ffmpeg/APKBUILD
+++ b/main/ffmpeg/APKBUILD
@@ -32,7 +32,10 @@ build() {
 	[ -n "$DEBUG" ] && _dbg="--enable-debug"
 	[ "$CARCH" = "x86" ] && _asm="--disable-asm"
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-gpl \
 		--enable-libmp3lame \
 		--enable-librtmp \
diff --git a/main/fftw/APKBUILD b/main/fftw/APKBUILD
index 3fce77d33c9c9e1fe8e4f3ecc68f62afa9f6cc8c..7430f5949e13db19e793e0d265f042615bdf3c4b 100644
--- a/main/fftw/APKBUILD
+++ b/main/fftw/APKBUILD
@@ -21,11 +21,15 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--enable-single
+		--enable-single \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/file/APKBUILD b/main/file/APKBUILD
index 045a917912e6bae080d2adb05b40c3cdd2a2e27e..bb77dbe5310f605dab3897c4cc26a57911a6965e 100644
--- a/main/file/APKBUILD
+++ b/main/file/APKBUILD
@@ -12,7 +12,12 @@ subpackages="$pkgname-dev $pkgname-doc"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --datadir=/usr/share
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--datadir=/usr/share \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/findutils/APKBUILD b/main/findutils/APKBUILD
index 90a6c25d0004a5cfc934c33337d592e9b27f0b5f..48f6fd348f91f9ede228107a30731fe5ea92fa05 100644
--- a/main/findutils/APKBUILD
+++ b/main/findutils/APKBUILD
@@ -16,10 +16,14 @@ source="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install
 
diff --git a/main/fixesproto/APKBUILD b/main/fixesproto/APKBUILD
index 2db32801e5b9f1b838b6b28ad3bc887bd339d76b..65ccb3849260192f6dcca674314157895b725bf7 100644
--- a/main/fixesproto/APKBUILD
+++ b/main/fixesproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.t
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/flac/APKBUILD b/main/flac/APKBUILD
index add0acc18b80a71030ee932e1889f8a66f813878..7ebcf4dc126dd80a4861fd92462b7b9caff1e932 100644
--- a/main/flac/APKBUILD
+++ b/main/flac/APKBUILD
@@ -14,14 +14,18 @@ source="http://downloads.xiph.org/releases/flac/flac-${pkgver}.tar.xz"
 build () {
 	cd "$srcdir"/$pkgname-$pkgver || return 1
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--enable-shared \
 		--enable-ogg \
 		--disable-sse \
 		--disable-rpath \
 		--disable-cpplibs \
-		--with-pic || return 1
+		--with-pic \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/flex/APKBUILD b/main/flex/APKBUILD
index 909f184b48d795eee00e3fdbf64193edd0c3b1c4..669a70d8e545cf18f705c4642059efa9117da688 100644
--- a/main/flex/APKBUILD
+++ b/main/flex/APKBUILD
@@ -14,11 +14,13 @@ subpackages="$pkgname-doc"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
-		--build=${CBUILD} \
-		--host=${CHOST} \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/flite/APKBUILD b/main/flite/APKBUILD
index dad4703025c8f15f3d444cf45b86f891aff440a5..8efee0d42339fb194e6e325a24616255de57bc61 100644
--- a/main/flite/APKBUILD
+++ b/main/flite/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	CFLAGS="$CFLAGS -fPIC" ./configure --prefix=/usr \
+	CFLAGS="$CFLAGS -fPIC" ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-shared \
 		--localstatedir=/var \
 		|| return 1
diff --git a/main/fluxbox/APKBUILD b/main/fluxbox/APKBUILD
index 4b6b398016169b5683fd5a53f00f39ae42537281..cfb64f5f0144f429c4aa4ad9a65ab7ce78e0ab9a 100644
--- a/main/fluxbox/APKBUILD
+++ b/main/fluxbox/APKBUILD
@@ -15,7 +15,10 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-imlib2 \
 		--disable-nls \
 		|| return 1
diff --git a/main/font-adobe-100dpi/APKBUILD b/main/font-adobe-100dpi/APKBUILD
index 2057abcff17474b42678d59a8a5ff3d846309d7c..eac386a55a1711fcf10a7286f7343b95f2990557 100644
--- a/main/font-adobe-100dpi/APKBUILD
+++ b/main/font-adobe-100dpi/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi
+		--with-fontdir=/usr/share/fonts/100dpi \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-adobe-75dpi/APKBUILD b/main/font-adobe-75dpi/APKBUILD
index 081e5ba5eca5d3897930d762d1d5d55b9db0a759..1b9fca51aaa798fd37d0d692b7470656cbcd4196 100644
--- a/main/font-adobe-75dpi/APKBUILD
+++ b/main/font-adobe-75dpi/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi
+		--with-fontdir=/usr/share/fonts/75dpi \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-adobe-utopia-100dpi/APKBUILD b/main/font-adobe-utopia-100dpi/APKBUILD
index 3ca2381ab71c9477befcefa1e9cd640d5d2e6287..b35c71ebe95a036ac8584554c19e92a2c814ba94 100644
--- a/main/font-adobe-utopia-100dpi/APKBUILD
+++ b/main/font-adobe-utopia-100dpi/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi
+		--with-fontdir=/usr/share/fonts/100dpi \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-adobe-utopia-75dpi/APKBUILD b/main/font-adobe-utopia-75dpi/APKBUILD
index f2429974fe8f36ec87e9c156908a740e69b0abfc..5a86692f67822414828995413415caa8316e0116 100644
--- a/main/font-adobe-utopia-75dpi/APKBUILD
+++ b/main/font-adobe-utopia-75dpi/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi
+		--with-fontdir=/usr/share/fonts/75dpi \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-adobe-utopia-type1/APKBUILD b/main/font-adobe-utopia-type1/APKBUILD
index ed40e552ba07dfbe5d30e1d971f4944959ee8e5e..7095c61027fea3e515b399e5e4e7b7749563dc1d 100644
--- a/main/font-adobe-utopia-type1/APKBUILD
+++ b/main/font-adobe-utopia-type1/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/utopia-type1
+		--with-fontdir=/usr/share/fonts/utopia-type1 \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/font-alias/APKBUILD b/main/font-alias/APKBUILD
index 83fc28f0e92aec1590b6449ab51b96130d257e22..55a9ee165d5d0ac570ee3349cde64ad67adb3562 100644
--- a/main/font-alias/APKBUILD
+++ b/main/font-alias/APKBUILD
@@ -13,8 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 build ()
 { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-top-fontdir=/usr/share/fonts
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--with-top-fontdir=/usr/share/fonts \
+		|| return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
diff --git a/main/font-arabic-misc/APKBUILD b/main/font-arabic-misc/APKBUILD
index a68d08d6250e4509539f3357999f7caf69b32fc7..4c518f1b61576a1af32a6e497231329c9ab28bd5 100644
--- a/main/font-arabic-misc/APKBUILD
+++ b/main/font-arabic-misc/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
+		--with-fontdir=/usr/share/fonts/misc \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-bh-100dpi/APKBUILD b/main/font-bh-100dpi/APKBUILD
index 0133f31d2598e07647ddc49c96aed43a1c03be3d..8a7be53e36cb8bd9f9b88bf817566452d5504277 100644
--- a/main/font-bh-100dpi/APKBUILD
+++ b/main/font-bh-100dpi/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi
+		--with-fontdir=/usr/share/fonts/100dpi \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-bh-75dpi/APKBUILD b/main/font-bh-75dpi/APKBUILD
index 62a4f66b3af9e6a0a6e18c421903cc23b6f9578c..314afca701eb34d1e77cd85b6db4178d67f884df 100644
--- a/main/font-bh-75dpi/APKBUILD
+++ b/main/font-bh-75dpi/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi
+		--with-fontdir=/usr/share/fonts/75dpi \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-bh-lucidatypewriter-100dpi/APKBUILD b/main/font-bh-lucidatypewriter-100dpi/APKBUILD
index ddae97e87b6ab6cbe3dc483f4bb1342442f7dcc2..b365f8369f67c5f768e691d155d91909380b2af1 100644
--- a/main/font-bh-lucidatypewriter-100dpi/APKBUILD
+++ b/main/font-bh-lucidatypewriter-100dpi/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi
+		--with-fontdir=/usr/share/fonts/100dpi \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-bh-lucidatypewriter-75dpi/APKBUILD b/main/font-bh-lucidatypewriter-75dpi/APKBUILD
index 6fde0c80e748e0961c74c0507bd542aabf799078..70b170172c86351ceeea5285d93f02c3e03ec939 100644
--- a/main/font-bh-lucidatypewriter-75dpi/APKBUILD
+++ b/main/font-bh-lucidatypewriter-75dpi/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi
+		--with-fontdir=/usr/share/fonts/75dpi \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-bh-ttf/APKBUILD b/main/font-bh-ttf/APKBUILD
index bf3a046ebb6c9a321a78ec497c81072cf5c4ca33..fa29ff8555850a7969c3bd7a89d7362b957e1945 100644
--- a/main/font-bh-ttf/APKBUILD
+++ b/main/font-bh-ttf/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/TTF
+		--with-fontdir=/usr/share/fonts/TTF \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/font-bh-type1/APKBUILD b/main/font-bh-type1/APKBUILD
index a5e718744abf6e71827a14c75b60d388144c3448..507feab3c7582ccb6270b2b6284def1dd7c1f5a3 100644
--- a/main/font-bh-type1/APKBUILD
+++ b/main/font-bh-type1/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Type1
+		--with-fontdir=/usr/share/fonts/Type1 \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/font-bitstream-100dpi/APKBUILD b/main/font-bitstream-100dpi/APKBUILD
index 8adf9ea7e3e16e6fc5fe8f62f4b720dae375ba20..a0be678a4d35df06fd582454dfa444548a2ba115 100644
--- a/main/font-bitstream-100dpi/APKBUILD
+++ b/main/font-bitstream-100dpi/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi
+		--with-fontdir=/usr/share/fonts/100dpi \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-bitstream-75dpi/APKBUILD b/main/font-bitstream-75dpi/APKBUILD
index 2182946be00f96306563ac3531727dbcde867025..6046a2038ed8a7a0892a0ed3261a51b6dceb868e 100644
--- a/main/font-bitstream-75dpi/APKBUILD
+++ b/main/font-bitstream-75dpi/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi
+		--with-fontdir=/usr/share/fonts/75dpi \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-bitstream-speedo/APKBUILD b/main/font-bitstream-speedo/APKBUILD
index 1780bdde7b78770e332914ab680e8e79361272c6..557a074eeca5b1de60dbff9115c127959aa0a7e0 100644
--- a/main/font-bitstream-speedo/APKBUILD
+++ b/main/font-bitstream-speedo/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Speedo
+		--with-fontdir=/usr/share/fonts/Speedo \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/font-bitstream-type1/APKBUILD b/main/font-bitstream-type1/APKBUILD
index 4f54e8b73a1f6c55080a4fbf3287ae77a9d38875..27255d96bd353998711ea27ec375d89bb6243235 100644
--- a/main/font-bitstream-type1/APKBUILD
+++ b/main/font-bitstream-type1/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Type1
+		--with-fontdir=/usr/share/fonts/Type1 \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/font-cronyx-cyrillic/APKBUILD b/main/font-cronyx-cyrillic/APKBUILD
index 31a610489e8670e9ca809126adda9e58df3a57c2..8380951b2ff1d2421a579fa8d152bc12b9239dd3 100644
--- a/main/font-cronyx-cyrillic/APKBUILD
+++ b/main/font-cronyx-cyrillic/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/cyrillic
+		--with-fontdir=/usr/share/fonts/cyrillic \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-cursor-misc/APKBUILD b/main/font-cursor-misc/APKBUILD
index 0a344b2454eae59f25a44135f4fd69349644f43d..801a07d9d8d0427aece20399a36c015c88958c56 100644
--- a/main/font-cursor-misc/APKBUILD
+++ b/main/font-cursor-misc/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
+		--with-fontdir=/usr/share/fonts/misc \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-daewoo-misc/APKBUILD b/main/font-daewoo-misc/APKBUILD
index 8d99f6f066acffeabf7d4dd8a28b7fb84dfe11ca..fdbd5258cb26fdc069796666752a6a0e4ccf0c27 100644
--- a/main/font-daewoo-misc/APKBUILD
+++ b/main/font-daewoo-misc/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
+		--with-fontdir=/usr/share/fonts/misc \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-dec-misc/APKBUILD b/main/font-dec-misc/APKBUILD
index 3d56bfba757f057d5fb1d950753384f61032b72c..1849d1322c9410516a221df11c24f85f0ab7ce2c 100644
--- a/main/font-dec-misc/APKBUILD
+++ b/main/font-dec-misc/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
+		--with-fontdir=/usr/share/fonts/misc \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-ibm-type1/APKBUILD b/main/font-ibm-type1/APKBUILD
index b278e736952fd6579ed213464e0b7c85c12afd2d..366e1adc1e734fbbfcc9e63c553ea2a7b79a1eea 100644
--- a/main/font-ibm-type1/APKBUILD
+++ b/main/font-ibm-type1/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Type1
+		--with-fontdir=/usr/share/fonts/Type1 \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/font-isas-misc/APKBUILD b/main/font-isas-misc/APKBUILD
index b6da30844c0b0e18b0c00205fa5a668de76dab27..874904cb38e1c07e433c88862a048c1154ca84d2 100644
--- a/main/font-isas-misc/APKBUILD
+++ b/main/font-isas-misc/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
+		--with-fontdir=/usr/share/fonts/misc \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-jis-misc/APKBUILD b/main/font-jis-misc/APKBUILD
index 7367ae5deefb134d0a0ce63c55c8a4c38a043a7b..f7b6a8ac53c4b9fadb413991cb3277ec51359d51 100644
--- a/main/font-jis-misc/APKBUILD
+++ b/main/font-jis-misc/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
+		--with-fontdir=/usr/share/fonts/misc \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-micro-misc/APKBUILD b/main/font-micro-misc/APKBUILD
index a2d6a83aec9e6f9722ba2d81c11c356b1b8d1bae..45801df0bbce91295f43ae549ba61606ab598776 100644
--- a/main/font-micro-misc/APKBUILD
+++ b/main/font-micro-misc/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
+		--with-fontdir=/usr/share/fonts/misc \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-misc-cyrillic/APKBUILD b/main/font-misc-cyrillic/APKBUILD
index 7f69e82d863ba6c353c1249aa3628e4e9ddf5868..f5a403bbeea2aaa4efa470fe3af6c48085caa84b 100644
--- a/main/font-misc-cyrillic/APKBUILD
+++ b/main/font-misc-cyrillic/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/cyrillic
+		--with-fontdir=/usr/share/fonts/cyrillic \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-misc-ethiopic/APKBUILD b/main/font-misc-ethiopic/APKBUILD
index 8b11cf4b8f0a30d970f8e4b13ad6d8b0f6b4ebd7..05e76360ac00acf1d338c99d12eb678669d9a597 100644
--- a/main/font-misc-ethiopic/APKBUILD
+++ b/main/font-misc-ethiopic/APKBUILD
@@ -14,9 +14,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 _builddir="$srcdir"/$pkgname-$pkgver
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/ethiopic
+		--with-fontdir=/usr/share/fonts/ethiopic \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/font-misc-meltho/APKBUILD b/main/font-misc-meltho/APKBUILD
index 6c0102a361415bcc4d2021899cd2e52419c62e42..8cd7789551f7902909e0a412dd70931fb2c67707 100644
--- a/main/font-misc-meltho/APKBUILD
+++ b/main/font-misc-meltho/APKBUILD
@@ -14,9 +14,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 _builddir="$srcdir"/$pkgname-$pkgver
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/meltho
+		--with-fontdir=/usr/share/fonts/meltho \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/font-misc-misc/APKBUILD b/main/font-misc-misc/APKBUILD
index b4e86369b00ccf37e36efe4fe27b8129a9866b68..3f19cc334c2e22e5981f012ce1b417e52ce85424 100644
--- a/main/font-misc-misc/APKBUILD
+++ b/main/font-misc-misc/APKBUILD
@@ -14,9 +14,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 _builddir="$srcdir"/$pkgname-$pkgver
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
+		--with-fontdir=/usr/share/fonts/misc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/font-mutt-misc/APKBUILD b/main/font-mutt-misc/APKBUILD
index 14f321e4c44304db433add9ce3f834d19a331c9c..d9a9e521fbbc2bebf4494da86a2221ad574b806a 100644
--- a/main/font-mutt-misc/APKBUILD
+++ b/main/font-mutt-misc/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
+		--with-fontdir=/usr/share/fonts/misc \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-schumacher-misc/APKBUILD b/main/font-schumacher-misc/APKBUILD
index 67705d3bff8ed11fa795b94c737c6cea049e5f12..6a18163e87da821663824ad4f090bf22b2209265 100644
--- a/main/font-schumacher-misc/APKBUILD
+++ b/main/font-schumacher-misc/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
+		--with-fontdir=/usr/share/fonts/misc \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-screen-cyrillic/APKBUILD b/main/font-screen-cyrillic/APKBUILD
index 9f5c643cb05f7a016e8de2a5d794e29da9514633..b016055a87dd70c0a3acf1724d4dcaa0056542c1 100644
--- a/main/font-screen-cyrillic/APKBUILD
+++ b/main/font-screen-cyrillic/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/cyrillic
+		--with-fontdir=/usr/share/fonts/cyrillic \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-sony-misc/APKBUILD b/main/font-sony-misc/APKBUILD
index 708ecbad7f213ca1c4e7ada0e86cf199dc7c6874..df52f0ad6cbb7614d05a42bd2359edc54059558f 100644
--- a/main/font-sony-misc/APKBUILD
+++ b/main/font-sony-misc/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
+		--with-fontdir=/usr/share/fonts/misc \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-sun-misc/APKBUILD b/main/font-sun-misc/APKBUILD
index dc13429422ab1063e8773398dfe00b2b8016b9bc..b2919aeb52070cfdf9164d12815905171a29c28e 100644
--- a/main/font-sun-misc/APKBUILD
+++ b/main/font-sun-misc/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc
+		--with-fontdir=/usr/share/fonts/misc \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-util/APKBUILD b/main/font-util/APKBUILD
index 16d914132da008d9444318ed25f773f189df75e0..94be113358a217664401fcd8a157ce13bf70977e 100644
--- a/main/font-util/APKBUILD
+++ b/main/font-util/APKBUILD
@@ -14,8 +14,12 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/font-winitzki-cyrillic/APKBUILD b/main/font-winitzki-cyrillic/APKBUILD
index 4fe93fadbeebcff2814f1af1122c9a2e3e34ff53..2a4440d0b2906b7c934a26bea58b37d856b27fae 100644
--- a/main/font-winitzki-cyrillic/APKBUILD
+++ b/main/font-winitzki-cyrillic/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/cyrillic
+		--with-fontdir=/usr/share/fonts/cyrillic \
+		|| return 1
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
diff --git a/main/font-xfree86-type1/APKBUILD b/main/font-xfree86-type1/APKBUILD
index b1e0897399ac7a13a9c7ebcc1b4a9bae2444facf..cbb2d42d4472e6495623863a6952fb4ccc7613f9 100644
--- a/main/font-xfree86-type1/APKBUILD
+++ b/main/font-xfree86-type1/APKBUILD
@@ -13,9 +13,13 @@ source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.ta
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Type1
+		--with-fontdir=/usr/share/fonts/Type1 \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/fontconfig/APKBUILD b/main/fontconfig/APKBUILD
index ecc9a9fb424c274351da4c3a90db8af5b60784ed..2390d8f2b7ff9da38c993cb984cc860d5003d5a5 100644
--- a/main/fontconfig/APKBUILD
+++ b/main/fontconfig/APKBUILD
@@ -29,9 +29,13 @@ prepare() {
 build() {
 	cd "$_builddir"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-docs
+		--disable-docs \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/fontsproto/APKBUILD b/main/fontsproto/APKBUILD
index 1ea7040bf8878640f0af288665f2ffa79ddb19d3..fde07dbcb2158a1b49a8e990dd7c6dbd7dcc4bc6 100644
--- a/main/fontsproto/APKBUILD
+++ b/main/fontsproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.t
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/fping/APKBUILD b/main/fping/APKBUILD
index 1ac36be4581735636d7874363d8e90147937d43d..b39056dfaafdda8951f91e86713984a9a5fed17f 100644
--- a/main/fping/APKBUILD
+++ b/main/fping/APKBUILD
@@ -15,8 +15,12 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build () { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/fprobe-ulog/APKBUILD b/main/fprobe-ulog/APKBUILD
index 139aaf02c1b1a73ad5b968e00f8bf3b310460df2..4e88be2960e56a75f0e375f7e70e29fc9a77a04b 100644
--- a/main/fprobe-ulog/APKBUILD
+++ b/main/fprobe-ulog/APKBUILD
@@ -29,10 +29,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/fprobe/APKBUILD b/main/fprobe/APKBUILD
index 79da613cfbed389bb688ab98b9fbb61781d1185c..824c4e1cbcfd8da8eaa7b5565ddf8ada23bf9269 100644
--- a/main/fprobe/APKBUILD
+++ b/main/fprobe/APKBUILD
@@ -30,10 +30,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/freeglut/APKBUILD b/main/freeglut/APKBUILD
index 2875613001964e2a9e5748d671936f43dd267f1f..fa624a6636bb85564a3f14cf064ae2c430677866 100644
--- a/main/freeglut/APKBUILD
+++ b/main/freeglut/APKBUILD
@@ -30,7 +30,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr --disable-static || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/freeradius-client/APKBUILD b/main/freeradius-client/APKBUILD
index 01ff2e25aad707d62a6d9f50afcb450ee9124667..049775d4edb063791866a820ab5b9ef1946eafa4 100644
--- a/main/freeradius-client/APKBUILD
+++ b/main/freeradius-client/APKBUILD
@@ -20,10 +20,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index 188c0c67c07ce569f355786d5b8c22c5d4fe0c25..9f7d775ff5f2882ea97a80604c15b623173226ed 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -49,11 +49,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-                --localstatedir=/var \
+		--localstatedir=/var \
 		--libdir=/usr/lib/freeradius \
 		--disable-static \
 		--enable-shared \
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 3b68a044761b98631fac7ed8cd32384b6fe24d7a..a7ab3467a39d5eba1776d833f2ea93e3f8eb5025 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -50,7 +50,10 @@ build() {
 	# remove -Werror since gcc-4.5 is more strict
 	sed -i -e 's/-Werror//g' configure || return 1
 	[ "$ALPINE_LIBC" != "eglibc" ] && export LDFLAGS="$LDFLAGS -liconv"
-	CFLAGS="-Wno-unused-but-set-variable" ./configure --prefix=/usr \
+	CFLAGS="-Wno-unused-but-set-variable" ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc/freeswitch \
 		--with-modinstdir=/usr/lib/freeswitch \
 		--with-rundir=/var/run/freeswitch \
diff --git a/main/freetds/APKBUILD b/main/freetds/APKBUILD
index a1afcc46ce18f40476858417e96625bb194d6b5a..d980ccd541e2619728489dec62bc5f7646c2f3f6 100644
--- a/main/freetds/APKBUILD
+++ b/main/freetds/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/freetype/APKBUILD b/main/freetype/APKBUILD
index c1206f25b1a5801f62a21c9d78aa7b4ef78a4448..dd545dad476a23f9495bd94928272aef82814518 100644
--- a/main/freetype/APKBUILD
+++ b/main/freetype/APKBUILD
@@ -29,11 +29,15 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/fribidi/APKBUILD b/main/fribidi/APKBUILD
index 05ca5541f53628069a461edca77e97ac60c48b11..3b2ec1b8cb24577af407cabdad0b4be2991d697c 100644
--- a/main/fribidi/APKBUILD
+++ b/main/fribidi/APKBUILD
@@ -14,7 +14,11 @@ source="http://fribidi.org/download/fribidi-$pkgver.tar.bz2"
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/fsarchiver/APKBUILD b/main/fsarchiver/APKBUILD
index 6ea09df1a883557a2cb9de7c912243931e75a7e0..772cf9abaf1bca32d487909aeb01e41277ec821d 100644
--- a/main/fsarchiver/APKBUILD
+++ b/main/fsarchiver/APKBUILD
@@ -13,7 +13,11 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
+  ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
   make
 }
 
diff --git a/main/fuse/APKBUILD b/main/fuse/APKBUILD
index 122c9e424958142ce66ad70ce9f7a74eeb994007..c24b5950c973ecf8fe09aa8d35343793692fd681 100644
--- a/main/fuse/APKBUILD
+++ b/main/fuse/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-static \
 		--enable-shared \
 		--disable-example \
diff --git a/main/galculator/APKBUILD b/main/galculator/APKBUILD
index 717cc9cec561f8b7e473e76b4c08422861fd947c..b42cb3f745fe343b00721ebc38633c362837db7e 100644
--- a/main/galculator/APKBUILD
+++ b/main/galculator/APKBUILD
@@ -23,7 +23,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-gtk3 \
 		|| return 1
 	make || return 1
diff --git a/main/gamin/APKBUILD b/main/gamin/APKBUILD
index 712be26613d1cfb8c4b31d72da1a7a031fa8c181..b13fe04779d559b16baa2341112c0b8f850bb3fc 100644
--- a/main/gamin/APKBUILD
+++ b/main/gamin/APKBUILD
@@ -24,7 +24,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-static \
 		--with-threads \
 		--disable-debug-api \
diff --git a/main/garcon/APKBUILD b/main/garcon/APKBUILD
index 2b0cb10f4be0a06a4d065a83b71b0ef320465519..10e23f8a5ff48ece3b0e28ba7210c65857f877fb 100644
--- a/main/garcon/APKBUILD
+++ b/main/garcon/APKBUILD
@@ -16,11 +16,15 @@ replaces="xfdesktop"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make
 }
 
diff --git a/main/gawk/APKBUILD b/main/gawk/APKBUILD
index 8615e8ed28a6f2171351eb2e5364e5156ae4e258..7c250586c556c7020850f98188124c838779be4b 100644
--- a/main/gawk/APKBUILD
+++ b/main/gawk/APKBUILD
@@ -14,13 +14,15 @@ source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
-		--build=${CBUILD} \
-		--host=${CHOST} \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-nls
+		--disable-nls \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gc/APKBUILD b/main/gc/APKBUILD
index e8db5195231cbecd52125ccd378bf314d99f11c9..dbf663023586cba94437a62ff5734ebfab6fdf3d 100644
--- a/main/gc/APKBUILD
+++ b/main/gc/APKBUILD
@@ -24,9 +24,13 @@ prepare() {
 	
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--datadir=/usr/share/doc/gc \
-		--enable-cplusplus || return 1
+		--enable-cplusplus \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gconf/APKBUILD b/main/gconf/APKBUILD
index c20157e75cc29a95710dd8b8d8f8cc3df254dbf0..77b8fe0b72c40620915ce522b138a984b90752a8 100644
--- a/main/gconf/APKBUILD
+++ b/main/gconf/APKBUILD
@@ -30,9 +30,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--with-gtk=2.0 || return 0
+		--with-gtk=2.0 \
+		|| return 0 \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gd/APKBUILD b/main/gd/APKBUILD
index 63d7a1164630c40b5a34ac6fb333cc3e6001ae32..6a5632eadd0a61ec4961c203a90bb01d380959ae 100644
--- a/main/gd/APKBUILD
+++ b/main/gd/APKBUILD
@@ -20,7 +20,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -28,7 +31,8 @@ build() {
 		--with-freetype \
 		--with-jpeg \
 		--without-xpm \
-		--without-fontconfig
+		--without-fontconfig \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gdb/APKBUILD b/main/gdb/APKBUILD
index b9b4439be0e773087d1119ff7327a22c76c1e583..b4c45b7cb335e75b4e320e932aec69e4e5d70cd3 100644
--- a/main/gdb/APKBUILD
+++ b/main/gdb/APKBUILD
@@ -34,9 +34,10 @@ prepare() {
 
 build () {
 	cd "$_builddir"
-	local _config="--prefix=/usr
+	local _config="
 		--build=$CBUILD
 		--host=$CHOST
+		--prefix=/usr
 		--target=$CTARGET
 		--with-build-sysroot=$CBUILDROOT
 		--disable-nls
@@ -50,9 +51,8 @@ build () {
 	# gdb server does not compile with musl
 	[ "${CHOST#*musl}" != "$CHOST" ] &&  _config="$_config --disable-gdbserver"
 
-	./configure $_config
-	cd opcodes && ./configure $_config || return 1
-	cd ..
+	./configure $_config || return 1
+	(cd opcodes && ./configure $_config) || return 1
 	make || return 1
 }
 
diff --git a/main/gdbm/APKBUILD b/main/gdbm/APKBUILD
index dd515f5ec76f949b4ea480a00ec3fec8eb67fa60..d6b820cd4709e393a284be2c21ed461b13a135b7 100644
--- a/main/gdbm/APKBUILD
+++ b/main/gdbm/APKBUILD
@@ -28,11 +28,15 @@ build() {
 	cd "$_builddir"
 	# we disable large-file due to it makes the db file non-compat
 	# with gdbm-1.8.3
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-libgdbm-compat \
 		--disable-largefile \
 		--disable-dependency-tracking \
-		--enable-fast-install
+		--enable-fast-install \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gdk-pixbuf/APKBUILD b/main/gdk-pixbuf/APKBUILD
index f00640764c50e9db48e18ca5c6c501eb45f7a1d7..72e82c6a472005a7c8684a6236cdd46f768be60d 100644
--- a/main/gdk-pixbuf/APKBUILD
+++ b/main/gdk-pixbuf/APKBUILD
@@ -28,11 +28,15 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--with-x11 \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gdl/APKBUILD b/main/gdl/APKBUILD
index fb03c64c4a6395b16fb21848709d1ff858897a04..415b5f911de50b457f717e25915e746d589a3b91 100644
--- a/main/gdl/APKBUILD
+++ b/main/gdl/APKBUILD
@@ -12,7 +12,10 @@ source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$p
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
diff --git a/main/gdnsd/APKBUILD b/main/gdnsd/APKBUILD
index 77a96eb30bd8456ac9f4ef711cbff762394549ad..5652bf31d5e26cfecc679d8762d9545ec1f0f7b1 100644
--- a/main/gdnsd/APKBUILD
+++ b/main/gdnsd/APKBUILD
@@ -35,7 +35,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-fast-install \
diff --git a/main/geany/APKBUILD b/main/geany/APKBUILD
index 4118919b4109407dd6cc9b5195df59f1107ed078..8a699339dee8d903839c8c531da80c16c799633e 100644
--- a/main/geany/APKBUILD
+++ b/main/geany/APKBUILD
@@ -53,7 +53,11 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gegl/APKBUILD b/main/gegl/APKBUILD
index 5f4d40521bf4b302cb08456fb7a5875f008f69e3..56987a3d38b51135a6310cab038aa3913e43db3d 100644
--- a/main/gegl/APKBUILD
+++ b/main/gegl/APKBUILD
@@ -24,7 +24,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-librsvg \
 		--disable-docs \
 		|| return 1
diff --git a/main/geh/APKBUILD b/main/geh/APKBUILD
index dfa61e095f544f06c52553741d46b75191db96a1..afa3b555b275f1284e7f50bb434114461b746761 100644
--- a/main/geh/APKBUILD
+++ b/main/geh/APKBUILD
@@ -26,10 +26,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/geoip/APKBUILD b/main/geoip/APKBUILD
index d5f72ef0c90fe1142ffc184f9eab86c25290b261..2c18cae4f9ee703dc8a80168f3f261a9ddf63afa 100644
--- a/main/geoip/APKBUILD
+++ b/main/geoip/APKBUILD
@@ -23,10 +23,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc/geoip \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 	make check || return 1
 }
diff --git a/main/gettext/APKBUILD b/main/gettext/APKBUILD
index 4a5c0de14dc800c59fa80f79449cb9b96d0438d8..4c9ff82f6a893f6760d67c5b4c2e222ecba8df67 100644
--- a/main/gettext/APKBUILD
+++ b/main/gettext/APKBUILD
@@ -35,11 +35,15 @@ build() {
 	# http://bugs.gentoo.org/show_bug.cgi?id=81628
 	export CPPFLAGS="$CPPFLAGS -I/usr/include/libxml2"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--enable-threads=posix \
 		--disable-java \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/ghostscript/APKBUILD b/main/ghostscript/APKBUILD
index 69806d87b4daa2db71f4057876fb850a08885a71..e01a138758685c48e33b7abd5ede82b043381ed4 100644
--- a/main/ghostscript/APKBUILD
+++ b/main/ghostscript/APKBUILD
@@ -39,11 +39,22 @@ prepare() {
 build(){
 	# build ijs
 	cd "$_builddir"/ijs
-	./configure --prefix=/usr --enable-shared --disable-static || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--enable-shared \
+		--disable-static \
+		|| return 1
 	make
 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+
+	# --disable-compile-inits is needed to link with system-zlib
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -56,7 +67,8 @@ build(){
 		--enable-gtk \
 		--with-drivers=FILES \
 		--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
-		--disable-compile-inits # needed for linking with system-zlib
+		--disable-compile-inits \
+		|| return 1
 	make so all || return 1 
 }
 
diff --git a/main/giblib/APKBUILD b/main/giblib/APKBUILD
index f14b62abf0546ea3234a7716a6b7ed61abde8c82..cb1196d8a91dc31294641391a89551e4e54dc50a 100644
--- a/main/giblib/APKBUILD
+++ b/main/giblib/APKBUILD
@@ -14,7 +14,11 @@ source="http://linuxbrit.co.uk/downloads/$pkgname-$pkgver.tar.gz"
 depends_dev="imlib2-dev freetype-dev zlib-dev libx11-dev libxext-dev"
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/giflib/APKBUILD b/main/giflib/APKBUILD
index 81a5fc73a7505eabff603bd00f160f026e5068f1..32f5c72161b52ebd8b7ff008e718834ba666e053 100644
--- a/main/giflib/APKBUILD
+++ b/main/giflib/APKBUILD
@@ -24,7 +24,11 @@ prepare() {
 
 build () { 
 	cd "$_builddir"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 	MAJOR=`echo $pkgver | sed 's/\([0-9]\+\)\..*/\1/'`
 	gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.$pkgver || return 1
diff --git a/main/gigolo/APKBUILD b/main/gigolo/APKBUILD
index 0bed2a64f9c1d6274ca398240f30f3d762a5ad28..7de77d1bd9879656a38c71993046c5c73751f9a6 100644
--- a/main/gigolo/APKBUILD
+++ b/main/gigolo/APKBUILD
@@ -20,10 +20,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gimp/APKBUILD b/main/gimp/APKBUILD
index c4b6c9d15e149395e594795e0f9cbf1a68acf34c..ec6198ef662b64871ff37f6e6d70a725346cd420 100644
--- a/main/gimp/APKBUILD
+++ b/main/gimp/APKBUILD
@@ -30,7 +30,10 @@ prepare() {
 
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-dependency-tracking \
 		--sysconfdir=/etc \
 		--enable-mp \
@@ -40,7 +43,8 @@ build() {
 		--with-gvfs \
 		--without-gnomevfs \
 		--with-gif-compression=lzw \
-		--without-aa || return 1
+		--without-aa \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/glade/APKBUILD b/main/glade/APKBUILD
index bb25db79ad9d563d33c41e0d04e8825040ad7973..c436803b1c22eb77fcb48cf9f40674e91ca346dc 100644
--- a/main/glade/APKBUILD
+++ b/main/glade/APKBUILD
@@ -26,10 +26,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/glade3/APKBUILD b/main/glade3/APKBUILD
index e70b90ba6c3d40ee777e51d8255899e32d93d00e..1d748621afa239ca53f1c90a0bc3feba89b03bfb 100644
--- a/main/glade3/APKBUILD
+++ b/main/glade3/APKBUILD
@@ -19,7 +19,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/glib-networking/APKBUILD b/main/glib-networking/APKBUILD
index ab9bc5750be863d687b70db549c34b71562c7ad6..1a547ebca0e7a2b36725fa2e02e6282f5aecc3a7 100644
--- a/main/glib-networking/APKBUILD
+++ b/main/glib-networking/APKBUILD
@@ -31,7 +31,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	CONFIG_SHELL=/bin/bash ./configure --prefix=/usr \
+	CONFIG_SHELL=/bin/bash ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-libproxy \
 		--with-gnutls \
 		|| return 1
diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD
index 129b5df6dc1c1773fda26bf3d2aaba86d1640e3c..fbe1f164de674ebbfd044ec521191a4655526797 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -22,8 +22,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/glibmm/APKBUILD b/main/glibmm/APKBUILD
index 3fe0ac686f01a76f6d16b37dc13c0b8eb8dbf26a..e09c93717a5f0f08e413672d484313fbaa7e0aa8 100644
--- a/main/glibmm/APKBUILD
+++ b/main/glibmm/APKBUILD
@@ -14,7 +14,11 @@ source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$p
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/glproto/APKBUILD b/main/glproto/APKBUILD
index a6f91e3e5cd75805e4a10c1d5dc64ee33eee0f8a..d6b9af13a1c36163d75f3dad88f4ce680fcf0650 100644
--- a/main/glproto/APKBUILD
+++ b/main/glproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.t
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/glu/APKBUILD b/main/glu/APKBUILD
index 48b117ee598e8d1e73017a2257a8ca98ede44035..4f88ce8d944db224f05de19b78f95de22509f4bb 100644
--- a/main/glu/APKBUILD
+++ b/main/glu/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-static \
 		|| return 1
 	make || return 1
diff --git a/main/gmime/APKBUILD b/main/gmime/APKBUILD
index af59ad9e471bc9aa6754467e05317390e82be017..599de2af01237174332461a1e3d9592209f88d9d 100644
--- a/main/gmime/APKBUILD
+++ b/main/gmime/APKBUILD
@@ -27,8 +27,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gmp5/APKBUILD b/main/gmp5/APKBUILD
index f57a04f6573cebca3cdbcfd992884512a608944f..cf624951db5d3869a1146152ab7c446963f9ad64 100644
--- a/main/gmp5/APKBUILD
+++ b/main/gmp5/APKBUILD
@@ -24,14 +24,15 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--build=${CBUILD} \
-		--host=${CHOST} \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--with-sysroot=${CBUILDROOT} \
+		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		--localstatedir=/var/state/gmp \
-		--enable-cxx  \
+		--enable-cxx \
 		--with-pic \
 		|| return 1
 
diff --git a/main/gnats/APKBUILD b/main/gnats/APKBUILD
index 9b4460809e057028889bc228bfa16ceddf2008b5..befad8edbaf0a02300b8fc96d195578c09368170 100644
--- a/main/gnats/APKBUILD
+++ b/main/gnats/APKBUILD
@@ -18,11 +18,15 @@ build() {
 	# make install needs gnats user
 	sudo sh $srcdir/$install pre_install || return 1
 
-	AWK=awk ./configure --prefix=/usr \
+	AWK=awk ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--sharedstatedir=/var/lib \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 
 	make || return 1
 	make DESTDIR="$pkgdir/" install
diff --git a/main/gnokii/APKBUILD b/main/gnokii/APKBUILD
index cd4ffce498f8a84735f2cb3bd0a8449a0a8052c4..9d02ec554717bb1ffcdc40dbc5bf30a54bdf3494 100644
--- a/main/gnokii/APKBUILD
+++ b/main/gnokii/APKBUILD
@@ -32,7 +32,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--enable-security \
 		--disable-unix98test \
diff --git a/main/gnomad2/APKBUILD b/main/gnomad2/APKBUILD
index 804d008931585de34e481af579a4ac0376e10df0..237a8dc53f6983357f7603ad972801687334466b 100644
--- a/main/gnomad2/APKBUILD
+++ b/main/gnomad2/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/gnome-bluetooth/APKBUILD b/main/gnome-bluetooth/APKBUILD
index 182e9765aefc0b165bbc1af4f545f6a66ee08fb1..4666c4eb054d5aba45e49747d1a927d851848059 100644
--- a/main/gnome-bluetooth/APKBUILD
+++ b/main/gnome-bluetooth/APKBUILD
@@ -32,7 +32,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-desktop-update \
diff --git a/main/gnome-control-center/APKBUILD b/main/gnome-control-center/APKBUILD
index c7c1417cad71a7a22bfb65f141b1c5a6558d3aa6..7977e90d4b7dd6f8dc6f7a7ad6d0eead0858678a 100644
--- a/main/gnome-control-center/APKBUILD
+++ b/main/gnome-control-center/APKBUILD
@@ -51,9 +51,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gnome-desktop/APKBUILD b/main/gnome-desktop/APKBUILD
index 5dff957bb57e30636b27f9b197d5983389d80ee8..c76d46440853b82fe7fcbdb273540627dc4af424 100644
--- a/main/gnome-desktop/APKBUILD
+++ b/main/gnome-desktop/APKBUILD
@@ -27,10 +27,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--with-gnome-distributor=Alpine \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gnome-disk-utility/APKBUILD b/main/gnome-disk-utility/APKBUILD
index 95c1e1e0907532a54bc257decdc1cf1a2407f692..4d6ed675343a3fa77f5f1109ed414e6a2c3b1f92 100644
--- a/main/gnome-disk-utility/APKBUILD
+++ b/main/gnome-disk-utility/APKBUILD
@@ -26,13 +26,17 @@ prepare() {
 build () 
 { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--libexecdir=/usr/lib/gnome-disk-utility \
 		--disable-scrollkeeper \
 		--disable-nautilus \
-		--disable-gtk-doc
+		--disable-gtk-doc \
+		|| return 1
 	make
 }
 
diff --git a/main/gnome-doc-utils/APKBUILD b/main/gnome-doc-utils/APKBUILD
index 99d0625c3830d7cba59b204822c26c008f494076..c18984186d27b48260c69260dfb6f3dcf002407e 100644
--- a/main/gnome-doc-utils/APKBUILD
+++ b/main/gnome-doc-utils/APKBUILD
@@ -19,11 +19,15 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	# broken with parallell builds
 	make -j1 || return 1
 }
diff --git a/main/gnome-icon-theme/APKBUILD b/main/gnome-icon-theme/APKBUILD
index 72a009efe35d24acea4831c01dcf04b6228d0c49..a1f7e5f1a25176f3f61fd54727b169a5503ee30c 100644
--- a/main/gnome-icon-theme/APKBUILD
+++ b/main/gnome-icon-theme/APKBUILD
@@ -27,9 +27,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gnome-keyring/APKBUILD b/main/gnome-keyring/APKBUILD
index 574df5ef131c7a2cfa35ca1dbbdac7f1ec92fc8d..74c604f1b5e79d1145a427dc30adea1d2056b0f9 100644
--- a/main/gnome-keyring/APKBUILD
+++ b/main/gnome-keyring/APKBUILD
@@ -46,8 +46,12 @@ build() {
 	cd "$_builddir"
 	# build fails on eglibc when using ccache
 	[ "$ALPINE_LIBC" = "eglibc" ] && export CC="/usr/bin/gcc"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gnome-menus/APKBUILD b/main/gnome-menus/APKBUILD
index 13076e97800ae6db38c85210fb7ff8d842c31bc2..6827135105e2423c57660731073ffe5054949aac 100644
--- a/main/gnome-menus/APKBUILD
+++ b/main/gnome-menus/APKBUILD
@@ -27,9 +27,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gnome-mime-data/APKBUILD b/main/gnome-mime-data/APKBUILD
index 9cbd4698f7b38c6440f640cdd8a52b305a77affd..5988e4c00d6580a1219fd54069718196a0a4aef2 100644
--- a/main/gnome-mime-data/APKBUILD
+++ b/main/gnome-mime-data/APKBUILD
@@ -27,9 +27,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gnome-panel/APKBUILD b/main/gnome-panel/APKBUILD
index 6e3ce26bded825d7287c68339ac781d2619dd997..e2ea9679427dcc05dc93a7e5522be4524f889310 100644
--- a/main/gnome-panel/APKBUILD
+++ b/main/gnome-panel/APKBUILD
@@ -41,9 +41,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gnome-power-manager/APKBUILD b/main/gnome-power-manager/APKBUILD
index 08e7463ee1c64b413f9f11b25733b6781fb088fd..16550a3adf631c80fd4700488447df23416e0dce 100644
--- a/main/gnome-power-manager/APKBUILD
+++ b/main/gnome-power-manager/APKBUILD
@@ -50,10 +50,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--disable-applets \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gnome-screensaver/APKBUILD b/main/gnome-screensaver/APKBUILD
index d7e1acabb4083fd4c56030e537c2f86657aca07f..91da558467b54fec7aa76a6d6b0827251ad8f657 100644
--- a/main/gnome-screensaver/APKBUILD
+++ b/main/gnome-screensaver/APKBUILD
@@ -48,10 +48,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--disable-applets \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gnome-session/APKBUILD b/main/gnome-session/APKBUILD
index bb453be6fe4114de429a4cd918252d88858f8590..8710854ac4e693de172d6ae8bf076b823c88e060 100644
--- a/main/gnome-session/APKBUILD
+++ b/main/gnome-session/APKBUILD
@@ -36,10 +36,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--enable-compositor \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gnome-settings-daemon/APKBUILD b/main/gnome-settings-daemon/APKBUILD
index 9d827f6ac5d1ac4dacf7a781e95d8f52405c0156..58863deb36d29ca6e460c68d00aa7b5e48cff633 100644
--- a/main/gnome-settings-daemon/APKBUILD
+++ b/main/gnome-settings-daemon/APKBUILD
@@ -47,9 +47,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gnome-system-monitor/APKBUILD b/main/gnome-system-monitor/APKBUILD
index 1374b210863bf01b0e106c752fc5f9a914488ab0..ad83de9e00352069068f083748a996ae94159b71 100644
--- a/main/gnome-system-monitor/APKBUILD
+++ b/main/gnome-system-monitor/APKBUILD
@@ -63,9 +63,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gnome-terminal/APKBUILD b/main/gnome-terminal/APKBUILD
index 9ff4320913d67b9cb14466cf650d724bfbf6ec7c..979e31ea962f81af20332ff291fa05f924183f34 100644
--- a/main/gnome-terminal/APKBUILD
+++ b/main/gnome-terminal/APKBUILD
@@ -26,9 +26,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gnome-themes/APKBUILD b/main/gnome-themes/APKBUILD
index b9a963e5ea4aac85872166f150fbffa338a0358f..da9ce458977f6ca0fb006998986c3d7e7e6cf874 100644
--- a/main/gnome-themes/APKBUILD
+++ b/main/gnome-themes/APKBUILD
@@ -27,9 +27,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gnome-vfs/APKBUILD b/main/gnome-vfs/APKBUILD
index 70d2e4ca12da0f693b651c63090ea363bfdc03f5..0854692d1a9c63ef2d270f898708dc13760d2db8 100644
--- a/main/gnome-vfs/APKBUILD
+++ b/main/gnome-vfs/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		|| return 1
 	make || return 1
diff --git a/main/gnuchess/APKBUILD b/main/gnuchess/APKBUILD
index bb1a7ed2a08970eea4e5eaf1b4d75dee46cda11e..bc98ebeaaa7a01760e954ee4f42cf56527ab5bc9 100644
--- a/main/gnuchess/APKBUILD
+++ b/main/gnuchess/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/gnumeric/APKBUILD b/main/gnumeric/APKBUILD
index 119cf470598c56f3d50ef223f1b8ea6caa66cbc3..1a0dc46de39f7ea4ff2f8d8b146fcbbcfc962d0a 100644
--- a/main/gnumeric/APKBUILD
+++ b/main/gnumeric/APKBUILD
@@ -24,7 +24,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
diff --git a/main/gnupg/APKBUILD b/main/gnupg/APKBUILD
index 445dd673164286ab3272c4d54a894c832e0e0947..0fef88634b5062067a1f757fe5777f95e1cf5faa 100644
--- a/main/gnupg/APKBUILD
+++ b/main/gnupg/APKBUILD
@@ -14,8 +14,12 @@ source="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2"
 
 build () {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr \
-		--disable-nls
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-nls \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gnutls/APKBUILD b/main/gnutls/APKBUILD
index e7e8bf6d94d62f308a0487fe4134582281627c27..1dbe3465704cab6a61348d825ddf7c07f7a385b3 100644
--- a/main/gnutls/APKBUILD
+++ b/main/gnutls/APKBUILD
@@ -29,7 +29,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	LIBS="-lgmp" ./configure --prefix=/usr \
+	LIBS="-lgmp" ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/gobject-introspection/APKBUILD b/main/gobject-introspection/APKBUILD
index 69e8a03aa891e4a5e869273a5d666575fb9dfced..7d7e462a1e4a520d2adaed8d1b4970b6656afc58 100644
--- a/main/gobject-introspection/APKBUILD
+++ b/main/gobject-introspection/APKBUILD
@@ -31,7 +31,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr --disable-static || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-static \
+		|| return 1
 	make V=1 || return 1
 }
 
diff --git a/main/goffice/APKBUILD b/main/goffice/APKBUILD
index 961a1086b317b8b47e515e5f1a19549a7e2eb2d6..6d1806c77833762931f8a6539ce35b2fea92118d 100644
--- a/main/goffice/APKBUILD
+++ b/main/goffice/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
diff --git a/main/goffice0.8/APKBUILD b/main/goffice0.8/APKBUILD
index 54829f2cdd5256bc4440df2bf911ce70b63857c6..cde30efe6017215090cd703ab523b175bc742cd8 100644
--- a/main/goffice0.8/APKBUILD
+++ b/main/goffice0.8/APKBUILD
@@ -30,7 +30,10 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$_realname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--without-gconf \
diff --git a/main/gparted/APKBUILD b/main/gparted/APKBUILD
index e6f9ca91b967be1e8d892480b045b1ccfeb8fcdf..e98d15415dc8eb044f8c537695c02ecc08b05a8d 100644
--- a/main/gparted/APKBUILD
+++ b/main/gparted/APKBUILD
@@ -20,12 +20,16 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--disable-doc \
-		--disable-scrollkeeper
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gperf/APKBUILD b/main/gperf/APKBUILD
index 6cad51f78ed8bd8177e4b7d909488719c2b3876b..37c4ce18ce29e71aaae461c495c53c4ac67e1a21 100644
--- a/main/gperf/APKBUILD
+++ b/main/gperf/APKBUILD
@@ -14,7 +14,11 @@ source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
 build () 
 { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gpgme/APKBUILD b/main/gpgme/APKBUILD
index 3e5f3419a518ccdead806d623d11d06856cb558a..bd7d29d1da22a93bc99f21cc6d3eeabd7bf78e5b 100644
--- a/main/gpgme/APKBUILD
+++ b/main/gpgme/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/gphoto2/APKBUILD b/main/gphoto2/APKBUILD
index fdb6d26bf4d411a6adf08abc197ced4dc01f13ff..7831471fe643a8f209ac5c4f959c7dd6fe7bc564 100644
--- a/main/gphoto2/APKBUILD
+++ b/main/gphoto2/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/gpicview/APKBUILD b/main/gpicview/APKBUILD
index d7b2c63975218213c6fdea35faeaa66d32847940..ad26d8cd1971d63e4c599db6c1c8125675e30024 100644
--- a/main/gpicview/APKBUILD
+++ b/main/gpicview/APKBUILD
@@ -22,7 +22,12 @@ prepare() {
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --sysconfdir=/etc --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--sysconfdir=/etc \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/graphviz/APKBUILD b/main/graphviz/APKBUILD
index d5cf0096aa53505bfef68786bd70328b810f515a..531d158e9141f62ffd745b540ab26f667e452d3e 100644
--- a/main/graphviz/APKBUILD
+++ b/main/graphviz/APKBUILD
@@ -33,7 +33,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--with-x \
 		--disable-static \
diff --git a/main/grep/APKBUILD b/main/grep/APKBUILD
index 0be3037679f30eee0b9ee1a046ee2a9b7bba8ee8..3303e7bd69493da03a2775c167714be9a416c522 100644
--- a/main/grep/APKBUILD
+++ b/main/grep/APKBUILD
@@ -16,11 +16,15 @@ source="http://mirrors.kernel.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-nls
+		--disable-nls \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/groff/APKBUILD b/main/groff/APKBUILD
index aca8b4803d54be8b85fe71591005a40b15eed6fc..3b7d7a6d0d1bc1afef55839b52a1a2c2ad7779f7 100644
--- a/main/groff/APKBUILD
+++ b/main/groff/APKBUILD
@@ -13,7 +13,12 @@ source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build () {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr --without-x
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--without-x \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gross/APKBUILD b/main/gross/APKBUILD
index e06a6ef58a4df4ecb4819f5b827501465ae82e97..9ab6ca9ab4fc9aba07455954b82a0b8523fac90d 100644
--- a/main/gross/APKBUILD
+++ b/main/gross/APKBUILD
@@ -33,10 +33,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-        ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --mandir=/usr/share/man \
-                --infodir=/usr/share/info
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		|| return 1
 
         make -j1 || return 1
 }
diff --git a/main/gsl/APKBUILD b/main/gsl/APKBUILD
index aee3d17fec02a79afcfd0ec2e12e81e2c1d95b59..479e571d5237fffa73c0965fa5fbd350b02e1ed5 100644
--- a/main/gsl/APKBUILD
+++ b/main/gsl/APKBUILD
@@ -15,7 +15,11 @@ source="http://ftp.gnu.org/gnu/gsl/gsl-$pkgver.tar.gz"
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gst-ffmpeg/APKBUILD b/main/gst-ffmpeg/APKBUILD
index fb66fe98a84b13d42762aa9ea6b34d24216a3c88..23a659917163b3546a3f57b7993a05252f2dbd8f 100644
--- a/main/gst-ffmpeg/APKBUILD
+++ b/main/gst-ffmpeg/APKBUILD
@@ -21,11 +21,15 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export CFLAGS="$CFLAGS -fno-strict-aliasing"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-orc \
-		--with-ffmpeg-extra-configure="--enable-pic --disable-mmx --disable-mmx2" || return 1
+		--with-ffmpeg-extra-configure="--enable-pic --disable-mmx --disable-mmx2" \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gst-libav1/APKBUILD b/main/gst-libav1/APKBUILD
index 685fe007d2a8f446eefd50e6acdf2757555f48ef..8eb1fb3831293bae9450f4d6c285e807fb63f158 100644
--- a/main/gst-libav1/APKBUILD
+++ b/main/gst-libav1/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export CFLAGS="$CFLAGS -fno-strict-aliasing"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-orc \
diff --git a/main/gst-plugins-bad/APKBUILD b/main/gst-plugins-bad/APKBUILD
index 458fc7411849d9b151e0374b5f97140433865286..ce7bb29822b0091a216321b852ead568a1885ec8 100644
--- a/main/gst-plugins-bad/APKBUILD
+++ b/main/gst-plugins-bad/APKBUILD
@@ -19,7 +19,10 @@ source="http://gstreamer.freedesktop.org//src/gst-plugins-bad/gst-plugins-bad-$p
 
 build() { 
 	cd "$srcdir"/gst-plugins-bad-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
diff --git a/main/gst-plugins-bad1/APKBUILD b/main/gst-plugins-bad1/APKBUILD
index 2a758e9aa2788215eb87c0d8d3bed58dc9d7ef3c..e7a103cd9c3923d23ffafec6bbb8797085ffd801 100644
--- a/main/gst-plugins-bad1/APKBUILD
+++ b/main/gst-plugins-bad1/APKBUILD
@@ -41,7 +41,10 @@ ldpath="/usr/lib/gstreamer-1.0"
 _builddir="$srcdir"/gst-plugins-bad-$pkgver
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
diff --git a/main/gst-plugins-base/APKBUILD b/main/gst-plugins-base/APKBUILD
index 2b2d3e09c5213b187cba38cfc0cfbd89eddd396e..5aec95753ec054f38764b5569400295324f6922f 100644
--- a/main/gst-plugins-base/APKBUILD
+++ b/main/gst-plugins-base/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
diff --git a/main/gst-plugins-base1/APKBUILD b/main/gst-plugins-base1/APKBUILD
index 4b1de23e7b71088bcd940d66f715dec71dc89f75..0891ea957d8b08d983d79eddc4cebd198ee19357 100644
--- a/main/gst-plugins-base1/APKBUILD
+++ b/main/gst-plugins-base1/APKBUILD
@@ -36,7 +36,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
diff --git a/main/gst-plugins-good/APKBUILD b/main/gst-plugins-good/APKBUILD
index 66cae7326757d737bab1518475f082b1cd16e407..353c27a8317285e3882263f7a73fad0312a6cc7f 100644
--- a/main/gst-plugins-good/APKBUILD
+++ b/main/gst-plugins-good/APKBUILD
@@ -32,7 +32,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
diff --git a/main/gst-plugins-good1/APKBUILD b/main/gst-plugins-good1/APKBUILD
index a119a4810caa92c2b04346b8558f0fb14f51e184..53b9d86cdc4ce8be2db13ac7393466516cd0059d 100644
--- a/main/gst-plugins-good1/APKBUILD
+++ b/main/gst-plugins-good1/APKBUILD
@@ -50,7 +50,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
diff --git a/main/gst-plugins-ugly/APKBUILD b/main/gst-plugins-ugly/APKBUILD
index 04a39c4438fb2b2681f4070384493f69ac3fa117..f97ca6d810b13ab367657064157d7b17eead2542 100644
--- a/main/gst-plugins-ugly/APKBUILD
+++ b/main/gst-plugins-ugly/APKBUILD
@@ -27,13 +27,17 @@ prepare() {
 
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
 		--enable-experimental \
 		--with-package-name="GStreamer Ugly Plugins (Alpine Linux)" \
-		--with-package-origin="http://www.alpinelinux.org/" || return 1
+		--with-package-origin="http://www.alpinelinux.org/" \
+		|| return 1
 	make
 }
 
diff --git a/main/gst-plugins-ugly1/APKBUILD b/main/gst-plugins-ugly1/APKBUILD
index 6430d0a0684ae9a251d3675562e6bba3c3d1b052..962dd01eed67ef1cb1f898fac545b54d4610712a 100644
--- a/main/gst-plugins-ugly1/APKBUILD
+++ b/main/gst-plugins-ugly1/APKBUILD
@@ -30,13 +30,17 @@ _builddir="$srcdir"/gst-plugins-ugly-$pkgver
 
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
 		--enable-experimental \
 		--with-package-name="GStreamer Ugly Plugins (Alpine Linux)" \
-		--with-package-origin="http://alpinelinux.org/" || return 1
+		--with-package-origin="http://alpinelinux.org/" \
+		|| return 1
 	make
 }
 
diff --git a/main/gstreamer/APKBUILD b/main/gstreamer/APKBUILD
index 1d7d1f46f2b631c355985a017e97b0e56f35af6e..ce158ab2f9eb09bd32110655f7c42692cb9639fb 100644
--- a/main/gstreamer/APKBUILD
+++ b/main/gstreamer/APKBUILD
@@ -32,11 +32,15 @@ prepare() {
 
 build() {
 	cd "$srcdir"/gstreamer-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-introspection \
-		--disable-docs-build || return 1
+		--disable-docs-build \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gstreamer1/APKBUILD b/main/gstreamer1/APKBUILD
index 59df186f63bc4d9bf4bafe9a6fedae0a5ad826c8..d7a5149869413a24254d0943261dba8ad1312fe3 100644
--- a/main/gstreamer1/APKBUILD
+++ b/main/gstreamer1/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$srcdir"/gstreamer-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-introspection \
diff --git a/main/gtk+2.0/APKBUILD b/main/gtk+2.0/APKBUILD
index acfe2689ff19610be5f8b86162a690073757e1a4..97fa9ac57cd59c425a3fa711b41210396e476737 100644
--- a/main/gtk+2.0/APKBUILD
+++ b/main/gtk+2.0/APKBUILD
@@ -66,12 +66,16 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--with-xinput=yes \
 		--without-libjasper \
-		--with-included-loaders=png || return 1
+		--with-included-loaders=png \
+		|| return 1
 	# https://bugzilla.gnome.org/show_bug.cgi?id=655517
 	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool || return 1
 	make || return 1
diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD
index 0c84becd13f3f9959b67d36a55b082460c4c5820..43013e2174094137fe18a70819682ecb7dbee393 100644
--- a/main/gtk+3.0/APKBUILD
+++ b/main/gtk+3.0/APKBUILD
@@ -54,7 +54,10 @@ source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.ta
 _builddir="$srcdir"/gtk+-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		|| return 1
diff --git a/main/gtk-doc/APKBUILD b/main/gtk-doc/APKBUILD
index a0828f58871fe34e931a6917bf59f57992247fcd..1c70f5b7e7dc7608560609989149a83c05cfe0ac 100644
--- a/main/gtk-doc/APKBUILD
+++ b/main/gtk-doc/APKBUILD
@@ -12,7 +12,11 @@ source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gtk-engines/APKBUILD b/main/gtk-engines/APKBUILD
index 643ecd8665ae364b604f8242e63119855c3e0bde..50baa5cbf11650f18573cb31f3a0dcc9ee06051a 100644
--- a/main/gtk-engines/APKBUILD
+++ b/main/gtk-engines/APKBUILD
@@ -32,10 +32,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--enable-animation \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gtk-vnc/APKBUILD b/main/gtk-vnc/APKBUILD
index e3c1e32807d01359d1fbcf2faf050126f0f70b60..0304bda52387e4ee966a06aacc99d8bd0a8f094e 100644
--- a/main/gtk-vnc/APKBUILD
+++ b/main/gtk-vnc/APKBUILD
@@ -15,11 +15,15 @@ source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$p
 subpackages="$pkgname-dev gvncviewer $pkgname-lang $pkgname-doc"
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-examples \
 		--enable-introspection \
 		--with-gtk=3.0 \
-		--disable-static || return 1
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gtk-xfce-engine/APKBUILD b/main/gtk-xfce-engine/APKBUILD
index 9004db92925d4c9035f1f4717af16f9d31779e8f..9fa4fc0abfedac1bbb23ce1fe6f64020237b8c75 100644
--- a/main/gtk-xfce-engine/APKBUILD
+++ b/main/gtk-xfce-engine/APKBUILD
@@ -23,11 +23,15 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gtkglext/APKBUILD b/main/gtkglext/APKBUILD
index adee233d10aa03d5d343fcff5569f91bd0f839b2..b6d974773309e0b283f8a63c669768ac991513fb 100644
--- a/main/gtkglext/APKBUILD
+++ b/main/gtkglext/APKBUILD
@@ -30,7 +30,10 @@ prepare() {
 build() {
 	cd "$_builddir"
 	./configure \
-		--prefix=/usr || return 1
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gtkmm/APKBUILD b/main/gtkmm/APKBUILD
index c4f57d332ea1c1e93d564ebbb2e6c141a41efb65..c2422dc465a56ee3d2b0aaca8d937a683be9a7fd 100644
--- a/main/gtkmm/APKBUILD
+++ b/main/gtkmm/APKBUILD
@@ -14,7 +14,11 @@ source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$p
 
 build() {
 	cd "$srcdir"/gtkmm-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gtksourceview/APKBUILD b/main/gtksourceview/APKBUILD
index 09d46d392e6454ecc6669b59e2ab25e2d66c43da..5a9da5c9d7059b9f8af2f5423a3bf55cc56d5c4f 100644
--- a/main/gtksourceview/APKBUILD
+++ b/main/gtksourceview/APKBUILD
@@ -14,10 +14,14 @@ source="http://ftp.gnome.org/pub/gnome/sources/gtksourceview/${pkgver%.*}/gtksou
 
 build() { 
 	cd "$srcdir"/gtksourceview-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--disable-static || return 1
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/gtkspell/APKBUILD b/main/gtkspell/APKBUILD
index 3b5df6f94f71ca156a1d0c4d324e6af244c2512e..9112599b6f4196d1d2a1ac84303b35c20ddb3647 100644
--- a/main/gtkspell/APKBUILD
+++ b/main/gtkspell/APKBUILD
@@ -13,7 +13,10 @@ source="http://$pkgname.sourceforge.net/download/$pkgname-$pkgver.tar.gz"
 depends_dev="gtk+-dev"
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		|| return 1
 	make || return 1
 }
diff --git a/main/gucharmap/APKBUILD b/main/gucharmap/APKBUILD
index e942c30ae88fb83a5486fbcab502e7a45755448e..e7078e43ef52ea948b12dd0d2b75eafb1b962cf4 100644
--- a/main/gucharmap/APKBUILD
+++ b/main/gucharmap/APKBUILD
@@ -21,7 +21,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/guile/APKBUILD b/main/guile/APKBUILD
index f3fb25372a44b322854bcce1b22a3c432e04a062..7166bb65cb4bc21c79ad522fe2a76a908797eeb1 100644
--- a/main/guile/APKBUILD
+++ b/main/guile/APKBUILD
@@ -29,8 +29,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--disable-error-on-warning || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-error-on-warning \
+		|| return 1
 	make LDFLAGS+="-lpthread" || return 1
 }
 
diff --git a/main/gvfs/APKBUILD b/main/gvfs/APKBUILD
index d771bd5c115773533874f06c6b461a47e1a0adad..33a7f08e952599a3559f9a2252c35c71e491427b 100644
--- a/main/gvfs/APKBUILD
+++ b/main/gvfs/APKBUILD
@@ -37,7 +37,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/gvfs \
 		--mandir=/usr/share/man \
diff --git a/main/gzip/APKBUILD b/main/gzip/APKBUILD
index fec3177a31a1a9eec649560835600d131d8abe9b..b1b062c06d6a163315739bf9c1365efdcdcc6b3e 100644
--- a/main/gzip/APKBUILD
+++ b/main/gzip/APKBUILD
@@ -19,9 +19,13 @@ build() {
 
 	# avoid text relocation
 	export DEFS="NO_ASM"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
@@ -29,6 +33,9 @@ package() {
 	cd "$_builddir"
 	make DESTDIR=$pkgdir install
 
+	rm -rf "$pkgdir"/usr/lib/charset.alias
+	rmdir -p "$pkgdir"/usr/lib 2>/dev/null
+
 	mkdir -p "$pkgdir"/bin
 	mv "$pkgdir"/usr/bin/gzip "$pkgdir"/usr/bin/gunzip "$pkgdir"/bin/
 	ln -s /bin/gzip "$pkgdir"/usr/bin/gzip
diff --git a/main/harfbuzz/APKBUILD b/main/harfbuzz/APKBUILD
index 1a6244bb6a5420a4618cdabc6f1e34ee24c6b5ec..358ca8735ff335f1630e803595da42551aaf32de 100644
--- a/main/harfbuzz/APKBUILD
+++ b/main/harfbuzz/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-static \
 		|| return 1
 	make
diff --git a/main/haserl/APKBUILD b/main/haserl/APKBUILD
index ad7e36d233093857788f9e39fc7b48b02a4ab2c4..26c3ee6c1e3eb44ad1d1193cdcf9bf8919384f91 100644
--- a/main/haserl/APKBUILD
+++ b/main/haserl/APKBUILD
@@ -32,8 +32,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--with-lua=lua5.1 || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--with-lua=lua5.1 \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/haveged/APKBUILD b/main/haveged/APKBUILD
index 54e6993b34bcd829a570e17077c6d1a1dbdb5cff..7490e314fdf0e1d463e9cc7f784d9a2d3c8e7ab1 100644
--- a/main/haveged/APKBUILD
+++ b/main/haveged/APKBUILD
@@ -16,7 +16,12 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
   cd "$_builddir"
-  ./configure --prefix /usr --sysconfdir /etc || return 1
+  ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix /usr \
+		--sysconfdir /etc \
+		|| return 1
   make || return 1
 }
 
diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD
index 767ee417890f18c699ea232bef9b8bb6cc461331..d5a71f30970313d366b7ab6b3b4b944768fde988 100644
--- a/main/heimdal/APKBUILD
+++ b/main/heimdal/APKBUILD
@@ -54,14 +54,18 @@ build() {
 	export LDFLAGS="${LDFLAGS} -Wl,--as-needed"
 	export LIBS="-ldb"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-shared=yes \
 		--without-x \
 		--with-berkeley-db \
 		--with-readline-lib=/usr/lib \
 		--with-readline-include=/usr/include/readline \
 		--with-sqlite3=/usr \
-		--with-openssl=/usr || return 1
+		--with-openssl=/usr \
+		|| return 1
 
 	# make sure we use system version
 	rm -r lib/sqlite lib/com_err
diff --git a/main/hicolor-icon-theme/APKBUILD b/main/hicolor-icon-theme/APKBUILD
index c3d7144baa2c2928d3fff6b341b63ad34f56f79f..d752d0be8a70a378ccc4637875ff19ab8a9e0f4c 100644
--- a/main/hicolor-icon-theme/APKBUILD
+++ b/main/hicolor-icon-theme/APKBUILD
@@ -12,7 +12,11 @@ source="http://icon-theme.freedesktop.org/releases/$pkgname-$pkgver.tar.gz"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/htop/APKBUILD b/main/htop/APKBUILD
index ac4a843b5f9c1584b89b70b6b1a52eb376cdff13..c7c89133fc31a817b8b4a99c8013f0e35ad7ba2b 100644
--- a/main/htop/APKBUILD
+++ b/main/htop/APKBUILD
@@ -15,6 +15,8 @@ _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		|| return 1
diff --git a/main/hunspell/APKBUILD b/main/hunspell/APKBUILD
index a8409b8b461f66803c80635b56ba2670dda8c6b0..f629a1e46c652e1392b50df7dac19b332fbaf707 100644
--- a/main/hunspell/APKBUILD
+++ b/main/hunspell/APKBUILD
@@ -13,9 +13,13 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build() {
 	cd "$srcdir/hunspell-$pkgver"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-static \
-		--without-included-gettext || return 1
+		--without-included-gettext \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/hwdata/APKBUILD b/main/hwdata/APKBUILD
index bdb25ceb82577e434c7f8d7927213a624175714a..caa449df860ff96cea8ec4e59ac1b88a626a96d9 100644
--- a/main/hwdata/APKBUILD
+++ b/main/hwdata/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		|| return 1
diff --git a/main/hylafax/APKBUILD b/main/hylafax/APKBUILD
index 418027766fd8bf67772ccdace634fb139515f3ce..35c01c96e1f65ebb34b3c85a10988e4a7e072156 100644
--- a/main/hylafax/APKBUILD
+++ b/main/hylafax/APKBUILD
@@ -27,7 +27,11 @@ build() {
 	# the configure script does not handle ccache or distcc
 	export CC=gcc
 	export CXX=g++
-	./configure --nointeractive --disable-pam \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--nointeractive \
+		--disable-pam \
 		--with-DIR_BIN=/usr/bin \
 		--with-DIR_SBIN=/usr/sbin \
 		--with-DIR_LIB=/usr/lib \
diff --git a/main/hypermail/APKBUILD b/main/hypermail/APKBUILD
index 5a6824d85667cdac35c89736d3be6f6f1edb4d8b..02c8f3fcf39c4c1a4946d0fe766557c718be30d5 100644
--- a/main/hypermail/APKBUILD
+++ b/main/hypermail/APKBUILD
@@ -17,12 +17,16 @@ source="http://www.hypermail-project.org/$pkgname-$pkgver.tar.gz
 _builddir="$srcdir"/hypermail
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--with-httpddir=/var/www \
-		--with-cgidir=/var/www/cgi-bin
+		--with-cgidir=/var/www/cgi-bin \
+		|| return 1
 	make || return 1
 }
 package() {
diff --git a/main/iceauth/APKBUILD b/main/iceauth/APKBUILD
index 42712528df010389f4efb05fcecc51c49161a776..77fad92b3b514ad4dd03227873a216e70489d9d8 100644
--- a/main/iceauth/APKBUILD
+++ b/main/iceauth/APKBUILD
@@ -12,7 +12,10 @@ makedepends="pkgconfig libice-dev"
 source="http://xorg.freedesktop.org/releases/individual/app/iceauth-$pkgver.tar.bz2"
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		|| return 1
 	make || return 1
diff --git a/main/icecast/APKBUILD b/main/icecast/APKBUILD
index 83282982c7399f3a58827fee4d538ef28bb3270d..4046c5e4b15216626d5eab8a1616bfec12891f37 100644
--- a/main/icecast/APKBUILD
+++ b/main/icecast/APKBUILD
@@ -26,11 +26,15 @@ prepare() {
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--localstatedir=/var \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 
 	make
 }
diff --git a/main/icedtea-web/APKBUILD b/main/icedtea-web/APKBUILD
index 74cfaebd961596bff3d526d36186681017a08b47..0a45aa915aa06bcbe685ce9f675692001481d9d0 100644
--- a/main/icedtea-web/APKBUILD
+++ b/main/icedtea-web/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr/lib/jvm/java-1.6-openjdk \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr/lib/jvm/java-1.6-openjdk \
 		--datarootdir=/usr/share \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
diff --git a/main/icon-naming-utils/APKBUILD b/main/icon-naming-utils/APKBUILD
index c55416924e744ad8a0c916fba01fe00f7625cab4..b7ba1e1822c6d7b7b73b8d608af1f99c8d313afb 100644
--- a/main/icon-naming-utils/APKBUILD
+++ b/main/icon-naming-utils/APKBUILD
@@ -13,10 +13,14 @@ source="http://tango.freedesktop.org/releases/$pkgname-$pkgver.tar.bz2"
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/icon-naming-utils \
-		--localstatedir=/var || return 1
+		--localstatedir=/var \
+		|| return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 	mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/pkgconfig || return 1
diff --git a/main/icu/APKBUILD b/main/icu/APKBUILD
index a8ebea59179c2ddc72e31db649243fe9df075314..240a3e8f43b3537785dafdfffe69e8a40c45f697 100644
--- a/main/icu/APKBUILD
+++ b/main/icu/APKBUILD
@@ -40,7 +40,10 @@ prepare() {
 
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--with-data-packaging=library \
 		--disable-samples \
diff --git a/main/iftop/APKBUILD b/main/iftop/APKBUILD
index c0161cdc9c572ce88e032c5ae31cc9c614014a49..26a8b0fd866c3514bc9d40089ca266aa08a5a4a2 100644
--- a/main/iftop/APKBUILD
+++ b/main/iftop/APKBUILD
@@ -13,7 +13,12 @@ source="http://www.ex-parrot.com/~pdw/$pkgname/download/$pkgname-$pkgver.tar.gz"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr --mandir=/usr/share/man
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make
 }
 
diff --git a/main/igmpproxy/APKBUILD b/main/igmpproxy/APKBUILD
index c0a8b9a5b080ff53ae3059c2a7306db1757db42c..792cb2f7eb6ff422b896b282107a1951a212f5ca 100644
--- a/main/igmpproxy/APKBUILD
+++ b/main/igmpproxy/APKBUILD
@@ -21,10 +21,14 @@ build() {
 	sed -i -e 's:^#define MAX_MC_VIFS.*:#define MAX_MC_VIFS   MAXVIFS:' \
 		src/igmpproxy.h
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install
 
diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
index 0649ef3964b491e714d5b9918eb428e32b180fcc..a5b79855ec5b944440fc89f348f9b925e27a6677 100644
--- a/main/imagemagick/APKBUILD
+++ b/main/imagemagick/APKBUILD
@@ -33,7 +33,10 @@ build() {
 		's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/imagemagick":g' \
 		configure || die
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -41,7 +44,8 @@ build() {
 		--without-x \
 		--with-gslib \
 		--with-gs-font-dir=/usr/share/fonts/Type1 \
-		--with-modules
+		--with-modules \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/imlib2/APKBUILD b/main/imlib2/APKBUILD
index 15b0fe828cc778030644c2268935300d0f8f2409..0af33ef14a86692ac67b5f08d75b38bfc0ca963e 100644
--- a/main/imlib2/APKBUILD
+++ b/main/imlib2/APKBUILD
@@ -20,7 +20,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc/imlib2 \
 		--x-libraries=/usr/lib \
 		--disable-mmx \
diff --git a/main/indent/APKBUILD b/main/indent/APKBUILD
index 260684cae7dc2e0eb27227f5b91e716ec197a463..65c247549de1819098dc53384ae5df8ec0bb1ece 100644
--- a/main/indent/APKBUILD
+++ b/main/indent/APKBUILD
@@ -22,12 +22,16 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--without-included-gettext \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--without-texinfo
+		--without-texinfo \
+		|| return 1
 	make SUBDIRS="intl po src" || return 1
 }
 
diff --git a/main/inkscape/APKBUILD b/main/inkscape/APKBUILD
index 3944f1257723e2b7a14a02584698802bf03be8cb..b4e9d975567f91b7d47aa472fd520a8d299e3108 100644
--- a/main/inkscape/APKBUILD
+++ b/main/inkscape/APKBUILD
@@ -44,7 +44,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-python \
 		--with-perl \
 		--without-gnome-vfs \
diff --git a/main/inputproto/APKBUILD b/main/inputproto/APKBUILD
index 94775c1e5f392125f03dbbf6028a456b06802b28..356919f386ec2cb87f38256bee6874ccc3dd8a7d 100644
--- a/main/inputproto/APKBUILD
+++ b/main/inputproto/APKBUILD
@@ -10,7 +10,11 @@ source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.t
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/intltool/APKBUILD b/main/intltool/APKBUILD
index 8cbcad1b3aa8e8845b5c28bf4de4cb030a5a7f86..50ba6a5ab6743ca036d3a06034694d8863f4ce6b 100644
--- a/main/intltool/APKBUILD
+++ b/main/intltool/APKBUILD
@@ -12,7 +12,11 @@ source="http://edge.launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/iperf/APKBUILD b/main/iperf/APKBUILD
index 248abcb0b39d15efe66b2b5ad15f40fbd1cdf3fe..ede37bdf00187375220e6d47cd9d5d191697dfee 100644
--- a/main/iperf/APKBUILD
+++ b/main/iperf/APKBUILD
@@ -17,6 +17,8 @@ _builddir="$srcdir/$pkgname-$pkgver"
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD
index f0bf0056e680bcd0a4567710575bfb5c16d0d24e..ade1959dfdd1acbe0897b48a2978e8c6a29c137a 100644
--- a/main/iproute2/APKBUILD
+++ b/main/iproute2/APKBUILD
@@ -31,7 +31,10 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$_realver
-	./configure || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		|| return 1
 	make CCOPTS="-D_GNU_SOURCE $CFLAGS" LIBDIR=/lib || return 1
 }
 
diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD
index 300c6627994a795893b3e8cb80020d77965e7423..661e2e98b9b03821fac13b8d04cfdcd58faecfa2 100644
--- a/main/ipsec-tools/APKBUILD
+++ b/main/ipsec-tools/APKBUILD
@@ -35,7 +35,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -47,7 +50,8 @@ build() {
 		--enable-frag \
 		--enable-hybrid \
 		--enable-ipv6 \
-		--enable-natt
+		--enable-natt \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/ipset/APKBUILD b/main/ipset/APKBUILD
index 2af4fcab0ec9dfaecd712323b3798b19bc25ab6b..7411c7732ca70f31084fef61a59648d857070977 100644
--- a/main/ipset/APKBUILD
+++ b/main/ipset/APKBUILD
@@ -26,7 +26,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --with-kmod=no --prefix=/usr && make
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--with-kmod=no \
+		--prefix=/usr \
+		|| return 1
+	make || return 1
 }
 
 package() {
diff --git a/main/iptables/APKBUILD b/main/iptables/APKBUILD
index 02916d3c6a59d53798fcb8e3e034d46e86a27e12..600f6cade863c8ea5656da500fe89dd5802b71d1 100644
--- a/main/iptables/APKBUILD
+++ b/main/iptables/APKBUILD
@@ -24,19 +24,22 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
-	sed -i -e '/if_packet/i#define __aligned_u64 __u64 __attribute__((aligned(8)))'    \
+	sed -i -e '/if_packet/i#define __aligned_u64 __u64 __attribute__((aligned(8)))' \
 		extensions/libxt_pkttype.c || return 1
 }
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--sbindir=/sbin \
 		--without-kernel \
-	        --enable-devel \
+		--enable-devel \
 		--enable-libipq \
-		--enable-shared  \
+		--enable-shared \
 		|| return 1
 	# do not use rpath
 	sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
diff --git a/main/iptraf-ng/APKBUILD b/main/iptraf-ng/APKBUILD
index 7fb417a740fedbd2b78563ee0b80c1e9566d3352..58aac82726346d1f3ee5d4e4c600030972aa0a14 100644
--- a/main/iptraf-ng/APKBUILD
+++ b/main/iptraf-ng/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-  	CFLAGS="$CFLAGS -std=gnu99" ./configure --prefix=/usr \
+  	CFLAGS="$CFLAGS -std=gnu99" ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		|| return 1
 	make
 }
diff --git a/main/ircii/APKBUILD b/main/ircii/APKBUILD
index a1dd40456b4517277ecc1bb4d296f7dd17f37373..a18f48408a6ab410d3cc9d38572103049f7b22e0 100644
--- a/main/ircii/APKBUILD
+++ b/main/ircii/APKBUILD
@@ -16,7 +16,10 @@ source="http://dev.alpinelinux.org/archive/ircii/ircii-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/ircservices/APKBUILD b/main/ircservices/APKBUILD
index 2e373824942692ed33d3159a61c0002a37d530b5..3527070319da4a11fa653558bf3fb087df34c10f 100644
--- a/main/ircservices/APKBUILD
+++ b/main/ircservices/APKBUILD
@@ -25,6 +25,8 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
+
+	# note: this is not autotools
 	RUNGROUP=ircservices ./configure \
 		-cc "$CC" \
 		-cflags "$CFLAGS" \
@@ -33,9 +35,9 @@ build() {
 		|| return 1
 
 	# build targets one by one as paralell builds breaks
-	make config-check &&\
-		make ircservices &&\
-		make languages &&\
+	make config-check && \
+		make ircservices && \
+		make languages && \
 		make tools
 }
 
diff --git a/main/irqbalance/APKBUILD b/main/irqbalance/APKBUILD
index 461aa5c9da08cac6d51cf014629c7e68738e3ca1..45dbc9eec32302091ffb177f6566a2bc3512ff5c 100644
--- a/main/irqbalance/APKBUILD
+++ b/main/irqbalance/APKBUILD
@@ -25,10 +25,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/irssi/APKBUILD b/main/irssi/APKBUILD
index 8a3de49fca8355288a4742479968aa3bc7916c9c..9e4d9aae8ed136de3329efd182d00dd2c0807908 100644
--- a/main/irssi/APKBUILD
+++ b/main/irssi/APKBUILD
@@ -29,11 +29,15 @@ prepare() {
 build() {
 	cd "$_builddir"
 
-	./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--mandir=/usr/share/man \
-	--with-perl-staticlib \
-	--with-proxy
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--with-perl-staticlib \
+		--with-proxy \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/isl/APKBUILD b/main/isl/APKBUILD
index 4aa28ad201e065bec3292138a52bee615cb85799..1d9d0ef2cef6a2457fb9263732445fb0c03cb7dd 100644
--- a/main/isl/APKBUILD
+++ b/main/isl/APKBUILD
@@ -28,12 +28,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--build=${CBUILD} \
-		--host=${CHOST} \
 		--with-sysroot=${CBUILDROOT} \
 		|| return 1
 
diff --git a/main/iso-codes/APKBUILD b/main/iso-codes/APKBUILD
index abee4ef9d3f3d20823f6dd5c714a636e1ba47f5e..d57d1104061ad0ca24b4505a82446dff19d6d3a8 100644
--- a/main/iso-codes/APKBUILD
+++ b/main/iso-codes/APKBUILD
@@ -14,7 +14,11 @@ source="http://pkg-isocodes.alioth.debian.org/downloads/$pkgname-$pkgver.tar.xz"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/itstool/APKBUILD b/main/itstool/APKBUILD
index 4321f6d814e0fe7a592a5b7405c52c58cd3567f7..6b8c48d6ee3685651d98b85af5257c44c8051886 100644
--- a/main/itstool/APKBUILD
+++ b/main/itstool/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/jansson/APKBUILD b/main/jansson/APKBUILD
index d3e8a9cb3d64507014ab904e3f6e2b2dabbd6de9..8811086f3728f8af18794864f62391a6bf102df4 100644
--- a/main/jansson/APKBUILD
+++ b/main/jansson/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 build() {
 	cd "$_builddir"
 	LIBS=-lm \
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/jasper/APKBUILD b/main/jasper/APKBUILD
index f246759549ca613d86e63d1ab0cd48a9060541c0..57a5d5847c6165169371a651be8fc6e01362d241 100644
--- a/main/jasper/APKBUILD
+++ b/main/jasper/APKBUILD
@@ -30,9 +30,13 @@ prepare() {
 
 build () {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
-		--enable-shared || return 1
+		--enable-shared \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/jfsutils/APKBUILD b/main/jfsutils/APKBUILD
index 86bbd721ee7d7a95005f23325dd1c48293caa410..f14ad8668bb203befecc294a4c249ec2b3b78275 100644
--- a/main/jfsutils/APKBUILD
+++ b/main/jfsutils/APKBUILD
@@ -29,7 +29,10 @@ prepare() {
 build () {
 	cd "$_builddir"
 	./configure \
-		--mandir=/usr/share/man
+		--build=$CBUILD \
+		--host=$CHOST \
+		--mandir=/usr/share/man \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/joe/APKBUILD b/main/joe/APKBUILD
index 6ee1013bd9b527a0e6ccc21c0746865323e0e80d..51e07aa8803be66ac4878b75714c549bebb4baa6 100644
--- a/main/joe/APKBUILD
+++ b/main/joe/APKBUILD
@@ -26,7 +26,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr --sysconfdir=/etc || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/js/APKBUILD b/main/js/APKBUILD
index fb986990f1f2c2c7973c9d3c615f4352aab49152..ec55fff25208cefab75fee8e6162d343496ca868 100644
--- a/main/js/APKBUILD
+++ b/main/js/APKBUILD
@@ -44,7 +44,10 @@ EOF
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-system-nspr \
 		--enable-threadsafe \
 		--enable-readline \
diff --git a/main/json-glib/APKBUILD b/main/json-glib/APKBUILD
index 892b2b8ec95ffd5121f2b6e23044b74232f7bf3e..66c64b4d75f7467b6d97dd19aa5b13a41673d778 100644
--- a/main/json-glib/APKBUILD
+++ b/main/json-glib/APKBUILD
@@ -14,7 +14,11 @@ source="http://ftp.gnome.org/pub/GNOME/sources/json-glib/${pkgver%.*}/json-glib-
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd $srcdir/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make
 }
 
diff --git a/main/jwhois/APKBUILD b/main/jwhois/APKBUILD
index c5a5c89ebaf2abe2dcda2f25b4908f26f03a3a00..8bc206fdea3af3419e48ddb2ccabea6d45b28d86 100644
--- a/main/jwhois/APKBUILD
+++ b/main/jwhois/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/ \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/ \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/jwm/APKBUILD b/main/jwm/APKBUILD
index 12fc7d875bab2111edea17b2017406f57d662f02..77dd40a31982a85151dd944e9981590a09a8dcf7 100644
--- a/main/jwm/APKBUILD
+++ b/main/jwm/APKBUILD
@@ -23,6 +23,8 @@ _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--enable-confirm \
@@ -36,7 +38,8 @@ build() {
 		--enable-xmu \
 		--enable-xinerama \
 		--disable-fribidi \
-		--disable-debug || return 1
+		--disable-debug \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/kbd/APKBUILD b/main/kbd/APKBUILD
index 59b4bf87d9e67aecc12020b905131d546ea844d3..35aa5c1e4f07002e313e7cd4ec513c5b8324e7e7 100644
--- a/main/kbd/APKBUILD
+++ b/main/kbd/APKBUILD
@@ -48,7 +48,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--datadir=/lib/kbd \
 		--localedir=/usr/share/locale \
 		--disable-nls \
diff --git a/main/kbproto/APKBUILD b/main/kbproto/APKBUILD
index 6d5baee5b86ca49e6da09a141f2109c3ae6de573..c12289b12747237a5a7eb7b4feb687a2a8d575ac 100644
--- a/main/kbproto/APKBUILD
+++ b/main/kbproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.t
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/keybinder/APKBUILD b/main/keybinder/APKBUILD
index 8c4188f02323b75e9ebee13443eff3923a03ad02..94ea8106799a39e325e0d0f2dad552a34b849ec9 100644
--- a/main/keybinder/APKBUILD
+++ b/main/keybinder/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-static \
 		--disable-python \
 		--disable-lua \
diff --git a/main/kmod/APKBUILD b/main/kmod/APKBUILD
index 65e52722c48b8bac55321bbfe2bd1affa93064a1..877c1ccfbded87618756a8c78276c4838c5b67b8 100644
--- a/main/kmod/APKBUILD
+++ b/main/kmod/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --bindir=/bin \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--bindir=/bin \
 		--with-rootlibdir=/lib \
 		--with-zlib \
 		--with-xz \
diff --git a/main/knock/APKBUILD b/main/knock/APKBUILD
index 58a63654d5e267a1ae4c5c27dba02906c9676903..0e285324561df1c5841cd1922a3756d8c22094e3 100644
--- a/main/knock/APKBUILD
+++ b/main/knock/APKBUILD
@@ -30,10 +30,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/krb5/APKBUILD b/main/krb5/APKBUILD
index 72ec8549937bec7f94d970ab55be13390c2f2a79..061e981050c805ae92c0abd03d284ce0f88395fa 100644
--- a/main/krb5/APKBUILD
+++ b/main/krb5/APKBUILD
@@ -43,6 +43,8 @@ build() {
 	cd "$_builddir"/src
 	./configure \
 		CPPFLAGS="$CPPFLAGS -fPIC -I/usr/include/et" \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--localstatedir=/var/lib \
 		--enable-shared \
diff --git a/main/lame/APKBUILD b/main/lame/APKBUILD
index 45de772a21aecdb201e82c94f516f0b988a9954b..f9a9a264622bd2539d4f75e007e5fbe09a4b6ecc 100644
--- a/main/lame/APKBUILD
+++ b/main/lame/APKBUILD
@@ -37,11 +37,15 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-nasm \
 		--disable-mp3x \
 		--enable-shared \
-		--with-pic
+		--with-pic \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/lcms/APKBUILD b/main/lcms/APKBUILD
index c2d09b112ba993ac713ac0619a9b6ab6dd06bd6d..583a251a6a22ccf40ad8a03585ae82eccd735ebc 100644
--- a/main/lcms/APKBUILD
+++ b/main/lcms/APKBUILD
@@ -14,7 +14,11 @@ source="http://downloads.sourceforge.net/project/lcms/lcms/$pkgver/lcms-$pkgver.
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/ldns/APKBUILD b/main/ldns/APKBUILD
index 75041a6339a0f6d9d2998cdfb82dc02a7c53838d..b38981723227b9ff9dc0d2f97e0c6f946c71f163 100644
--- a/main/ldns/APKBUILD
+++ b/main/ldns/APKBUILD
@@ -27,14 +27,25 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
 		|| return 1
-	(cd drill && ./configure --prefix=/usr)
-	(cd examples && ./configure --prefix=/usr)
+	(cd drill && ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr) \
+		|| return 1
+	(cd examples && ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr) \
+		|| return 1
 
 	make || return 1
 	make -C drill || return 1
diff --git a/main/less/APKBUILD b/main/less/APKBUILD
index 8953f964d82cbb373313da205155a7415846104c..b7e140363cbc035df23acdf373a66d60c6d2fe01 100644
--- a/main/less/APKBUILD
+++ b/main/less/APKBUILD
@@ -15,10 +15,14 @@ source="http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/lftp/APKBUILD b/main/lftp/APKBUILD
index de23dfddbaee19cacbe8270b6ab59526a5e6eca6..c676c96dfb990eaba31972ffe532b01c7f81ec6c 100644
--- a/main/lftp/APKBUILD
+++ b/main/lftp/APKBUILD
@@ -25,13 +25,17 @@ prepare() {
 build() {
 	cd "$_builddir"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc/lftp \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--with-modules \
 		--disable-nls \
-		--with-openssl
+		--with-openssl \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/lha/APKBUILD b/main/lha/APKBUILD
index 5ee866fb9be337f594c281b75fa1c3071de86bc5..22a71502ca8a0508225249c879bf80c2c7a2f9f3 100644
--- a/main/lha/APKBUILD
+++ b/main/lha/APKBUILD
@@ -15,10 +15,14 @@ source="http://osdn.dl.sourceforge.jp/lha/22231/$pkgname-$pkgver-ac20050924p1.ta
 build ()
 {
 	cd $srcdir/$pkgname-$pkgver-ac20050924p1
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 	make "DESTDIR=$pkgdir" install
 	#install -D -m755 $srcdir/lha $pkgdir/usr/bin/lha
diff --git a/main/libao/APKBUILD b/main/libao/APKBUILD
index 5e47953411afd4fc1c373850bb484f522af52d55..cfffd994b219b0b02cdd537cefaa55972d610218 100644
--- a/main/libao/APKBUILD
+++ b/main/libao/APKBUILD
@@ -13,10 +13,14 @@ source="http://downloads.xiph.org/releases/ao/$pkgname-$pkgver.tar.gz"
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-alsa09 \
 		--disable-esd \
-		--disable-arts
+		--disable-arts \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libarchive/APKBUILD b/main/libarchive/APKBUILD
index 5305967e1b71ed6dc234deadffb4f8159401ff79..20ee616df502385019646bfdce141812599fbb9d 100644
--- a/main/libarchive/APKBUILD
+++ b/main/libarchive/APKBUILD
@@ -25,7 +25,12 @@ prepare() {
 
 build () {
 	cd "$_builddir"
-	./configure --prefix=/usr --without-xml2
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--without-xml2 \
+		|| return 1
 	make
 }
 
diff --git a/main/libart-lgpl/APKBUILD b/main/libart-lgpl/APKBUILD
index 0f767301114bba4a6146404073d3442a343fff4c..436c460a02993a5e2ac7d2de246f2bbbe8ac50b4 100644
--- a/main/libart-lgpl/APKBUILD
+++ b/main/libart-lgpl/APKBUILD
@@ -15,7 +15,11 @@ source="http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-$pkgv
 _builddir="$srcdir"/libart_lgpl-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libass/APKBUILD b/main/libass/APKBUILD
index 3edf6bf9279f804c14d6e9ab90bf00ffdbd33f10..34f5f2543d5f17ec589963e80b20f68a4cbaff13 100644
--- a/main/libass/APKBUILD
+++ b/main/libass/APKBUILD
@@ -21,10 +21,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libassuan/APKBUILD b/main/libassuan/APKBUILD
index e85724155ea6fb18580034641f68b31b40243e07..87d89fb8f83adf0e9d25ef829a367a8edb89c1ba 100644
--- a/main/libassuan/APKBUILD
+++ b/main/libassuan/APKBUILD
@@ -13,7 +13,11 @@ source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2"
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libasyncns/APKBUILD b/main/libasyncns/APKBUILD
index edb57b1de179b441da0ca53fcd6b181088b1fad2..366f3f08287509d43b96605d664131cd96d51c5e 100644
--- a/main/libasyncns/APKBUILD
+++ b/main/libasyncns/APKBUILD
@@ -18,6 +18,8 @@ _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--disable-static \
 		--prefix=/usr \
 		|| return 1
diff --git a/main/libatasmart/APKBUILD b/main/libatasmart/APKBUILD
index e73dcfc6b18cf90b90cac17b3fd12a3901ab7b2f..4a30fbe7f2295970d042634a00caf5892a458f3a 100644
--- a/main/libatasmart/APKBUILD
+++ b/main/libatasmart/APKBUILD
@@ -23,12 +23,16 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--disable-static \
-		--localstatedir=/var
+		--localstatedir=/var \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/libavc1394/APKBUILD b/main/libavc1394/APKBUILD
index ed8423ac79910ae24b19fa4e194559851cb56a86..f392c3aa6dd80a3599d7e3ccc6d626cf90d932ff 100644
--- a/main/libavc1394/APKBUILD
+++ b/main/libavc1394/APKBUILD
@@ -31,7 +31,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libbluray/APKBUILD b/main/libbluray/APKBUILD
index 180e8cbfed4f3b804bc8a7354824260f2294cb96..8472993e9b95240331fe930890c1a6e02ad55b75 100644
--- a/main/libbluray/APKBUILD
+++ b/main/libbluray/APKBUILD
@@ -33,7 +33,10 @@ build() {
 	# and this seems to be what libbluray assumes
 	export CFLAGS="$CFLAGS -D_BSD_SOURCE"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libbonobo/APKBUILD b/main/libbonobo/APKBUILD
index e1150894c7a13119111b4a80a1a6ce2a2c0deba2..65bf59912978ce3489eab8ef5819f0e468c8a248 100644
--- a/main/libbonobo/APKBUILD
+++ b/main/libbonobo/APKBUILD
@@ -32,7 +32,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		|| return 1
 	make || return 1
diff --git a/main/libbsd/APKBUILD b/main/libbsd/APKBUILD
index a8f0866b05a964b8290af634f54bce168ce4d915..1499eb93d4d08f6c0988f685a0ba67303369fcaa 100644
--- a/main/libbsd/APKBUILD
+++ b/main/libbsd/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libburn/APKBUILD b/main/libburn/APKBUILD
index e42741117eef331fdb9318610808ca30c8d958cf..bb7da613973cd8aa7daaf257e299bea71c65f184 100644
--- a/main/libburn/APKBUILD
+++ b/main/libburn/APKBUILD
@@ -20,7 +20,12 @@ _builddir="$srcdir"/$pkgname-$_ver
 build () 
 { 
 	cd "$_builddir"
-	./configure --prefix=/usr --disable-static
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libcanberra/APKBUILD b/main/libcanberra/APKBUILD
index 2bbeccc57d8554143d7acb582abe6cb503ad01f0..26705f7225e118305316c227fd4e1e46b2ee83de 100644
--- a/main/libcanberra/APKBUILD
+++ b/main/libcanberra/APKBUILD
@@ -23,10 +23,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libcap-ng/APKBUILD b/main/libcap-ng/APKBUILD
index 8f6fd85ed820e0dd0ff44d71871656e27d02a86e..6421b4ff9a4e14f84739ea63e30cf3b568017641 100644
--- a/main/libcap-ng/APKBUILD
+++ b/main/libcap-ng/APKBUILD
@@ -21,10 +21,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libcddb/APKBUILD b/main/libcddb/APKBUILD
index 482702da7ada253db0c5c1c8c2dc0012468bd047..4a03352067fac24b20adb960d13a80d7e789d6d1 100644
--- a/main/libcddb/APKBUILD
+++ b/main/libcddb/APKBUILD
@@ -25,10 +25,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libcdio-paranoia/APKBUILD b/main/libcdio-paranoia/APKBUILD
index d82446378dbd67af3b0e22ef859b55d28b707879..16cb1323d0553dfb81974153f7a9173a91f68136 100644
--- a/main/libcdio-paranoia/APKBUILD
+++ b/main/libcdio-paranoia/APKBUILD
@@ -30,7 +30,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libcdio/APKBUILD b/main/libcdio/APKBUILD
index 72619db032d417cb17bbb1877d4b33299678d6aa..0e31e7547229064d01671e5b529ab9e8a903c90a 100644
--- a/main/libcdio/APKBUILD
+++ b/main/libcdio/APKBUILD
@@ -25,14 +25,18 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--disable-vcd-info \
 		--disable-static \
 		--disable-rpath \
-		--disable-cpp-progs
+		--disable-cpp-progs \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libcec/APKBUILD b/main/libcec/APKBUILD
index 9068783f2e6d52688f9e9f57f44384ca3dba04dc..d8ff6106a894ce9d614418a81909c8588ad84cbe 100644
--- a/main/libcec/APKBUILD
+++ b/main/libcec/APKBUILD
@@ -28,11 +28,14 @@ prepare() {
 build() {
 	cd "$_builddir"
         ./bootstrap || return 1
-        ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --mandir=/usr/share/man \
-                --infodir=/usr/share/info \
-                --localstatedir=/var \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
 		|| return 1
 }
 
diff --git a/main/libconfig/APKBUILD b/main/libconfig/APKBUILD
index d86ce9bf05297efea047f4ebac92fcb1a21afdf5..615f12e46d7b23ac1cda9e024c081a445c6f0ba1 100644
--- a/main/libconfig/APKBUILD
+++ b/main/libconfig/APKBUILD
@@ -14,9 +14,13 @@ subpackages="$pkgname-doc $pkgname-dev"
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
-		--disable-cxx
+		--disable-cxx \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libcroco/APKBUILD b/main/libcroco/APKBUILD
index 539d3ac39a5691a2febd062ffea37aa8fe8572a4..a183994ccee217a4d501ff155f58e9d0a5b4cf66 100644
--- a/main/libcroco/APKBUILD
+++ b/main/libcroco/APKBUILD
@@ -15,8 +15,12 @@ depends_dev="glib-dev libxml2-dev pkgconfig"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--disable-static || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libcue/APKBUILD b/main/libcue/APKBUILD
index 0972f2388080c1a03407186c4c9afe212f742f44..3cb1c3d023207d899d73c0a4f6ea6ad1f19c6b71 100644
--- a/main/libcue/APKBUILD
+++ b/main/libcue/APKBUILD
@@ -17,10 +17,14 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libdaemon/APKBUILD b/main/libdaemon/APKBUILD
index bac12d55acacb2f7ca723550655fda931fd518ba..a6adb55fd4da3966994d678b51a97391a8326d85 100644
--- a/main/libdaemon/APKBUILD
+++ b/main/libdaemon/APKBUILD
@@ -14,7 +14,10 @@ source="http://0pointer.de/lennart/projects/libdaemon/libdaemon-$pkgver.tar.gz"
 _builddir="$srcdir"/$pkgname-$pkgver
 build () {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--localstatedir=/var \
 		--disable-lynx \
 		|| return 1
diff --git a/main/libdc1394/APKBUILD b/main/libdc1394/APKBUILD
index f80a4a252245d172ba8273f4692776ee633ece1c..488a7a06d284d35fc72953bcdf5c82a9e25f6688 100644
--- a/main/libdc1394/APKBUILD
+++ b/main/libdc1394/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libdnet/APKBUILD b/main/libdnet/APKBUILD
index 6bd8c61d6f8fbb93f973f7601f89032b91493488..b5b11be992e1613c0e9cebd9553837dd58f68de6 100644
--- a/main/libdnet/APKBUILD
+++ b/main/libdnet/APKBUILD
@@ -30,7 +30,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--without-python \
 		|| return 1
diff --git a/main/libdrm/APKBUILD b/main/libdrm/APKBUILD
index 88aa6cc7b0edab1440c79a6493cd91e6958b369f..ce89f018620319de24ce8c6032e320fab5af96d1 100644
--- a/main/libdrm/APKBUILD
+++ b/main/libdrm/APKBUILD
@@ -22,7 +22,10 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-udev \
 		--disable-manpages \
 		|| return 1
diff --git a/main/libdv/APKBUILD b/main/libdv/APKBUILD
index 4d46ae3be5039d7680e2a7fcef9fadf7ba5749d0..dd5b90ee4a731c8944ac4ddbde28f5347f3a6efa 100644
--- a/main/libdv/APKBUILD
+++ b/main/libdv/APKBUILD
@@ -34,7 +34,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libdvbcsa/APKBUILD b/main/libdvbcsa/APKBUILD
index deb48b6e3ad372a1dc7213a612d46a68e4d3387a..75a173d7d7165bd0ed81aab5a38637d5785c0f98 100644
--- a/main/libdvbcsa/APKBUILD
+++ b/main/libdvbcsa/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libdvbpsi/APKBUILD b/main/libdvbpsi/APKBUILD
index eaa87f2a4b03141a185d8438051609ad3f6a623b..bbe543c846fee3dd36a1cc998a25c0e23a8294c4 100644
--- a/main/libdvbpsi/APKBUILD
+++ b/main/libdvbpsi/APKBUILD
@@ -14,8 +14,12 @@ source="http://download.videolan.org/pub/libdvbpsi/$pkgver/$pkgname-$pkgver.tar.
 _builddir="$srcdir/$pkgname-$pkgver"
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--enable-release || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--enable-release \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libedit/APKBUILD b/main/libedit/APKBUILD
index 410baf91cbaf498ebbbdd63a1b78a7839aae7e42..39e2e622c9a7fb74aa1c069262a1d7f86aa7b10c 100644
--- a/main/libedit/APKBUILD
+++ b/main/libedit/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libee/APKBUILD b/main/libee/APKBUILD
index 45de60b53015c273c635f623fcfc234fa126a427..90eeac8ad162e7026fba85140e18c1bc088f3111 100644
--- a/main/libee/APKBUILD
+++ b/main/libee/APKBUILD
@@ -14,7 +14,11 @@ source="http://www.libee.org/download/files/download/$pkgname-$pkgver.tar.gz"
 _builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
 	cd "$_builddir"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 }
 
 build() {
diff --git a/main/libelf/APKBUILD b/main/libelf/APKBUILD
index 82ad01352c07f89eb23167b9c326c01dcf7ae258..6ca2d542fd4f2a8c13ec902b9d7f6e99f279a676 100644
--- a/main/libelf/APKBUILD
+++ b/main/libelf/APKBUILD
@@ -13,10 +13,14 @@ source="http://www.mr511.de/software/$pkgname-$pkgver.tar.gz"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-shared \
 		--enable-gnu-names \
-		--enable-compat || return 1
+		--enable-compat \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libestr/APKBUILD b/main/libestr/APKBUILD
index b5b2509a674de33a90f0d55eb35fda86e9a2fdee..eb58b5d001cee2562021c9ed917ccb196a33dcd6 100644
--- a/main/libestr/APKBUILD
+++ b/main/libestr/APKBUILD
@@ -13,7 +13,11 @@ source="http://libestr.adiscon.com/files/download/$pkgname-$pkgver.tar.gz"
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 }
 
 build() {
diff --git a/main/libetpan/APKBUILD b/main/libetpan/APKBUILD
index fde5177cfe762abd1f437a09061df7ef5315f778..055df1d48aa7b91449b93ad1a0b52aa6351c18e6 100644
--- a/main/libetpan/APKBUILD
+++ b/main/libetpan/APKBUILD
@@ -25,11 +25,15 @@ prepare() {
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-gnutls=yes \
 		--with-openssl=no \
 		--with-gnutls \
-		--disable-static
+		--disable-static \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/libev/APKBUILD b/main/libev/APKBUILD
index 0bc2576a9b6a9bea1548feb6711a7d69f98861cc..7b7855b0690d9d6c0ad1a9fd7d31352df3b0ad67 100644
--- a/main/libev/APKBUILD
+++ b/main/libev/APKBUILD
@@ -32,8 +32,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libevent/APKBUILD b/main/libevent/APKBUILD
index ea160c1e23e8dab39f51b0e5a30af11a535ebae7..f031f8cb3791b385869f268e3502903c3d05a29f 100644
--- a/main/libevent/APKBUILD
+++ b/main/libevent/APKBUILD
@@ -16,9 +16,12 @@ _builddir="$srcdir"/$pkgname-$pkgver-stable
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-static || return 1
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libexif/APKBUILD b/main/libexif/APKBUILD
index b26b623ecac3726261f43c12d7a7865a1d3e18e2..7380981b986f0c976b6e78e7bf15a2de64caebbc 100644
--- a/main/libexif/APKBUILD
+++ b/main/libexif/APKBUILD
@@ -13,7 +13,11 @@ source="http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make
 }
 
diff --git a/main/libffi/APKBUILD b/main/libffi/APKBUILD
index 9291c6b2063b00dab320255b5682de4ad4564cf5..7ea08ee543aa7c98be448f87a3d532ac24765fdb 100644
--- a/main/libffi/APKBUILD
+++ b/main/libffi/APKBUILD
@@ -15,7 +15,11 @@ source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.gz"
 _builddir="$srcdir"/$pkgname-$pkgver
 build () {
 	cd "$_builddir"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libfontenc/APKBUILD b/main/libfontenc/APKBUILD
index 93cf33d1a357916fb737fdca5e5de1c6d5bdacdc..6b4c625b76182f98e890d395a099818b1b6d6e21 100644
--- a/main/libfontenc/APKBUILD
+++ b/main/libfontenc/APKBUILD
@@ -13,11 +13,15 @@ source="http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$pkgver.tar
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
-		--with-encodingsdir=/usr/share/fonts/encodings
+		--with-encodingsdir=/usr/share/fonts/encodings \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libfprint/APKBUILD b/main/libfprint/APKBUILD
index 879c91169d3e4126841d598ba66f58e87845f235..e142b8396a73dc057ce305e081531bf94fff9336 100644
--- a/main/libfprint/APKBUILD
+++ b/main/libfprint/APKBUILD
@@ -31,7 +31,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libgcrypt/APKBUILD b/main/libgcrypt/APKBUILD
index 241ff5bdda39cef2820857fa45235311111c775a..84d5ff86d66238927db6ef8e04c6f9213c5fdff7 100644
--- a/main/libgcrypt/APKBUILD
+++ b/main/libgcrypt/APKBUILD
@@ -16,10 +16,13 @@ depends_dev="libgpg-error-dev"
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	./configure --build=${CHOST:-i486-alpine-linux-uclibc} \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--enable-padlock-support \
-		--disable-static
+		--disable-static \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/libgee/APKBUILD b/main/libgee/APKBUILD
index 241dcd63e5f1f6513c1ef489809231613e9acbf4..d992c76940b20f9c277657d9c7773d4fff7588db 100644
--- a/main/libgee/APKBUILD
+++ b/main/libgee/APKBUILD
@@ -16,7 +16,12 @@ source="http://ftp.gnome.org/pub/GNOME/sources/libgee/${_xy}/libgee-$pkgver.tar.
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr --disable-static || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libgexiv2/APKBUILD b/main/libgexiv2/APKBUILD
index e0031e000c75d1e2c190db1c6edf28977fa3281b..96cb4b8e837066490ebe3e9fb779321de9f95bf8 100644
--- a/main/libgexiv2/APKBUILD
+++ b/main/libgexiv2/APKBUILD
@@ -23,10 +23,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libglade/APKBUILD b/main/libglade/APKBUILD
index f730b60c1fa82a249bff1ca624aec5c983767baa..17a55d58a18df01eb03f5bfd179519261528051b 100644
--- a/main/libglade/APKBUILD
+++ b/main/libglade/APKBUILD
@@ -24,10 +24,14 @@ package() {
 
 build() {
 	cd "$_builddir"
-	./configure --sysconfdir=/etc \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--sysconfdir=/etc \
 		--prefix=/usr \
 		--disable-static \
-		--localstatedir=/var || return 1
+		--localstatedir=/var \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libgnome-keyring/APKBUILD b/main/libgnome-keyring/APKBUILD
index ecf98536f08d3ace3a3a342d4697d1a9bb40ad3a..55d738c7ce5cd450818c0aa28d2fea555ccefede 100644
--- a/main/libgnome-keyring/APKBUILD
+++ b/main/libgnome-keyring/APKBUILD
@@ -43,9 +43,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libgnome/APKBUILD b/main/libgnome/APKBUILD
index 515f0efb08b7dd52932896422f84b4f24c1531a9..ada696e2e7a5e5cb93a1776677d8826695ed70e8 100644
--- a/main/libgnome/APKBUILD
+++ b/main/libgnome/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		|| return 1
 	make || return 1
diff --git a/main/libgnomekbd/APKBUILD b/main/libgnomekbd/APKBUILD
index 8407830958c939e04a86c2496cc94d2b11b58576..4c4045f6a7d7258ebf4e93f4bffe5cfb88e4fccf 100644
--- a/main/libgnomekbd/APKBUILD
+++ b/main/libgnomekbd/APKBUILD
@@ -38,9 +38,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libgpg-error/APKBUILD b/main/libgpg-error/APKBUILD
index 1606a92203947a275a433bc03600c757ace955e9..18fec5c2495b14a917319d7b33256602ad0d4e7f 100644
--- a/main/libgpg-error/APKBUILD
+++ b/main/libgpg-error/APKBUILD
@@ -13,8 +13,12 @@ source="ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/$pkgname/$pkg
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--disable-nls
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-nls \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/libgphoto2/APKBUILD b/main/libgphoto2/APKBUILD
index 8cb026f8d0372cb21b61409ce104f82b589664e1..f0ad59d8c1aa8449c4e9ec46a5cfda81ade6f36b 100644
--- a/main/libgphoto2/APKBUILD
+++ b/main/libgphoto2/APKBUILD
@@ -18,7 +18,10 @@ options="libtool"
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	udevscriptdir=/lib/udev ./configure --prefix=/usr \
+	udevscriptdir=/lib/udev ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-drivers=all \
 		--disable-static \
 		--disable-rpath \
diff --git a/main/libgsf/APKBUILD b/main/libgsf/APKBUILD
index d5c099736ac1e548ba85c3679de202adce30b2c6..1673d9733463db9421eb45c340fe877ea727eccf 100644
--- a/main/libgsf/APKBUILD
+++ b/main/libgsf/APKBUILD
@@ -16,13 +16,17 @@ depends_dev="glib-dev bzip2-dev libxml2-dev pkgconfig"
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	sed -i -e 's/gsf-gnome//' -e 's/thumbnailer//' Makefile.* || return 1
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--mandir=/usr/share/man \
 		--disable-static \
 		--without-gnome-vfs \
-		--without-bonobo || return 1
+		--without-bonobo \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libgssglue/APKBUILD b/main/libgssglue/APKBUILD
index aeb880b64954cd739bc8bfb0bdf65b87ad5030c6..fc10ce7239cbac29957139969c1e84b2abcb3b13 100644
--- a/main/libgssglue/APKBUILD
+++ b/main/libgssglue/APKBUILD
@@ -14,7 +14,11 @@ source="http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libgtop/APKBUILD b/main/libgtop/APKBUILD
index f837561e7ccf3db89888307f6b2097d6edef1134..44e58b3b3335882a058def15f3ddb67f2fbfe3eb 100644
--- a/main/libgtop/APKBUILD
+++ b/main/libgtop/APKBUILD
@@ -27,9 +27,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libguess/APKBUILD b/main/libguess/APKBUILD
index ae50e898b28f9e560b14a8b65f1563ff3330416d..997e53c079bf5896015fd3919feff5479fe7ae04 100644
--- a/main/libguess/APKBUILD
+++ b/main/libguess/APKBUILD
@@ -28,10 +28,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libgweather/APKBUILD b/main/libgweather/APKBUILD
index 1fa9e5244fbe4666a47171b7d379f3a3c52beef4..c2a37cb30498a588b99946ed17038defed8986fd 100644
--- a/main/libgweather/APKBUILD
+++ b/main/libgweather/APKBUILD
@@ -27,10 +27,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--with-zoneinfo-dir=. \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libical/APKBUILD b/main/libical/APKBUILD
index 7ad9ffd252c5a921296f15e16c41da8422b697e2..f900cc9000b0cfb54deb2b464e56e1c8cfc1fed9 100644
--- a/main/libical/APKBUILD
+++ b/main/libical/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-shared \
 		--disable-static \
 		|| return 1
diff --git a/main/libice/APKBUILD b/main/libice/APKBUILD
index 9bf4fbb1fc9c9814318a0cb4bac4c6226000efbd..50023319def1aa9516c1287bedaa63521e3bf8f9 100644
--- a/main/libice/APKBUILD
+++ b/main/libice/APKBUILD
@@ -14,8 +14,12 @@ source="http://xorg.freedesktop.org/releases/individual/lib/libICE-$pkgver.tar.b
 depends_dev="xproto"
 build () {
 	cd "$srcdir"/libICE-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libiconv/APKBUILD b/main/libiconv/APKBUILD
index 6f4214e72d6b93b34228f384d4b03cb740ffab5d..e5ed3e26ef85de09353795177d79abfc2c085c3b 100644
--- a/main/libiconv/APKBUILD
+++ b/main/libiconv/APKBUILD
@@ -15,7 +15,10 @@ build() {
 	#only build if we need it
 	[ "$ALPINE_LIBC" = "eglibc" ] && return 0
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		|| return 1
 	# work around rpath issue
diff --git a/main/libid3tag/APKBUILD b/main/libid3tag/APKBUILD
index aaee71faecfb4f7439e3ef751dd96070585aaedc..2526477bf43586fc19092f873bcfcbd5a14de034 100644
--- a/main/libid3tag/APKBUILD
+++ b/main/libid3tag/APKBUILD
@@ -16,10 +16,14 @@ source="ftp://ftp.mars.org/pub/mpeg/libid3tag-$pkgver.tar.gz"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libidl/APKBUILD b/main/libidl/APKBUILD
index c14ecd627c02a320e2b50241b448d48ecc261c69..714c105e1251e649469424c6d7351fe0bb8380ab 100644
--- a/main/libidl/APKBUILD
+++ b/main/libidl/APKBUILD
@@ -22,10 +22,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libidn/APKBUILD b/main/libidn/APKBUILD
index 931ad283c694a8c8f6bf6db5ce99b4d5042b09b5..fd93b3fcb263c24d126821023a6229b5d21a33f0 100644
--- a/main/libidn/APKBUILD
+++ b/main/libidn/APKBUILD
@@ -17,11 +17,15 @@ source="http://ftp.gnu.org/gnu/libidn/$pkgname-$pkgver.tar.gz"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-nls
+		--disable-nls \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libiec61883/APKBUILD b/main/libiec61883/APKBUILD
index 7f3d5f787c635fbc2428cf376eaf5a7e1fc606b6..6718faa7a82be761368b71cae6f55ab9c17db755 100644
--- a/main/libiec61883/APKBUILD
+++ b/main/libiec61883/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libisofs/APKBUILD b/main/libisofs/APKBUILD
index 31d3653d253203157e0b7811580e07a8e31dc6a4..7ba3c398fb2085b225ec4f1ca55dcc5fe7f018a8 100644
--- a/main/libisofs/APKBUILD
+++ b/main/libisofs/APKBUILD
@@ -14,10 +14,14 @@ source="http://files.libburnia-project.org/releases/libisofs-$pkgver.tar.gz"
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-libacl \
 		--enable-xattr \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libjpeg-turbo/APKBUILD b/main/libjpeg-turbo/APKBUILD
index 6133c00ed9f03fdcee07ae1688525ac5cca831ab..6b339ca416189d18c4cf76247dd26c81e8d06de2 100644
--- a/main/libjpeg-turbo/APKBUILD
+++ b/main/libjpeg-turbo/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libksba/APKBUILD b/main/libksba/APKBUILD
index 09e1be546f9570ad94646fe2ffef5588ad492d4b..f257c8e804ec03d9aab8d16aff336a8b8041adbe 100644
--- a/main/libksba/APKBUILD
+++ b/main/libksba/APKBUILD
@@ -13,7 +13,11 @@ source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2"
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/liblockfile/APKBUILD b/main/liblockfile/APKBUILD
index 16d5d1b78ba9d932b20065e8b19d2d66bd22f244..a52bb159182837b6de937df9e6e80ef5e03695a2 100644
--- a/main/liblockfile/APKBUILD
+++ b/main/liblockfile/APKBUILD
@@ -18,9 +18,13 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--mandir=/usr/share/man
+		--mandir=/usr/share/man \
+		|| return 1
 	make -j1 || return 1
 }
 
diff --git a/main/libmad/APKBUILD b/main/libmad/APKBUILD
index 8791a5d7fa2d6abb7d8498b04d1e87187963b4f2..360430ef17ecbf2332b5d87c4abfbd86950442f6 100644
--- a/main/libmad/APKBUILD
+++ b/main/libmad/APKBUILD
@@ -31,9 +31,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-fpm=intel \
-		--enable-accuracy
+		--enable-accuracy \
+		|| return 1
 
 	make -j1 || return 1
 }
diff --git a/main/libmcrypt/APKBUILD b/main/libmcrypt/APKBUILD
index 2edbed516393cc515a44f6bd67f87e1f77dda818..4920b747466e5336b977d75eae8e6daa15d71ba6 100644
--- a/main/libmcrypt/APKBUILD
+++ b/main/libmcrypt/APKBUILD
@@ -15,9 +15,13 @@ source="http://downloads.sourceforge.net/mcrypt/${pkgname}-${pkgver}.tar.bz2"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
-		--disable-posix-threads
+		--disable-posix-threads \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libmicrohttpd/APKBUILD b/main/libmicrohttpd/APKBUILD
index 4111ff74202e61ad86fb88ef215f12436ac64df9..943815c0590ee1fd10a8f64366441d17e2b04ea6 100644
--- a/main/libmicrohttpd/APKBUILD
+++ b/main/libmicrohttpd/APKBUILD
@@ -22,13 +22,17 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--enable-largefile \
 		--enable-curl \
-		--enable-messages 
+		--enable-messages \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/libmikmod/APKBUILD b/main/libmikmod/APKBUILD
index 374e5f08a2fb7608f348efebeac690034801d585..aab61c37a0a826fdd088632b67ae6bd7f9af79f2 100644
--- a/main/libmikmod/APKBUILD
+++ b/main/libmikmod/APKBUILD
@@ -29,7 +29,12 @@ build() {
 	cd "$_builddir"
 	# build fails with bash
 	export CONFIG_SHELL="/bin/sh"
-	./configure --prefix=/usr --enable-alsa || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--enable-alsa \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libmms/APKBUILD b/main/libmms/APKBUILD
index bb184d1a17b205c4ea3b3e710fb138551ca35169..c217d56278ff82ec86cd440780af6432fb12fb3e 100644
--- a/main/libmms/APKBUILD
+++ b/main/libmms/APKBUILD
@@ -22,11 +22,15 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libmng/APKBUILD b/main/libmng/APKBUILD
index 988f4271962a44a023352b4c8f04efebfcc2d9c5..0c46982ea3607ea4082e0bf645b4f3352be0d58f 100644
--- a/main/libmng/APKBUILD
+++ b/main/libmng/APKBUILD
@@ -23,7 +23,11 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libmnl/APKBUILD b/main/libmnl/APKBUILD
index 068c6f46276294c9a1c33fda83f63285bd3ee907..309be9782f518e2e995ab6e547906f277abd3e7c 100644
--- a/main/libmnl/APKBUILD
+++ b/main/libmnl/APKBUILD
@@ -16,7 +16,11 @@ source="http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 }
 
 package() {
diff --git a/main/libmodplug/APKBUILD b/main/libmodplug/APKBUILD
index b2c144df0e9c606c301318e8eeeeafe31090600c..40f098d776db7d09b60e446c64613f708b0c52f2 100644
--- a/main/libmodplug/APKBUILD
+++ b/main/libmodplug/APKBUILD
@@ -22,10 +22,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libmowgli/APKBUILD b/main/libmowgli/APKBUILD
index 780cf6b5ef60716fc738bca02a619808c3bf25b3..8e6b992b491e120edea6dfb73d66bafb56b58aab 100644
--- a/main/libmowgli/APKBUILD
+++ b/main/libmowgli/APKBUILD
@@ -24,10 +24,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libmp3splt/APKBUILD b/main/libmp3splt/APKBUILD
index 3d2716ec1024b555461d4f2f9f481f2a5728ee48..41571e28461baffa8793e77c25bf99f703e0208a 100644
--- a/main/libmp3splt/APKBUILD
+++ b/main/libmp3splt/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-ogg \
 		--enable-mp3 \
 		|| return 1
diff --git a/main/libmpc/APKBUILD b/main/libmpc/APKBUILD
index 2fb1129351410239b33ce76ff7f47a79c5ff86a4..80b25e580319110fa6852716ecae9fc61ef56fcc 100644
--- a/main/libmpc/APKBUILD
+++ b/main/libmpc/APKBUILD
@@ -22,9 +22,10 @@ build() {
 	cd "$_builddir"
 	# workaround for a bug in configure script
 	EGREP=egrep \
-	./configure --prefix=/usr \
-		--build=${CBUILD} \
-		--host=${CHOST} \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libmpdclient/APKBUILD b/main/libmpdclient/APKBUILD
index f10f18e0976b2485ad14bf89fc6bc429726ad173..2319966624549e2256429348402958332fd8bea2 100644
--- a/main/libmpdclient/APKBUILD
+++ b/main/libmpdclient/APKBUILD
@@ -13,7 +13,11 @@ source="http://www.musicpd.org/download/libmpdclient/${pkgver%.*}/libmpdclient-$
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libmpeg2/APKBUILD b/main/libmpeg2/APKBUILD
index 3b67503734b8699e2d60ae3054dbfc284805f1ec..f5d4a723f9dea7c498541dda94a65447e331cdc6 100644
--- a/main/libmpeg2/APKBUILD
+++ b/main/libmpeg2/APKBUILD
@@ -13,9 +13,13 @@ source="http://$pkgname.sourceforge.net/files/$pkgname-$pkgver.tar.gz"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-shared \
-		--disable-static || return 1
+		--disable-static \
+		|| return 1
 	make OPT_CFLAGS="${CFLAGS}" \
 		MPEG2DEC_CFLAGS="${CFLAGS}" \
 		LIBMPEG2_CFLAGS="" || return 1
diff --git a/main/libmtp/APKBUILD b/main/libmtp/APKBUILD
index e43af2e6024ee246b5dbae4610b91382fbbda8cd..87aae32d30d0553b4357e9d4ce91781346bc7191 100644
--- a/main/libmtp/APKBUILD
+++ b/main/libmtp/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libnet/APKBUILD b/main/libnet/APKBUILD
index fabb1c7d499be5d7ae1cc55845f251dc0d20871b..295eaef34c3d72595be86f0fa54baafcebecef23 100644
--- a/main/libnet/APKBUILD
+++ b/main/libnet/APKBUILD
@@ -15,7 +15,11 @@ source="http://downloads.sourceforge.net/project/libnet-dev/libnet-$pkgver.tar.g
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libnetfilter_acct/APKBUILD b/main/libnetfilter_acct/APKBUILD
index 83bba7515a0a0e6f3b37f4aff1d321955c18f90a..afa4e5d89eb9342b70a9c87615b788a7541d84b9 100644
--- a/main/libnetfilter_acct/APKBUILD
+++ b/main/libnetfilter_acct/APKBUILD
@@ -15,10 +15,14 @@ source="http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libnetfilter_conntrack/APKBUILD b/main/libnetfilter_conntrack/APKBUILD
index 376e79e4657d18f8f7e4d268cb8da3cf6292b4a1..c7b894798b39531a5d366214558f7ebe7566bb2b 100644
--- a/main/libnetfilter_conntrack/APKBUILD
+++ b/main/libnetfilter_conntrack/APKBUILD
@@ -15,10 +15,14 @@ source="http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libnetfilter_cthelper/APKBUILD b/main/libnetfilter_cthelper/APKBUILD
index aee2921c4ee43116e1a5f90e24a5d9a8672d4db4..50c4533dfbf2f58ec957c73b076cec38ee75fae6 100644
--- a/main/libnetfilter_cthelper/APKBUILD
+++ b/main/libnetfilter_cthelper/APKBUILD
@@ -25,7 +25,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libnetfilter_cttimeout/APKBUILD b/main/libnetfilter_cttimeout/APKBUILD
index 7c63f0cdf92f6eb8b92abc4b6712b3a103d26bf1..f90e923e9917a73e0991548b5e29116227342e66 100644
--- a/main/libnetfilter_cttimeout/APKBUILD
+++ b/main/libnetfilter_cttimeout/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libnetfilter_log/APKBUILD b/main/libnetfilter_log/APKBUILD
index 5c427c9a0e30b03e69056925ddf03df3ed6e866f..8345639dd35e0b0a97908b38a87d39354dabe0cc 100644
--- a/main/libnetfilter_log/APKBUILD
+++ b/main/libnetfilter_log/APKBUILD
@@ -15,10 +15,14 @@ source="http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libnetfilter_queue/APKBUILD b/main/libnetfilter_queue/APKBUILD
index 7d4b119ebeeea4d7033fcc9b43bb21d06e4c7b40..98a425154557b3a6f4b7590eb1467a0c7ae479b9 100644
--- a/main/libnetfilter_queue/APKBUILD
+++ b/main/libnetfilter_queue/APKBUILD
@@ -25,7 +25,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libnfnetlink/APKBUILD b/main/libnfnetlink/APKBUILD
index 7a4983b6d0cdae2602a64b497684895f74d9b337..3931f27c176a60915c82966ad0f8e78731b233a9 100644
--- a/main/libnfnetlink/APKBUILD
+++ b/main/libnfnetlink/APKBUILD
@@ -15,10 +15,14 @@ source="http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-$pkgve
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libnfs/APKBUILD b/main/libnfs/APKBUILD
index f75fcc43dcbc0f3466ccda3711afc99f3727a1fe..52375bd90039849c167c8b5c65968b19e40a012e 100644
--- a/main/libnfs/APKBUILD
+++ b/main/libnfs/APKBUILD
@@ -28,12 +28,15 @@ prepare() {
 build() {
 	cd "$_builddir"
 	./bootstrap || return 1
-        ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --mandir=/usr/share/man \
-                --infodir=/usr/share/info \
-                --localstatedir=/var \
-                || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		|| return 1
         make || return 1
 }
 
diff --git a/main/libnfsidmap/APKBUILD b/main/libnfsidmap/APKBUILD
index 480dab8a810f09e74d1a1b0b782546101694d802..1ed782826c4519650d85974401829102b56a9795 100644
--- a/main/libnfsidmap/APKBUILD
+++ b/main/libnfsidmap/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-static \
 		|| return 1
 	make || return 1
diff --git a/main/libnice/APKBUILD b/main/libnice/APKBUILD
index 3e6054ade29348a97233243e5ede8551e5c75ae1..9905aaea535c1f66e8e642a56662c7da91eeece6 100644
--- a/main/libnice/APKBUILD
+++ b/main/libnice/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libnih/APKBUILD b/main/libnih/APKBUILD
index 2d6c0c26d818a4b269529242c058549f9e2a7f13..7875ed96a02c049cd0ed686675bafa19f2354c6e 100644
--- a/main/libnih/APKBUILD
+++ b/main/libnih/APKBUILD
@@ -27,10 +27,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--libdir=/lib \
 		--sysconfdir=/etc \
-		--localstatedir=/var || return 1
+		--localstatedir=/var \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libnjb/APKBUILD b/main/libnjb/APKBUILD
index 186d87e744add0e65ad21057eb6423717b212c12..b5378df39aba2d534acd036a5a7169d775b11e10 100644
--- a/main/libnjb/APKBUILD
+++ b/main/libnjb/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libnl/APKBUILD b/main/libnl/APKBUILD
index 49089fdcf3a710827d0d005637bbb3320d414e4a..04c84c2b8cebdc6d6abcfa1271df21a384611ed6 100644
--- a/main/libnl/APKBUILD
+++ b/main/libnl/APKBUILD
@@ -29,7 +29,11 @@ prepare () {
 
 build () { 
 	cd "$_builddir"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libnl3/APKBUILD b/main/libnl3/APKBUILD
index f4c4ac2db8eeb5f559adb7883a586a7770302feb..f9489a6b875d324b539c3f2c137ccb88a40512ed 100644
--- a/main/libnl3/APKBUILD
+++ b/main/libnl3/APKBUILD
@@ -25,7 +25,10 @@ prepare () {
 
 build () { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-static \
 		|| return 1
 	make || return 1
diff --git a/main/libnotify/APKBUILD b/main/libnotify/APKBUILD
index e801dfe6f0929598c7bfb04b7f4ce3f6d98afd08..fcc742b3b20145e1c3b26163f9d8e09d430eaf7f 100644
--- a/main/libnotify/APKBUILD
+++ b/main/libnotify/APKBUILD
@@ -27,7 +27,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr --disable-static || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libogg/APKBUILD b/main/libogg/APKBUILD
index d2d9e6fdb0c22f723f95f5b0b61605c2dcc53a57..6182643aa3da8c317673c31ebf5e4fbd13bd1647 100644
--- a/main/libogg/APKBUILD
+++ b/main/libogg/APKBUILD
@@ -15,7 +15,11 @@ source="http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.gz
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/liboil/APKBUILD b/main/liboil/APKBUILD
index a28283c1201e7449b959a0a5baed85d6c2cefd9e..1ea58325ae5a333df44fcfafa628e72aad9ea526 100644
--- a/main/liboil/APKBUILD
+++ b/main/liboil/APKBUILD
@@ -14,7 +14,11 @@ build ()
 {
 	unset CFLAGS
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libotr/APKBUILD b/main/libotr/APKBUILD
index 1150e948c7b595da6d87d2de21bf7cc0cbd34593..72926f5400ad7771905aa11d76410fdf5f2efa8f 100644
--- a/main/libotr/APKBUILD
+++ b/main/libotr/APKBUILD
@@ -27,7 +27,11 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-        ./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libotr3/APKBUILD b/main/libotr3/APKBUILD
index 664fc0d88b098feaea5e679e0969d46182ea27c3..03c44342ab823bb7c52f45455f7673a305e5da05 100644
--- a/main/libotr3/APKBUILD
+++ b/main/libotr3/APKBUILD
@@ -28,7 +28,11 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-        ./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libpaper/APKBUILD b/main/libpaper/APKBUILD
index 7bddda58e523c75a11dade03e3c05c7bb5b55265..51364d250b8bc21648ed840c296d2788c955573b 100644
--- a/main/libpaper/APKBUILD
+++ b/main/libpaper/APKBUILD
@@ -15,8 +15,12 @@ _builddir="$srcdir"/$pkgname-$pkgver
 build ()
 {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--mandir="$pkgdir"/usr/share/man
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir="$pkgdir"/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libpcap/APKBUILD b/main/libpcap/APKBUILD
index 4853e9f2910f3ad412d8f0df4e2e42cac75b4f8b..91c0ccf0c2cc14c6610d87db3f0e54ac541ec0bb 100644
--- a/main/libpcap/APKBUILD
+++ b/main/libpcap/APKBUILD
@@ -25,7 +25,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr --enable-ipv6 || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--enable-ipv6 \
+		|| return 1
 	# seems to be problem with timestamps
 	sleep 1
 	./config.status
diff --git a/main/libpciaccess/APKBUILD b/main/libpciaccess/APKBUILD
index 45f74f46fb61c91d14ff6b11a16638c2ec1b992f..85e18510790291bb85d2324c47f75abddfdb6a81 100644
--- a/main/libpciaccess/APKBUILD
+++ b/main/libpciaccess/APKBUILD
@@ -13,7 +13,11 @@ source="http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$pkgver.tar
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libpng/APKBUILD b/main/libpng/APKBUILD
index 6e499884c3c887b693b71d02a50de0baa5aa594e..51cec202309f7bd0ad7321215b5806a20930702f 100644
--- a/main/libpng/APKBUILD
+++ b/main/libpng/APKBUILD
@@ -24,7 +24,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		|| return 1
 	make
 }
diff --git a/main/libpthread-stubs/APKBUILD b/main/libpthread-stubs/APKBUILD
index 9f9347e00034a130b0c84577507f01729350170f..30a2d9159cd41369d5b542b0509c60e3e714de33 100644
--- a/main/libpthread-stubs/APKBUILD
+++ b/main/libpthread-stubs/APKBUILD
@@ -11,7 +11,11 @@ source="http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	# we actually have pthread_exit, the configure script just
 	# fails to detect it
 	make CFLAGS="$CFLAGS -DHAVE_PTHREAD_EXIT=1"
diff --git a/main/libraw/APKBUILD b/main/libraw/APKBUILD
index 221d60cc643fda508ae5efbc6acee5bf685f1d20..4d89b9239f2bf75da65f58800d39403a589c1835 100644
--- a/main/libraw/APKBUILD
+++ b/main/libraw/APKBUILD
@@ -23,7 +23,11 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make lib/libraw.a lib/libraw_r.a
 	make
 }
diff --git a/main/libraw1394/APKBUILD b/main/libraw1394/APKBUILD
index 1b45a8e975dd13d49be4a093f928f159afa06cd4..8c8e36648e966683ffba4ba8cd11e1cb403b8975 100644
--- a/main/libraw1394/APKBUILD
+++ b/main/libraw1394/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libresample/APKBUILD b/main/libresample/APKBUILD
index be81aacf80548f4dd5abb2aeed59b56b90a91620..0c8289049d1e9b6a83be877fc3a42645b74c1834 100644
--- a/main/libresample/APKBUILD
+++ b/main/libresample/APKBUILD
@@ -26,10 +26,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/librpcsecgss/APKBUILD b/main/librpcsecgss/APKBUILD
index f6ee20aa11c073de916e1bf75e92cea223e185af..57b21a8eaf1309cbcc8be5981a7d9a8aea92b828 100644
--- a/main/librpcsecgss/APKBUILD
+++ b/main/librpcsecgss/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/librsvg/APKBUILD b/main/librsvg/APKBUILD
index e43118c576e65d77e9eb843cec7befc9534db356..b6922c336b59054d502ea8e61f2e53c0a66dc22e 100644
--- a/main/librsvg/APKBUILD
+++ b/main/librsvg/APKBUILD
@@ -18,12 +18,16 @@ depends_dev="glib-dev gtk+-dev cairo-dev libcroco-dev libgsf-dev"
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--libexecdir=/usr/lib/$pkgname \
 		--with-croco \
 		--disable-static \
 		--disable-mozilla-plugin \
-		--with-svgz || return 1
+		--with-svgz \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/librsync/APKBUILD b/main/librsync/APKBUILD
index 25c1b0ee876cdeaabc04906b4a73e2fd95ddb59a..3e42bf7007663286bcc2a9f3d8c1431e1b45fa95 100644
--- a/main/librsync/APKBUILD
+++ b/main/librsync/APKBUILD
@@ -18,7 +18,13 @@ _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
 
-	./configure --prefix=/usr --mandir=/usr/share/man --enable-shared
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--enable-shared \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libsamplerate/APKBUILD b/main/libsamplerate/APKBUILD
index ecf28f7eaadcdf1f15225d6e7b723cf91e687399..c8d3e9bfbea321d6badd8c43a7d27ebb4cddfe39 100644
--- a/main/libsamplerate/APKBUILD
+++ b/main/libsamplerate/APKBUILD
@@ -12,7 +12,11 @@ source="http://www.mega-nerd.com/SRC/$pkgname-$pkgver.tar.gz"
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libsecret/APKBUILD b/main/libsecret/APKBUILD
index c355f41408ee144ae1889010e1245daf3905e555..a036d55583ce113d88f918d9b5c2ff4db83f36b1 100644
--- a/main/libsecret/APKBUILD
+++ b/main/libsecret/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libsexy/APKBUILD b/main/libsexy/APKBUILD
index b30998cb10af46eb37717f2a0bbce1d9ecf5457f..e3423d53b676d991da3b0942c8493c9a922e19b1 100644
--- a/main/libsexy/APKBUILD
+++ b/main/libsexy/APKBUILD
@@ -13,8 +13,12 @@ source="http://releases.chipx86.com/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--disable-static
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libshairport/APKBUILD b/main/libshairport/APKBUILD
index e320b572c4877d9638aca9b28417982b64d87cd1..17e036e91e48b9d94ca12504163d4fbcc1a02fdd 100644
--- a/main/libshairport/APKBUILD
+++ b/main/libshairport/APKBUILD
@@ -29,11 +29,15 @@ prepare() {
 build() {
 	cd "$_builddir"
 	autoreconf -vif
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--localstatedir=/var
+		--localstatedir=/var \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libshout/APKBUILD b/main/libshout/APKBUILD
index d39a110d01127a561be3ee0db3342e268be48993..3eacdcde44b06b5830d39b1069a1b4bb755c9278 100644
--- a/main/libshout/APKBUILD
+++ b/main/libshout/APKBUILD
@@ -25,7 +25,11 @@ prepare() {
 }
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr 
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 		--sysconfdir=/etc 
 		--localstatedir=/var
          make LDFLAGS+=-lspeex || return 1
diff --git a/main/libsigc++/APKBUILD b/main/libsigc++/APKBUILD
index 816a1eae46487caf9f27e9db6f909acac59ef085..e7e44d9a8257f1e0269a70c765acf86b2c19b263 100644
--- a/main/libsigc++/APKBUILD
+++ b/main/libsigc++/APKBUILD
@@ -13,7 +13,11 @@ source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.2/$pkgname-$pkgver.tar
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libsm/APKBUILD b/main/libsm/APKBUILD
index 13488e4f0cb2f46b0b4d0ac9bd94f38665d6c55b..16ce377b495999399e3534815d33bd985c2846f1 100644
--- a/main/libsm/APKBUILD
+++ b/main/libsm/APKBUILD
@@ -15,7 +15,12 @@ depends_dev="libice-dev xproto"
 
 build () {
 	cd "$srcdir"/libSM-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libsndfile/APKBUILD b/main/libsndfile/APKBUILD
index 19a22714d2617f9844691843faa8009493905ea8..673d5d01650428d6da2bfb6e0df3ede0799a7ac3 100644
--- a/main/libsndfile/APKBUILD
+++ b/main/libsndfile/APKBUILD
@@ -15,7 +15,10 @@ source="http://www.mega-nerd.com/$pkgname/files/$pkgname-$pkgver.tar.gz"
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
 	ac_cv_sys_largefile_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-sqlite \
 		--enable-largefile \
 		|| return 1
diff --git a/main/libsoup/APKBUILD b/main/libsoup/APKBUILD
index a679a1cfadcd26e396fbda73b5d3191890ee6582..0d522b90c195ad0097459822b61f4f44951e6c07 100644
--- a/main/libsoup/APKBUILD
+++ b/main/libsoup/APKBUILD
@@ -15,7 +15,10 @@ source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$p
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	DATADIRNAME=share ./configure --prefix=/usr \
+	DATADIRNAME=share ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
diff --git a/main/libspf2/APKBUILD b/main/libspf2/APKBUILD
index 41ae24e8fff7af45bb12f450c6d0e05ee140c68d..5bfa649f656d55d1e388e909c9a2dfd807fff034 100644
--- a/main/libspf2/APKBUILD
+++ b/main/libspf2/APKBUILD
@@ -31,7 +31,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		|| return 1
 	make || return 1
 }
diff --git a/main/libssh2/APKBUILD b/main/libssh2/APKBUILD
index e45b92bc77cb05e6d3e7887e0689a80e50dcce31..ca69b55a73455d4d0e32f4b49d5a622d09898911 100644
--- a/main/libssh2/APKBUILD
+++ b/main/libssh2/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libtasn1/APKBUILD b/main/libtasn1/APKBUILD
index 43eaa6d3bd21f79a1b34199ad6ca85dbae603134..72bdfa69561397e5032f2ca9887b242c8f9f273a 100644
--- a/main/libtasn1/APKBUILD
+++ b/main/libtasn1/APKBUILD
@@ -15,7 +15,11 @@ source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
 _builddir="$srcdir"/$pkgname-$pkgver
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libtheora/APKBUILD b/main/libtheora/APKBUILD
index a11d6411823c0f29567b29d6635f852030f9d593..a4632b2f44f6455460cb9a2b66ef8fa1436a8d2b 100644
--- a/main/libtheora/APKBUILD
+++ b/main/libtheora/APKBUILD
@@ -32,9 +32,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-shared \
-		--disable-static || return 1
+		--disable-static \
+		|| return 1
 
 	cd lib && make || return 1
 	cd ..
diff --git a/main/libtirpc/APKBUILD b/main/libtirpc/APKBUILD
index 029d7d33de4f3350f2dedf73fc276c42ad9be3eb..98f736a962d5bf85e8810dd9ce9e780d27707a40 100644
--- a/main/libtirpc/APKBUILD
+++ b/main/libtirpc/APKBUILD
@@ -36,7 +36,10 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-gss \
 		|| return 1
 	make || return 1
diff --git a/main/libtool/APKBUILD b/main/libtool/APKBUILD
index 758156d613f5f026f7f886b96250d89af438bb57..d91cfe41dc59b85c43e9089456631e411782d7eb 100644
--- a/main/libtool/APKBUILD
+++ b/main/libtool/APKBUILD
@@ -13,7 +13,11 @@ options="libtool"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make
 }
 
diff --git a/main/libtorrent/APKBUILD b/main/libtorrent/APKBUILD
index 2f23d1f53bf2d522992e0316905e9367d54aec70..d7d0dad9636c3f8d24fe4651c833926f4dc3c8f8 100644
--- a/main/libtorrent/APKBUILD
+++ b/main/libtorrent/APKBUILD
@@ -13,19 +13,20 @@ options='libtool'
 source="http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz"
 
 build() {
-  cd "$srcdir"/$pkgname-$pkgver
+	cd "$srcdir"/$pkgname-$pkgver
 
-  ./configure \
-    --prefix=/usr \
-    --disable-debug \
-    || return 1
-
-  make || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-debug \
+		|| return 1
+	make || return 1
 }
 
 package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install || return 1
+	cd "$srcdir"/$pkgname-$pkgver
+	make DESTDIR="$pkgdir" install || return 1
 }
 
 md5sums="e94f6c590bb02aaf4d58618f738a85f2  libtorrent-0.13.3.tar.gz"
diff --git a/main/libtxc_dxtn/APKBUILD b/main/libtxc_dxtn/APKBUILD
index 13dd5142bc1a121899eb9700e2b1837efdffbd22..121e4ca248c09cf91657f15ff3155d7957e14c75 100644
--- a/main/libtxc_dxtn/APKBUILD
+++ b/main/libtxc_dxtn/APKBUILD
@@ -29,7 +29,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr --sysconfdir=/etc || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make
 }
 
diff --git a/main/libunique/APKBUILD b/main/libunique/APKBUILD
index e93a3cb12725cb8807c5e667c43c40ea0f423dbc..f0f304f90d3b3a706fd644e1f9c1f48e423ca308 100644
--- a/main/libunique/APKBUILD
+++ b/main/libunique/APKBUILD
@@ -24,7 +24,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-maintainer-flags=no \
diff --git a/main/libunique3/APKBUILD b/main/libunique3/APKBUILD
index 2a1411e6f0ee0b01ae6f02929a6fdbf4df0c96c5..f545c71e2c06a75a60b75d017888eee28a8c7b85 100644
--- a/main/libunique3/APKBUILD
+++ b/main/libunique3/APKBUILD
@@ -24,7 +24,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-  	./configure --prefix=/usr \
+  	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
diff --git a/main/libunistring/APKBUILD b/main/libunistring/APKBUILD
index e55d7474d03176e2698acd06488ff5e9a1873030..12d220a122fed7dc168252e35baa1fac4028b8c0 100644
--- a/main/libunistring/APKBUILD
+++ b/main/libunistring/APKBUILD
@@ -28,7 +28,11 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	 ./configure --prefix=/usr || return 1
+	 ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make all || return 1
 }
 
diff --git a/main/libusb-compat/APKBUILD b/main/libusb-compat/APKBUILD
index 4952b3c9750569261d747ac968c295e07799074a..39d03684940a09dc10173bf128f5f186697eb657 100644
--- a/main/libusb-compat/APKBUILD
+++ b/main/libusb-compat/APKBUILD
@@ -14,7 +14,12 @@ source="http://downloads.sourceforge.net/libusb/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --disable-build-docs
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-build-docs \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libusb/APKBUILD b/main/libusb/APKBUILD
index 4de038b5eeaee49a89e3f11120128ac9f05c624c..72feccc2be61bb2b2bc9c1732f2df6e7ca543631 100644
--- a/main/libusb/APKBUILD
+++ b/main/libusb/APKBUILD
@@ -27,7 +27,11 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
 _builddir="$srcdir"/$pkgname-$_ver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libva-intel-driver/APKBUILD b/main/libva-intel-driver/APKBUILD
index 3356450de120ff90a4cd043f500169b02f1b40ba..5c8d43b1f0c2f4f3d09b0b32c48a81be0dd3f224 100644
--- a/main/libva-intel-driver/APKBUILD
+++ b/main/libva-intel-driver/APKBUILD
@@ -28,7 +28,11 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libva/APKBUILD b/main/libva/APKBUILD
index 9acb53e1aaafaf2d2993eedc03ac8f377dcad88f..02b35cbc3a2d96bdd731ebc4e38fe2798bb8eadc 100644
--- a/main/libva/APKBUILD
+++ b/main/libva/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libvdpau/APKBUILD b/main/libvdpau/APKBUILD
index 51c5c2234787837633d2aaf5c08073abfd2bf4b2..70e1bc7d9bdf89ba51feb86a576d35b424604bfb 100644
--- a/main/libvdpau/APKBUILD
+++ b/main/libvdpau/APKBUILD
@@ -22,10 +22,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libverto/APKBUILD b/main/libverto/APKBUILD
index 64dc5dfd85dece847a966d29caf306a901864178..c0a371e0f905cb20d32a33e98a6d500dc7ffbe1b 100644
--- a/main/libverto/APKBUILD
+++ b/main/libverto/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-libev \
 		--with-libevent \
 		|| return 1
diff --git a/main/libvirt-glib/APKBUILD b/main/libvirt-glib/APKBUILD
index 30c9e9e63843da74c0c4cf06d20ca346db605445..834fec326a9286ccb02bc44f6d6083e88ce84181 100644
--- a/main/libvirt-glib/APKBUILD
+++ b/main/libvirt-glib/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libvirt/APKBUILD b/main/libvirt/APKBUILD
index 966482aaa52af5834bf42edbff9339a0bb22f620..aa0d91c403949f5210329053d871d56f36fa1b16 100644
--- a/main/libvirt/APKBUILD
+++ b/main/libvirt/APKBUILD
@@ -59,7 +59,10 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -lm"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libvorbis/APKBUILD b/main/libvorbis/APKBUILD
index 37727e4241a9677346ae6a3dbfa8fb059526db3a..8224b0a28a1fda4c27c3e79c69d2ffef7bef8d57 100644
--- a/main/libvorbis/APKBUILD
+++ b/main/libvorbis/APKBUILD
@@ -16,8 +16,12 @@ source="http://downloads.xiph.org/releases/vorbis/libvorbis-$pkgver.tar.gz"
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--disable-static || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libvpx/APKBUILD b/main/libvpx/APKBUILD
index 98556a7e8dd367c26c1d9f916f3283f309debd41..74a4ff470cb51c44dd8605c4828f56e7fe5880c7 100644
--- a/main/libvpx/APKBUILD
+++ b/main/libvpx/APKBUILD
@@ -28,6 +28,8 @@ prepare() {
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--enable-pic \
 		--enable-libs \
 		--enable-runtime-cpu-detect \
diff --git a/main/libwebp/APKBUILD b/main/libwebp/APKBUILD
index de99445b439397f9805fc368580b69e9466bb537..27c0d2962a427d7c44effd02bce4d6e93c66eaa5 100644
--- a/main/libwebp/APKBUILD
+++ b/main/libwebp/APKBUILD
@@ -19,7 +19,11 @@ _builddir="$srcdir/$pkgname-$pkgver"
 build() {
 	cd "$_builddir"
 	sh autogen.sh
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libwnck/APKBUILD b/main/libwnck/APKBUILD
index db9e905bee3c5a614caa3e9ce8ef0176c28c32f3..9b0699a3b7281ce569a48177b2a504bf914220c1 100644
--- a/main/libwnck/APKBUILD
+++ b/main/libwnck/APKBUILD
@@ -18,10 +18,14 @@ depends_dev="glib-dev gtk+-dev libx11-dev pango-dev cairo-dev
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--disable-static || return 1
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libx11/APKBUILD b/main/libx11/APKBUILD
index 7b8fc4d9951aba88b8fe33db8e387e073f12d60b..b42b6d0d681a14a0fd22c7d0b912883c4a245093 100644
--- a/main/libx11/APKBUILD
+++ b/main/libx11/APKBUILD
@@ -16,8 +16,12 @@ source="http://xorg.freedesktop.org/releases/individual/lib/libX11-$pkgver.tar.b
 
 build() {
 	cd "$srcdir"/libX11-$pkgver
-	./configure --prefix=/usr \
-		--with-xcb || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--with-xcb \
+		|| return 1
 	make
 }
 
diff --git a/main/libxau/APKBUILD b/main/libxau/APKBUILD
index 88ed3e1b052d22960413fba21018ab2e9e155f98..7c0d6c6719b161070569c8fc1b4c72995eb562b8 100644
--- a/main/libxau/APKBUILD
+++ b/main/libxau/APKBUILD
@@ -15,7 +15,12 @@ depends_dev="xproto"
 
 build() {
 	cd "$srcdir"/libXau-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxcb/APKBUILD b/main/libxcb/APKBUILD
index 1657306f5b7bad0decc43f68f9fdd46b50e83408..23a845bb371465d8c57f349a1d9e043be8208153 100644
--- a/main/libxcb/APKBUILD
+++ b/main/libxcb/APKBUILD
@@ -25,7 +25,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-xkb \
 		--enable-xinput \
 		--disable-xprint \
diff --git a/main/libxcomposite/APKBUILD b/main/libxcomposite/APKBUILD
index b7e58c819ced3e2d915507fb9896e58160601d92..1b891c4b49b31d63b4bb0851d1bb8ec655b75496 100644
--- a/main/libxcomposite/APKBUILD
+++ b/main/libxcomposite/APKBUILD
@@ -15,8 +15,12 @@ depends_dev="xproto compositeproto libxfixes-dev libx11-dev libxext-dev"
 _builddir="$srcdir"/libXcomposite-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxcursor/APKBUILD b/main/libxcursor/APKBUILD
index c1d14bcc6e1b127562f226c88560c03539ec4df5..c394aa1d7064691beac0ffb81b3dbcb78f916fe6 100644
--- a/main/libxcursor/APKBUILD
+++ b/main/libxcursor/APKBUILD
@@ -24,7 +24,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		|| return 1
 	make || return 1
diff --git a/main/libxdamage/APKBUILD b/main/libxdamage/APKBUILD
index 52038101eaf1d91bdd3492369d45697bf4d651fc..0ddd9126a90c551ef67537a5d624ae9081876425 100644
--- a/main/libxdamage/APKBUILD
+++ b/main/libxdamage/APKBUILD
@@ -14,7 +14,12 @@ source="http://xorg.freedesktop.org/releases/individual/lib/libXdamage-$pkgver.t
 depends_dev="xproto damageproto libxfixes-dev libx11-dev fixesproto"
 build() {
 	cd "$srcdir"/libXdamage-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxdg-basedir/APKBUILD b/main/libxdg-basedir/APKBUILD
index 63f515209fb4de77a38b6b34eef7b90cc9c99978..65934815a6330594bcf1927612d90bd41da425ce 100644
--- a/main/libxdg-basedir/APKBUILD
+++ b/main/libxdg-basedir/APKBUILD
@@ -27,8 +27,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxdmcp/APKBUILD b/main/libxdmcp/APKBUILD
index 62aabfb1a67888b3ab83e90e7deec0b9bf3b1eb7..b63883dd0e02cd7b747bfdefda373c8f0c2b970b 100644
--- a/main/libxdmcp/APKBUILD
+++ b/main/libxdmcp/APKBUILD
@@ -13,8 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-$pkgver.tar
 
 build() {
 	cd "$srcdir"/libXdmcp-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc 
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxext/APKBUILD b/main/libxext/APKBUILD
index 90c3921f33d09c09fde463e45f0078cc47c3486b..bd4e308a4791c580e0890706eacebda90d9e6f34 100644
--- a/main/libxext/APKBUILD
+++ b/main/libxext/APKBUILD
@@ -26,7 +26,12 @@ prepare() {
 
 build() {
 	cd "$srcdir"/libXext-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make
 }
 
diff --git a/main/libxfce4ui/APKBUILD b/main/libxfce4ui/APKBUILD
index 55d39a5313d41d7741964c55d196c7034814ce55..dedff9861f7974c19f0205360b91fc7509bf01ef 100644
--- a/main/libxfce4ui/APKBUILD
+++ b/main/libxfce4ui/APKBUILD
@@ -16,13 +16,17 @@ source="http://archive.xfce.org/src/xfce/${pkgname}/${pkgver%.*}/${pkgname}-${pk
 depends_dev="gtk+-dev libxfce4util-dev xfconf-dev startup-notification-dev"
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
 		--enable-gladeui \
 		--with-vendor-info="Alpine Linux" \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxfce4util/APKBUILD b/main/libxfce4util/APKBUILD
index ca175426ccba2b473d1263d6b14acd8ef5290061..995b6d2769381720fa75e8b414b8525f7a24c398 100644
--- a/main/libxfce4util/APKBUILD
+++ b/main/libxfce4util/APKBUILD
@@ -14,11 +14,15 @@ source="http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.
 depends_dev="glib-dev"
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxfcegui4/APKBUILD b/main/libxfcegui4/APKBUILD
index 6979041cfbb7b7143e09a5900630d29741d7a4cc..166d19d318dee77991d2e5d0b142ef2ba2eca545 100644
--- a/main/libxfcegui4/APKBUILD
+++ b/main/libxfcegui4/APKBUILD
@@ -15,11 +15,15 @@ source="http://archive.xfce.org/src/xfce/${pkgname}/${pkgver%.*}/${pkgname}-${pk
 depends_dev="gtk+-dev libxfce4util-dev xfconf-dev startup-notification-dev"
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxfixes/APKBUILD b/main/libxfixes/APKBUILD
index 89decdb0e1540575946f2128fb5f409baacb66cc..c0e67347c69bc1284f76ea56e3c3c866f5578c78 100644
--- a/main/libxfixes/APKBUILD
+++ b/main/libxfixes/APKBUILD
@@ -24,7 +24,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr --sysconfdir=/etc --build=${CHOST} --host=${CHOST}
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxfont/APKBUILD b/main/libxfont/APKBUILD
index 4b322417617165e91d4e0b6f724e970412221941..6313cfd50a2b93c1e5d4ee357d162c3aa67d1122 100644
--- a/main/libxfont/APKBUILD
+++ b/main/libxfont/APKBUILD
@@ -15,7 +15,12 @@ source="http://xorg.freedesktop.org/archive/individual/lib/libXfont-$pkgver.tar.
 
 build() {
 	cd "$srcdir"/libXfont-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxft/APKBUILD b/main/libxft/APKBUILD
index ae7e4bc632cb3d108b0b47893b89f0e5352c8aea..83776140e0ff13290808271e881832ad9b179f4d 100644
--- a/main/libxft/APKBUILD
+++ b/main/libxft/APKBUILD
@@ -14,8 +14,12 @@ source="http://xorg.freedesktop.org/releases/individual/lib/libXft-$pkgver.tar.b
 
 build () {
 	cd "$srcdir"/libXft-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxi/APKBUILD b/main/libxi/APKBUILD
index 485d33e9830ff5bce4244e5fda901f2b1bd6c376..294e4aa564db5443ec446ef3bb2352b4d1500594 100644
--- a/main/libxi/APKBUILD
+++ b/main/libxi/APKBUILD
@@ -30,7 +30,12 @@ prepare() {
 build () 
 { 
 	cd "$_builddir"
-	./configure --prefix=/usr --sysconfdir=/etc || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxinerama/APKBUILD b/main/libxinerama/APKBUILD
index 2d5465f243fb88630b250cc91c196bb06cd317f0..39c95ef994cf41a569971f3d89659ee733ce4048 100644
--- a/main/libxinerama/APKBUILD
+++ b/main/libxinerama/APKBUILD
@@ -25,7 +25,11 @@ prepare() {
 
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxkbcommon/APKBUILD b/main/libxkbcommon/APKBUILD
index d7e790cef12e3b2869d1994ce7896472601f0c32..fdd72b649905f1411419272f64fe54d1f53b222a 100644
--- a/main/libxkbcommon/APKBUILD
+++ b/main/libxkbcommon/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libxkbfile/APKBUILD b/main/libxkbfile/APKBUILD
index fd53a15f50c9adafd4a6762c3d00f131ae70af24..351c5ace4c4c6bc8057fa5643700c84d5f77d674 100644
--- a/main/libxkbfile/APKBUILD
+++ b/main/libxkbfile/APKBUILD
@@ -14,8 +14,12 @@ source="http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$pkgver.tar
 depends_dev="libx11-dev kbproto"
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxkbui/APKBUILD b/main/libxkbui/APKBUILD
index b9cffba90c358fbb1c90256aad664715c010e0c8..a2d77a03eb0b23608ec924ceb39d258c1c7a7985 100644
--- a/main/libxkbui/APKBUILD
+++ b/main/libxkbui/APKBUILD
@@ -14,7 +14,11 @@ source="http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$pkgver.tar
 depends_dev="libx11-dev xproto libxt-dev"
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxklavier/APKBUILD b/main/libxklavier/APKBUILD
index d5075dce1923ac580ef569115c80de05dbcbd71b..771398a4818819d984b76d97192ec5f66eb85126 100644
--- a/main/libxklavier/APKBUILD
+++ b/main/libxklavier/APKBUILD
@@ -24,9 +24,13 @@ depends_dev="libxml2-dev glib-dev gettext-dev libxkbfile-dev"
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-xkb-base=/usr/share/X11/xkb \
-		--disable-static || return 1
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxml2/APKBUILD b/main/libxml2/APKBUILD
index 4121c44b2f524adfbf3a2788ec60d2c32578deea..5500426a1787db3376687576ff452210d1105e7b 100644
--- a/main/libxml2/APKBUILD
+++ b/main/libxml2/APKBUILD
@@ -28,10 +28,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info 
+		--infodir=/usr/share/info \
+		|| return 1
 	make
 }
 
diff --git a/main/libxmu/APKBUILD b/main/libxmu/APKBUILD
index 3d1838323862e071ef8f2c2ef0814a847bb89090..c4f9442846c3ff4cf518a7b3e870e1d8dfb268fe 100644
--- a/main/libxmu/APKBUILD
+++ b/main/libxmu/APKBUILD
@@ -16,8 +16,12 @@ depends_dev="xproto libx11-dev libxt-dev libxext-dev util-linux-dev"
 build () 
 { 
 	cd "$srcdir"/libXmu-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxp/APKBUILD b/main/libxp/APKBUILD
index c7a6acf771b36672b2e53fc97b653ea0f4ab95f7..e917d6cae8ad76252394efdcdd648a1ead8bcb66 100644
--- a/main/libxp/APKBUILD
+++ b/main/libxp/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/libxpm/APKBUILD b/main/libxpm/APKBUILD
index ae409ebc4a10cc7e4db044affd36d61145125fe5..90c31e2c2bff7ecc4180d5da281878612c172036 100644
--- a/main/libxpm/APKBUILD
+++ b/main/libxpm/APKBUILD
@@ -15,7 +15,10 @@ source="http://xorg.freedesktop.org/releases/individual/lib/libXpm-$pkgver.tar.b
 depends_dev="libx11-dev"
 build() {
 	cd "$srcdir"/libXpm-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		|| return 1
 	make || return 1
diff --git a/main/libxrandr/APKBUILD b/main/libxrandr/APKBUILD
index 84d96a634e68f457008d89d6f399ea7d6883c6c8..4ae7c83c98f8535e0ab89064cb220cced916f8bf 100644
--- a/main/libxrandr/APKBUILD
+++ b/main/libxrandr/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		|| return 1
 	make || return 1
diff --git a/main/libxrender/APKBUILD b/main/libxrender/APKBUILD
index 0a4e6a80d7cf67c2d43f9fc533713df48a6fe948..b3591f0d26db6e9ac90e7b7a906c86748981c387 100644
--- a/main/libxrender/APKBUILD
+++ b/main/libxrender/APKBUILD
@@ -17,7 +17,11 @@ _builddir="$srcdir"/libXrender-$pkgver
 
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxres/APKBUILD b/main/libxres/APKBUILD
index 2abb57fed03cb9bde09c681508f4aa192d5054be..c1cdafcf5515e7ea272025d5c27518bdc7afc986 100644
--- a/main/libxres/APKBUILD
+++ b/main/libxres/APKBUILD
@@ -25,8 +25,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc 
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxslt/APKBUILD b/main/libxslt/APKBUILD
index cf9d1c32280fa5dd389f8eef2e303da309984d1f..1b7fd68fffbd0d3bdf3f2b81a39bb6c8abfb2748 100644
--- a/main/libxslt/APKBUILD
+++ b/main/libxslt/APKBUILD
@@ -23,7 +23,11 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make
 }
 
diff --git a/main/libxt/APKBUILD b/main/libxt/APKBUILD
index 613958d2a5c2e814d494b79bc514a2c1d7aeb1c8..2f006b1db6206ae2ebf4fb5391d4e2f97c790215 100644
--- a/main/libxt/APKBUILD
+++ b/main/libxt/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build () {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		|| return 1
 	make || return 1
diff --git a/main/libxtst/APKBUILD b/main/libxtst/APKBUILD
index 30da3627f414506a0a6cf187739f02d7d25a4f22..ff61909ae13bf207f302b96662e10f4258aab99c 100644
--- a/main/libxtst/APKBUILD
+++ b/main/libxtst/APKBUILD
@@ -25,8 +25,11 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--build=${CHOST} --host=${CHOST}
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxv/APKBUILD b/main/libxv/APKBUILD
index 5e1a2dcf1982328728a4f3a4c29daa9608977970..ff07b6e49f9465ad2fe2370700fad4174b02cd05 100644
--- a/main/libxv/APKBUILD
+++ b/main/libxv/APKBUILD
@@ -25,7 +25,11 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxvmc/APKBUILD b/main/libxvmc/APKBUILD
index 8f45ff7cc3d9cd4cfc0e2a8cea0577f7e7ed25b3..7aea30dcd99b050a58b772d9c34cac3a7f5dc861 100644
--- a/main/libxvmc/APKBUILD
+++ b/main/libxvmc/APKBUILD
@@ -16,7 +16,12 @@ _builddir="$srcdir"/libXvMC-$pkgver
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr --sysconfdir=/etc
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxxf86dga/APKBUILD b/main/libxxf86dga/APKBUILD
index 464301d61c59efaf0f058a59b048baed4f683d4a..4ea190070effe834a969398aa9e2233134dfd07c 100644
--- a/main/libxxf86dga/APKBUILD
+++ b/main/libxxf86dga/APKBUILD
@@ -24,7 +24,11 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxxf86misc/APKBUILD b/main/libxxf86misc/APKBUILD
index 37501780516396d8ecbd2fca7dc41103a3ff681d..1529d841adab3cc4a66d513cd55b3ae203512187 100644
--- a/main/libxxf86misc/APKBUILD
+++ b/main/libxxf86misc/APKBUILD
@@ -14,8 +14,12 @@ depends_dev="xf86miscproto libx11-dev libxext-dev"
 
 build() {
 	cd "$srcdir"/libXxf86misc-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/libxxf86vm/APKBUILD b/main/libxxf86vm/APKBUILD
index 474b6a97f94a4cde677be2745a2306ae6b80a496..d9323479d2aba81e9ffc27fc5951ace74cff458b 100644
--- a/main/libxxf86vm/APKBUILD
+++ b/main/libxxf86vm/APKBUILD
@@ -25,7 +25,11 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/lighttpd/APKBUILD b/main/lighttpd/APKBUILD
index 0ed6c45ec15e0f12fdef401585aa5c28c4c216fe..06b2446a17b432566bcc7c8488466fc05c1fab5c 100644
--- a/main/lighttpd/APKBUILD
+++ b/main/lighttpd/APKBUILD
@@ -55,7 +55,10 @@ __EOF__
 build() { 
 	local i
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-dependency-tracking \
 		--enable-lfs \
 		--libdir=/usr/lib/lighttpd \
@@ -71,7 +74,8 @@ build() {
 		--with-ldap \
 		--with-openssl \
 		--with-libev \
-		--with-lua || return 1
+		--with-lua \
+		|| return 1
 
 	make
 }
diff --git a/main/links/APKBUILD b/main/links/APKBUILD
index 79b04d12339e4952fd6d76bc861857aaeafb2188..9a0e77c0078393146744b033563c83cf565dc8f0 100644
--- a/main/links/APKBUILD
+++ b/main/links/APKBUILD
@@ -13,12 +13,16 @@ source="http://$pkgname.twibright.com/download/$pkgname-$pkgver.tar.bz2"
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--enable-javascript \
 		--disable-graphics \
 		--without-x \
-		--disable-nls || return 1
+		--disable-nls \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/linux-pam/APKBUILD b/main/linux-pam/APKBUILD
index b1164032503c3f3614d88f974a639cb4400731e7..c244e671bb63bc7251073da601f1ef2368fe371c 100644
--- a/main/linux-pam/APKBUILD
+++ b/main/linux-pam/APKBUILD
@@ -37,7 +37,10 @@ prepare() {
 build() {
 	cd "$_builddir"
 	autoreconf -vif || return 1
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--libdir=/lib \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
diff --git a/main/llvm/APKBUILD b/main/llvm/APKBUILD
index 65a8bc0cf0e7b1bfdbcd7b6672151566eee104f1..2fbcd1d4044c68e4fa4f3bb6526ed99a00e51bba 100644
--- a/main/llvm/APKBUILD
+++ b/main/llvm/APKBUILD
@@ -58,11 +58,13 @@ build() {
 		|| return 1
 
 	$_srcdir/configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--enable-ffi  \
+		--enable-ffi \
 		--enable-shared \
 		|| return 1
 
diff --git a/main/lockdev/APKBUILD b/main/lockdev/APKBUILD
index 7dc2d061263d57a2bdf51e10d360d1e827d2fe7d..d5aa96dd35d029315fb779a4f09b645c3f562d16 100644
--- a/main/lockdev/APKBUILD
+++ b/main/lockdev/APKBUILD
@@ -32,7 +32,10 @@ build() {
 	# bootstap fails with missing m4 dir
 	mkdir m4
 	./bootstrap || return 1
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/loudmouth/APKBUILD b/main/loudmouth/APKBUILD
index aaaa9c2d3329b664d3b6b7e4dfe8f024fafe5b05..973c32efafd49ebaf05523f1c5d04ecaf4501774 100644
--- a/main/loudmouth/APKBUILD
+++ b/main/loudmouth/APKBUILD
@@ -33,6 +33,8 @@ prepare() {
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--disable-static \
 		--with-asyncns=yes \
 		--with-ssl=openssl \
diff --git a/main/lsscsi/APKBUILD b/main/lsscsi/APKBUILD
index 98604c036d8ce19136db4da58b7276496677e05a..66ed5b49a688e7ab14dcf8db756f6c1ce1c566cd 100644
--- a/main/lsscsi/APKBUILD
+++ b/main/lsscsi/APKBUILD
@@ -21,10 +21,14 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/lsyncd/APKBUILD b/main/lsyncd/APKBUILD
index e7a27327eade9df4ea3714b5cbdcfe48b8a4e75a..ec6b099e19dcb3a5710a73ddbcf890c37b32670d 100644
--- a/main/lsyncd/APKBUILD
+++ b/main/lsyncd/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/ltrace/APKBUILD b/main/ltrace/APKBUILD
index 1b1274a43855f65e0e7e0fcdfdc13ad84dc63965..91785f275d1a6b941dbbbac4d26828fd36e57267 100644
--- a/main/ltrace/APKBUILD
+++ b/main/ltrace/APKBUILD
@@ -24,7 +24,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--disable-werror \
 		|| return 1
diff --git a/main/lua-bitlib/APKBUILD b/main/lua-bitlib/APKBUILD
index 4610091decc7e17d6276fe6a4441338cc019ff6d..0c8fd572358d88b3e607e5cac342ab956c957672 100644
--- a/main/lua-bitlib/APKBUILD
+++ b/main/lua-bitlib/APKBUILD
@@ -17,7 +17,11 @@ _builddir="$srcdir"/$_name-$pkgver
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/lua-curl/APKBUILD b/main/lua-curl/APKBUILD
index 501728da55251db52b0d5f34cb1dc06ffa3565da..33d2564f25a05db5bc9c7c999b1eeb5739d5465e 100644
--- a/main/lua-curl/APKBUILD
+++ b/main/lua-curl/APKBUILD
@@ -15,7 +15,11 @@ source="http://luaforge.net/frs/download.php/2634/lua-curl-0.2.tar.gz"
 _builddir="$srcdir"/lua-curl-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make
 }
 
diff --git a/main/lua-posix/APKBUILD b/main/lua-posix/APKBUILD
index 1dd8bcdb74b5b47e449a0ce06133bc9110739eeb..5385d5a5b4f222d0c7c73561c2f7e2ab2594852b 100644
--- a/main/lua-posix/APKBUILD
+++ b/main/lua-posix/APKBUILD
@@ -8,7 +8,7 @@ url="https://github.com/luaposix/luaposix"
 arch="all"
 license="MIT"
 depends="lua lua-bitlib"
-makedepends="lua-dev perl ncurses-dev"
+makedepends="lua lua-dev perl ncurses-dev"
 source="luaposix-$pkgver.tar.gz::https://github.com/luaposix/luaposix/archive/release-v$pkgver.tar.gz
 	0001-Removed-Lua-5.2-functions-lua_len-and-lua_tointegerx.patch"
 
@@ -29,7 +29,10 @@ prepare() {
 }
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--libdir=$_lualib \
 		--datadir=$_luashare \
 		|| return 1
diff --git a/main/lua-stdlib/APKBUILD b/main/lua-stdlib/APKBUILD
index b7bf1b684ae2b1e38a2a5bafb0d5e2b28c622127..7198b89640203eb2616db3a11ae33c26039f02d8 100644
--- a/main/lua-stdlib/APKBUILD
+++ b/main/lua-stdlib/APKBUILD
@@ -16,7 +16,10 @@ _builddir="$srcdir"/stdlib-$pkgver
 _luashare=/usr/share/lua/5.1
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--datadir="$_luashare" \
 		|| return 1
 	make || return 1
diff --git a/main/lua5.2/APKBUILD b/main/lua5.2/APKBUILD
index 4f4af2e5eec9935f801f8b9e60994f0b69061b78..66edf7b22e80ebd355501265726ab354f6a4185a 100644
--- a/main/lua5.2/APKBUILD
+++ b/main/lua5.2/APKBUILD
@@ -44,7 +44,11 @@ EOF
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	cd src
 	make V=$pkgver \
 		CFLAGS=" -DLUA_USE_LINUX -DLUA_COMPAT_ALL" \
diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD
index 38f6bf255bb1db1dda65b3998766a00569568042..0ae07a5ab39e4dbb8900791a64bf77a4252c582e 100644
--- a/main/lvm2/APKBUILD
+++ b/main/lvm2/APKBUILD
@@ -17,7 +17,10 @@ subpackages="$pkgname-dev $pkgname-doc device-mapper:dm $pkgname-libs"
 build () {
 	cd "$srcdir"/LVM2.$pkgver
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libdir=/lib \
 		--sbindir=/sbin \
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD
index 4a65633b7a20f2bb18f55665705ac75df66222ef..cfb8866c8044656436a28024833264468aded28b 100644
--- a/main/lxc/APKBUILD
+++ b/main/lxc/APKBUILD
@@ -33,7 +33,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-apparmor \
diff --git a/main/lxdm/APKBUILD b/main/lxdm/APKBUILD
index da7382be4e291ac42a03db4af7de2ecda1fe2616..92228c79a95f0ad3769ad78aaa5c8b97d75f179b 100644
--- a/main/lxdm/APKBUILD
+++ b/main/lxdm/APKBUILD
@@ -35,7 +35,10 @@ prepare() {
 build() {
 	cd "$_builddir"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/lxdm \
 		--without-pam \
diff --git a/main/lxpolkit/APKBUILD b/main/lxpolkit/APKBUILD
index afb9b97d5bd197d133757e9f0adfc59cd759f739..92b362145414cd446efed75beac75b718aa0dc74 100644
--- a/main/lxpolkit/APKBUILD
+++ b/main/lxpolkit/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/lxsession/APKBUILD b/main/lxsession/APKBUILD
index 1947d4a828bf680e33f7e0635286e73126248254..108512e5f2749b2ea6576576e932f1f7cb04ea5a 100644
--- a/main/lxsession/APKBUILD
+++ b/main/lxsession/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/lxterminal/APKBUILD b/main/lxterminal/APKBUILD
index e03403179564fb4b0efacca9a8eb55d422c6adab..6b3d41543c2977e7936eb141ef8eee2c7db28e44 100644
--- a/main/lxterminal/APKBUILD
+++ b/main/lxterminal/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/lynx/APKBUILD b/main/lynx/APKBUILD
index 8b841714eb18cff6a088f26e243d9237b7da349e..234a503e3f8e45425b1a39e27dab0b146f61976a 100644
--- a/main/lynx/APKBUILD
+++ b/main/lynx/APKBUILD
@@ -29,7 +29,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr --sysconfdir=/etc || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/lzo/APKBUILD b/main/lzo/APKBUILD
index 958e0ac12cb8b9cd534f7ab206a8d1e43d43da73..c522e773a5db4a3401af400973fb25d1a35c4d4e 100644
--- a/main/lzo/APKBUILD
+++ b/main/lzo/APKBUILD
@@ -16,11 +16,15 @@ source="http://www.oberhumer.com/opensource/lzo/download/$pkgname-$pkgver.tar.gz
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--enable-shared
+		--enable-shared \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/m4/APKBUILD b/main/m4/APKBUILD
index 9dff611a4753f4409d712cc5cb5ea97e06b7d085..3647bb5fe641143a97c2cff9997777f3c7e5ddb2 100644
--- a/main/m4/APKBUILD
+++ b/main/m4/APKBUILD
@@ -22,7 +22,11 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make
 }
 
diff --git a/main/make/APKBUILD b/main/make/APKBUILD
index 124144ab855e61e277e82355b18ae212e7c8bb85..06a4debc7b8d9125dbbfdcf8a4ab71a12b3ae6c9 100644
--- a/main/make/APKBUILD
+++ b/main/make/APKBUILD
@@ -32,13 +32,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-                --build=${CBUILD} \
-                --host=${CHOST} \
-                --target=${CTARGET} \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-nls
+		--disable-nls \
+		|| return 1
 	make || return 1
 	[ "$CBUILD" = "$CHOST" ] && (make check || return 1)
 	return 0
diff --git a/main/makedepend/APKBUILD b/main/makedepend/APKBUILD
index 414ca56a9860e83396642139c0657718a1f0e87d..69240b980bb7ceef8d681aca3de29854078b9a86 100644
--- a/main/makedepend/APKBUILD
+++ b/main/makedepend/APKBUILD
@@ -27,8 +27,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/makekit/APKBUILD b/main/makekit/APKBUILD
index 18ed2b2e387c1a520ff56b566152e12efea8771f..aaddd9b379e7f5a94e4502d28e1a47f8b4670490 100644
--- a/main/makekit/APKBUILD
+++ b/main/makekit/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 build() {
 	mkdir -p "$_builddir"
 	cd "$_builddir"
-	../configure --prefix=/usr \
+	../configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/man/APKBUILD b/main/man/APKBUILD
index f1e8aa306ad2a2faecd5fda11670f68da37a4528..e590b5da1c44cee208c03fb7070f8e5fc418d58a 100644
--- a/main/man/APKBUILD
+++ b/main/man/APKBUILD
@@ -24,6 +24,7 @@ prepare() {
 
 build () {
 	cd "$_builddir"
+	# note: not autotools
 	./configure -confdir=/etc +sgid +fhs +lang none
 	sed -i "s/\\/usr\\/bin\\/awk/\\/usr\\/bin\\/gawk/" ./conf_script
 	make || return 1
diff --git a/main/mc/APKBUILD b/main/mc/APKBUILD
index a4ac89c9e6fe2d1f3e3ee3cd7b65e91073e23973..857bef20d02467824f66a64c5e01d40e90d7f6a5 100644
--- a/main/mc/APKBUILD
+++ b/main/mc/APKBUILD
@@ -14,7 +14,10 @@ source="http://www.midnight-commander.org/downloads/mc-$pkgver.tar.bz2"
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--libexecdir=/usr/lib \
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc \
diff --git a/main/mcabber/APKBUILD b/main/mcabber/APKBUILD
index 926590715f0cdcfe6b4d2861b4ddc754142c2a6a..a5eeef8b8b1c16c2ce362f5988f72a822c70bf84 100644
--- a/main/mcabber/APKBUILD
+++ b/main/mcabber/APKBUILD
@@ -27,6 +27,8 @@ _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--disable-static \
 		--enable-hgcset \
 		--enable-enchant \
diff --git a/main/memcached/APKBUILD b/main/memcached/APKBUILD
index 24f7a0453fdca61cec0e9382a19a08d52bb79c39..33639b9edc3482d9b5c36276de603c9dced7bfa8 100644
--- a/main/memcached/APKBUILD
+++ b/main/memcached/APKBUILD
@@ -30,7 +30,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr\
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		|| return 1
 	make || return 1
 }
diff --git a/main/mesa-demos/APKBUILD b/main/mesa-demos/APKBUILD
index ef871587c4ad66b402b84d0ec04ab8d3c11829aa..3d59f0bdc73b5742441436c4f0aa313a1558b02e 100644
--- a/main/mesa-demos/APKBUILD
+++ b/main/mesa-demos/APKBUILD
@@ -29,7 +29,11 @@ prepare() {
 build() {
         cd "$_builddir"
         export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-        ./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
         make V=1 || return 1
 }
 
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index cf16d4f4c7a3e738391a1aa8844ec5cd6dac9210..c9d40bbb26046dd437f5262b16b7f20a4007cd3d 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -57,7 +57,10 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--with-dri-driverdir=$_dri_driverdir \
 		--disable-asm \
diff --git a/main/metacity/APKBUILD b/main/metacity/APKBUILD
index 49702d0e43e51ce7034f0a6566822fe5f68934b4..986134b8c89f4ea69136451cf8fbb6d3e15bae8e 100644
--- a/main/metacity/APKBUILD
+++ b/main/metacity/APKBUILD
@@ -36,10 +36,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--enable-compositor \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/midori/APKBUILD b/main/midori/APKBUILD
index e7bbe4b4b16b8778714c98c6f11fca5b29add1ce..c5e2b4365bb7dd8830b8e5167fd0d15336e78527 100644
--- a/main/midori/APKBUILD
+++ b/main/midori/APKBUILD
@@ -33,13 +33,16 @@ source="http://www.midori-browser.org/downloads/midori_${pkgver}_all_.tar.bz2"
 _builddir="$srcdir"/midori_${pkgver}_all_
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--jobs=${MAKEFLAGS/-j/} \
 		--disable-zeitgeist \
 		--enable-addons \
 		--enable-unique \
 		--enable-nls \
-		--enable-gtk3\
+		--enable-gtk3 \
 		|| return 1
 	make
 }
diff --git a/main/minicom/APKBUILD b/main/minicom/APKBUILD
index 0573b468da1cee82f8e7591aa0626c2e5ec19d06..d9a6742f5a27859b2165df268d6c4bb037944fd5 100644
--- a/main/minicom/APKBUILD
+++ b/main/minicom/APKBUILD
@@ -17,6 +17,8 @@ _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
diff --git a/main/mkfontdir/APKBUILD b/main/mkfontdir/APKBUILD
index 24b70697d3c5bc4e168e96d2e4776bce971aae77..bdee1b75b5827d6d27c570221a3d3bbf23123efd 100644
--- a/main/mkfontdir/APKBUILD
+++ b/main/mkfontdir/APKBUILD
@@ -15,7 +15,11 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr 
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/mkfontscale/APKBUILD b/main/mkfontscale/APKBUILD
index 6069575a49f506d6ee6e679f6bb85507b0cc7ebb..553fb772a2fd3d9ec087caf7826e30c7e9c4edeb 100644
--- a/main/mkfontscale/APKBUILD
+++ b/main/mkfontscale/APKBUILD
@@ -15,7 +15,11 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr 
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/mlmmj/APKBUILD b/main/mlmmj/APKBUILD
index d98dc187c3c3f7d38ee3d671bc27376606a4e18d..ac0d4ab0714aa6cca5c1c68e7afd21c65c3a6028 100644
--- a/main/mlmmj/APKBUILD
+++ b/main/mlmmj/APKBUILD
@@ -17,7 +17,11 @@ source="http://mlmmj.org/releases/mlmmj-$pkgver.tar.gz"
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/mousepad/APKBUILD b/main/mousepad/APKBUILD
index 48b38a9bf044544e46d942f9798e6e3b923c054c..ecbbfd4275e49e1325384fb9918ff64ac4a2ff5e 100644
--- a/main/mousepad/APKBUILD
+++ b/main/mousepad/APKBUILD
@@ -15,11 +15,15 @@ source="http://archive.xfce.org/src/apps/mousepad/${pkgver%.*}/mousepad-$pkgver.
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/xfce4 \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/mp3splt-gtk/APKBUILD b/main/mp3splt-gtk/APKBUILD
index ceeff71418b062fe1d235363a32e52a1c7446adf..0c1409063359a03309964075cbf663b3f37d924f 100644
--- a/main/mp3splt-gtk/APKBUILD
+++ b/main/mp3splt-gtk/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-gnome \
 		|| return 1
 	sed -i -e 's/-DGTK_DISABLE_DEPRECATED//' Makefile src/Makefile
diff --git a/main/mp3splt/APKBUILD b/main/mp3splt/APKBUILD
index 35a1e8c913dd60161c7963feba7be882c6b786f7..d16ef30a115e3f19412d465844ad6654432f92ab 100644
--- a/main/mp3splt/APKBUILD
+++ b/main/mp3splt/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-mp3splt-includes=/usr/include/libmp3splt \
 		--enable-oggsplt_symlink \
 		|| return 1
diff --git a/main/mpc/APKBUILD b/main/mpc/APKBUILD
index 47c61aa164c4d908a930730fd5e9751b7ab29549..9dd066208beead437f4e87816a11d98cfa8c27db 100644
--- a/main/mpc/APKBUILD
+++ b/main/mpc/APKBUILD
@@ -13,7 +13,11 @@ source="http://www.musicpd.org/download/mpc/${pkgver%.*}/mpc-${pkgver}.tar.bz2"
 
 build() {
 	cd "$srcdir"/mpc-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/mpc1/APKBUILD b/main/mpc1/APKBUILD
index a6cb2fdb6436eeecf4a7eb415d1e4d0fde3a06b5..32c6f1c3ef54a9a53b2773d3dd0a24af8f747aa2 100644
--- a/main/mpc1/APKBUILD
+++ b/main/mpc1/APKBUILD
@@ -22,10 +22,11 @@ build() {
 	cd "$_builddir"
 	# workaround for a bug in configure script
 	EGREP=egrep \
-	./configure --prefix=/usr \
-		--build=${CBUILD} \
-		--host=${CHOST} \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--with-sysroot="${CBUILDROOT}" \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/mpd/APKBUILD b/main/mpd/APKBUILD
index 443b186413fd7685a9783b9d0cd6e18e1b3f7da4..bf60c1ea69edff75087c27baa7df4d52bf8292f0 100644
--- a/main/mpd/APKBUILD
+++ b/main/mpd/APKBUILD
@@ -22,7 +22,10 @@ source="http://www.musicpd.org/download/mpd/${pkgver%.*}/mpd-$pkgver.tar.xz
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/mpdscribble/APKBUILD b/main/mpdscribble/APKBUILD
index e2c4d90693176f33b2db4987eddb5535abe7c12d..16f82ed02fd37a84059abc85699bf14f95718288 100644
--- a/main/mpdscribble/APKBUILD
+++ b/main/mpdscribble/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/mpfr3/APKBUILD b/main/mpfr3/APKBUILD
index 789096ff795d055301ab45eabf5eb022b4315a5d..d9200704312cba73e6cb198180382eb815cbfa03 100644
--- a/main/mpfr3/APKBUILD
+++ b/main/mpfr3/APKBUILD
@@ -14,11 +14,13 @@ subpackages="$pkgname-doc mpfr-dev"
 _builddir="$srcdir"/mpfr-$pkgver
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--build=${CBUILD} \
-		--host=${CHOST} \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--with-sysroot=${CBUILDROOT} \
-		--enable-shared || return 1;
+		--prefix=/usr \
+		--enable-shared \
+		|| return 1;
 	make || return 1;
 }
 
diff --git a/main/mpg123/APKBUILD b/main/mpg123/APKBUILD
index 477789998648d530193377eecc29458c3eeabcfa..3a1258754fd9d16511a98be47f9697d9fa504b0b 100644
--- a/main/mpg123/APKBUILD
+++ b/main/mpg123/APKBUILD
@@ -14,13 +14,17 @@ options="libtool"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-dependency-tracking \
 		--with-ipv6 \
 		--with-pic \
 		--with-optimization=0 \
 		--with-cpu=i386_fpu \
-		--with-audio="alsa oss" || return 1
+		--with-audio="alsa oss" \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/mplayer/APKBUILD b/main/mplayer/APKBUILD
index 668b38e5f816d521d272c577bb4d4757f184ea22..45aea5661c1698bb8f05947e1ea9cf1a8ca46c0b 100644
--- a/main/mplayer/APKBUILD
+++ b/main/mplayer/APKBUILD
@@ -31,7 +31,10 @@ build() {
 	cd "$_builddir"
 
 	export GCC_SPECS=hardenednopie.specs
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-gui \
 		--disable-gif \
 		--disable-arts \
@@ -48,7 +51,7 @@ build() {
 		--disable-fribidi \
 		--disable-libdv \
 		--disable-musepack \
-		--language=all\
+		--language=all \
 		--disable-esd \
 		--disable-mga \
 		--disable-lirc \
diff --git a/main/mrtg/APKBUILD b/main/mrtg/APKBUILD
index a43fbb27f6472ff61e4198bce76e2fbde0faae0a..180fa51d40c020d6e1bb5c0b26f5ddb5b66a3b73 100644
--- a/main/mrtg/APKBUILD
+++ b/main/mrtg/APKBUILD
@@ -17,7 +17,10 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
        cd "$_builddir"
-       ./configure --bindir=/usr/bin \
+       ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--bindir=/usr/bin \
 		--libdir=/usr/lib \
 		--datadir=/usr/share/doc \
 		--mandir=/usr/share/doc/man \
diff --git a/main/mrxvt/APKBUILD b/main/mrxvt/APKBUILD
index 11b436d5d9e251cf8f2fda5b4723fade15993576..7e3f45a58bab9163c2c3336a24728274596f4d37 100644
--- a/main/mrxvt/APKBUILD
+++ b/main/mrxvt/APKBUILD
@@ -24,6 +24,8 @@ prepare() {
 build() {
 	cd "$_builddir"
 	 ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--enable-xft \
@@ -39,7 +41,8 @@ build() {
 		--enable-greek \
 		--enable-cjk \
 		--enable-backspace-key \
-		--with-save-lines=2048 || return 1
+		--with-save-lines=2048 \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/msmtp/APKBUILD b/main/msmtp/APKBUILD
index 4ee01cbc3c4f3e195af5634266ac20e495397a83..76ebbb0b0232c3884f37c8f229d7bc754468753d 100644
--- a/main/msmtp/APKBUILD
+++ b/main/msmtp/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/mtdev/APKBUILD b/main/mtdev/APKBUILD
index 61c5f5beb332fcbf9bf51906d2084298856ead4e..be94cd7b28c3418d390049f6f053e2a19929ca5b 100644
--- a/main/mtdev/APKBUILD
+++ b/main/mtdev/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/mtools/APKBUILD b/main/mtools/APKBUILD
index d7507fea05988716ed04df478f7417ae510cd299..c04f3c7218bfb4943817978b98f1652d64e64201 100644
--- a/main/mtools/APKBUILD
+++ b/main/mtools/APKBUILD
@@ -13,11 +13,15 @@ subpackages="$pkgname-doc"
 
 build () { 
 	cd $srcdir/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--sysconfdir=/etc \
-		--without-x
+		--without-x \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/mtx/APKBUILD b/main/mtx/APKBUILD
index dec0abd064b79fec509b44bca46d2c5ab2e790cd..5fb9a720f3eb90846ee28592d8105f0731686e2e 100644
--- a/main/mtx/APKBUILD
+++ b/main/mtx/APKBUILD
@@ -15,8 +15,12 @@ source="http://downloads.sourceforge.net/mtx/$pkgname-$pkgver.tar.gz"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr \
-	 --datadir=/usr/share
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--datadir=/usr/share \
+		|| return 1
 	make || return 1
 	make prefix="$pkgdir" install
 }
diff --git a/main/mutt/APKBUILD b/main/mutt/APKBUILD
index 4bc57166d5ac782214c1af1d62b1d0abf1db24aa..c5da8f5f0bc9b3c5593f1a97f6934dddfafb5d04 100644
--- a/main/mutt/APKBUILD
+++ b/main/mutt/APKBUILD
@@ -24,7 +24,10 @@ prepare() {
 build() {
 	cd "$_builddir"
 	ISPELL=/usr/bin/hunspell \
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/nagios-plugins/APKBUILD b/main/nagios-plugins/APKBUILD
index d466146b7bcde1bc291ec3a62ef7248f0471ba47..6f4a7cd7f6e8221c669f59c47f9e3082c97c7744 100644
--- a/main/nagios-plugins/APKBUILD
+++ b/main/nagios-plugins/APKBUILD
@@ -23,7 +23,10 @@ prepare() {
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--bindir=/usr/sbin \
@@ -33,7 +36,8 @@ build() {
 		--with-ps-format="%d %s %s %s" \
 		--with-ps-varlist="&procpid,&procuid,&procpcpu,procprog" \
 		--with-ps-cols=4 \
-		--with-ping-command="/bin/ping -c %d %s"
+		--with-ping-command="/bin/ping -c %d %s" \
+		|| return 1
 	make all || return 1
 }
 
diff --git a/main/nagios/APKBUILD b/main/nagios/APKBUILD
index b53f56d12d700fd730363e30c6cd8ae01973b3c7..e8b643a193534e490614ada815ed5b735d760079 100644
--- a/main/nagios/APKBUILD
+++ b/main/nagios/APKBUILD
@@ -22,7 +22,10 @@ _builddir="$srcdir/$pkgname"
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc/nagios \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -36,7 +39,8 @@ build() {
 		--with-nagios-user=nagios \
 		--with-nagios-group=nagios \
 		--enable-embedded-perl \
-		--with-perlcache
+		--with-perlcache \
+		|| return 1
 	make all || return 1
 }
 
diff --git a/main/nano/APKBUILD b/main/nano/APKBUILD
index 1149d5ad6b7fc4f3b65d6d45fe0becfb62e0e2d0..560d0950b693368d63445d96ed569e067d9f604c 100644
--- a/main/nano/APKBUILD
+++ b/main/nano/APKBUILD
@@ -16,12 +16,16 @@ source="http://www.nano-editor.org/dist/v${pkgver%.*}/$pkgname-$pkgver.tar.gz"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--disable-nls \
-		--disable-speller
+		--disable-speller \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/nasm/APKBUILD b/main/nasm/APKBUILD
index 2ff5c852fde93ece9dfa14fbd6b762328064df75..fc9f58349a2700ef7f110158400f4e8cfa96dd23 100644
--- a/main/nasm/APKBUILD
+++ b/main/nasm/APKBUILD
@@ -25,7 +25,11 @@ build () {
 	cd "$_builddir"
 	export CFLAGS=
 	export CXXFLAGS=
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make nasmlib.o || return 1
 	make || return 1
 }
diff --git a/main/nautilus/APKBUILD b/main/nautilus/APKBUILD
index dea6db841de4f01c21630c0e65aeee54400220ca..0db3a425659aea6a348d736cc93f04fc41aeaf22 100644
--- a/main/nautilus/APKBUILD
+++ b/main/nautilus/APKBUILD
@@ -58,7 +58,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		|| return 1
 	make || return 1
diff --git a/main/ncdu/APKBUILD b/main/ncdu/APKBUILD
index 8f611adce13fa8e5bff4671c2eede13706fe38a2..e52110c402f02a050d07ba1beff99e27e16f9578 100644
--- a/main/ncdu/APKBUILD
+++ b/main/ncdu/APKBUILD
@@ -18,6 +18,8 @@ _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
diff --git a/main/ncftp/APKBUILD b/main/ncftp/APKBUILD
index 582ff6331035c85101cbf97b694c69b44c2a0840..850d38c8b1f7416036042a5022ed78d5a9d6a429 100644
--- a/main/ncftp/APKBUILD
+++ b/main/ncftp/APKBUILD
@@ -21,9 +21,13 @@ prepare() {
 build () {
 	cd "$_builddir" || return 1
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--mandir=/usr/share/man || return 1
+		--mandir=/usr/share/man \
+		|| return 1
 	
 	cd "$_builddir"/libncftp
 	make shared || return 1
diff --git a/main/ncurses/APKBUILD b/main/ncurses/APKBUILD
index 772ec1ad80a8fa89b396fbe0a76b1d98e723723c..341212dc30d816dab508fff8a5f363142a2435ef 100644
--- a/main/ncurses/APKBUILD
+++ b/main/ncurses/APKBUILD
@@ -12,9 +12,10 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-base $pkgname-terminfo
 	$pkgname-widec-libs:widec $pkgname-libs"
 
 build() {
-	local _confopts="--mandir=/usr/share/man
+	local _confopts="
 		--build=$CBUILD
 		--host=$CHOST
+		--mandir=/usr/share/man
 		--without-ada
 		--disable-termcap
 		--disable-rpath-hack
@@ -26,12 +27,16 @@ build() {
 
 	mkdir ncurses-build ncursesw-build
 	cd ncurses-build
-	../configure $_confopts || return 1
+	../configure $_confopts \
+		|| return 1
 	make libs || return 1
 	make -C progs || return 1
 
 	cd ../ncursesw-build
-	../configure $_confopts --enable-widec --without-progs || return 1
+	../configure $_confopts \
+		--enable-widec \
+		--without-progs \
+		|| return 1
 	make libs || return 1
 	cd ..
 }
diff --git a/main/neon/APKBUILD b/main/neon/APKBUILD
index 7c661c0f053b5e837321d2c8c1db66adbb64cc3f..5c4e3450ef40089c91fea290172dfc531ab182e9 100644
--- a/main/neon/APKBUILD
+++ b/main/neon/APKBUILD
@@ -14,7 +14,10 @@ source="http://www.webdav.org/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build () {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-ssl \
 		--with-expat \
 		--without-gssapi \
@@ -22,7 +25,7 @@ build () {
 		--disable-socks \
 		--enable-shared \
 		--disable-static \
-
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/net-snmp/APKBUILD b/main/net-snmp/APKBUILD
index dce92cda11bc73d74ec6a3a3bd12b7fa4ed68c42..75e8bd4617798abd98d0086a617f154af46a5db2 100644
--- a/main/net-snmp/APKBUILD
+++ b/main/net-snmp/APKBUILD
@@ -50,7 +50,10 @@ build() {
 	#build fails on: libnetsnmpmibs.so: undefined reference to `pthread_create'
 	LDFLAGS="$LDFLAGS -lpthread"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -66,7 +69,8 @@ build() {
 		--enable-shared \
 		--enable-as-needed \
 		--with-perl-modules="INSTALLDIRS=vendor" \
-		--disable-embedded-perl
+		--disable-embedded-perl \
+		|| return 1
 		# embedded-perl seems to create TEXTREL's
 
 	# work around parallell build issue
diff --git a/main/netcf/APKBUILD b/main/netcf/APKBUILD
index 746b16ee5d9a99b5a0bb6ec810d0151c3ea90b43..771b4836df42413f495acadd30d7488e4fb8a81d 100644
--- a/main/netcf/APKBUILD
+++ b/main/netcf/APKBUILD
@@ -21,7 +21,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/nettle/APKBUILD b/main/nettle/APKBUILD
index 2998922845deb02dd9106aacac64d0bcda25f2c4..236636e0ab2e62ab2c398a12c8f24b4637ee3936 100644
--- a/main/nettle/APKBUILD
+++ b/main/nettle/APKBUILD
@@ -29,6 +29,8 @@ prepare() {
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
diff --git a/main/newt/APKBUILD b/main/newt/APKBUILD
index 6ecb58e583b82fdc15e76d73d33bd838d72802c5..1ec0838f34f9585265d34ea9bb81f013cb6bd78a 100644
--- a/main/newt/APKBUILD
+++ b/main/newt/APKBUILD
@@ -26,10 +26,14 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--without-gpm \
 		--without-tcl \
-		--disable-nls
+		--disable-nls \
+		|| return 1
 	make RPM_OPT_FLAGS="$CFLAGS" || return 1
 }
 
diff --git a/main/nfdump/APKBUILD b/main/nfdump/APKBUILD
index e7665eb8a5b56b66c5872726445f7161d6b177cb..aa4958c00d756df03dcb10264747d82557f73d98 100644
--- a/main/nfdump/APKBUILD
+++ b/main/nfdump/APKBUILD
@@ -29,7 +29,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-nfprofile \
 		|| return 1
 	make || return 1
diff --git a/main/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD
index 2d304c41cc34f9f5d28a8e32119980c2416673b3..32f8fa10514403ad6234a10cbb4589b4905e8fe8 100644
--- a/main/nfs-utils/APKBUILD
+++ b/main/nfs-utils/APKBUILD
@@ -51,7 +51,10 @@ prepare() {
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -61,7 +64,8 @@ build() {
 		--enable-uuid \
 		--enable-gss \
 		--enable-libmount-mount \
-		--with-statedir=/var/lib/nfs
+		--with-statedir=/var/lib/nfs \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD
index 9848263bece198f4d8369f1b26678c5f2e70c14c..dfd32500df9829f3b2b53db8a68d13b3ee1f5ad3 100644
--- a/main/nginx/APKBUILD
+++ b/main/nginx/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--conf-path=/etc/$pkgname/$pkgname.conf \
 		--pid-path=/var/run/$pkgname.pid \
 		--lock-path=/var/run/$pkgname.lock \
@@ -35,12 +38,15 @@ build() {
 		--http-client-body-temp-path=/tmp/$pkgname/client-body \
 		--http-proxy-temp-path=/tmp/$pkgname/proxy \
 		--http-fastcgi-temp-path=/tmp/$pkgname/fastcgi \
-		--user=http --group=http \
-		--with-ipv6 --with-pcre-jit \
+		--user=http \
+		--group=http \
+		--with-ipv6 \
+		--with-pcre-jit \
 		--with-http_ssl_module \
 		--with-http_gzip_static_module \
 		--with-http_spdy_module \
-		--with-mail --with-mail_ssl_module \
+		--with-mail \
+		--with-mail_ssl_module \
 		|| return 1 
 	make || return 1
 }
diff --git a/main/ngircd/APKBUILD b/main/ngircd/APKBUILD
index 4e569814f3962c3c41b7ba0be8d10603b81642b6..c74d651a0a9618a58ca20e2b36abd26ccf7bfb4b 100644
--- a/main/ngircd/APKBUILD
+++ b/main/ngircd/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 	
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc/ngircd \
 		--mandir=/usr/share/man \
 		--without-ident \
diff --git a/main/ngrep/APKBUILD b/main/ngrep/APKBUILD
index 141d8566c7d3be9c848852e6e587b9384282f7d2..31666553be958687ec810183bdfacf6b785f6509 100644
--- a/main/ngrep/APKBUILD
+++ b/main/ngrep/APKBUILD
@@ -16,9 +16,13 @@ source="http://downloads.sourceforge.net/sourceforge/ngrep/$pkgname-$pkgver.tar.
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--with-pcap-includes=/usr/include/pcap
+		--with-pcap-includes=/usr/include/pcap \
+		|| return 1
 	make || return 1
 }
 package() {
diff --git a/main/nload/APKBUILD b/main/nload/APKBUILD
index 7d6232628131e14a16336f486db4c389a109f67d..ac7f0a82b8dd13dc345c910021f1c8f87ad47fba 100644
--- a/main/nload/APKBUILD
+++ b/main/nload/APKBUILD
@@ -17,10 +17,14 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD
index 3856b4c58fa75710a60c9b6f053bd0f99c344995..cd9c5dae6e8a82229c2a8fcc35ef118f854b9a83 100644
--- a/main/nmap/APKBUILD
+++ b/main/nmap/APKBUILD
@@ -17,13 +17,17 @@ source="http://nmap.org/dist/$pkgname-$pkgver.tgz"
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--without-zenmap \
 		--with-liblua=/usr/include \
-		--with-openssl=/usr/lib
+		--with-openssl=/usr/lib \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/nrpe/APKBUILD b/main/nrpe/APKBUILD
index 4d59a80fb9370409be6790f928f1c114017ab41a..98ee89f90c0bb54efa8febc44ee33c2812659ea4 100644
--- a/main/nrpe/APKBUILD
+++ b/main/nrpe/APKBUILD
@@ -19,12 +19,16 @@ source="http://downloads.sourceforge.net/nagios/$pkgname-$pkgver.tar.gz
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--libexecdir=/usr/lib/nagios/plugins \
-		--enable-command-args
+		--enable-command-args \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/nsd/APKBUILD b/main/nsd/APKBUILD
index 80b104c4bf8d9120b0e1ff4455701e82cd47e858..6a94490dc5abf12b0fecb04735581066b9fb8b04 100644
--- a/main/nsd/APKBUILD
+++ b/main/nsd/APKBUILD
@@ -36,6 +36,8 @@ build() {
 	cd "$_builddir"
 
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--sbindir=/usr/sbin \
 		--mandir=/usr/share/man \
 		--with-user=nsd \
diff --git a/main/nspr/APKBUILD b/main/nspr/APKBUILD
index b72e31c288e42c7d2cd09cc04548760dafed8a72..34087da00b4d5fa00ce5a00ad4456b4227eb1946 100644
--- a/main/nspr/APKBUILD
+++ b/main/nspr/APKBUILD
@@ -39,7 +39,10 @@ build() {
 		conf="--enable-64bit"
 	fi
 	cd "$_builddir"/build
-	../mozilla/nsprpub/configure --prefix=/usr \
+	../mozilla/nsprpub/configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-debug \
 		--enable-optimize \
 		$conf \
diff --git a/main/ntfs-3g/APKBUILD b/main/ntfs-3g/APKBUILD
index 0122aa1b8c4758c5cb8109984be50d8ec506bb9b..8f5024a0dd9a518dc737ce22c69475bd11093b14 100644
--- a/main/ntfs-3g/APKBUILD
+++ b/main/ntfs-3g/APKBUILD
@@ -15,10 +15,14 @@ source="http://tuxera.com/opensource/ntfs-3g_ntfsprogs-$pkgver.tgz"
 _builddir="$srcdir"/ntfs-3g_ntfsprogs-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/obex-data-server/APKBUILD b/main/obex-data-server/APKBUILD
index f9de2be6e9329468e96b569ad682ca68aaba9d44..8eac8a9178f2b77a5e9b5c9c9c1b6896b1589b9b 100644
--- a/main/obex-data-server/APKBUILD
+++ b/main/obex-data-server/APKBUILD
@@ -24,9 +24,13 @@ prepare() {
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--enable-bip=gdk-pixbuf
+		--enable-bip=gdk-pixbuf \
+		|| return 1
 	make
 }
 
diff --git a/main/obexd/APKBUILD b/main/obexd/APKBUILD
index 4b92b38f520094c5ee560f85543244be0872af7a..53af098f7d0cb9112bb7ea1ea348f98f249844b4 100644
--- a/main/obexd/APKBUILD
+++ b/main/obexd/APKBUILD
@@ -25,7 +25,10 @@ prepare() {
 build () 
 { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--libexecdir=/usr/lib/obexd \
 		|| return 1
 	make || return 1
diff --git a/main/ocfs2-tools/APKBUILD b/main/ocfs2-tools/APKBUILD
index ee4b71d8931f74957440cf5cd1e5e5618cc3d5d3..a08724a96dc7036921c1c5b530d6f2074fe973d2 100644
--- a/main/ocfs2-tools/APKBUILD
+++ b/main/ocfs2-tools/APKBUILD
@@ -38,14 +38,18 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--enable-ocfs2console=yes \
 		--enable-dynamic-fsck=yes \
 		--enable-dynamic-ctl=yes \
-		--disable-glibtest || return 1
+		--disable-glibtest \
+		|| return 1
 	make -j1 || return 1
 }
 
diff --git a/main/oidentd/APKBUILD b/main/oidentd/APKBUILD
index f7d9ca752259c20eee3e4a09fa2e5c827713e75a..b16a23344c1542da3418903e9afeac3c164c4ec0 100644
--- a/main/oidentd/APKBUILD
+++ b/main/oidentd/APKBUILD
@@ -18,10 +18,14 @@ oidentd.confd"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install
 	install -D -m755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
diff --git a/main/open-lldp/APKBUILD b/main/open-lldp/APKBUILD
index ef1e73f0394f6a4bb606fdc7679a484eeb1f8186..e87fa00be1eeb548ec36abe7aca06b8038f34a94 100644
--- a/main/open-lldp/APKBUILD
+++ b/main/open-lldp/APKBUILD
@@ -30,10 +30,14 @@ build() {
 	cd "$_builddir"
 	./bootstrap.sh || return 1
 	# aclocal -W all && automake -W all && autoconf -W all
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info || return 1
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD
index f8da756fbebc3203e9bc51f306fb9e6f30c51952..2150747b24fdab44a7fd0fad94818a5b7854a23a 100644
--- a/main/open-vm-tools-grsec/APKBUILD
+++ b/main/open-vm-tools-grsec/APKBUILD
@@ -60,7 +60,10 @@ prepare() {
 build() {
 	export GCC_SPECS=hardenednopie.specs
 	cd "$_builddir"
-	./configure --without-pam \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--without-pam \
 		--without-x \
 		--without-dnet \
 		--without-icu \
diff --git a/main/open-vm-tools/APKBUILD b/main/open-vm-tools/APKBUILD
index b1afc7534cfc609b228448d833b14e26237f9cfb..63500a1fb5729e80fef74b0d2e843210431eb044 100644
--- a/main/open-vm-tools/APKBUILD
+++ b/main/open-vm-tools/APKBUILD
@@ -70,7 +70,10 @@ build() {
 	export CUSTOM_PROCPS_NAME="procps"
 	export CFLAGS="$CLFAGS -Wno-unused-but-set-variable"
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--disable-unity \
 		--with-dnet \
diff --git a/main/openbox/APKBUILD b/main/openbox/APKBUILD
index 1d65c2a5430c6ef9f53a9d010b57d4fdd1ecff96..fd1114a36afa964448542a275aea4d698daf036b 100644
--- a/main/openbox/APKBUILD
+++ b/main/openbox/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--disable-static \
 		|| return 1
diff --git a/main/openjdk6/APKBUILD b/main/openjdk6/APKBUILD
index 934714211a9f83399993f61f0fb5c67906cf9b6a..694fdb359b058a88ece8ca4e07c401a3544aa671 100644
--- a/main/openjdk6/APKBUILD
+++ b/main/openjdk6/APKBUILD
@@ -121,7 +121,10 @@ build() {
 
 	cd "$_builddir"
 	sh autogen.sh
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -138,7 +141,7 @@ build() {
 		--with-ant-home=$srcdir/apache-ant-$ANT_VER \
 		--with-rhino=$srcdir/rhino$RHINO_VER/js.jar \
 		--with-pkgversion="Alpine ${pkgver}-r${pkgrel}" \
-		  || return 1
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD
index 519cbc201636de0be103f8bce4930969539d9a9c..5649307108325860b504197e7318a12380301049 100644
--- a/main/openldap/APKBUILD
+++ b/main/openldap/APKBUILD
@@ -39,7 +39,10 @@ prepare() {
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
diff --git a/main/openntpd/APKBUILD b/main/openntpd/APKBUILD
index af5536771917bfc381b459f6e0c9c0b9a6b7fde1..a16c323a4b5c687aa7305ea89995eb13f0a802f3 100644
--- a/main/openntpd/APKBUILD
+++ b/main/openntpd/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$srcdir/$pkgname-$_myver"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc \
 		|| return 1
diff --git a/main/openobex/APKBUILD b/main/openobex/APKBUILD
index 30438bb88a504389c0318973ec5ae0dd44f65411..d784c4ccb562701f5bf63e2c496c6f4f2eb5e511 100644
--- a/main/openobex/APKBUILD
+++ b/main/openobex/APKBUILD
@@ -15,7 +15,10 @@ source="http://downloads.sourceforge.net/project/openobex/openobex/$pkgver/openo
 _builddir="$srcdir"/openobex-$pkgver-Source
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-apps \
 		--enable-irda \
 		--enable-bluetooth \
diff --git a/main/openresolv/APKBUILD b/main/openresolv/APKBUILD
index c84aa0093dd02b603ebcfdf85799bd7036c65c22..5bf93c6d8080d4c8478473990ef4540463813978 100644
--- a/main/openresolv/APKBUILD
+++ b/main/openresolv/APKBUILD
@@ -12,10 +12,13 @@ source="http://roy.marples.name/downloads/openresolv/openresolv-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
-		|| return 
+		|| return 1
 	make
 }
 
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD
index 4250f8cd3777bcb9f90d55a718dfd36ca74f5fcd..e0ef95251735dc95be6045ee1976dc842b8e8647 100644
--- a/main/openssh/APKBUILD
+++ b/main/openssh/APKBUILD
@@ -11,6 +11,8 @@ depends="openssh-client"
 makedepends="openssl-dev zlib-dev"
 subpackages="$pkgname-doc $pkgname-client"
 source="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz
+	openssh-fix-includes.diff
+	openssh-fix-utmp.diff
 	openssh-peaktput.diff
 	openssh-hmac-accel.diff
 	sshd.initd
@@ -40,19 +42,22 @@ prepare() {
 
 build () {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--with-mantype=man \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc/ssh \
+		--datadir=/usr/share/openssh \
+		--libexecdir=/usr/lib/ssh \
 		--mandir=/usr/share/man \
-	        --with-ldflags="${LDFLAGS}" \
-	        --disable-strip \
+		--with-mantype=man \
+		--with-ldflags="${LDFLAGS}" \
+		--disable-strip \
 		--disable-lastlog \
-	        --sysconfdir=/etc/ssh \
-        	--datadir=/usr/share/openssh \
-	        --with-privsep-path=/var/empty \
-	        --with-privsep-user=sshd \
-	        --with-md5-passwords \
-	        --with-ssl-engine \
-		--libexecdir=/usr/lib/ssh \
+		--with-privsep-path=/var/empty \
+		--with-privsep-user=sshd \
+		--with-md5-passwords \
+		--with-ssl-engine \
 		--without-tcp-wrappers \
 		--without-pam \
 		|| return 1
@@ -95,16 +100,22 @@ client() {
 }
 
 md5sums="be46174dcbb77ebb4ea88ef140685de1  openssh-6.2p2.tar.gz
+99adc484731fcd5fc17b39a6f9fe055b  openssh-fix-includes.diff
+223b1a488cd937388e99ce75e00fb7d4  openssh-fix-utmp.diff
 949ff348573438163240c60d6c3618eb  openssh-peaktput.diff
 c65d454dc5b149647273485fc184636d  openssh-hmac-accel.diff
 cb0dd08c413fad346f0c594107b4a2e0  sshd.initd
 b35e9f3829f4cfca07168fcba98749c7  sshd.confd"
 sha256sums="7f29b9d2ad672ae0f9e1dcbff871fc5c2e60a194e90c766432e32161b842313b  openssh-6.2p2.tar.gz
+41940659600fe455c43247c6a7cb3d258c3abb5fcec40fc5559d243277a2be35  openssh-fix-includes.diff
+9f9cbea58ba220e64a97b190169b732af47bd1791d2629fdc3a469856a03db44  openssh-fix-utmp.diff
 dab18c1fd1496c1ba4a4fe08c6c6b8cf3347fc82878d85498202f50168161f6b  openssh-peaktput.diff
 902ea83a9ef726f32b096280da0f1b722f4372886c65c4e28985ee57e725d95c  openssh-hmac-accel.diff
 3fa062fd4bfac64abf21f3c1d0548f1dfcf3c6e56e84ece14c848f53a293024e  sshd.initd
 29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41  sshd.confd"
 sha512sums="80c8fb6bb25e86e8261cc7c6671773cdc0d9b0da9c9ebca33b3d5278c44197734fe32e878e1f444b693c4b49b0a525458aa07e57c231cefafc23a9c6975b05df  openssh-6.2p2.tar.gz
+5521b3a02d36573480c799c748badeab72127b03a85c73184c556d69e8e20643c823c43e5d06f6edb46e83310969333c08427dacf6c6f09227b1871c48c96984  openssh-fix-includes.diff
+de5f9b3f64e9bb13a1eed348f6f1239aa35b62bb71ee1af091437ea24b24c65681969469ce1680e307d481c51fb2cc5ebe97ab79902a04c36341a770ba0f7bbd  openssh-fix-utmp.diff
 64f2c94f41225c76428440d778b0bf5657408123d1cd7d6cb4bdf5000bfba8ad80ec5e57acd0880adc7a8ea7e2f1a64e329b83cf8be630b9aaebff6ab138d025  openssh-peaktput.diff
 aaa128126400171d0755038a846672aa7b1e87340edf73a672962d403abf404ef1821466b17da51dde25f04ec7533ae4a653399ccc912ea9c4a7b1a14032e76f  openssh-hmac-accel.diff
 1483e2bcd700da9b02f04508d490b472c816344787bf1675fef2f7e27f72b91e4323e4e8c1db701e47d81d37d6d4b0623eaeac46b2cf589ae5ad69f363baa594  sshd.initd
diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD
index f9cd11cc02c4551c5df9ca59e908cd7a85ed55d3..c55edfccd5e03d2d0e5a72b3a0df2d804827eea2 100644
--- a/main/openssl/APKBUILD
+++ b/main/openssl/APKBUILD
@@ -67,13 +67,14 @@ build() {
 	x86)    _target="linux-elf" ;;
 	x86_64) _target="linux-x86_64" ;;
 	arm*)   _target="linux-armv4" ;;
+	*)	msg "Unable to determine architecture from (CARCH=$CARCH)" ; return 1 ;;
 	esac
 
 	# Configure assumes --options are for it, so can't use
 	# gcc's --sysroot fake this by overriding CC
 	[ -n "$CBUILDROOT" ] && CC="$CC --sysroot=${CBUILDROOT}"
 
-	./Configure $_target --prefix=/usr \
+	perl ./Configure $_target --prefix=/usr \
 		--libdir=lib \
 		--openssldir=/etc/ssl \
 		shared zlib enable-montasm enable-md2 \
diff --git a/main/openvpn-auth-ldap/APKBUILD b/main/openvpn-auth-ldap/APKBUILD
index ab58d527a45c5cd9c862a1bdc22d533e24dccc87..50e2b93bf40f06d627fdb45624c63640c0b87276 100644
--- a/main/openvpn-auth-ldap/APKBUILD
+++ b/main/openvpn-auth-ldap/APKBUILD
@@ -24,7 +24,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/openvpn/APKBUILD b/main/openvpn/APKBUILD
index 487c907bdcb4b559d07ca016a1867189e78f09cd..61bb99b047b08e3a3f8c52811eae716ebb799c15 100644
--- a/main/openvpn/APKBUILD
+++ b/main/openvpn/APKBUILD
@@ -31,13 +31,17 @@ prepare() {
 
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc/openvpn \
 		--enable-ssl \
 		--enable-crypto \
 		--enable-password-save \
-		--enable-iproute2
+		--enable-iproute2 \
+		|| return 1
 
 	make || return 1
 	cd plugin/down-root
diff --git a/main/oprofile/APKBUILD b/main/oprofile/APKBUILD
index 74550d29ed5c30548c7597578b82ce454b563714..d71a8f6acca4e470579fd0c02d17175e107341e0 100644
--- a/main/oprofile/APKBUILD
+++ b/main/oprofile/APKBUILD
@@ -23,11 +23,15 @@ prepare() {
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--with-pic
+		--with-pic \
+		|| return 1
 	make -j1 || return 1
 }
 
diff --git a/main/orage/APKBUILD b/main/orage/APKBUILD
index 80a0cef1fcf52280a3e559a1baddb55c54813970..2ee5d67d9bca3bc29a9c6af557ede544660ca147 100644
--- a/main/orage/APKBUILD
+++ b/main/orage/APKBUILD
@@ -19,11 +19,15 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
-		--disable-static || return 1
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/orbit2/APKBUILD b/main/orbit2/APKBUILD
index 4387f4c12a9cf9a163ac1cc798fd79ef5bc5c1d9..fdca00968f3abb18b1ff6eb7b0eee524b1e6d3ad 100644
--- a/main/orbit2/APKBUILD
+++ b/main/orbit2/APKBUILD
@@ -28,7 +28,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr --sysconfdir=/etc || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/orc/APKBUILD b/main/orc/APKBUILD
index 596afb906da0920792d7cf7895bb335c73149577..1df6ddcb2c1269354110c4465bc2c4c392748bbe 100644
--- a/main/orc/APKBUILD
+++ b/main/orc/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/ortp/APKBUILD b/main/ortp/APKBUILD
index 93b0dd76694eec92424446f5c1e4dfdd9a73365d..dba936a87dfafc50ea933a28a0e68337c4c04f01 100644
--- a/main/ortp/APKBUILD
+++ b/main/ortp/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-static \
 		--enable-ipv6 \
 		|| return 1
diff --git a/main/osmo/APKBUILD b/main/osmo/APKBUILD
index 169822579263c565c3d3155097b3eed9912b77f9..33a771d66d92fb6adeaf60e92916b8729d5145e7 100644
--- a/main/osmo/APKBUILD
+++ b/main/osmo/APKBUILD
@@ -28,7 +28,11 @@ prepare() {
 build() {
 	cd "$_builddir"
 	CFLAGS="$CFLAGS -I/usr/include/libical"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/p11-kit/APKBUILD b/main/p11-kit/APKBUILD
index 21165d899a0c5d867d5d5819f8c406a4604dc4b6..8087dab514851ce6be6581993d7b39d89d83e60b 100644
--- a/main/p11-kit/APKBUILD
+++ b/main/p11-kit/APKBUILD
@@ -28,6 +28,8 @@ prepare() {
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--sysconfdir=/etc \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
diff --git a/main/pacman/APKBUILD b/main/pacman/APKBUILD
index 7f8fbf9de2d61284b41b5d9e44766b3e9b8c9adc..a00f439a4ecedf30ec3092e1f8e7ab343bb8e220 100644
--- a/main/pacman/APKBUILD
+++ b/main/pacman/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/pam-pgsql/APKBUILD b/main/pam-pgsql/APKBUILD
index a085bf5aed1d011f93413c3842dee77c7311613f..e13322dfe7f215c7c491025f178aa0fcf122d524 100644
--- a/main/pam-pgsql/APKBUILD
+++ b/main/pam-pgsql/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		|| return 1
 	make || return 1
 }
diff --git a/main/pango/APKBUILD b/main/pango/APKBUILD
index 98092ffd0d415c9a4c5ed139e481fadbcbf3733d..71458daea91cba2983ba2f57c2d5dcfea7fc3aa2 100644
--- a/main/pango/APKBUILD
+++ b/main/pango/APKBUILD
@@ -16,10 +16,14 @@ source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$p
 build () 
 { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--with-included-modules=basic-fc \
-		--localstatedir=/var || return 1
+		--localstatedir=/var \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/pangomm/APKBUILD b/main/pangomm/APKBUILD
index 11496b4c8be15c65d529130237bf00676c270950..6aa9441c1f3e965a4ea5ebd0c3f63d214a9e106a 100644
--- a/main/pangomm/APKBUILD
+++ b/main/pangomm/APKBUILD
@@ -15,7 +15,11 @@ source="http://ftp.gnome.org/pub/GNOME/sources/pangomm/${pkgver%.*}/pangomm-$pkg
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/pangox-compat/APKBUILD b/main/pangox-compat/APKBUILD
index 4d55baf93265bc4cb2b398b87bd64aa0cf135a46..577ddade07f7acd691005fa0364057a28f0f2f21 100644
--- a/main/pangox-compat/APKBUILD
+++ b/main/pangox-compat/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-static \
 		|| return 1
 	make || return 1
diff --git a/main/parole/APKBUILD b/main/parole/APKBUILD
index f7683e864115bdd7a71d46fe29b8c55742f25013..16b12936522f7a530e2b547c0dddf6586f6481b6 100644
--- a/main/parole/APKBUILD
+++ b/main/parole/APKBUILD
@@ -29,7 +29,10 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/parted/APKBUILD b/main/parted/APKBUILD
index f06fc54ebcdcaa61d84d0d71aaeb2dd8f3dfac0c..9bac464fd5cdaac2796082def2b998c5ac77cc64 100644
--- a/main/parted/APKBUILD
+++ b/main/parted/APKBUILD
@@ -14,10 +14,14 @@ source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz"
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-debug \
 		--disable-nls \
-		--disable-Werror
+		--disable-Werror \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/patch/APKBUILD b/main/patch/APKBUILD
index 4091c3e66b0d85a1781ec12a90833ca0f044879a..fa8f5e0478c59d8f8c6550bc58b5775d1610db90 100644
--- a/main/patch/APKBUILD
+++ b/main/patch/APKBUILD
@@ -15,16 +15,21 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--build=${CBUILD} \
-		--host=${CHOST} \
-		--mandir=/usr/share/man
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
 package() {
 	cd "$_builddir"
 	make prefix="$pkgdir"/usr mandir="$pkgdir"/usr/share/man install
+	rm -rf "$pkgdir"/usr/lib/charset.alias
+	rmdir -p "$pkgdir"/usr/lib 2>/dev/null
+	return 0
 }
 
 md5sums="0881a7c6477862fc395f373ada0ec6b6  patch-2.7.1.tar.bz2"
diff --git a/main/patchutils/APKBUILD b/main/patchutils/APKBUILD
index f30eeab846be9b93ae6e0fbb3b46c0fc785ebac5..c1b03bc780b8b76ed82f15f79f3d4bd23a5f52cc 100644
--- a/main/patchutils/APKBUILD
+++ b/main/patchutils/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/pcre/APKBUILD b/main/pcre/APKBUILD
index c0af61aefca9af94c1dca03155d39bc662ac5f7a..c90d95069ac2dd345c82bdcd91f23d13f25ab307 100644
--- a/main/pcre/APKBUILD
+++ b/main/pcre/APKBUILD
@@ -24,7 +24,10 @@ prepare() {
 
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-jit \
 		--enable-utf8 \
 		--enable-unicode-properties \
@@ -33,7 +36,8 @@ build() {
 		--enable-pcre32 \
 		--with-match-limit-recursion=8192 \
 		--htmldir=/usr/share/doc/$pkgname-$pkgver/html \
-		--docdir=/usr/share/doc/$pkgname-$pkgver
+		--docdir=/usr/share/doc/$pkgname-$pkgver \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/pdnsd/APKBUILD b/main/pdnsd/APKBUILD
index a8e976929c723b15873b2eb54ed145065461203e..6dbeaf16c5332bdc5b9e07361acafda6d3171d68 100644
--- a/main/pdnsd/APKBUILD
+++ b/main/pdnsd/APKBUILD
@@ -34,7 +34,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/pekwm/APKBUILD b/main/pekwm/APKBUILD
index 7362112211052949eb1f0aecb4567773f8d532d2..e4ea5a05ff2058267d60dbc14ef03c20f27101ba 100644
--- a/main/pekwm/APKBUILD
+++ b/main/pekwm/APKBUILD
@@ -21,10 +21,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/perdition/APKBUILD b/main/perdition/APKBUILD
index 470dc3ba9175dea02afffaa60106bacc802df004..c63527faa1187f52f1ff651d1a55bb2bb68421b9 100644
--- a/main/perdition/APKBUILD
+++ b/main/perdition/APKBUILD
@@ -30,7 +30,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -43,7 +46,8 @@ build() {
 		--disable-nis \
 		--disable-posix-regex \
 		--disable-ldap \
-		--disable-daemon-map
+		--disable-daemon-map \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/pgcluster/APKBUILD b/main/pgcluster/APKBUILD
index 01eb9005d0a19e5236d6e4e57e09102ad08924e3..f3fdf8be7f1bf264717ddea4e5e858eb279de3a4 100644
--- a/main/pgcluster/APKBUILD
+++ b/main/pgcluster/APKBUILD
@@ -19,7 +19,10 @@ source="http://pgfoundry.org/frs/download.php/1705/$pkgname-$_myver.tar.gz
 
 build() {
 	cd "$srcdir"/$pkgname-$_myver || return 1
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--with-docdir=/usr/share/doc \
 		--with-openssl \
diff --git a/main/pgpool/APKBUILD b/main/pgpool/APKBUILD
index a601022322e82a829aff1db4fb88c3781dc8ad22..b56ad8becff7ffe8f554041df19b43924ed6c9da 100644
--- a/main/pgpool/APKBUILD
+++ b/main/pgpool/APKBUILD
@@ -17,6 +17,8 @@ _builddir="$srcdir"/$_opkgname-$pkgver
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
diff --git a/main/php-apc/APKBUILD b/main/php-apc/APKBUILD
index d9263845d39d0acd8f27f00b1b21b4f30075b8d8..8f179d88030f24690607d2d29303f3a0f1865c12 100644
--- a/main/php-apc/APKBUILD
+++ b/main/php-apc/APKBUILD
@@ -16,9 +16,13 @@ apc.ini"
 build() {
 	cd "$srcdir/APC-${pkgver}"
 	phpize || return 1
-	./configure --enable-apc \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--enable-apc \
 		--disable-apc-mmap \
-		--with-php-config=/usr/bin/php-config
+		--with-php-config=/usr/bin/php-config \
+		|| return 1
 		make || return 1
 }
 
diff --git a/main/php-mailparse/APKBUILD b/main/php-mailparse/APKBUILD
index aa4a889074aa8b8d1b6011cbaf5f30632b566ce0..e7725300cb54da2e51ec1f65353f09fa69c904c1 100644
--- a/main/php-mailparse/APKBUILD
+++ b/main/php-mailparse/APKBUILD
@@ -31,7 +31,11 @@ prepare() {
 build() {
 	cd "$_builddir"
 	phpize || return 1
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/php-xcache/APKBUILD b/main/php-xcache/APKBUILD
index 677eec0cd32c8470770b51cc0134c65f4300c7a9..681eb6850a24c245ee5060832453edb9d44db236 100644
--- a/main/php-xcache/APKBUILD
+++ b/main/php-xcache/APKBUILD
@@ -29,6 +29,8 @@ build() {
 	cd "$_builddir"
 	phpize --clean && phpize || return 1
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--enable-xcache \
 		--enable-xcache-constant \
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 529e67cbfff54efcfc4b08ba2edd4b995533013b..5b5fd7f692d70942d07b3cb662b89db210becca3 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -143,7 +143,9 @@ _do_build() {
 }
 
 build() {
-	_phpconfig="--build=${CHOST:-i486-alpine-linux-uclibc} \
+	_phpconfig="\
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc/php \
 		--with-layout=GNU \
diff --git a/main/pidgin-audacious/APKBUILD b/main/pidgin-audacious/APKBUILD
index c87b8d27c8bb5b972f0f89313913fa9dd695ab46..56aaaa9b16c0c44fed9232200ecd5c8eb7318882 100644
--- a/main/pidgin-audacious/APKBUILD
+++ b/main/pidgin-audacious/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/pidgin-otr/APKBUILD b/main/pidgin-otr/APKBUILD
index 2020cf907b98af3c0bbb3aaacb2647f0645e9608..944be373d2d279b5c58868b258c22ffa41523b0e 100644
--- a/main/pidgin-otr/APKBUILD
+++ b/main/pidgin-otr/APKBUILD
@@ -25,7 +25,11 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-        ./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/pidgin-sipe/APKBUILD b/main/pidgin-sipe/APKBUILD
index d7eb4b37dee6660400871b114a46c66fd0233d59..eeb5ea9c5dd2f5089c8fe3cb6ac29c9bee39fb30 100644
--- a/main/pidgin-sipe/APKBUILD
+++ b/main/pidgin-sipe/APKBUILD
@@ -29,7 +29,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-purple \
 		--disable-telepathy \
 		--with-vv \
diff --git a/main/pidgin/APKBUILD b/main/pidgin/APKBUILD
index 8803c9a96f9bde603a259a0daf6cdf8a3e9350f4..622296dfad74abf98033b7f6bd815eaf6f6b67d5 100644
--- a/main/pidgin/APKBUILD
+++ b/main/pidgin/APKBUILD
@@ -30,7 +30,10 @@ prepare() {
 
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--disable-avahi \
 		--disable-doxygen \
diff --git a/main/pinentry/APKBUILD b/main/pinentry/APKBUILD
index cd972a58a72805197e8358eb5b28a7f1b0790dc3..073d922ab3d686e290ec8aeae36b4339923abeb7 100644
--- a/main/pinentry/APKBUILD
+++ b/main/pinentry/APKBUILD
@@ -15,13 +15,17 @@ source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-pinentry-gtk \
 		--enable-pinentry-gtk2 \
 		--disable-pinentry-qt \
 		--enable-pinentry-curses \
 		--enable-pinentry-gtk2 \
-		--enable-fallback-curses
+		--enable-fallback-curses \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/pixman/APKBUILD b/main/pixman/APKBUILD
index 53868db89f3e51b180b692b534f3aa5778abb02c..f50c394ef241105a93b9162726b5b2206b7ee9c9 100644
--- a/main/pixman/APKBUILD
+++ b/main/pixman/APKBUILD
@@ -13,8 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$pkgver.tar
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--disable-static || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/pjproject/APKBUILD b/main/pjproject/APKBUILD
index 4215fe172db7e5ff4ee3d34d18e2a71964e46f05..710b221d99a29e2ffa4032a747c7168562e378db 100644
--- a/main/pjproject/APKBUILD
+++ b/main/pjproject/APKBUILD
@@ -33,7 +33,9 @@ prepare() {
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --build=${CHOST:-i486-alpine-linux-uclibc} \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
diff --git a/main/pkgconf/APKBUILD b/main/pkgconf/APKBUILD
index b6a29ebf286bb50c8a445804566b27f940759eed..c704cef76bd855c8c1eed2b6a9585f145185863c 100644
--- a/main/pkgconf/APKBUILD
+++ b/main/pkgconf/APKBUILD
@@ -27,13 +27,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--build=${CBUILD} \
-		--host=${CHOST} \
 		|| return 1
 	make || return 1
 	if [ "$CHOST" = "$CBUILD" ]; then
diff --git a/main/pm-utils/APKBUILD b/main/pm-utils/APKBUILD
index 1afed83ebd1debb2dd8aa3224dd305ea6a261efb..46ffb1bb59a2d80f364f63d880a92682143f3f61 100644
--- a/main/pm-utils/APKBUILD
+++ b/main/pm-utils/APKBUILD
@@ -24,10 +24,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/pmacct/APKBUILD b/main/pmacct/APKBUILD
index dbdc3d2d85a845afc253583cd8adc715977d9e78..075869081c88789f23b8e45104150f5f25076852 100644
--- a/main/pmacct/APKBUILD
+++ b/main/pmacct/APKBUILD
@@ -27,14 +27,18 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--enable-pgsql \
 		--enable-64bit \
 		--enable-threads \
-		--enable-ulog
+		--enable-ulog \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/polkit/APKBUILD b/main/polkit/APKBUILD
index f072cb76cc8f78bbe7805be6569ebf73deb6fa07..a4b8ab02069b38e4a6906b140ec5a585da01f8e2 100644
--- a/main/polkit/APKBUILD
+++ b/main/polkit/APKBUILD
@@ -32,7 +32,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -45,7 +48,8 @@ build() {
 		--with-os-type=alpine \
 		--disable-gtk-doc \
 		--disable-gtk-doc-html \
-		--disable-gtk-doc-pdf
+		--disable-gtk-doc-pdf \
+		|| return 1
 		
 	make || return 1
 }
diff --git a/main/poppler-gtk/APKBUILD b/main/poppler-gtk/APKBUILD
index 1d5331ed2c6678ef8b19844fcac86632f3d207d2..bb71f05cd9b99aa06a006fbaa0231afc1aa8abdc 100644
--- a/main/poppler-gtk/APKBUILD
+++ b/main/poppler-gtk/APKBUILD
@@ -33,7 +33,10 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$_realname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
diff --git a/main/poppler-qt4/APKBUILD b/main/poppler-qt4/APKBUILD
index d9ed0bc231d4cfdad62a839a800cae1cc0175d67..787419755274d82b5f49bbc7c833dc4e274e26e2 100644
--- a/main/poppler-qt4/APKBUILD
+++ b/main/poppler-qt4/APKBUILD
@@ -35,7 +35,10 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$_realname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
diff --git a/main/poppler/APKBUILD b/main/poppler/APKBUILD
index fda7ba9027bcd60f630bf97685da25e3aa7f4d51..47b3e6f53307acb3349b6d3746e070aefddde629 100644
--- a/main/poppler/APKBUILD
+++ b/main/poppler/APKBUILD
@@ -19,7 +19,10 @@ source="http://$pkgname.freedesktop.org/$pkgname-$pkgver.tar.gz"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
diff --git a/main/popt/APKBUILD b/main/popt/APKBUILD
index 33fa56032ffe9ab34ac2cb5f0ba6b97e4bc0d87d..e5d902c44eb61932fac5d4214ff175a4b291c17e 100644
--- a/main/popt/APKBUILD
+++ b/main/popt/APKBUILD
@@ -11,10 +11,12 @@ makedepends="!libiconv-dev"
 source="http://rpm5.org/files/$pkgname/$pkgname-$pkgver.tar.gz"
 subpackages="$pkgname-doc $pkgname-dev"
 
-build ()
-{
+build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--libdir=/lib \
 		--disable-static \
 		|| return 1
diff --git a/main/portaudio/APKBUILD b/main/portaudio/APKBUILD
index 4ca739e9808c3f2fd272a5f7fd52918fd92e2528..8fb8b917ee8907b0ee679ddc200172c0a5ed18f1 100644
--- a/main/portaudio/APKBUILD
+++ b/main/portaudio/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		|| return 1
 	make || return 1
 }
diff --git a/main/postgresql/APKBUILD b/main/postgresql/APKBUILD
index 6de9ceb15137c7ae69be45f1f0df3005ad63e0f6..18d33c6179509f98bc6127010c69e2015baea4b3 100644
--- a/main/postgresql/APKBUILD
+++ b/main/postgresql/APKBUILD
@@ -31,7 +31,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--with-openssl \
 		|| return 1
diff --git a/main/pound/APKBUILD b/main/pound/APKBUILD
index 7af602ffb1388109757a48b95caf6ce38773284f..7fe7c10cb963c3dfb617e23b6aa070367c45aa94 100644
--- a/main/pound/APKBUILD
+++ b/main/pound/APKBUILD
@@ -25,7 +25,12 @@ prepare() {
 
 build() { 
 	cd "$_builddir"
-	./configure --prefix=/usr --sysconfdir=/etc/pound
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc/pound \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/ppp/APKBUILD b/main/ppp/APKBUILD
index 162d6da0f90821ece7bb95110cdb63ec8df738ed..57cc8966abd5aa622e1d6a7dd9127af05e20c812 100644
--- a/main/ppp/APKBUILD
+++ b/main/ppp/APKBUILD
@@ -49,7 +49,11 @@ build () {
 	sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux
 	# Fix build error with recent kernels
 	rm include/linux/if_pppol2tp.h
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make COPTS="$CFLAGS" || return 1
 }
 
diff --git a/main/printproto/APKBUILD b/main/printproto/APKBUILD
index dc1c0b415cc99fd125682702cb7fda3f33e7321a..82e0eb4f03848e78d37144b1810b40feb7a5ce61 100644
--- a/main/printproto/APKBUILD
+++ b/main/printproto/APKBUILD
@@ -13,7 +13,11 @@ source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.t
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/privoxy/APKBUILD b/main/privoxy/APKBUILD
index 04b8265f7894943f8221882363b874edfa04ff73..33be30fa318486f44c12f22b1e84bc2a9b174879 100644
--- a/main/privoxy/APKBUILD
+++ b/main/privoxy/APKBUILD
@@ -31,7 +31,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--localstatedir=/var/ \
 		--enable-zlib \
 		--enable-dynamic-pcre \
diff --git a/main/procps/APKBUILD b/main/procps/APKBUILD
index e306be5bce4564720b7c71c7397353559cd2d58d..f383a1949cd2d332a923513312cd78af3d897031 100644
--- a/main/procps/APKBUILD
+++ b/main/procps/APKBUILD
@@ -19,7 +19,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/ \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/ \
 		--bindir=/bin \
 		--sbindir=/sbin \
 		--libdir=/lib \
@@ -30,7 +33,8 @@ build() {
 		--disable-w-from \
 		--disable-kill \
 		--disable-rpath \
-		--with-ncurses
+		--with-ncurses \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/psqlodbc/APKBUILD b/main/psqlodbc/APKBUILD
index 1ba7ae7a51114e2032e68e1003bd95c5249b3701..a744b1b16c3011906d68c4bd93cee74e12aae7e9 100644
--- a/main/psqlodbc/APKBUILD
+++ b/main/psqlodbc/APKBUILD
@@ -15,7 +15,11 @@ _builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/pth/APKBUILD b/main/pth/APKBUILD
index 7882289c43504932d055936e3d8cc6cc1b6a810b..5ce83025210b4055c7499a5aff62fdb7e6bfab69 100644
--- a/main/pth/APKBUILD
+++ b/main/pth/APKBUILD
@@ -22,10 +22,14 @@ build () {
 		patch -p1 < $i || return 1
 	done
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--mandir=/usr/share/man
+		--mandir=/usr/share/man \
+		|| return 1
 
 	make || return 1
 }
diff --git a/main/putty/APKBUILD b/main/putty/APKBUILD
index e678cfb6ce6641b9973d00fb92f72f5eae30914d..667dee6a37520e6f7c30706c256c1e80463f6fde 100644
--- a/main/putty/APKBUILD
+++ b/main/putty/APKBUILD
@@ -32,7 +32,11 @@ build() {
 	sed -i 's#$(INSTALL_PROGRAM) -m 755 putty $(DESTDIR)$(bindir)/putty##' Makefile.in
 	sed -i 's#$(INSTALL_PROGRAM) -m 755 puttytel $(DESTDIR)$(bindir)/puttytel##' Makefile.in
 	
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make all-cli || return 1
 }
 
diff --git a/main/pwgen/APKBUILD b/main/pwgen/APKBUILD
index c8fa1b99dac6e0d249bf5566a5ad25da401c4353..16a0c568559ca07be87494419fc5a90bc9008364 100644
--- a/main/pwgen/APKBUILD
+++ b/main/pwgen/APKBUILD
@@ -16,10 +16,14 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/py-cairo/APKBUILD b/main/py-cairo/APKBUILD
index 83ce38403ca17b3f7d920e5a37171990e17876ed..2353d1dcb1b2511162fa2542968a08aff7bb017f 100644
--- a/main/py-cairo/APKBUILD
+++ b/main/py-cairo/APKBUILD
@@ -21,7 +21,8 @@ prepare() {
 build() {
 	cd "$_builddir"
 	./waf configure --prefix=/usr || return 1
-#	./configure --prefix=/usr \
+#	./configure \
+#		--prefix=/usr \
 #		--sysconfdir=/etc \
 #		--mandir=/usr/share/man \
 #		--infodir=/usr/share/info \
diff --git a/main/py-dbus/APKBUILD b/main/py-dbus/APKBUILD
index eb35109855a2cfc9650b37196c2b23f0bb80b503..0117fa0f18cb85a32cafdcae3f0e7e88b28e91c7 100644
--- a/main/py-dbus/APKBUILD
+++ b/main/py-dbus/APKBUILD
@@ -14,7 +14,10 @@ source="http://dbus.freedesktop.org/releases/dbus-python/dbus-python-$pkgver.tar
 _builddir="$srcdir"/dbus-python-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		|| return 1
 	make || return 1
 	make test || return 1
diff --git a/main/py-gnome/APKBUILD b/main/py-gnome/APKBUILD
index e34b55768c4d0371cf488133412139398746cb04..43a6d73b0dd9aba6b988088a08e1e7566df4fb8e 100644
--- a/main/py-gnome/APKBUILD
+++ b/main/py-gnome/APKBUILD
@@ -26,10 +26,14 @@ prepare() {
 build() {
 	cd "$_builddir"
 	LIBS="$(pkg-config gobject-2.0 --libs)" \
-		./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --mandir=/usr/share/man \
-                --infodir=/usr/share/info
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		|| return 1
         make || return 1
 }
 
diff --git a/main/py-gobject/APKBUILD b/main/py-gobject/APKBUILD
index 0fe0d19b318f7247a51fe2a93332ee2fbba18d57..8fe8cb2373feafe49baac18fc5491ed76d0ced9d 100644
--- a/main/py-gobject/APKBUILD
+++ b/main/py-gobject/APKBUILD
@@ -21,7 +21,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/py-gobject3/APKBUILD b/main/py-gobject3/APKBUILD
index c6b33ccd0474dad234cd7508a0de28e1594f9b9d..c60f660aafd92e904cd1958669b736d97c57d223 100644
--- a/main/py-gobject3/APKBUILD
+++ b/main/py-gobject3/APKBUILD
@@ -21,7 +21,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/py-gst/APKBUILD b/main/py-gst/APKBUILD
index 9382a08074fd2dd3011e67e80377145a8425a000..9a6d6dcfe99ee6a02989fd105b00a5724b8ede5f 100644
--- a/main/py-gst/APKBUILD
+++ b/main/py-gst/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/py-gtk/APKBUILD b/main/py-gtk/APKBUILD
index 48243c1f5e8858280197061cb28d5443ee3c9b66..7e9cf6c85644a836cb1ed105a0954dc3e23534e5 100644
--- a/main/py-gtk/APKBUILD
+++ b/main/py-gtk/APKBUILD
@@ -33,7 +33,11 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/python/APKBUILD b/main/python/APKBUILD
index 0f79882c4d2916d8c1ce38446588b9e864d1ef68..5de5a9d7a7a8c0bd698999283135c7de1c149b30 100644
--- a/main/python/APKBUILD
+++ b/main/python/APKBUILD
@@ -33,7 +33,10 @@ prepare() {
 build() {
 	cd "$srcdir/Python-$pkgver"
 	export OPT="$CFLAGS"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-shared \
 		--with-threads \
 		--enable-ipv6 \
diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD
index 921b298374314bb2932d9e758e7fcb4eead34973..58c44eeabd33e997b665ffc3c5e433dd514231fd 100644
--- a/main/qemu/APKBUILD
+++ b/main/qemu/APKBUILD
@@ -97,7 +97,10 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--audio-drv-list=oss,alsa,sdl \
 		--enable-vde \
diff --git a/main/qpdf/APKBUILD b/main/qpdf/APKBUILD
index 597e0214d9ea25f52daf5c795199668363bea070..3cffa9bfd6cc38d10a6670ef2615aa31ab680cd7 100644
--- a/main/qpdf/APKBUILD
+++ b/main/qpdf/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/qt/APKBUILD b/main/qt/APKBUILD
index 95fecd192311094f4bc38b6ba20ddea4f10cf087..4cf6ba8720e3c532122907f46380f0c8c5da526a 100644
--- a/main/qt/APKBUILD
+++ b/main/qt/APKBUILD
@@ -49,6 +49,7 @@ build() {
 	export QT4DIR="$_builddir"
 	export PATH="${QT4DIR}/bin:${PATH}"
 	export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+	# note: not autotools
 	./configure -confirm-license -opensource \
 		-prefix /usr \
 		-docdir /usr/share/doc/qt \
diff --git a/main/quagga/APKBUILD b/main/quagga/APKBUILD
index bbf69bc036bdee7f6f58d893dce19611dd9f6728..fed1530e5f783bce8d102b445c93a84958c10102 100644
--- a/main/quagga/APKBUILD
+++ b/main/quagga/APKBUILD
@@ -36,7 +36,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-static \
 		--enable-ipv6 \
 		--enable-ospf6d \
diff --git a/main/radvd/APKBUILD b/main/radvd/APKBUILD
index 8358c39aaed62ebbe3eddd76d028ff318bd9fc14..fe964793e78f4c81bddb79b2028d95779fb093db 100644
--- a/main/radvd/APKBUILD
+++ b/main/radvd/APKBUILD
@@ -31,7 +31,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc/ \
 		--with-pidfile=/var/run/radvd/radvd.pid \
 		|| return 1
diff --git a/main/randrproto/APKBUILD b/main/randrproto/APKBUILD
index 93ee41d3df810566f09eba366c07aafb135f2649..dd1965f0a59773c842cf4a54727a71fd2dbd7dc3 100644
--- a/main/randrproto/APKBUILD
+++ b/main/randrproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.t
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/rarian/APKBUILD b/main/rarian/APKBUILD
index 2818f06a32bcf717487aa02118c5ba70c6f92f49..635f32f03ae9706a4df898d9eac0fee0ecb0bbef 100644
--- a/main/rarian/APKBUILD
+++ b/main/rarian/APKBUILD
@@ -16,11 +16,15 @@ build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
 	patch -p0 -i "$srcdir"/user-segfault.patch || return 1
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-scrollkeeper-compat \
-		--disable-static || return 1
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/rdesktop/APKBUILD b/main/rdesktop/APKBUILD
index 89f11058bb5de063a9c9ffa7241a168c494801ac..6ca11e502bbfe34a528471c8df69d69c84427ee3 100644
--- a/main/rdesktop/APKBUILD
+++ b/main/rdesktop/APKBUILD
@@ -14,8 +14,12 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
 build () 
 { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--with-sound=ao
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--with-sound=ao \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/re2c/APKBUILD b/main/re2c/APKBUILD
index 8d994b4373590bbf2565009c8ac9ff517dd769a4..1a7362bbf69641870b9a76afcebd90bd11d350d1 100644
--- a/main/re2c/APKBUILD
+++ b/main/re2c/APKBUILD
@@ -23,10 +23,14 @@ prepare() {
 
 build() {
         cd "$_builddir"
-        ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --mandir=/usr/share/man \
-                --infodir=/usr/share/info
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		|| return 1
         make || return 1
 }
 
diff --git a/main/readline/APKBUILD b/main/readline/APKBUILD
index 4fa4dc6232a654ec3593cd884980f6fee3bb7ec4..12fa5501baf08e21f7cdcbb6d0a13e21df26075c 100644
--- a/main/readline/APKBUILD
+++ b/main/readline/APKBUILD
@@ -35,9 +35,12 @@ prepare() {
 build() { 
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	
 	make SHLIB_LIBS=-lncurses || return 1
 }
diff --git a/main/recordmydesktop/APKBUILD b/main/recordmydesktop/APKBUILD
index a1996adb9f3c2063ab3cb0033ff23cada9645c2b..12cc3fe515367610d82ee644da4dbb20ec7ce850 100644
--- a/main/recordmydesktop/APKBUILD
+++ b/main/recordmydesktop/APKBUILD
@@ -31,7 +31,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-jack \
 		|| return 1
 }
diff --git a/main/recordproto/APKBUILD b/main/recordproto/APKBUILD
index 9df8736fd293fac9589a0e27e64a49b5ae0b8338..599ea48d2e985a192a0fbe8651a1273db2d786ba 100644
--- a/main/recordproto/APKBUILD
+++ b/main/recordproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.t
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/reiserfsprogs/APKBUILD b/main/reiserfsprogs/APKBUILD
index 9f9a88fd92ccfd919c2bc788e53053823a2232bd..49a0f7b41a9cd13965379da0ab8435b6befaad42 100644
--- a/main/reiserfsprogs/APKBUILD
+++ b/main/reiserfsprogs/APKBUILD
@@ -22,10 +22,14 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/remmina-xfce/APKBUILD b/main/remmina-xfce/APKBUILD
index 406e8a026aabd0079457502c8ead22bc265eb910..96afcda0c169c726f4c9ca68c1a8e8192caefc9f 100644
--- a/main/remmina-xfce/APKBUILD
+++ b/main/remmina-xfce/APKBUILD
@@ -16,7 +16,10 @@ _builddir="$srcdir"/$pkgname-$pkgver
 build () 
 { 
 	cd $srcdir/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		|| return 1
 	make || return 1
 }
diff --git a/main/renderproto/APKBUILD b/main/renderproto/APKBUILD
index 03a3c186b67e1ef128707d6f8ff1eb814f7db894..8fee73983359690942254fd277dc8165b05798ea 100644
--- a/main/renderproto/APKBUILD
+++ b/main/renderproto/APKBUILD
@@ -13,7 +13,11 @@ source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.t
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
diff --git a/main/resourceproto/APKBUILD b/main/resourceproto/APKBUILD
index 8061f59f26f05ab34c74b0461fb4ad3695cb4d73..4e14da433f38d169ccc123ec44d7b5e0e0d6a447 100644
--- a/main/resourceproto/APKBUILD
+++ b/main/resourceproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/rest/APKBUILD b/main/rest/APKBUILD
index 210833313f43e38ad5fc24f0d77a20859be5fb62..5fcfcfd6120f8c4f4b13dae973be37decc1512de 100644
--- a/main/rest/APKBUILD
+++ b/main/rest/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-static \
 		--enable-introspection \
 		--without-gnome \
diff --git a/main/rgb/APKBUILD b/main/rgb/APKBUILD
index 5d1cc8b8284f9774645e07f38be1cdb89cde0408..e84d2d371011e2af3004e2887f9de246e20c5eda 100644
--- a/main/rgb/APKBUILD
+++ b/main/rgb/APKBUILD
@@ -13,7 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/ristretto/APKBUILD b/main/ristretto/APKBUILD
index 00f73038b438f4f88fd64db7fd0aaa2d56ac4e0c..c6e6a3b10200dfc49f5ec1628e64d09a6fd2b60e 100644
--- a/main/ristretto/APKBUILD
+++ b/main/ristretto/APKBUILD
@@ -24,7 +24,10 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-debug \
diff --git a/main/rp-pppoe/APKBUILD b/main/rp-pppoe/APKBUILD
index a9d89c12a96d9bb883b4f89a0a28592be531dac3..c1b7b515949588efc852c766d27cb3736245ee94 100644
--- a/main/rp-pppoe/APKBUILD
+++ b/main/rp-pppoe/APKBUILD
@@ -19,12 +19,16 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
 	cd "$_builddir"/src
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		 --enable-plugin=/usr/include/pppd
-	make all  || return 1
+		--enable-plugin=/usr/include/pppd \
+		|| return 1
+	make all || return 1
 }
 
 package() {
diff --git a/main/rpcbind/APKBUILD b/main/rpcbind/APKBUILD
index 92774d5ebb055d279de60eb33f78951617a7eda6..b0318d8bd72b8191cf6e9b658860253f01848526 100644
--- a/main/rpcbind/APKBUILD
+++ b/main/rpcbind/APKBUILD
@@ -25,7 +25,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr --bindir=/sbin
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--bindir=/sbin \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/rrdcollect/APKBUILD b/main/rrdcollect/APKBUILD
index 5cebb462ed26a5086824eb17dcf553d541e98268..def4b88f5fbd62783ac2f1d858c3d2098ef623d4 100644
--- a/main/rrdcollect/APKBUILD
+++ b/main/rrdcollect/APKBUILD
@@ -30,7 +30,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--localstatedir=/var \
 		--sysconfdir=/etc/rrdcollect \
 		--mandir=/usr/share/man \
diff --git a/main/rrdtool/APKBUILD b/main/rrdtool/APKBUILD
index a51ec6ad21ef0e83038c9dbcfa67a4942960fca3..f9abbb09b0ff8bd42acd84791f362962a3648432 100644
--- a/main/rrdtool/APKBUILD
+++ b/main/rrdtool/APKBUILD
@@ -29,7 +29,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-nls \
 		--disable-tcl \
 		--disable-ruby \
diff --git a/main/rsync/APKBUILD b/main/rsync/APKBUILD
index ed226d7c3561c86b1adc6011395114ca6583f980..858a7f6018370a0e2b2d8f4375b404790b37d5bb 100644
--- a/main/rsync/APKBUILD
+++ b/main/rsync/APKBUILD
@@ -16,10 +16,20 @@ source="http://$pkgname.samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz
 	"
 subpackages="$pkgname-doc"
 
-build() { 
-	cd "$srcdir/$pkgname-$pkgver"
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
 	./prepare-source || return 1
-	./configure --prefix=/usr || return 1
+}
+
+build() {
+	cd "$_builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD
index c43cc4ab2bcdd9e81441b396f042478aaafb3f73..a145aae4bbb636cba29c41975266eee5e0622265 100644
--- a/main/rsyslog/APKBUILD
+++ b/main/rsyslog/APKBUILD
@@ -23,6 +23,8 @@ prepare() {
 	cd "$_builddir"
 	export LDFLAGS="-lestr"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--disable-gui \
 		--disable-rfc3195 \
 		--enable-largefile \
@@ -40,7 +42,8 @@ prepare() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 }
 
 build() {
diff --git a/main/rt4/APKBUILD b/main/rt4/APKBUILD
index 1621ed11a027d7fccc3ba7a910bd02b39b934adf..82e064ad91e664cccbd1e05666138cc677e1790f 100644
--- a/main/rt4/APKBUILD
+++ b/main/rt4/APKBUILD
@@ -121,7 +121,10 @@ EOF
 
 build() {
 	cd "$_builddir"
-	./configure --enable-layout=Alpine \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--enable-layout=Alpine \
 		--with-rt-group=rt4 \
 		--with-web-group=rt4 \
 		--with-web-user=rt4 \
diff --git a/main/rtorrent/APKBUILD b/main/rtorrent/APKBUILD
index 0bd70d8dad63e2994da30f96025444923dd78b75..24399d2fcaf04d957aa9cda8e14d624d7d668252 100644
--- a/main/rtorrent/APKBUILD
+++ b/main/rtorrent/APKBUILD
@@ -12,22 +12,24 @@ subpackages="$pkgname-doc"
 source="http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz"
 
 build() {
-  cd "$srcdir"/$pkgname-$pkgver
+	cd "$srcdir"/$pkgname-$pkgver
 
-  export LDFLAGS="$LDFLAGS -lpthread"
-  ./configure \
-    --prefix=/usr \
-    --disable-debug \
-    --with-xmlrpc-c \
-  || return 1
+	export LDFLAGS="$LDFLAGS -lpthread"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-debug \
+		--with-xmlrpc-c \
+		|| return 1
 
-  make || return 1
+	make || return 1
 }
 
 package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -D doc/rtorrent.rc "$pkgdir"/usr/share/doc/rtorrent/rtorrent.r
+	cd "$srcdir"/$pkgname-$pkgver
+	make DESTDIR="$pkgdir" install
+	install -D doc/rtorrent.rc "$pkgdir"/usr/share/doc/rtorrent/rtorrent.r
 }
 
 md5sums="0bf2f262faa8c8c8d3b11ce286ea2bf2  rtorrent-0.9.3.tar.gz"
diff --git a/main/rtpproxy/APKBUILD b/main/rtpproxy/APKBUILD
index dbc42e774d1eb0a02a453c136cabae1c63bc1d6f..4725332a3a1fb0b3bccc34558ad745302164f84d 100644
--- a/main/rtpproxy/APKBUILD
+++ b/main/rtpproxy/APKBUILD
@@ -29,10 +29,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD
index 9da0f6d940b6f14ad68bc7d70674cb9325104a58..4f39d61366150dbaff53d5633c93fd1427f59fad 100644
--- a/main/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
@@ -65,11 +65,17 @@ build() {
 	# ruby saves path to install. we want use $PATH
 	export INSTALL=install
 
-	# the configure script does not detect isnan/isinf as macros
-	ac_cv_func_isnan=yes \
-	ac_cv_func_isinf=yes \
+	case "$CLIBC" in
+	uclibc)
+		# the configure script does not detect isnan/isinf as macros
+		export ac_cv_func_isnan=yes
+		export ac_cv_func_isinf=yes
+		;;
+	esac
+
 	./configure \
-		--build=${CHOST:-i486-alpine-linux-uclibc} \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
diff --git a/main/run-parts/APKBUILD b/main/run-parts/APKBUILD
index 2a98f09cb46d36bef7c6c5a621edf0ab046f6233..293480e32a1a9e3c26e5884abbe96a207169c722 100644
--- a/main/run-parts/APKBUILD
+++ b/main/run-parts/APKBUILD
@@ -12,7 +12,11 @@ source="http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_${pk
 
 build () {
 	cd $srcdir/debianutils-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make
 }
 
diff --git a/main/rxvt-unicode/APKBUILD b/main/rxvt-unicode/APKBUILD
index 756e06020b7733b4f3e4e9ef58b5514292c678b4..aa73472f47d341beb59bfed89af0f43fab409986 100644
--- a/main/rxvt-unicode/APKBUILD
+++ b/main/rxvt-unicode/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-terminfo=/usr/share/terminfo \
 		--enable-256-color \
 		--enable-font-styles \
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index d0fb47c9d26575362ab5a721b3b58669e6b5763b..596348cd9c6b2af609df35ec7b6c1dcdeb726f42 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -30,7 +30,10 @@ prepare() {
 
 build() { 
 	cd "$_builddir"/source3
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc/samba \
 		--with-configdir=/etc/samba \
 		--localstatedir=/var \
@@ -47,7 +50,8 @@ build() {
 		--enable-external-libtalloc \
 		--disable-nss-wrapper \
 		--disable-dnssd \
-		--disable-swat
+		--disable-swat \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/screen/APKBUILD b/main/screen/APKBUILD
index bcf2849a5efe0ae54ece56148bd9ee06c47f0ed6..378a771466c754cde1e5dc8fa89594ff50c2b10e 100644
--- a/main/screen/APKBUILD
+++ b/main/screen/APKBUILD
@@ -21,7 +21,10 @@ build() {
 		patch -p1 < $i || return 1
 	done
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/scrnsaverproto/APKBUILD b/main/scrnsaverproto/APKBUILD
index 8d4f5fd229c2e780abfce209202ea6e58df1d57a..e391421b5dde1c1fc869d4b9f5b8ed2e35af10fe 100644
--- a/main/scrnsaverproto/APKBUILD
+++ b/main/scrnsaverproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/scrot/APKBUILD b/main/scrot/APKBUILD
index a11a79c2de14c8fc46d4d7c04cbf718b252dbf23..781d56915bedd3b810bed0e1da7bbcecfb0feaf4 100644
--- a/main/scrot/APKBUILD
+++ b/main/scrot/APKBUILD
@@ -13,7 +13,12 @@ source="http://linuxbrit.co.uk/downloads/$pkgname-$pkgver.tar.gz"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/sdl/APKBUILD b/main/sdl/APKBUILD
index b58047148e201c00be8d159ec1af32fcece89087..ba9b6bb51cd0b29ed5866b09c04f909ee088a031 100644
--- a/main/sdl/APKBUILD
+++ b/main/sdl/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-nasm \
 		--disable-esd \
 		--disable-video-svga \
@@ -35,7 +38,8 @@ build() {
 		--enable-alsa \
 		--with-x \
 		--disable-rpath \
-		--disable-nls 
+		--disable-nls \
+		|| return 1
 	make
 }
 
diff --git a/main/sdl_image/APKBUILD b/main/sdl_image/APKBUILD
index e49faded1ab6af868dfd9599e4be20094ac293a4..7c02b18bda568694937f710b853f44bb255c5abb 100644
--- a/main/sdl_image/APKBUILD
+++ b/main/sdl_image/APKBUILD
@@ -27,10 +27,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/sdl_mixer/APKBUILD b/main/sdl_mixer/APKBUILD
index f6ff767636ed3f3126b660d46970894561327c4d..7254cdd751b5c9bd34f962b5c7601727faf72c48 100644
--- a/main/sdl_mixer/APKBUILD
+++ b/main/sdl_mixer/APKBUILD
@@ -25,11 +25,15 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--enable-music-mod
+		--enable-music-mod \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/sed/APKBUILD b/main/sed/APKBUILD
index 21a8f61b223851a0665a6065ac2ed2a44105282f..f2e2b1422ed234ec2d968fa02ff76d5c5bd10de3 100644
--- a/main/sed/APKBUILD
+++ b/main/sed/APKBUILD
@@ -14,12 +14,16 @@ source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build() { 
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--bindir=/bin \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--disable-i18n \
-		--disable-nls
+		--disable-nls \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/sessreg/APKBUILD b/main/sessreg/APKBUILD
index 68824d5d7ef64c0bfd6546ab10a85b6202ba2e08..eb5b7f75037b109e0ba901ac7f90f1ddb6c36218 100644
--- a/main/sessreg/APKBUILD
+++ b/main/sessreg/APKBUILD
@@ -13,7 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/setxkbmap/APKBUILD b/main/setxkbmap/APKBUILD
index 287586fd5240a789f30b18ef9a07e6f593cc7f5b..766cc56971d6ca5fab6f84bea8101bbd70bcd39f 100644
--- a/main/setxkbmap/APKBUILD
+++ b/main/setxkbmap/APKBUILD
@@ -14,7 +14,11 @@ build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 	make DESTDIR=""$pkgdir"" install || return 1
 }
diff --git a/main/sfic/APKBUILD b/main/sfic/APKBUILD
index 14d28a5f3189e6b8ebb5b8d01ec270a6bebe3cdc..46c5afaac2138e64672f0bc1e0d8924ca126cf24 100644
--- a/main/sfic/APKBUILD
+++ b/main/sfic/APKBUILD
@@ -30,7 +30,11 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/sg3_utils/APKBUILD b/main/sg3_utils/APKBUILD
index 9b082816901ee9d8761165f8f63b5d446b61cdc2..b52278e2867ff22d6da7b859893932329a89ea3c 100644
--- a/main/sg3_utils/APKBUILD
+++ b/main/sg3_utils/APKBUILD
@@ -22,10 +22,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/shared-mime-info/APKBUILD b/main/shared-mime-info/APKBUILD
index 73845cb66783e4aebc7a402910e7104927d94a7f..68d4e7c6e3c94e7dff9fc26c6590e5adaa55d648 100644
--- a/main/shared-mime-info/APKBUILD
+++ b/main/shared-mime-info/APKBUILD
@@ -15,8 +15,12 @@ source="http://freedesktop.org/~hadess/$pkgname-$pkgver.tar.xz"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--disable-update-mimedb || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-update-mimedb \
+		|| return 1
 	make -j1
 }
 
diff --git a/main/shotwell/APKBUILD b/main/shotwell/APKBUILD
index c4220325046eebcbf7cb43bd930d4b4f1f333d13..7ee880f011810be9e2c946595cf19d2209acf19c 100644
--- a/main/shotwell/APKBUILD
+++ b/main/shotwell/APKBUILD
@@ -32,9 +32,13 @@ prepare() {
 build () 
 { 
 	cd $srcdir/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-desktop-update \
-		--disable-icon-update
+		--disable-icon-update \
+		|| return 1
 	make
 }
 
diff --git a/main/sipsak/APKBUILD b/main/sipsak/APKBUILD
index 13b11ff37a47488ea9651d5d61d9e60fa4e3bf56..b93d5a815ca72572e9a7316768eeb5f0535b3b1d 100644
--- a/main/sipsak/APKBUILD
+++ b/main/sipsak/APKBUILD
@@ -16,11 +16,13 @@ _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		 || return 1
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/slang/APKBUILD b/main/slang/APKBUILD
index 486e74cde2205c3b872d271fba945d573a7abff3..7f13a9f0f371f7de1b11724551e5c00f162ccb02 100644
--- a/main/slang/APKBUILD
+++ b/main/slang/APKBUILD
@@ -24,7 +24,10 @@ prepare () {
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		|| return 1
 	make -j1 elf static || return 1
diff --git a/main/smartmontools/APKBUILD b/main/smartmontools/APKBUILD
index ffd1d9cda35aeb14b48887f38e75a28ca79c08cb..68130d849cec7ae5233a0ab5227f9c213b14e17b 100644
--- a/main/smartmontools/APKBUILD
+++ b/main/smartmontools/APKBUILD
@@ -16,7 +16,12 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/smokeping/APKBUILD b/main/smokeping/APKBUILD
index f97d28405112b015ca7f39619ba4a7ec0b89d13a..24f5de44abc913e6b2abd136c597be142e1af0df 100644
--- a/main/smokeping/APKBUILD
+++ b/main/smokeping/APKBUILD
@@ -44,7 +44,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--bindir=/usr/bin \
 		--libdir=/usr/lib \
 		--sysconfdir=/etc/smokeping \
diff --git a/main/smstools/APKBUILD b/main/smstools/APKBUILD
index 732a48a79a04ad2d904cdc1c37c439326f29416f..f4898731edac3cf5012b16524b697fcaa3093ed7 100644
--- a/main/smstools/APKBUILD
+++ b/main/smstools/APKBUILD
@@ -28,10 +28,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/snort/APKBUILD b/main/snort/APKBUILD
index 325a43e17f6e44ef652db271f0468453ff0d965f..5d7d28e126ba2073edcb63b7848e240d6f0727b6 100644
--- a/main/snort/APKBUILD
+++ b/main/snort/APKBUILD
@@ -44,12 +44,16 @@ prepare() {
 
 build() {
         cd "$_builddir"
-        ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --mandir=/usr/share/man \
-                --infodir=/usr/share/info \
-                --enable-ipv6 \
-                --enable-gre
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--enable-ipv6 \
+		--enable-gre \
+		|| return 1
         make || return 1
 }
 
diff --git a/main/socat/APKBUILD b/main/socat/APKBUILD
index 81d2dc22272fbe39d6bf963d4e6bc9e9e4ad8486..e25aaf942fce618dc7400e171b3d204a5eb5c274 100644
--- a/main/socat/APKBUILD
+++ b/main/socat/APKBUILD
@@ -15,7 +15,11 @@ source="http://www.dest-unreach.org/$pkgname/download/$pkgname-$pkgver.tar.bz2"
 _builddir="$srcdir/$pkgname-$pkgver"
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/sox/APKBUILD b/main/sox/APKBUILD
index 5822e611a10ea0d40735c1a2420ea389a66d6ee8..53ec5793d3d078a72a4bd7c619db653123927bba 100644
--- a/main/sox/APKBUILD
+++ b/main/sox/APKBUILD
@@ -26,10 +26,14 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--with-dyn-default \
-		--with-distro="Alpine Linux" || return 1
+		--with-distro="Alpine Linux" \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/spandsp/APKBUILD b/main/spandsp/APKBUILD
index b9d4ed9bb0c779331ef1e235cf5ea4ca9b2340f0..de0c7426e7524ef42801926a8afa385eebe09b99 100644
--- a/main/spandsp/APKBUILD
+++ b/main/spandsp/APKBUILD
@@ -19,10 +19,14 @@ _builddir="$srcdir"/$pkgname-0.0.6
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/speex/APKBUILD b/main/speex/APKBUILD
index 9c29dc84d34634dc7c1070a41605f012e66012f2..f9ac9b64341cd461197334f98699a484d6845cf1 100644
--- a/main/speex/APKBUILD
+++ b/main/speex/APKBUILD
@@ -20,10 +20,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/spice-gtk/APKBUILD b/main/spice-gtk/APKBUILD
index 7400273e935b789521bd81f1fe286f457dcc4404..08323c65a9dc6ab9a80d9e32f89651708b7af036 100644
--- a/main/spice-gtk/APKBUILD
+++ b/main/spice-gtk/APKBUILD
@@ -33,7 +33,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--with-gtk=3.0 \
diff --git a/main/spice-protocol/APKBUILD b/main/spice-protocol/APKBUILD
index 263942fbee3fa4de450bf65fdf043350255f3cda..194b69a0b7aeb9b72e217786bb7708805e0eed8e 100644
--- a/main/spice-protocol/APKBUILD
+++ b/main/spice-protocol/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		|| return 1
 	make || return 1
 }
diff --git a/main/spice/APKBUILD b/main/spice/APKBUILD
index 5b5c73a4a77a3c75da67140d3c0e3444c46f009e..08fae70d39f7f9ea791654a8042c602547e24ef0 100644
--- a/main/spice/APKBUILD
+++ b/main/spice/APKBUILD
@@ -30,7 +30,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/sqlite/APKBUILD b/main/sqlite/APKBUILD
index 1a48d5f7569794e12b5869c167206a3aed17ef2f..08b605831f30b117144e2655f559bb85bf697c4e 100644
--- a/main/sqlite/APKBUILD
+++ b/main/sqlite/APKBUILD
@@ -37,7 +37,10 @@ build() {
 	cd "$_builddir"
 	export LTLINK_EXTRAS="-ldl"
 	export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_ENABLE_RTREE=1 -DSQLITE_USE_URI -Iext/fts3"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-threadsafe \
 		--disable-static \
 		--enable-readline \
diff --git a/main/sqsh/APKBUILD b/main/sqsh/APKBUILD
index c424c42c1bcd08f8be5b153bb48e559d1c80a7e3..5e2ea2f9a6179f3f59b03caaa39ebb31efa1e382 100644
--- a/main/sqsh/APKBUILD
+++ b/main/sqsh/APKBUILD
@@ -29,11 +29,14 @@ build() {
 	cd "$_builddir"
 	SYBASE=/usr
 	export SYBASE
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/doc \
-#		--with-x \
-		--with-readline
+		--with-readline \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index 1d5f12fc5a4b7e32cace6be20a689aea62718983..a4b40a07a22428e1de1e00def15314ff9eecd1e4 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -44,7 +44,10 @@ prepare() {
 build() {
 	cd "$_builddir"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--datadir=/usr/share/squid \
 		--sysconfdir=/etc/squid \
 		--libexecdir=/usr/lib/squid \
diff --git a/main/sshfs/APKBUILD b/main/sshfs/APKBUILD
index 31ffb8df2b18eeba313ce64482316bfd5566b326..75407d35379b3ff2052f0184a87a23d3da5fe281 100644
--- a/main/sshfs/APKBUILD
+++ b/main/sshfs/APKBUILD
@@ -14,7 +14,11 @@ _builddir="$srcdir"/sshfs-fuse-$pkgver
 build () 
 { 
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/sshguard/APKBUILD b/main/sshguard/APKBUILD
index a337bbfc637860aa2386d9251f07942809d2adb1..79d5e4d521e9b17b7dd2f5d7cbacd8db2ed5ae12 100644
--- a/main/sshguard/APKBUILD
+++ b/main/sshguard/APKBUILD
@@ -30,7 +30,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-firewall=iptables \
 		|| return 1
 	make || return 1
diff --git a/main/sshpass/APKBUILD b/main/sshpass/APKBUILD
index c47f23ffc326699aeb402c97cba1b9a8d4edebc7..0162d35f70dd8a302bd81d2c63516f67532c60b9 100644
--- a/main/sshpass/APKBUILD
+++ b/main/sshpass/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/ssmtp/APKBUILD b/main/ssmtp/APKBUILD
index d8ee553a242d5721c81e36a5335956b100df4062..ee4019674a886598530b18a7421d2474543da694 100644
--- a/main/ssmtp/APKBUILD
+++ b/main/ssmtp/APKBUILD
@@ -31,10 +31,14 @@ build() {
 	cd "$_builddir"
 	sed -i -e 's:$(CC) -o:$(CC) @LDFLAGS@ -o:' Makefile.in
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc \
-		--enable-ssl
+		--enable-ssl \
+		|| return 1
 	make
 }
 
diff --git a/main/startup-notification/APKBUILD b/main/startup-notification/APKBUILD
index 49014bf1c5da681159e34aba7b84b63b1ec8bc7f..4111bce7ff681d6929a6a6f819334eac8bac0b17 100644
--- a/main/startup-notification/APKBUILD
+++ b/main/startup-notification/APKBUILD
@@ -14,7 +14,10 @@ source="http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.t
 depends_dev="libsm-dev xcb-util-dev"
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--localstatedir=/var \
 		--sysconfdir=/etc \
 		|| return 1
diff --git a/main/strace/APKBUILD b/main/strace/APKBUILD
index 81c8349a4497c8d9d17c218e466287c23b60da0c..fab598ff39f7a1dec1a454e9661defb1f966e4d1 100644
--- a/main/strace/APKBUILD
+++ b/main/strace/APKBUILD
@@ -17,8 +17,11 @@ build ()
 	#changes in kernel headers in 2.6.32
 	sed -i -e 's/include <linux\/socket.h>/include <sys\/socket.h>/g' \
 		configure
-	./configure --prefix=/usr \
-		
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD
index 8e8e5ee1091750167cb5c9d63b2a65c9ba1caa07..a6d79376280975812636c23fad24f38b9438401e 100644
--- a/main/subversion/APKBUILD
+++ b/main/subversion/APKBUILD
@@ -33,7 +33,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-nls \
 		--with-apxs \
 		--with-apache-libexecdir \
@@ -41,7 +44,8 @@ build() {
 		--disable-javahl \
 		--disable-static \
 		--enable-disallowing-of-undefined-references \
-		--without-jdk
+		--without-jdk \
+		|| return 1
 
 	make all || return 1
 	make swig-pl-lib || return 1
diff --git a/main/sudo/APKBUILD b/main/sudo/APKBUILD
index 818ff148415339c9e0b5cb8532dc54facd9d2df7..aa266058f7dbdd02d9e9fb355a21e54e1584d717 100644
--- a/main/sudo/APKBUILD
+++ b/main/sudo/APKBUILD
@@ -30,9 +30,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--build=${CBUILD} \
-		--host=${CHOST} \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-env-editor \
 		--without-pam \
 		--without-skey \
diff --git a/main/swfdec-mozilla/APKBUILD b/main/swfdec-mozilla/APKBUILD
index 984cb2308d6026225966507110b617771ab6f4db..40e462cb482d6fedf7d5dac6a3b55f9ef2e7f574 100644
--- a/main/swfdec-mozilla/APKBUILD
+++ b/main/swfdec-mozilla/APKBUILD
@@ -13,9 +13,13 @@ source="http://swfdec.freedesktop.org/download/$pkgname/0.8/$pkgname-$pkgver.tar
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-static \
-		--with-plugin-dir=/usr/lib/mozilla/plugins/
+		--with-plugin-dir=/usr/lib/mozilla/plugins/ \
+		|| return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" -name '*.la' -delete
diff --git a/main/swfdec/APKBUILD b/main/swfdec/APKBUILD
index ee22c23565a35d67b18c987e352748870cfbb590..128c2dc3427e2340772708f5df701656a643de99 100644
--- a/main/swfdec/APKBUILD
+++ b/main/swfdec/APKBUILD
@@ -17,12 +17,16 @@ source="http://$pkgname.freedesktop.org/download/$pkgname/0.8/$pkgname-$pkgver.t
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-static \
 		--enable-gtk \
 		--enable-gstreamer \
 		--enable-soup \
-		--with-audio=alsa
+		--with-audio=alsa \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/swig/APKBUILD b/main/swig/APKBUILD
index 2f9a30b59ace2b92e5757871987a86ad70f99418..3549002d881af8f5dbf177ffe44267d5c869d6af 100644
--- a/main/swig/APKBUILD
+++ b/main/swig/APKBUILD
@@ -12,7 +12,11 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/swish-e/APKBUILD b/main/swish-e/APKBUILD
index cc40b53b5c9efb238f9dcfb7759bfdf4a66430d8..9b9af9a2645b32fe57d9fd438a3348b68a89a627 100644
--- a/main/swish-e/APKBUILD
+++ b/main/swish-e/APKBUILD
@@ -16,10 +16,14 @@ source="http://www.swish-e.org/distribution/$pkgname-$pkgver.tar.gz"
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/sylpheed/APKBUILD b/main/sylpheed/APKBUILD
index 5dcbc61eaaedca14fbe9956f29696fa555f71b82..fdc49c10329d1e0fd124932778d353c18b5ebc6d 100644
--- a/main/sylpheed/APKBUILD
+++ b/main/sylpheed/APKBUILD
@@ -24,9 +24,13 @@ prepare() {
 
 build() {
 	cd "$srcdir/sylpheed-$pkgver"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-ldap \
-		--disable-gtkspell || return 1
+		--disable-gtkspell \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/sysfsutils/APKBUILD b/main/sysfsutils/APKBUILD
index e334e2bb64071009b5ddc1c392f420e03f92b30f..5b0860685498acf187e6faf02f0d50dec204c143 100644
--- a/main/sysfsutils/APKBUILD
+++ b/main/sysfsutils/APKBUILD
@@ -13,8 +13,12 @@ source="http://downloads.sourceforge.net/sourceforge/linux-diag/$pkgname-$pkgver
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/sysstat/APKBUILD b/main/sysstat/APKBUILD
index c3b687df1d482a433508d85c8fa3d38d89e7365d..c7cd0b8176769cbb2e24ac9fefbbd5c27b481246 100644
--- a/main/sysstat/APKBUILD
+++ b/main/sysstat/APKBUILD
@@ -14,11 +14,15 @@ source="http://pagesperso-orange.fr/sebastien.godard/sysstat-$pkgver.tar.gz"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-nls
+		--disable-nls \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/talloc/APKBUILD b/main/talloc/APKBUILD
index 979e234f6cb02b4d9e04ae8684fd40ee3392e3ef..d53483b8c2f7f51d16d108ab1ebd9137c5687c0b 100644
--- a/main/talloc/APKBUILD
+++ b/main/talloc/APKBUILD
@@ -29,9 +29,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-python \
-		--sysconfdir=/etc || return 1
+		--sysconfdir=/etc \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/tango-icon-theme/APKBUILD b/main/tango-icon-theme/APKBUILD
index ecc608f85be25a6b8ff2e5cbf705b5f350e2373a..21a84c0faeb8916e879c16921eab6bbad66a71d2 100644
--- a/main/tango-icon-theme/APKBUILD
+++ b/main/tango-icon-theme/APKBUILD
@@ -13,7 +13,11 @@ source="http://tango.freedesktop.org/releases/$pkgname-$pkgver.tar.gz"
 _builddir="$srcdir"/$pkgname-$pkgver
 build () {
 	cd "$_builddir"
-	./configure --prefix=/usr 
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/tar/APKBUILD b/main/tar/APKBUILD
index 9ef8468786a142f6bbb99cceb076f42341b0404f..a9f28dbe29ec7ed7b666274ef48ef790093c2950 100644
--- a/main/tar/APKBUILD
+++ b/main/tar/APKBUILD
@@ -22,8 +22,12 @@ prepare() {
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/tcl/APKBUILD b/main/tcl/APKBUILD
index 5f8f0c54449ec39224edf840c7557901736024e2..94f989a10fc7828013237c654f0270574f003ed2 100644
--- a/main/tcl/APKBUILD
+++ b/main/tcl/APKBUILD
@@ -8,19 +8,33 @@ arch="all"
 license="TCL"
 depends=
 makedepends=""
-source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname$pkgver-src.tar.gz"
+source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname$pkgver-src.tar.gz
+	tcl-stat64.patch
+	"
 subpackages="$pkgname-doc $pkgname-dev"
 
 _major=${pkgver%.*}
-
 _builddir="$srcdir"/tcl${pkgver}/unix
+
+prepare() {
+	cd "$srcdir"/tcl${pkgver}
+	for i in $source; do
+		case $i in
+		*.patch) msg "$i"; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
 build() {
 	local _64bit="--disable-64bit"
 	case "$CARCH" in
 		x86_64) _64bit="--enable-64bit";;
 	esac
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		$_64bit \
 		|| return 1
@@ -47,6 +61,9 @@ dev() {
 	done
 }
 
-md5sums="573aa5fe678e9185ef2b3c56b24658d3  tcl8.6.0-src.tar.gz"
-sha256sums="354422b9c4791685499123b2dfe01faa98b555c08906c010cb4449ddc75dcade  tcl8.6.0-src.tar.gz"
-sha512sums="ea64d2bb5b37b55bc424c759c67b5624e7d9a13b8bede744fd635cf668ff9e4a8681e41d94849f6c0a3564ee177268cbc3e5f287448b5a93179098d678e321f8  tcl8.6.0-src.tar.gz"
+md5sums="573aa5fe678e9185ef2b3c56b24658d3  tcl8.6.0-src.tar.gz
+5828445dcdebfbc761caecadf624bf1a  tcl-stat64.patch"
+sha256sums="354422b9c4791685499123b2dfe01faa98b555c08906c010cb4449ddc75dcade  tcl8.6.0-src.tar.gz
+ce1b6f1eab4445337c82d4c56f8d4483e312d7f65769b5e8cd7a72fdc2ac5ff5  tcl-stat64.patch"
+sha512sums="ea64d2bb5b37b55bc424c759c67b5624e7d9a13b8bede744fd635cf668ff9e4a8681e41d94849f6c0a3564ee177268cbc3e5f287448b5a93179098d678e321f8  tcl8.6.0-src.tar.gz
+cd52cbe80fd2be227c9018dbe38fa0888302293402e7a57f2e231c195b7c1902f1b58bc87d19c9d123915ca757e871abf084c0ef23b1a7f187bc03ba93904cc2  tcl-stat64.patch"
diff --git a/main/tcpdump/APKBUILD b/main/tcpdump/APKBUILD
index d7707dd23d5f759f2169b90abf7efebc12b89447..34438c3c67db96447344206d3d505f915bae4d28 100644
--- a/main/tcpdump/APKBUILD
+++ b/main/tcpdump/APKBUILD
@@ -15,6 +15,8 @@ _builddir="$srcdir"/$pkgname-$pkgver
 build () { 
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--enable-ipv6 \
diff --git a/main/tcpflow/APKBUILD b/main/tcpflow/APKBUILD
index e5c3d3c72829fd9fcfb796e3eb60692f23b5dfc6..2addf08f2b130381df1156f6501a949fa5481d90 100644
--- a/main/tcpflow/APKBUILD
+++ b/main/tcpflow/APKBUILD
@@ -17,6 +17,8 @@ _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		|| return 1
diff --git a/main/testdisk/APKBUILD b/main/testdisk/APKBUILD
index 84ca5bda3103bc79a92914b376b760d412b780ad..fa6bd4fc76ff125298db9064ba89ffd898d43d39 100644
--- a/main/testdisk/APKBUILD
+++ b/main/testdisk/APKBUILD
@@ -21,10 +21,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/texinfo/APKBUILD b/main/texinfo/APKBUILD
index 121ca9c7d2cdd32f09e70c1055700f3f41e5c36b..8e0b3abc071d9740b0b91860dcd2e8d390885c16 100644
--- a/main/texinfo/APKBUILD
+++ b/main/texinfo/APKBUILD
@@ -14,15 +14,24 @@ subpackages="$pkgname-doc"
 _builddir="$srcdir"/texinfo-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
 package() {
 	cd "$_builddir"
 	make DESTDIR=${pkgdir} install || return 1
+
 	rm -f ${pkgdir}/usr/share/info/dir
 	gzip ${pkgdir}/usr/share/info/*
+
+	rm -rf "$pkgdir"/usr/lib/charset.alias
+	rmdir -p "$pkgdir"/usr/lib 2>/dev/null
+	return 0
 }
 
 md5sums="54e250014fe698fb4832016158747c03  texinfo-5.1.tar.gz"
diff --git a/main/tftp-hpa/APKBUILD b/main/tftp-hpa/APKBUILD
index 6e4c858c86011dd199ebd238f889b03e5eaee5c1..a42bf9408b31c6e91fc36b75647533870c9d1cde 100644
--- a/main/tftp-hpa/APKBUILD
+++ b/main/tftp-hpa/APKBUILD
@@ -16,8 +16,12 @@ source="http://www.kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-$pkgve
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make
 }
 
diff --git a/main/thunar-archive-plugin/APKBUILD b/main/thunar-archive-plugin/APKBUILD
index 5662e96ecfc18473321112377527fc71145ab3a7..35104cded4d58de3605c290354db8cd8b5f06f1f 100644
--- a/main/thunar-archive-plugin/APKBUILD
+++ b/main/thunar-archive-plugin/APKBUILD
@@ -14,11 +14,15 @@ source="http://archive.xfce.org/src/thunar-plugins/thunar-archive-plugin/${pkgve
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/xfce4 \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/thunar-vcs-plugin/APKBUILD b/main/thunar-vcs-plugin/APKBUILD
index d8272390b02c09aa99bf9ecfa9ff0332aa5e4598..c996d8cdd9905a4953d8282d3fd4308972d7683e 100644
--- a/main/thunar-vcs-plugin/APKBUILD
+++ b/main/thunar-vcs-plugin/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--libexecdir=/usr/lib/xfce4 \
 		--disable-static \
 		--enable-subversion \
diff --git a/main/thunar-volman/APKBUILD b/main/thunar-volman/APKBUILD
index d889ff9de19fdcc68cabff6f342ae518e0bfc525..ac069e484e187a998be80fcb03e38737fa78e8ef 100644
--- a/main/thunar-volman/APKBUILD
+++ b/main/thunar-volman/APKBUILD
@@ -21,10 +21,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/thunar/APKBUILD b/main/thunar/APKBUILD
index 717f8b6f1fa7ca812decaf698a8e8cc69e73f644..a95c18216408c109307d2564160da8b1f9a11b7d 100644
--- a/main/thunar/APKBUILD
+++ b/main/thunar/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
diff --git a/main/tiff/APKBUILD b/main/tiff/APKBUILD
index 2bfdb997a8eb6c35def83c91e29d9ab5e7e7d6e2..97aa35152460ecf28da16da1081ec8e41042fc69 100644
--- a/main/tiff/APKBUILD
+++ b/main/tiff/APKBUILD
@@ -30,11 +30,15 @@ prepare() {
 build() {
 	cd "$_builddir"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-cxx
+		--disable-cxx \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/tig/APKBUILD b/main/tig/APKBUILD
index 62edd3d66132160019b16db072594245acef4b85..51903154e87ecfaaff487f10f7eecc202b5f2d42 100644
--- a/main/tig/APKBUILD
+++ b/main/tig/APKBUILD
@@ -18,6 +18,8 @@ _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
diff --git a/main/tinc/APKBUILD b/main/tinc/APKBUILD
index 704f032dfcae959fefc53c4bb45a1bb6dc4e1b10..51118d0aa04a0db61663f61d804b883cbc468686 100644
--- a/main/tinc/APKBUILD
+++ b/main/tinc/APKBUILD
@@ -23,13 +23,17 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--enable-jumbograms \
 		--enable-lzo \
-		--enable-zlib
+		--enable-zlib \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/tinyproxy/APKBUILD b/main/tinyproxy/APKBUILD
index 0bcb89648d2885c650da3a3c256eb2842683e463..1240e1240656b39530668f71818198e01f8d67b3 100644
--- a/main/tinyproxy/APKBUILD
+++ b/main/tinyproxy/APKBUILD
@@ -36,11 +36,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--localstatedir=/var \
 		--sysconfdir=/etc/tinyproxy \
 		--disable-dependency-tracking \
-		|| return
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/tlsdate/APKBUILD b/main/tlsdate/APKBUILD
index eb0058e5f17e59468001201e05dcfde5bd3e216c..c072d8ef49b24a405ab7235315b018680b886146 100644
--- a/main/tlsdate/APKBUILD
+++ b/main/tlsdate/APKBUILD
@@ -28,9 +28,13 @@ prepare() {
 build() {
 	cd "$_builddir"
 	autoreconf --install
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-static \
-		--sysconfdir=/etc || return 1
+		--sysconfdir=/etc \
+		|| return 1
 	make CFLAGS+="-DUNPRIV_GROUP='\"nobody\"'" || return 1
 }
 
diff --git a/main/tmux/APKBUILD b/main/tmux/APKBUILD
index 918ad1b098d5afcf2f59e0f130a15c68f5f96c3b..ae5f98a273c9be2e70996abf77d1a86ac46275ac 100644
--- a/main/tmux/APKBUILD
+++ b/main/tmux/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr\
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		|| return 1
 	make || return 1
 }
diff --git a/main/transmission/APKBUILD b/main/transmission/APKBUILD
index 49bc46e24878c5c4e7d2c07fd56b5fc4f86f8ef6..88cc2fa65a39c3867e253e5c99676adcf2ccc86a 100644
--- a/main/transmission/APKBUILD
+++ b/main/transmission/APKBUILD
@@ -36,11 +36,14 @@ prepare() {
 build() {
         cd "$_builddir"
 
-        ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --mandir=/usr/share/man \
-                --infodir=/usr/share/info \
-                --localstatedir=/var \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
 		--enable-utp \
 		--with-inotify \
 		|| return 1
diff --git a/main/tumbler/APKBUILD b/main/tumbler/APKBUILD
index fe814e920dea5e86c7bf242324fef1a81314b45d..b24554f528e97bb8c09ca62c90fcc5d965af1e3c 100644
--- a/main/tumbler/APKBUILD
+++ b/main/tumbler/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/tvheadend/APKBUILD b/main/tvheadend/APKBUILD
index 39b267676904d5fe0ceb13f31d7cde06aa894693..80eb7c76f468d6ab0adf527232e21ef45de4bb93 100644
--- a/main/tvheadend/APKBUILD
+++ b/main/tvheadend/APKBUILD
@@ -32,15 +32,18 @@ prepare() {
 
 build() {
         cd "$_builddir"
-        ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --mandir=/usr/share/man \
-                --infodir=/usr/share/info \
-                --localstatedir=/var \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
 		--release \
-                --enable-dvbcsa \
+		--enable-dvbcsa \
 		--disable-libav \
-                || return 1
+		|| return 1
         make || return 1
 }
 
diff --git a/main/ucarp/APKBUILD b/main/ucarp/APKBUILD
index 8e8da21eec2737f60fc714533a927f3877ee425e..e7639dd42cadad3bc7d77854269ce8d3187ded51 100644
--- a/main/ucarp/APKBUILD
+++ b/main/ucarp/APKBUILD
@@ -21,11 +21,15 @@ source="http://download.pureftpd.org/pub/ucarp/$pkgname-$pkgver.tar.gz
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-nls
+		--disable-nls \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/udev/APKBUILD b/main/udev/APKBUILD
index 7fce39d00b2443eb812b39b4dccd1c10ccd90ab7..390625261cb7ceb06ab9058586b17006c3d05651 100644
--- a/main/udev/APKBUILD
+++ b/main/udev/APKBUILD
@@ -20,7 +20,10 @@ source="http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.ta
 build () 
 { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--sbindir=/sbin \
 		--libdir=/usr/lib \
diff --git a/main/udisks/APKBUILD b/main/udisks/APKBUILD
index 62b01659187beff65d4c64991276a74efe77d38c..ab01329b5683388126a830d6c6c07c2e2b6ec999 100644
--- a/main/udisks/APKBUILD
+++ b/main/udisks/APKBUILD
@@ -30,7 +30,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/udisks2/APKBUILD b/main/udisks2/APKBUILD
index 70c9be167e761bb8f078aa5a066a71b22df8fac4..c8bf6620d54e6beb31f50b3a8e432bb04c5910df 100644
--- a/main/udisks2/APKBUILD
+++ b/main/udisks2/APKBUILD
@@ -31,7 +31,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/ulogd/APKBUILD b/main/ulogd/APKBUILD
index de590c2fd62c6c93e6a9f5d721894e9aa32a4533..72a5181a8fc8c359db5e01f67918d32b0555aad6 100644
--- a/main/ulogd/APKBUILD
+++ b/main/ulogd/APKBUILD
@@ -21,12 +21,16 @@ _builddir="$srcdir/$pkgname-$pkgver"
 build() {
 	cd "$_builddir"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--with-pgsql \
-		--with-mysql
+		--with-mysql \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/umix/APKBUILD b/main/umix/APKBUILD
index 97062edfbbb3c7cce7f0e85948b587eee752617a..ec07cc7e0876272be25d7a83ab3ab27ef6b5c44f 100644
--- a/main/umix/APKBUILD
+++ b/main/umix/APKBUILD
@@ -16,10 +16,14 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/unbound/APKBUILD b/main/unbound/APKBUILD
index 00639a8bb57cc5d32f201c59b84e5f37e5fc2451..43ac363205b4d79d7d713fd323cf79e45908b605 100644
--- a/main/unbound/APKBUILD
+++ b/main/unbound/APKBUILD
@@ -35,7 +35,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--with-pidfile=/var/run/unbound/unbound.pid \
 		--with-username=unbound \
diff --git a/main/unfs3/APKBUILD b/main/unfs3/APKBUILD
index d39d77347d4c762a11c4ff651412a30ebbeadd6c..41c4e580add4f8eb0ae99f2f180c23050d81efd2 100644
--- a/main/unfs3/APKBUILD
+++ b/main/unfs3/APKBUILD
@@ -14,8 +14,12 @@ subpackages="$pkgname-doc"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make -j1 || return 1
 	make DESTDIR="$pkgdir/" install
 }
diff --git a/main/unixodbc/APKBUILD b/main/unixodbc/APKBUILD
index 81080280ee445437bb6c52ac00b4d579b54372ba..0b0ceadda6e4758258920105a3f469d2168d4f30 100644
--- a/main/unixodbc/APKBUILD
+++ b/main/unixodbc/APKBUILD
@@ -17,12 +17,16 @@ _builddir="$srcdir/unixODBC-$pkgver"
 build() {
 	cd "$_builddir"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--disable-nls \
-		--enable-gui=no
+		--enable-gui=no \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/upower/APKBUILD b/main/upower/APKBUILD
index 1d0a6eae5a29f585520e304a977a1e607fa0364b..3e2a7c764c32ca304b303774e48b8dfcf9746f4f 100644
--- a/main/upower/APKBUILD
+++ b/main/upower/APKBUILD
@@ -15,11 +15,15 @@ source="http://upower.freedesktop.org/releases/upower-$pkgver.tar.xz"
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--libexecdir=/usr/lib/upower \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make
 }
 
diff --git a/main/usbredir/APKBUILD b/main/usbredir/APKBUILD
index 0e0614fdec4b24764a014ebdccd478ac55318dc5..03ff7a142e2477a3c979485c6f6d95c0b9401d7f 100644
--- a/main/usbredir/APKBUILD
+++ b/main/usbredir/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/usbutils/APKBUILD b/main/usbutils/APKBUILD
index 2841475b3a0ee6c5ee1d9c0ff927b2489e000bbe..299d7f52b69dc5aaba2862fe1004cbca38b2e759 100644
--- a/main/usbutils/APKBUILD
+++ b/main/usbutils/APKBUILD
@@ -15,10 +15,14 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--datadir=/usr/share/hwdata \
 		--disable-usbids \
-		--disable-zlib
+		--disable-zlib \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/util-macros/APKBUILD b/main/util-macros/APKBUILD
index f2a1910ef87b0a3f0a5418146a849556eba9150d..5a9f32ebf06f4f9a5dc023c849b17e76c21ac981 100644
--- a/main/util-macros/APKBUILD
+++ b/main/util-macros/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org/releases/individual/util/$pkgname-$pkgver.ta
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/util-vserver/APKBUILD b/main/util-vserver/APKBUILD
index f06ece122a34976c70763d5e3f2702a4b0e534ee..2f970c7c25a3be875c7926833773a32374c10e56 100644
--- a/main/util-vserver/APKBUILD
+++ b/main/util-vserver/APKBUILD
@@ -33,7 +33,10 @@ prepare() {
 build() {
 	local i
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc \
 		--with-initscripts=gentoo \
diff --git a/main/v4l-utils/APKBUILD b/main/v4l-utils/APKBUILD
index a1884ff87e291191285e18de67e6decf5c8215ce..b8fb807c500873ec0a04243b204ebb7c6729b553 100644
--- a/main/v4l-utils/APKBUILD
+++ b/main/v4l-utils/APKBUILD
@@ -33,13 +33,16 @@ build() {
         if [ "$ALPINE_LIBC" != "eglibc" ]; then
 		export LDFLAGS="$LDFLAGS -largp -liconv"
 	fi
-	./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --mandir=/usr/share/man \
-                --infodir=/usr/share/info \
-                --localstatedir=/var \
-                --disable-static \
-                || return 1	
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--disable-static \
+		|| return 1	
         make || return 1
 }
 
diff --git a/main/v86d/APKBUILD b/main/v86d/APKBUILD
index 2a15f0159bc2a8df0b82d29aff773b5b3e477f1c..7e6ae9ede7464bc46b780cf19fb048cdbe50935e 100644
--- a/main/v86d/APKBUILD
+++ b/main/v86d/APKBUILD
@@ -14,7 +14,11 @@ source="http://dev.gentoo.org/~spock/projects/uvesafb/archive/$pkgname-$pkgver.t
 build () 
 { 
 	cd "$srcdir"/v86d-$pkgver
-	./configure --with-x86emu
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--with-x86emu \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/vala/APKBUILD b/main/vala/APKBUILD
index ad341e59bc569dd7ae00dce918b1ef4177eada79..693c24645513a4df462ff7781c55ba5fde901420 100644
--- a/main/vala/APKBUILD
+++ b/main/vala/APKBUILD
@@ -25,8 +25,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--enable-vapigen || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--enable-vapigen \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/valgrind/APKBUILD b/main/valgrind/APKBUILD
index a04b508380cbf3827d293fa46a5cc8b9cf420768..beebe55850850657a98ccad9db31863cf85aa9b9 100644
--- a/main/valgrind/APKBUILD
+++ b/main/valgrind/APKBUILD
@@ -36,9 +36,13 @@ build() {
 	# fails to build with ccache
 	export CC="gcc"
 	export CFLAGS="$CFLAGS -fno-stack-protector -fno-pie"
-	./configure --prefix=/usr \
-		 --without-mpicc \
-		--mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--without-mpicc \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/vanessa_adt/APKBUILD b/main/vanessa_adt/APKBUILD
index 938e7ff53fc7e8f055b38daabea8862cc1557295..3e84140036469acde8bfaf7e7d9820d38e8002c8 100644
--- a/main/vanessa_adt/APKBUILD
+++ b/main/vanessa_adt/APKBUILD
@@ -24,10 +24,14 @@ prepare() {
 build() {
 	export LDFLAGS="$LDFLAGS -lvanessa_logger"
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/vanessa_logger/APKBUILD b/main/vanessa_logger/APKBUILD
index 3fc1f8f4fec10f3a8b191581ee659cfa0a3309b3..53c6533f6d813b4e7f31b53c9f151f4d40ebde8b 100644
--- a/main/vanessa_logger/APKBUILD
+++ b/main/vanessa_logger/APKBUILD
@@ -23,10 +23,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/vanessa_socket/APKBUILD b/main/vanessa_socket/APKBUILD
index a49474c22e6df39129dc3ffaad8efe7e265942f6..227e8ed644f6ffdb44658c6e3d2fec8a10e3cf9a 100644
--- a/main/vanessa_socket/APKBUILD
+++ b/main/vanessa_socket/APKBUILD
@@ -24,10 +24,14 @@ prepare() {
 build() {
 	export LDFLAGS="$LDFLAGS -lvanessa_logger"
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/varnish/APKBUILD b/main/varnish/APKBUILD
index 74edee65cf93208838ba42304baa8eee80e42997..5af7c5c675fcecdf6c00bd0ff418505520b21839 100644
--- a/main/varnish/APKBUILD
+++ b/main/varnish/APKBUILD
@@ -34,7 +34,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/vde2/APKBUILD b/main/vde2/APKBUILD
index 76a6794871d78def9c9a7c18122a42858f591545..a7a23dc33ce8bd7fd3e46e9ebb8531489c5ffffd 100644
--- a/main/vde2/APKBUILD
+++ b/main/vde2/APKBUILD
@@ -19,7 +19,10 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		|| return 1
 	make -C src/common || return 1
diff --git a/main/videoproto/APKBUILD b/main/videoproto/APKBUILD
index 4128949afa91673a630b428741f18d666cddf8a3..625c9d66d2152e399bdea0c06ac03c7e259edf1d 100644
--- a/main/videoproto/APKBUILD
+++ b/main/videoproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD
index 9c2523a1f9b79c2253ccc7b3ab01916be6edd2d0..04d441b4eaff851ae2a8261a5d467c879a3294c4 100644
--- a/main/vim/APKBUILD
+++ b/main/vim/APKBUILD
@@ -27,12 +27,16 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-luainterp \
 		--without-x \
 		--disable-nls \
 		--enable-multibyte \
-		--enable-gui=no
+		--enable-gui=no \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD
index 6d20b3ca63c22d6b661b585d6c75c34ba4ad9397..bacdb28a1afee880c86893b2a91d40879e0cd6a2 100644
--- a/main/vlc/APKBUILD
+++ b/main/vlc/APKBUILD
@@ -100,7 +100,10 @@ build ()
 	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
 	export CXXFLAGS="$CXXFLAGS -fpermissive"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-mmx \
 		--disable-nls \
 		--disable-optimizations \
diff --git a/main/vte/APKBUILD b/main/vte/APKBUILD
index d862f0687c3f914fc22d8fb1f29ba2e3ae28c836..9d41d5110bcb1f3d04b310ae77fe106eb81de9dc 100644
--- a/main/vte/APKBUILD
+++ b/main/vte/APKBUILD
@@ -25,7 +25,10 @@ prepare() {
 }
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/vte \
 		--localstatedir=/var \
diff --git a/main/vte3/APKBUILD b/main/vte3/APKBUILD
index 4520132a375ec952b1ee54ecdb0f6d2bbc0261de..c0777d8d099493f8d10b0d8e9b33c2eb6d1a4d6d 100644
--- a/main/vte3/APKBUILD
+++ b/main/vte3/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 }
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/$pkgname \
 		--localstatedir=/var \
diff --git a/main/wavpack/APKBUILD b/main/wavpack/APKBUILD
index def61f19c703d819978fb67bbc6cb1d5b111183a..83658b91b1cdd393072f79328fb61cb191846712 100644
--- a/main/wavpack/APKBUILD
+++ b/main/wavpack/APKBUILD
@@ -31,12 +31,16 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--enable-mmx \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/webkitgtk/APKBUILD b/main/webkitgtk/APKBUILD
index 209f6e5c062ec39907aabe1f7c5686eba02b661c..c9ca0bea25feda2d7403b24e62b1bb0ccb7efc1a 100644
--- a/main/webkitgtk/APKBUILD
+++ b/main/webkitgtk/APKBUILD
@@ -68,7 +68,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/wget/APKBUILD b/main/wget/APKBUILD
index 072352fd8f840478aabc13c19457514019b7a220..204536e705572ce6bed19d50c8bc081231c4023e 100644
--- a/main/wget/APKBUILD
+++ b/main/wget/APKBUILD
@@ -17,6 +17,8 @@ _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD
index 8d5346f1d478a8c373b259d1767bedfbd94c401c..665fcd9cc90d6531db3f3cd96c704f56a7e272b4 100644
--- a/main/wine/APKBUILD
+++ b/main/wine/APKBUILD
@@ -35,9 +35,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-dbus \
-		--with-x
+		--with-x \
+		|| return 1
 	make 
 }
 
diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD
index 413fc82eb469cc1434225bebf145970b4b91d00b..999f9319dc7ea57bb0b744b481f1d9a20a7e8c18 100644
--- a/main/wireshark/APKBUILD
+++ b/main/wireshark/APKBUILD
@@ -33,7 +33,10 @@ prepare() {
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -41,7 +44,8 @@ build() {
 		--with-gnutls \
 		--disable-text2pcap \
 		--disable-dftest \
-		--disable-randpkt
+		--disable-randpkt \
+		|| return 1
 	make
 }
 
diff --git a/main/wv/APKBUILD b/main/wv/APKBUILD
index 16488cc166818280ff43a5d6a900d784d0fff024..8a1c941fec03255df4595bf42091ec5b550acf11 100644
--- a/main/wv/APKBUILD
+++ b/main/wv/APKBUILD
@@ -18,8 +18,12 @@ prepare() {
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/wxgtk/APKBUILD b/main/wxgtk/APKBUILD
index 9aa4167191e8c1ab163fd685911eb16079365e0d..d8d0e97e5f2211102b4da05ef26ecf636a7a0ce2 100644
--- a/main/wxgtk/APKBUILD
+++ b/main/wxgtk/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-sdl \
 		--enable-unicode \
 		--enable-no_deps \
diff --git a/main/x264/APKBUILD b/main/x264/APKBUILD
index d34eea129c2a0a94f093881b9ce13fed581055b0..663404e560758934d80aaae681cf71d7a8d2b9b2 100644
--- a/main/x264/APKBUILD
+++ b/main/x264/APKBUILD
@@ -17,11 +17,15 @@ build() {
 	if [ "$CARCH" = "x86" ]; then
 		_asmopts="--disable-asm"
 	fi
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-visualize \
 		--enable-shared \
 		$_asmopts \
-		--enable-pic || return 1
+		--enable-pic \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xarchiver/APKBUILD b/main/xarchiver/APKBUILD
index b8ea83d27ba1c8a85a0f534b47c5e40b8ae08e44..2ba0696b9a7a442c288e477b7a013a868834e98e 100644
--- a/main/xarchiver/APKBUILD
+++ b/main/xarchiver/APKBUILD
@@ -20,8 +20,12 @@ prepare() {
 
 build() {
 	cd "$srcdir/xarchiver-$pkgver"
-	./configure --prefix=/usr \
-		--libexecdir=/usr/lib/xfce4 || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--libexecdir=/usr/lib/xfce4 \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xauth/APKBUILD b/main/xauth/APKBUILD
index f5d80992162b0b96da352bc91efc7ccdefc65055..cf3696dd25beb56f6d26361c8d8fe2ad931278ce 100644
--- a/main/xauth/APKBUILD
+++ b/main/xauth/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org/releases/individual/app/xauth-$pkgver.tar.bz
 
 build() {
 	cd "$srcdir"/xauth-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xbacklight/APKBUILD b/main/xbacklight/APKBUILD
index 657ce84e5ba4170e12b7570d8a3feded561ac0c5..42aa3d1f314f561c7693f7f42f7f05da93f25b59 100644
--- a/main/xbacklight/APKBUILD
+++ b/main/xbacklight/APKBUILD
@@ -13,7 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xbitmaps/APKBUILD b/main/xbitmaps/APKBUILD
index 646f641fde75c5bf94f5e6d96abbcf8fd6973d81..c2e8f416005342ff88f5ee046e011e1e5972945f 100644
--- a/main/xbitmaps/APKBUILD
+++ b/main/xbitmaps/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org/releases/individual/data/$pkgname-$pkgver.ta
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xbmc-pvr-addons/APKBUILD b/main/xbmc-pvr-addons/APKBUILD
index 63310b4d1422969437be6fbcd6fabee548025dae..dc20f3100226f79eb03078ce15b0822aee4c33bb 100644
--- a/main/xbmc-pvr-addons/APKBUILD
+++ b/main/xbmc-pvr-addons/APKBUILD
@@ -34,7 +34,10 @@ prepare() {
 build() {
 	cd "$_builddir"
 	./bootstrap || return 1
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/xbmc/APKBUILD b/main/xbmc/APKBUILD
index f42fec0e5be605e65a58838a5543657f6be23e2f..ac9542cc9f309a563ce3c2fd59291cd9b0deb8e3 100644
--- a/main/xbmc/APKBUILD
+++ b/main/xbmc/APKBUILD
@@ -44,7 +44,10 @@ prepare() {
 build() {
 	cd "$_builddir"
 	./bootstrap || return 1
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/xcb-proto/APKBUILD b/main/xcb-proto/APKBUILD
index d313a94a3b29bceb01c909f7c9e477ffe4827d8b..7103dc3ac4c09d047208c0b8398cdcbef30a414e 100644
--- a/main/xcb-proto/APKBUILD
+++ b/main/xcb-proto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir"/${pkgname}-${pkgver}
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xcb-util-image/APKBUILD b/main/xcb-util-image/APKBUILD
index 7f18e70921de537321b3fd6ea884b6860047c3f7..06f479b8a9012f2b9b0eddb00e062edc224c46c7 100644
--- a/main/xcb-util-image/APKBUILD
+++ b/main/xcb-util-image/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/xcb-util-keysyms/APKBUILD b/main/xcb-util-keysyms/APKBUILD
index 57292c54c51b7e88366319c0e5092aec17b78b5d..8b2951025086eb50ff11422ecc35e6f937cc0199 100644
--- a/main/xcb-util-keysyms/APKBUILD
+++ b/main/xcb-util-keysyms/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/xcb-util-renderutil/APKBUILD b/main/xcb-util-renderutil/APKBUILD
index 2e95f1d5d319689051cb7a88f4612b3d18a95502..d61122a9b8ba1bb3db73514efd454bca6d5afb39 100644
--- a/main/xcb-util-renderutil/APKBUILD
+++ b/main/xcb-util-renderutil/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/xcb-util-wm/APKBUILD b/main/xcb-util-wm/APKBUILD
index cec44432df4ca26cfe790beb8b0f8e846b536178..a9ab2a8230ddf9a87ac9e92da8f76721bc31cb5f 100644
--- a/main/xcb-util-wm/APKBUILD
+++ b/main/xcb-util-wm/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/xcb-util/APKBUILD b/main/xcb-util/APKBUILD
index 0796e789c31c7e73a06e51d158c056da18fb5156..4b0b2a6d45974a6b4f3f3e69c36c7ad7686c8a31 100644
--- a/main/xcb-util/APKBUILD
+++ b/main/xcb-util/APKBUILD
@@ -14,7 +14,12 @@ source="http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --disable-static || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xchat/APKBUILD b/main/xchat/APKBUILD
index 8ba2a091cc76fb5b036d460c4dc2c59a50fb3a54..2091d59ea87cd291ddd841b29e2c2d5c2b640a88 100644
--- a/main/xchat/APKBUILD
+++ b/main/xchat/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--enable-openssl \
 		--enable-dbus \
@@ -37,7 +40,8 @@ build() {
 		--disable-python \
 		--enable-ipv6 \
 		--enable-shm \
-		--enable-spell=static || return 1
+		--enable-spell=static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xcmiscproto/APKBUILD b/main/xcmiscproto/APKBUILD
index 6f4aa429e47f68e774ace8ffda7d28ba10dfd630..3f7edb9a5b23d56ecdc5cf3ca593569632f32d92 100644
--- a/main/xcmiscproto/APKBUILD
+++ b/main/xcmiscproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xcmsdb/APKBUILD b/main/xcmsdb/APKBUILD
index 1a7b9a94c12a9c377dbdbb9a418ff949105de64e..526a59111ac5e0e4117e30187230354d491bb80d 100644
--- a/main/xcmsdb/APKBUILD
+++ b/main/xcmsdb/APKBUILD
@@ -13,7 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xdelta3/APKBUILD b/main/xdelta3/APKBUILD
index cadc708966cc70f136dddbc020c42c99d0093a2b..8fd1df563381442f9bf744b1f4cae11a67fb7ba9 100644
--- a/main/xdelta3/APKBUILD
+++ b/main/xdelta3/APKBUILD
@@ -12,7 +12,11 @@ source="http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz"
 
 build() { 
 	cd $srcdir/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make
 }
 
diff --git a/main/xdg-utils/APKBUILD b/main/xdg-utils/APKBUILD
index b31b5f12131ac1c63fe074ec3aee8f4f3440bc8c..c94a5a1e45df308b7d6eb879d7cd9a7741a14fc6 100644
--- a/main/xdg-utils/APKBUILD
+++ b/main/xdg-utils/APKBUILD
@@ -28,10 +28,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xdpyinfo/APKBUILD b/main/xdpyinfo/APKBUILD
index aacbf836b1bafe74cbaa704715f54f2f393d0372..5e57ff0d96a26ba38e18dcaee8dbadc17420b554 100644
--- a/main/xdpyinfo/APKBUILD
+++ b/main/xdpyinfo/APKBUILD
@@ -13,8 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
diff --git a/main/xdriinfo/APKBUILD b/main/xdriinfo/APKBUILD
index 07368425ec66867d6494b09fac3dd0a4defbb14a..a28c0ebae703d8a0bb2c2aeef449a2ea2b00e277 100644
--- a/main/xdriinfo/APKBUILD
+++ b/main/xdriinfo/APKBUILD
@@ -13,8 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index 8c4abb98dccb67111d7c3b1cc36e4ae0dfb5dcf9..7ec7f33e907c3a379fb7cdd43334b330b60e876d 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -76,7 +76,10 @@ build() {
 	cd "$_builddir"
 
 	msg "Running configure..."
-	./configure || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		|| return 1
 
 	# Unset CFLAGS and LDFLAGS because the xen build system
 	# doesn't support them. Instead use .config in xen root
diff --git a/main/xev/APKBUILD b/main/xev/APKBUILD
index b2c40357e7891ac369b032631f6dd09c12ba13c3..2123a720b3432b0d2f55561839923d6f2c65f5d6 100644
--- a/main/xev/APKBUILD
+++ b/main/xev/APKBUILD
@@ -13,8 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
diff --git a/main/xextproto/APKBUILD b/main/xextproto/APKBUILD
index daf511942d69b0f63b8d72c65eafbd94fdfec17f..5e720959ecceb18909892158ce43749a4abde4e6 100644
--- a/main/xextproto/APKBUILD
+++ b/main/xextproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.t
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-input-evdev/APKBUILD b/main/xf86-input-evdev/APKBUILD
index e73ba221d654eded7370aa5060c425dd2b1aed42..691b99076d3d9fd60f007b03cd9b0e6c2b88643d 100644
--- a/main/xf86-input-evdev/APKBUILD
+++ b/main/xf86-input-evdev/APKBUILD
@@ -16,7 +16,10 @@ build() {
 	cd "$srcdir"/$pkgname-$pkgver
 
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		|| return 1
 	make
 }
diff --git a/main/xf86-input-keyboard/APKBUILD b/main/xf86-input-keyboard/APKBUILD
index b5bba71b1c31f9a4c0339d4fe0ddccedf449db3e..4024896c9b855f299f6cfef38ef23f533dcefa06 100644
--- a/main/xf86-input-keyboard/APKBUILD
+++ b/main/xf86-input-keyboard/APKBUILD
@@ -14,7 +14,11 @@ source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-input-mouse/APKBUILD b/main/xf86-input-mouse/APKBUILD
index 32278431e314304b6f7cdece1c617bce749d0964..31027bda445053e9afa4eaed6a31795ddecf1535 100644
--- a/main/xf86-input-mouse/APKBUILD
+++ b/main/xf86-input-mouse/APKBUILD
@@ -14,7 +14,11 @@ source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-input-synaptics/APKBUILD b/main/xf86-input-synaptics/APKBUILD
index 1ca6747198387cec973bc6e622d3e7ec0fa011b3..9ec72b027551f33c5b0fc900a2935aa77ca06dce 100644
--- a/main/xf86-input-synaptics/APKBUILD
+++ b/main/xf86-input-synaptics/APKBUILD
@@ -15,7 +15,11 @@ source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-input-vmmouse/APKBUILD b/main/xf86-input-vmmouse/APKBUILD
index aaf6ae595fe938d9ddd33a8eb2010b272a2ce8f7..7139b8d0c4a208b9d310efa0fbbe7d8d0ec2fa03 100644
--- a/main/xf86-input-vmmouse/APKBUILD
+++ b/main/xf86-input-vmmouse/APKBUILD
@@ -14,7 +14,11 @@ source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-apm/APKBUILD b/main/xf86-video-apm/APKBUILD
index b62539ddaec64bb55f8e84d4a6393f49a55d1569..9621f1e4a29a29816a2847148a7c34b463609ed2 100644
--- a/main/xf86-video-apm/APKBUILD
+++ b/main/xf86-video-apm/APKBUILD
@@ -28,7 +28,11 @@ build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-ark/APKBUILD b/main/xf86-video-ark/APKBUILD
index 32e0cd093fbeb218df1b4c349ab16fc0d8cc3187..1ba1d8ee35ead992cb8f9df5a894e0d6cd7a8571 100644
--- a/main/xf86-video-ark/APKBUILD
+++ b/main/xf86-video-ark/APKBUILD
@@ -26,7 +26,11 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-ast/APKBUILD b/main/xf86-video-ast/APKBUILD
index d770103958ae58f22805437b65b32cca22704476..57d1a7ac7fb613eddfc969cc9ab44c801e6b60e2 100644
--- a/main/xf86-video-ast/APKBUILD
+++ b/main/xf86-video-ast/APKBUILD
@@ -26,7 +26,11 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-ati/APKBUILD b/main/xf86-video-ati/APKBUILD
index 2244e59dd1efb6bee10038bc073a836ed7751d2d..89a4c8551e0eeae7c1c6ecfd2db066b4ed4f99f0 100644
--- a/main/xf86-video-ati/APKBUILD
+++ b/main/xf86-video-ati/APKBUILD
@@ -34,7 +34,10 @@ build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-dri \
 		--enable-kms \
 		|| return 1
diff --git a/main/xf86-video-chips/APKBUILD b/main/xf86-video-chips/APKBUILD
index 9b739621a94d814970fb791c7e8bcdc570414bd9..d06527a25bff329fdad4ae334b5640e65178ca1c 100644
--- a/main/xf86-video-chips/APKBUILD
+++ b/main/xf86-video-chips/APKBUILD
@@ -27,7 +27,11 @@ prepare() {
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-cirrus/APKBUILD b/main/xf86-video-cirrus/APKBUILD
index eb9f0381358da72f5f7aa6beb948aad6b17b48b4..160a38318a4a2082bd242f547917a2ae0353083b 100644
--- a/main/xf86-video-cirrus/APKBUILD
+++ b/main/xf86-video-cirrus/APKBUILD
@@ -25,7 +25,11 @@ prepare() {
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-dummy/APKBUILD b/main/xf86-video-dummy/APKBUILD
index 7d08b9602b0e126e0ede3001514187a88d57fd50..e891d074f07376c538ff4686d37c80a6dfb80a74 100644
--- a/main/xf86-video-dummy/APKBUILD
+++ b/main/xf86-video-dummy/APKBUILD
@@ -26,7 +26,11 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-fbdev/APKBUILD b/main/xf86-video-fbdev/APKBUILD
index b20df67bed0f16cb779896614ae27225e9f852f2..54c13c864247562aa994260fc3fa809f4a94a4cc 100644
--- a/main/xf86-video-fbdev/APKBUILD
+++ b/main/xf86-video-fbdev/APKBUILD
@@ -27,7 +27,11 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-geode/APKBUILD b/main/xf86-video-geode/APKBUILD
index 1243689be104cddc7eb6b93025749d82c4213034..9bd45d995808e09e5425a37d0765296d6fd963c7 100644
--- a/main/xf86-video-geode/APKBUILD
+++ b/main/xf86-video-geode/APKBUILD
@@ -26,7 +26,11 @@ prepare() {
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-glint/APKBUILD b/main/xf86-video-glint/APKBUILD
index 079bd2c7c9798f0e9b897eb82aff8683a7acab8d..94d3f4e21d24e09d99937a2fc0782eea921e4c7a 100644
--- a/main/xf86-video-glint/APKBUILD
+++ b/main/xf86-video-glint/APKBUILD
@@ -28,7 +28,11 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-i128/APKBUILD b/main/xf86-video-i128/APKBUILD
index 263a0a49ef01588f93229e5d7f0ed0f6385a4d79..f2f3ef5a184b9d2d626b421f3d2cb7389664e2e2 100644
--- a/main/xf86-video-i128/APKBUILD
+++ b/main/xf86-video-i128/APKBUILD
@@ -27,7 +27,11 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-i740/APKBUILD b/main/xf86-video-i740/APKBUILD
index bfa9958a32088d85c86564a455c07983ce85d5f4..80a71a782e47cf463830282f2b92c4bcce51fb2f 100644
--- a/main/xf86-video-i740/APKBUILD
+++ b/main/xf86-video-i740/APKBUILD
@@ -27,7 +27,11 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-intel/APKBUILD b/main/xf86-video-intel/APKBUILD
index dcfc73ca26aecce48aa467b54274f3ab845e4399..eaf5412e3c998f2757117bf5547a77193fcfe657 100644
--- a/main/xf86-video-intel/APKBUILD
+++ b/main/xf86-video-intel/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-xvmc \
 		--disable-selective-werror \
 		|| return 1
diff --git a/main/xf86-video-mach64/APKBUILD b/main/xf86-video-mach64/APKBUILD
index a8e0ea2755aea25685986125dc36a3638dac7548..1ba510150ab0af2495cb8213ee82566084d09dfe 100644
--- a/main/xf86-video-mach64/APKBUILD
+++ b/main/xf86-video-mach64/APKBUILD
@@ -18,7 +18,11 @@ source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-nouveau/APKBUILD b/main/xf86-video-nouveau/APKBUILD
index 6317109596b45d90e4dd932025d7f01cabaae451..d2db8b3cda4546b8a6839256d9b4dd6238545048 100644
--- a/main/xf86-video-nouveau/APKBUILD
+++ b/main/xf86-video-nouveau/APKBUILD
@@ -29,7 +29,11 @@ mksource() {
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-nv/APKBUILD b/main/xf86-video-nv/APKBUILD
index 9c0900781699b5dc3a64a02810b2f0b9eb433794..ea6c985c3a495c8a557dd5150b68aebd47b0b71d 100644
--- a/main/xf86-video-nv/APKBUILD
+++ b/main/xf86-video-nv/APKBUILD
@@ -27,7 +27,11 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make 
 }
 
diff --git a/main/xf86-video-openchrome/APKBUILD b/main/xf86-video-openchrome/APKBUILD
index a9e66766ce8f45ef8d97e7f4f6bee9eab5a91bc7..741f69d31a43cd79a692bc29479160646ea80c48 100644
--- a/main/xf86-video-openchrome/APKBUILD
+++ b/main/xf86-video-openchrome/APKBUILD
@@ -29,7 +29,11 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-qxl/APKBUILD b/main/xf86-video-qxl/APKBUILD
index 80f92f48b52c1682a7bd5d7e95299c0540978c77..884bc0a648b61ad99bc0b50b1aca403cf8ac5e97 100644
--- a/main/xf86-video-qxl/APKBUILD
+++ b/main/xf86-video-qxl/APKBUILD
@@ -29,7 +29,10 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/xf86-video-r128/APKBUILD b/main/xf86-video-r128/APKBUILD
index aedd198e4cc00fce22af8f27a65332b74f596be2..79d2b50cef53cc98b3382c758a2895d475be4a54 100644
--- a/main/xf86-video-r128/APKBUILD
+++ b/main/xf86-video-r128/APKBUILD
@@ -18,7 +18,10 @@ source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-dri \
 		|| return 1
 	make || return 1
diff --git a/main/xf86-video-rendition/APKBUILD b/main/xf86-video-rendition/APKBUILD
index e2d02188a556dec16e0d28341a98afbf31aba56f..d89eda86c1c35847be0a0f59c2e4da4b6449747d 100644
--- a/main/xf86-video-rendition/APKBUILD
+++ b/main/xf86-video-rendition/APKBUILD
@@ -26,7 +26,11 @@ prepare() {
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make
 }
 
diff --git a/main/xf86-video-s3/APKBUILD b/main/xf86-video-s3/APKBUILD
index 162c8b529a549807fc53ddd10fdba347ac39f4a1..b62e60787547675b0b97b62a1dd1b46991f055b0 100644
--- a/main/xf86-video-s3/APKBUILD
+++ b/main/xf86-video-s3/APKBUILD
@@ -27,7 +27,11 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-s3virge/APKBUILD b/main/xf86-video-s3virge/APKBUILD
index d4cb83a8f8a66742223e8fea9f03add873845585..1dfd799aa31ed5909f7d156efa9d916668bc6b10 100644
--- a/main/xf86-video-s3virge/APKBUILD
+++ b/main/xf86-video-s3virge/APKBUILD
@@ -24,7 +24,11 @@ prepare() {
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-savage/APKBUILD b/main/xf86-video-savage/APKBUILD
index a6cc5b86e71917f7a306d2cc25da9eead8a44d1c..09c785f951b7d0320be63d1156996ca58fdc4e8d 100644
--- a/main/xf86-video-savage/APKBUILD
+++ b/main/xf86-video-savage/APKBUILD
@@ -17,7 +17,11 @@ source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-siliconmotion/APKBUILD b/main/xf86-video-siliconmotion/APKBUILD
index d1c3ad2ce418090801565283a1d4d2d9f267333d..2b5ffc2f38ab916e4479aa0f5c0218b6da8f9eef 100644
--- a/main/xf86-video-siliconmotion/APKBUILD
+++ b/main/xf86-video-siliconmotion/APKBUILD
@@ -16,7 +16,11 @@ source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-sis/APKBUILD b/main/xf86-video-sis/APKBUILD
index 18ba6e91ca7df696b86fe6ae4fff7430289b316b..386844c56ce277ed858712a8ae3968f52e8b190b 100644
--- a/main/xf86-video-sis/APKBUILD
+++ b/main/xf86-video-sis/APKBUILD
@@ -29,7 +29,11 @@ build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-sunleo/APKBUILD b/main/xf86-video-sunleo/APKBUILD
index 04307e20b0e4c33b713ab6d765b886acdd1e6bbb..a6dd6e9426d0f059f50d2574f82ec0eab2bcbb07 100644
--- a/main/xf86-video-sunleo/APKBUILD
+++ b/main/xf86-video-sunleo/APKBUILD
@@ -16,7 +16,11 @@ source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-tdfx/APKBUILD b/main/xf86-video-tdfx/APKBUILD
index 8a72dd7680698309a1f76eb7d7fd586a860427b8..4564e730c4a576049c9f7c6c5e662eda3d9eb0d5 100644
--- a/main/xf86-video-tdfx/APKBUILD
+++ b/main/xf86-video-tdfx/APKBUILD
@@ -29,7 +29,11 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-v4l/APKBUILD b/main/xf86-video-v4l/APKBUILD
index 90eddc922cb0e5a05eeb2b20dc5c52a5909135a4..b6d392fa905b0be38caad2888f707929f092797e 100644
--- a/main/xf86-video-v4l/APKBUILD
+++ b/main/xf86-video-v4l/APKBUILD
@@ -16,7 +16,11 @@ source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-vesa/APKBUILD b/main/xf86-video-vesa/APKBUILD
index aac853ca6b6c59ef946f3d6b373e683342937310..63662e8bbed97c62bf1a14284edc52cd85196624 100644
--- a/main/xf86-video-vesa/APKBUILD
+++ b/main/xf86-video-vesa/APKBUILD
@@ -28,7 +28,11 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-vmware/APKBUILD b/main/xf86-video-vmware/APKBUILD
index 8c827c6e3d9db771ac10f2c5dba5ea465cd543dc..fd37ea5e8dd601734715561139fec52e1138bc47 100644
--- a/main/xf86-video-vmware/APKBUILD
+++ b/main/xf86-video-vmware/APKBUILD
@@ -26,7 +26,11 @@ build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86-video-xgixp/APKBUILD b/main/xf86-video-xgixp/APKBUILD
index c835545b414596c28b64a2e4919cc2b6b66e32ee..c21c2cdd600cc1fc26c0ce5096dfbfc8576c3e2d 100644
--- a/main/xf86-video-xgixp/APKBUILD
+++ b/main/xf86-video-xgixp/APKBUILD
@@ -26,7 +26,11 @@ build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86bigfontproto/APKBUILD b/main/xf86bigfontproto/APKBUILD
index ba577c9f8a30e24e2bc06c5498fa253200217109..a9a2808d6dea97a1dfcd733c09b0b614f951044a 100644
--- a/main/xf86bigfontproto/APKBUILD
+++ b/main/xf86bigfontproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.t
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
diff --git a/main/xf86dgaproto/APKBUILD b/main/xf86dgaproto/APKBUILD
index e29903cf1465d1e3b79665eab72e0b7ed6d8347a..927b216e2f5873be6471f6c74c6c12a7be6cc22b 100644
--- a/main/xf86dgaproto/APKBUILD
+++ b/main/xf86dgaproto/APKBUILD
@@ -13,7 +13,11 @@ source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.t
 build () 
 { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
diff --git a/main/xf86driproto/APKBUILD b/main/xf86driproto/APKBUILD
index c3f726edbfbedeef9745995755e7116426dbb8e2..797052d939ee5655af0dc94f720f33a1abe263a1 100644
--- a/main/xf86driproto/APKBUILD
+++ b/main/xf86driproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xf86miscproto/APKBUILD b/main/xf86miscproto/APKBUILD
index c1fc9bfab3bb8c471690e425490ce1ed17b369e4..77b83bcffc923d0067650115fb5c9186648d9ff6 100644
--- a/main/xf86miscproto/APKBUILD
+++ b/main/xf86miscproto/APKBUILD
@@ -13,7 +13,11 @@ source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.
 build () 
 { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
diff --git a/main/xf86vidmodeproto/APKBUILD b/main/xf86vidmodeproto/APKBUILD
index 60c6d207ff0b0da2c6323b8b0c6f9ec5d6a92e29..9041b654990699620744bed8c0026c43b074da49 100644
--- a/main/xf86vidmodeproto/APKBUILD
+++ b/main/xf86vidmodeproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfburn/APKBUILD b/main/xfburn/APKBUILD
index a729e0e65f63fa79c56fd1954c0770b0a83fa038..e991f7ceaf61851a6f6c7e162d76787198d0e066 100644
--- a/main/xfburn/APKBUILD
+++ b/main/xfburn/APKBUILD
@@ -31,10 +31,14 @@ prepare() {
 build () 
 { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--enable-gstreamer \
 		--enable-thunar-vfs \
-		--enable-dbus
+		--enable-dbus \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfce-utils/APKBUILD b/main/xfce-utils/APKBUILD
index 2db04237ed728d80caad73f5b49f70aa95e082c3..b58a54f35e2e8a55401a3d756d2655a278ccbf21 100644
--- a/main/xfce-utils/APKBUILD
+++ b/main/xfce-utils/APKBUILD
@@ -14,7 +14,10 @@ source="http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.
 
 build () { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
diff --git a/main/xfce4-appfinder/APKBUILD b/main/xfce4-appfinder/APKBUILD
index 41bff73cec8b7dede8bb7f679d56cce163bdff82..4a36dcb29f513f442e2615bb646894768f4c3c23 100644
--- a/main/xfce4-appfinder/APKBUILD
+++ b/main/xfce4-appfinder/APKBUILD
@@ -15,11 +15,15 @@ source="http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
-		--disable-static || return 1
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfce4-battery-plugin/APKBUILD b/main/xfce4-battery-plugin/APKBUILD
index 7a4e495a408a70d6094699af2be34fd7e824427f..733d13214f809fbe111324597594318fbbb55ca4 100644
--- a/main/xfce4-battery-plugin/APKBUILD
+++ b/main/xfce4-battery-plugin/APKBUILD
@@ -23,11 +23,15 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfce4-clipman-plugin/APKBUILD b/main/xfce4-clipman-plugin/APKBUILD
index 5a44ff0a61df4a49c4a89582f2a399e9d01e76f4..0f7608c09d875744add6034ec1e254d73bc2b23e 100644
--- a/main/xfce4-clipman-plugin/APKBUILD
+++ b/main/xfce4-clipman-plugin/APKBUILD
@@ -25,7 +25,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-static \
 		--enable-unique \
 		|| return 1
diff --git a/main/xfce4-cpufreq-plugin/APKBUILD b/main/xfce4-cpufreq-plugin/APKBUILD
index 6d8aa8140402a1e857e25851e67f30956acdc8df..13ec1b3e45b41d9da71be3e204dd1614667c9a39 100644
--- a/main/xfce4-cpufreq-plugin/APKBUILD
+++ b/main/xfce4-cpufreq-plugin/APKBUILD
@@ -16,11 +16,15 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/xfce4 \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfce4-cpugraph-plugin/APKBUILD b/main/xfce4-cpugraph-plugin/APKBUILD
index 77acb5851537b24238003801fcfb81848eefcb55..cc8b6e25a4ae359728a55ca9d1e7d8b842683616 100644
--- a/main/xfce4-cpugraph-plugin/APKBUILD
+++ b/main/xfce4-cpugraph-plugin/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/xfce4-dev-tools/APKBUILD b/main/xfce4-dev-tools/APKBUILD
index e6d3ffcf8a59965c413aeb7d8c3267634304743f..f567894faeaabad56f09335a39f797b7d222472f 100644
--- a/main/xfce4-dev-tools/APKBUILD
+++ b/main/xfce4-dev-tools/APKBUILD
@@ -12,11 +12,15 @@ source="http://archive.xfce.org/src/xfce/xfce4-dev-tools/${pkgver%.*}/xfce4-dev-
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfce4-mixer/APKBUILD b/main/xfce4-mixer/APKBUILD
index ebdcdf5d11ba3b770362fa08e70aa493cf0e2233..6946da1e0b6442805bd6bf78c7b676fd19e86d4c 100644
--- a/main/xfce4-mixer/APKBUILD
+++ b/main/xfce4-mixer/APKBUILD
@@ -16,12 +16,16 @@ source="http://archive.xfce.org/src/apps/xfce4-mixer/${pkgver%.*}/xfce4-mixer-$p
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
 		--disable-static \
-		--with-sound=alsa || return 1
+		--with-sound=alsa \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfce4-notes-plugin/APKBUILD b/main/xfce4-notes-plugin/APKBUILD
index 94af6b0e9a20f18fc9e8058df5fc1da3834bea6d..98791512b7d7057b0f84cbd13e68c2397333b181 100644
--- a/main/xfce4-notes-plugin/APKBUILD
+++ b/main/xfce4-notes-plugin/APKBUILD
@@ -22,10 +22,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfce4-notifyd/APKBUILD b/main/xfce4-notifyd/APKBUILD
index 6c92495ea34d686b49e54371ccef9bb565bd0616..f3576ae31676b00d0c4013e2c43b2e279dc46101 100644
--- a/main/xfce4-notifyd/APKBUILD
+++ b/main/xfce4-notifyd/APKBUILD
@@ -16,11 +16,15 @@ source="http://archive.xfce.org/src/apps/xfce4-notifyd/${pkgver%.*}/xfce4-notify
 _builddir="$srcdir"/$pkgname-$pkgver
 build () { 
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/xfce4 \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfce4-panel/APKBUILD b/main/xfce4-panel/APKBUILD
index 38bb98bde6b29c4e0b919e258f493c013ecbc236..753fd1e77c067f132d0118ca4e41ca7ccf1eacbd 100644
--- a/main/xfce4-panel/APKBUILD
+++ b/main/xfce4-panel/APKBUILD
@@ -26,11 +26,15 @@ prepare() {
 }
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make
 }
 
diff --git a/main/xfce4-power-manager/APKBUILD b/main/xfce4-power-manager/APKBUILD
index 31dd472f59e9f08a5e7878cdc8f056a49aedde42..2ec1b9595eb40d227104181b1e8c52c2a96f0ccc 100644
--- a/main/xfce4-power-manager/APKBUILD
+++ b/main/xfce4-power-manager/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/xfce4-screenshooter/APKBUILD b/main/xfce4-screenshooter/APKBUILD
index fd6a9af5b969560e24e1eb9156f932d164bd1f99..e18a6531b6ea2a6fbf18e8a2fe27301c25a7db82 100644
--- a/main/xfce4-screenshooter/APKBUILD
+++ b/main/xfce4-screenshooter/APKBUILD
@@ -26,11 +26,15 @@ prepare() {
 
 build () {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfce4-session/APKBUILD b/main/xfce4-session/APKBUILD
index dcd0f3239ec66d3b129d94711ee931a934fd290e..d54518d4ee3a5b5b05594615b41e784c6aceed76 100644
--- a/main/xfce4-session/APKBUILD
+++ b/main/xfce4-session/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/xfce4 \
 		--localstatedir=/var \
diff --git a/main/xfce4-settings/APKBUILD b/main/xfce4-settings/APKBUILD
index 8881b41ebfb6c505ad15235619db4f0afc48e9e1..de50cd699112ff65bd6d29f54db0b3ea9f7551c5 100644
--- a/main/xfce4-settings/APKBUILD
+++ b/main/xfce4-settings/APKBUILD
@@ -30,13 +30,17 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
 		--enable-libxklavier \
 		--enable-xrandr \
-		--enable-sound-settings
+		--enable-sound-settings \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfce4-taskmanager/APKBUILD b/main/xfce4-taskmanager/APKBUILD
index 8fd845484589b3fcd063d28060cbd62666751fcb..0e5143c15e7dc6e19b6a0e463da83e76f745fe6a 100644
--- a/main/xfce4-taskmanager/APKBUILD
+++ b/main/xfce4-taskmanager/APKBUILD
@@ -13,11 +13,15 @@ source="http://archive.xfce.org/src/apps/${pkgname}/1.0/${pkgname}-${pkgver}.tar
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/xfce4 \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfce4-terminal/APKBUILD b/main/xfce4-terminal/APKBUILD
index 55897e7fb9c033ed8c5d1aa8455d1fdf9faea54d..bfa04ae45b6d31e9557c26f6efda68e8f2470d31 100644
--- a/main/xfce4-terminal/APKBUILD
+++ b/main/xfce4-terminal/APKBUILD
@@ -16,7 +16,10 @@ source="http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/xfce4-terminal-
 _builddir="$srcdir"/xfce4-terminal-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/xfce4 \
 		--localstatedir=/var \
diff --git a/main/xfce4-vala/APKBUILD b/main/xfce4-vala/APKBUILD
index b986011b788a8a082d7053d30b620ba5b419ac6d..0f39749ee8c2c7caf93342e58b2f3474fa2c40bd 100644
--- a/main/xfce4-vala/APKBUILD
+++ b/main/xfce4-vala/APKBUILD
@@ -30,10 +30,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfce4-wavelan-plugin/APKBUILD b/main/xfce4-wavelan-plugin/APKBUILD
index f3542b549c2fae28e8e7bb1c898acf0fa97e53cc..e270b0885adf5e0c82fc8559e390178372f1b4ac 100644
--- a/main/xfce4-wavelan-plugin/APKBUILD
+++ b/main/xfce4-wavelan-plugin/APKBUILD
@@ -26,11 +26,14 @@ prepare() {
 build() {
 	cd "$_builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfce4-xkb-plugin/APKBUILD b/main/xfce4-xkb-plugin/APKBUILD
index 25a74cbf0a8eea1c1722ad1ad6b3723bfafb95ea..cfcea8833a28f57bd4112f3dba99bdf0d19bd0d5 100644
--- a/main/xfce4-xkb-plugin/APKBUILD
+++ b/main/xfce4-xkb-plugin/APKBUILD
@@ -22,11 +22,15 @@ prepare() {
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfconf/APKBUILD b/main/xfconf/APKBUILD
index 93fe535f667ffeba9784a1b45ed5bb71f6470f7f..62a76ad047f6168cd3a59464dc5057fcd7db9c8b 100644
--- a/main/xfconf/APKBUILD
+++ b/main/xfconf/APKBUILD
@@ -17,11 +17,15 @@ depends_dev="glib-dev dbus-dev dbus-glib-dev"
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfdesktop/APKBUILD b/main/xfdesktop/APKBUILD
index d11f07d8dd1316b4128f0895223a980704623564..0d59d6ffd6804231202124b45f26a8e2d2032832 100644
--- a/main/xfdesktop/APKBUILD
+++ b/main/xfdesktop/APKBUILD
@@ -26,11 +26,15 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
-		--disable-static || return 1
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfsprogs/APKBUILD b/main/xfsprogs/APKBUILD
index 05c711dc6e97cf02c804aa67af7e683ef3d8fa33..81d3a58658538b5eef99fe475dd79b549a864e93 100644
--- a/main/xfsprogs/APKBUILD
+++ b/main/xfsprogs/APKBUILD
@@ -25,11 +25,15 @@ build() {
 	export OPTIMIZER="$CFLAGS"
 
 	ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes \
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sbindir=/sbin \
 		--libexecdir=/usr/lib \
 		--enable-lib64=no \
-		--enable-gettext=no
+		--enable-gettext=no \
+		|| return 1
 
 	make SHELL=/bin/bash || return 1
 }
diff --git a/main/xfwm4-themes/APKBUILD b/main/xfwm4-themes/APKBUILD
index d9eb9fafb3ea5e3e12ffcae0b32d4d94128dab77..093258a25d435b7391afbdf86ac7ea6b49201e7b 100644
--- a/main/xfwm4-themes/APKBUILD
+++ b/main/xfwm4-themes/APKBUILD
@@ -13,11 +13,15 @@ source="http://archive.xfce.org/src/art/xfwm4-themes/${pkgver%.*}/xfwm4-themes-$
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
-		--disable-static
+		--disable-static \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xfwm4/APKBUILD b/main/xfwm4/APKBUILD
index 6fc8249a43e78a3515d943a38eb8cb7568e9b339..c82d94dd8c42b73a123aae8e445273fa9a00e3f5 100644
--- a/main/xfwm4/APKBUILD
+++ b/main/xfwm4/APKBUILD
@@ -15,13 +15,17 @@ source="http://archive.xfce.org/src/xfce/xfwm4/${pkgver%.*}/xfwm4-$pkgver.tar.bz
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
 		--disable-static \
 		--enable-compositor \
-		--enable-xsync || return 1
+		--enable-xsync \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xgamma/APKBUILD b/main/xgamma/APKBUILD
index 731befccb28c0be681de48e7e1d8b600310e108b..758f174a206ed9c928fc39a0671c7af9b8431e44 100644
--- a/main/xgamma/APKBUILD
+++ b/main/xgamma/APKBUILD
@@ -13,7 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xhost/APKBUILD b/main/xhost/APKBUILD
index f3635c1ee40ec6f01ca0f475e3f7c11a690d23ed..e00fdd11446035d70ce5834d54dcb86b95f00f58 100644
--- a/main/xhost/APKBUILD
+++ b/main/xhost/APKBUILD
@@ -13,7 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xineramaproto/APKBUILD b/main/xineramaproto/APKBUILD
index 1c1910c36270219d6b310f463f6586e9f840b28c..d7574b6a88b5fc4f938bcf2c68ce1eb283593193 100644
--- a/main/xineramaproto/APKBUILD
+++ b/main/xineramaproto/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xinit/APKBUILD b/main/xinit/APKBUILD
index 8b809843fca66b5e7609281e363b04e9fe6bb7b3..3a6923d96401a7e73c55f2a20fb1ba558bd39c3c 100644
--- a/main/xinit/APKBUILD
+++ b/main/xinit/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() { 
 	cd "$srcdir"/xinit-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-xinitdir=/etc/X11/xinit \
 		|| return 1
 	make || return 1
diff --git a/main/xkbcomp/APKBUILD b/main/xkbcomp/APKBUILD
index da3bc4853a4f997f5e0d776f128935ce46fadeb2..3629142a2d1755aba6b12ad8f3147972a0110fef 100644
--- a/main/xkbcomp/APKBUILD
+++ b/main/xkbcomp/APKBUILD
@@ -14,10 +14,14 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xkeyboard-config/APKBUILD b/main/xkeyboard-config/APKBUILD
index df6462d3e536636ab8799b1065aecf63277e4d74..84a51293ef2441ef752ed9b8a1c843bc46616e1e 100644
--- a/main/xkeyboard-config/APKBUILD
+++ b/main/xkeyboard-config/APKBUILD
@@ -24,10 +24,14 @@ prepare() {
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--with-xkb-base=/usr/share/X11/xkb \
 		--with-xkb-rules-symlink=xorg \
-		--enable-compat-rules=yes || return 1
+		--enable-compat-rules=yes \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xmlrpc-c/APKBUILD b/main/xmlrpc-c/APKBUILD
index 416231b9f8392592745e1174ceb64f6db51560d7..dea1834a2df8a5489dbca4635134f5dd6e489383 100644
--- a/main/xmlrpc-c/APKBUILD
+++ b/main/xmlrpc-c/APKBUILD
@@ -25,16 +25,20 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--enable-libxml2-backend \
 		--disable-cgi-server \
 		--disable-libwww-client \
-		--disable-wininet-client
+		--disable-wininet-client \
+		|| return 1
 	# no parallel builds :-(
-	make -C include &&\
-	make -C lib &&\
-	make -j1 -C src &&\
+	make -C include && \
+	make -C lib && \
+	make -j1 -C src && \
 	make
 }
 
diff --git a/main/xmlto/APKBUILD b/main/xmlto/APKBUILD
index ad4387fa31654c59a13c994ac7abb5aa0bb84ee5..5335ace4f07fe897071a2803f256f3f87014fd43 100644
--- a/main/xmlto/APKBUILD
+++ b/main/xmlto/APKBUILD
@@ -27,8 +27,12 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make -j1 || return 1
 }
 
diff --git a/main/xmodmap/APKBUILD b/main/xmodmap/APKBUILD
index 2a44bfbe2041be059b730a6c05ac7f96fd08e534..cf7405096cd1bf3e6856f15c8473b4d3f5d17f96 100644
--- a/main/xmodmap/APKBUILD
+++ b/main/xmodmap/APKBUILD
@@ -13,7 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD
index 8e3115b1637023e4ecbe9b025e1fd9c78a46327c..6198ae2cd10ada354dbf2901d9d346c0981311ef 100644
--- a/main/xorg-server/APKBUILD
+++ b/main/xorg-server/APKBUILD
@@ -90,7 +90,10 @@ build() {
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	_fontroot="/usr/share/fonts"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc/X11 \
 		--localstatedir=/var \
 		--with-fontrootdir=$_fontroot \
diff --git a/main/xprop/APKBUILD b/main/xprop/APKBUILD
index ee0a935cd6a4cc2818b21261b0a7cc84e3e6c65f..dd972dde8394e928724a065c8b90308126a8f275 100644
--- a/main/xprop/APKBUILD
+++ b/main/xprop/APKBUILD
@@ -27,7 +27,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		|| return 1
 	make || return 1
 }
diff --git a/main/xproto/APKBUILD b/main/xproto/APKBUILD
index 3b04b62b778d412d087080a1feecdfee39a909f7..13cdcb0fd746a611cd0cc6f3834d4be1f470f35c 100644
--- a/main/xproto/APKBUILD
+++ b/main/xproto/APKBUILD
@@ -16,7 +16,11 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xrandr/APKBUILD b/main/xrandr/APKBUILD
index 312bc852bd587379ad8b6299b29985b45abf176b..8c32a5ffb0b237109557c70c741358c1b49b7ed5 100644
--- a/main/xrandr/APKBUILD
+++ b/main/xrandr/APKBUILD
@@ -13,7 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xrdb/APKBUILD b/main/xrdb/APKBUILD
index 6819aac85f24c6cef1ffc383f61aa6a7ad5548b1..f109b9c0fae6ed9b5b08f404684b9ae181d54ec7 100644
--- a/main/xrdb/APKBUILD
+++ b/main/xrdb/APKBUILD
@@ -13,7 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xrefresh/APKBUILD b/main/xrefresh/APKBUILD
index fd7dd669dc0624a868c147f8a8daf58a3eb2c029..ef3d04bc3217ef6bac1c50b9f6a33ffd22eaf5b0 100644
--- a/main/xrefresh/APKBUILD
+++ b/main/xrefresh/APKBUILD
@@ -13,7 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xscreensaver/APKBUILD b/main/xscreensaver/APKBUILD
index bb742c7fd8ce58d3eeff88a9fe652895783610ba..731051eaadbb67aee4a3581168ccffbc4f84a478 100644
--- a/main/xscreensaver/APKBUILD
+++ b/main/xscreensaver/APKBUILD
@@ -30,7 +30,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/xset/APKBUILD b/main/xset/APKBUILD
index 105dbe4ac8a03633d3c2d73fbd6af8cd3cf4cc52..5ca771c77d546cb937b1cafd8d288c41d195a0bf 100644
--- a/main/xset/APKBUILD
+++ b/main/xset/APKBUILD
@@ -13,7 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xsetmode/APKBUILD b/main/xsetmode/APKBUILD
index 8b11f547858c37b92ef74a6b0899c449ab639322..a51dbfe082b401bfcb7c957ba183c9fd3e3bfde0 100644
--- a/main/xsetmode/APKBUILD
+++ b/main/xsetmode/APKBUILD
@@ -13,7 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xsetroot/APKBUILD b/main/xsetroot/APKBUILD
index e8a6d072af85f0f66a2c9ba042236633907c1172..928981be48231bde64752dcbaa39b3422a1975a7 100644
--- a/main/xsetroot/APKBUILD
+++ b/main/xsetroot/APKBUILD
@@ -13,7 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD
index 5ecd7a454422923d94c25fe586986c8ce5b998e8..d4ea035f67ad81e32008322f49ce852428792d3c 100644
--- a/main/xtables-addons-grsec/APKBUILD
+++ b/main/xtables-addons-grsec/APKBUILD
@@ -41,8 +41,12 @@ prepare() {
 
 build() {
 	cd "$srcdir/$_realname-$_realver"
-	./configure --prefix=/usr \
-		--with-kbuild=/usr/src/linux-headers-${_abi_release}
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--with-kbuild=/usr/src/linux-headers-${_abi_release} \
+		|| return 1
 
 	cd extensions
 	export GCC_SPECS=hardenednopie.specs
diff --git a/main/xtables-addons/APKBUILD b/main/xtables-addons/APKBUILD
index 2653a6fbe594ccf81134ce996963cf8814caed76..d7ba0aa1a1a744dc099b206e2f3da28b7d033a76 100644
--- a/main/xtables-addons/APKBUILD
+++ b/main/xtables-addons/APKBUILD
@@ -15,9 +15,13 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
-		--without-kbuild 
+		--without-kbuild \
+		|| return 1
 
 	make CC="${CC-gcc}" kbuilddir=
 }
diff --git a/main/xtrans/APKBUILD b/main/xtrans/APKBUILD
index d5c6cbb689ce499905d4b0ae689b5b84d0d677ee..82fa1fc964235f81c2c73cdf5db5ce9714fb78f2 100644
--- a/main/xtrans/APKBUILD
+++ b/main/xtrans/APKBUILD
@@ -12,7 +12,11 @@ source="http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$pkgver.tar
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xvidcore/APKBUILD b/main/xvidcore/APKBUILD
index e3bbfa68f92de2b8655d3b29cadc7d0bf2c2605c..bcfcfae1c341bad2b3c93f874d9d30fbb1ccc445 100644
--- a/main/xvidcore/APKBUILD
+++ b/main/xvidcore/APKBUILD
@@ -13,8 +13,12 @@ source="http://downloads.xvid.org/downloads/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$srcdir"/$pkgname/build/generic
-	./configure --prefix=/usr \
-		--disable-assembly
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-assembly \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xvinfo/APKBUILD b/main/xvinfo/APKBUILD
index c4aea3448e276e8b3e8f1d418d4d5d0830b8c3b3..8e28a1221065b6046872336c11be6ce1e9e7e8ab 100644
--- a/main/xvinfo/APKBUILD
+++ b/main/xvinfo/APKBUILD
@@ -13,8 +13,12 @@ source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
diff --git a/main/xwininfo/APKBUILD b/main/xwininfo/APKBUILD
index 32313ccb8a09931d35cade6d696c458b6f851332..4d348ae382110f1ff3b0200b1514305ad6d60ac1 100644
--- a/main/xwininfo/APKBUILD
+++ b/main/xwininfo/APKBUILD
@@ -19,10 +19,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/xz/APKBUILD b/main/xz/APKBUILD
index 0d39293fc8177488fe7316a199fef6ec903fb9cf..58af03b75b4dc89ab58d6e67bd63db6320cc3387 100644
--- a/main/xz/APKBUILD
+++ b/main/xz/APKBUILD
@@ -15,9 +15,13 @@ _builddir="$srcdir"/$pkgname-$pkgver
 build () 
 { 
 	cd $srcdir/$pkgname-$pkgver
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--disable-rpath \
-		--disable-werror
+		--disable-werror \
+		|| return 1
 	sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 	sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 	make
diff --git a/main/yaml/APKBUILD b/main/yaml/APKBUILD
index f93c31ccf0773182f2c22c7aa523e575ad3e7241..0be218f4bb7a3d879b0414cd4f395329b7cd821e 100644
--- a/main/yaml/APKBUILD
+++ b/main/yaml/APKBUILD
@@ -26,7 +26,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/yasm/APKBUILD b/main/yasm/APKBUILD
index 0b1a1f2ab1a494154af743680874d6302acde42a..09afbe7b993e28ab9939a77b79cf4547c1d183f1 100644
--- a/main/yasm/APKBUILD
+++ b/main/yasm/APKBUILD
@@ -14,7 +14,11 @@ source="http://www.tortall.net/projects/$pkgname/releases/$pkgname-$pkgver.tar.g
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/zabbix/APKBUILD b/main/zabbix/APKBUILD
index 4cb00d9b9abee9deef5344f894507fcce4ed2248..933a058fd9663bcb5afbd68b376c384e22b331d7 100644
--- a/main/zabbix/APKBUILD
+++ b/main/zabbix/APKBUILD
@@ -65,8 +65,12 @@ build() {
 		msg "Building for $db"
 		cp -r "$pkgname-$pkgver" "$pkgname-$pkgver-$db"
 		cd "$_builddir-$db"
-		./configure --with-$db \
-			$_configure
+		./configure \
+			--build=$CBUILD \
+			--host=$CHOST \
+			--with-$db \
+			$_configure \
+			|| return 1
 		make || return 1
 	done
 }
diff --git a/main/zenity/APKBUILD b/main/zenity/APKBUILD
index 10aae22c815a3779653f22d9af0e89e4348c2c81..7414486a2a99dc29c85a62e206d8e6bcf4eb7733 100644
--- a/main/zenity/APKBUILD
+++ b/main/zenity/APKBUILD
@@ -27,9 +27,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-scrollkeeper || return 1
+		--disable-scrollkeeper \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/zeromq/APKBUILD b/main/zeromq/APKBUILD
index 361efd0c5898534cf3dd14f44a657a924eaac558..1a2e93149efa1025df653e88c395d5877e023262 100644
--- a/main/zeromq/APKBUILD
+++ b/main/zeromq/APKBUILD
@@ -22,11 +22,15 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--with-pgm \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/zlib/APKBUILD b/main/zlib/APKBUILD
index 4d521dcacae722598bfb78a8a840dc438bcd47b8..c64e2866291dae533f04358a6bb74573507d2675 100644
--- a/main/zlib/APKBUILD
+++ b/main/zlib/APKBUILD
@@ -20,7 +20,13 @@ build() {
 	cd "$_builddir"
 	# we trade size for a little more speed.
 	export CFLAGS="$CFLAGS -O2"
-	CHOST="${CHOST}" ./configure --prefix=/usr --libdir=/lib --shared
+	CHOST="${CHOST}" ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--libdir=/lib \
+		--shared \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/znc/APKBUILD b/main/znc/APKBUILD
index 28809cfd71c3f15d55dd7e193e9b127e7adb1be9..ccdfc63103ab6212df592a1427e3e18d9aaa4504 100644
--- a/main/znc/APKBUILD
+++ b/main/znc/APKBUILD
@@ -32,7 +32,10 @@ prepare() {
 build() {
 	cd "$_builddir"
 	export CHARSET=
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/main/zsh/APKBUILD b/main/zsh/APKBUILD
index 4076da3e889db30b4262bda9cb971bb3411d71f7..49a28e437f9a5f99cf744846702798af9cf492fd 100644
--- a/main/zsh/APKBUILD
+++ b/main/zsh/APKBUILD
@@ -16,7 +16,10 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--bindir=/bin \
 		--enable-etcdir=/etc/zsh \
 		--enable-zshenv=/etc/zsh/zshenv \
@@ -30,7 +33,8 @@ build() {
 		--sysconfdir=/etc \
 		--with-tcsetpgrp \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/zsnes/APKBUILD b/main/zsnes/APKBUILD
index 955314d90bf73680428793796fa379f9df8adff2..47c503aaf712e2ab1e1eb0223c80910f931f89fc 100644
--- a/main/zsnes/APKBUILD
+++ b/main/zsnes/APKBUILD
@@ -28,11 +28,15 @@ build ()
 	cd "$srcdir"/${pkgname}_${pkgver%.*}_${pkgver#*.}/src
 	aclocal && autoconf  || return 1
 	export GCC_SPECS=hardenednopie.specs
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		x_libraries=/usr/lib \
 		force_arch=i486 \
-		--enable-release || return 1
+		--enable-release \
+		|| return 1
 	make makefile.dep
 	make || return 1
 }