From 8f6f2e3166478b14b208ecfb94ddf01d69dd7bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Sun, 29 Sep 2013 08:45:29 +0000
Subject: main/[various]: update config.sub (and remove charset.alias)

for musl build. the changes are automatically done based on previous
build log errors, so this does not guarantee successful build, but
is a required.
---
 main/a2ps/APKBUILD                 |  1 +
 main/alsa-utils/APKBUILD           |  1 +
 main/aspell/APKBUILD               | 11 +++++++++--
 main/augeas/APKBUILD               |  3 +++
 main/aumix/APKBUILD                |  1 +
 main/babl/APKBUILD                 | 11 +++++++++--
 main/bacula-client/APKBUILD        |  1 +
 main/bacula/APKBUILD               |  1 +
 main/bigreqsproto/APKBUILD         | 11 +++++++++--
 main/cdparanoia/APKBUILD           | 12 ++++++++++++
 main/celt051/APKBUILD              |  1 +
 main/check/APKBUILD                |  5 +++++
 main/cmph/APKBUILD                 |  1 +
 main/conky/APKBUILD                |  1 +
 main/coova-chilli/APKBUILD         |  1 +
 main/cpufreqd/APKBUILD             | 11 +++++++++--
 main/cracklib/APKBUILD             |  1 +
 main/dansguardian/APKBUILD         |  1 +
 main/dri2proto/APKBUILD            |  5 +++++
 main/dropbear/APKBUILD             |  1 +
 main/eggdrop/APKBUILD              |  1 +
 main/elinks/APKBUILD               |  6 ++++--
 main/enca/APKBUILD                 |  1 +
 main/exiv2/APKBUILD                |  5 +++++
 main/faac/APKBUILD                 |  3 ++-
 main/faad2/APKBUILD                |  1 +
 main/fastjar/APKBUILD              |  4 ++++
 main/fetchmail/APKBUILD            | 11 +++++++++--
 main/fftw/APKBUILD                 |  1 +
 main/findutils/APKBUILD            |  5 +++++
 main/flac/APKBUILD                 | 11 +++++++++--
 main/font-util/APKBUILD            | 11 +++++++++--
 main/fontsproto/APKBUILD           | 11 +++++++++--
 main/fping/APKBUILD                |  5 +++++
 main/fprobe-ulog/APKBUILD          |  1 +
 main/fribidi/APKBUILD              | 11 +++++++++--
 main/fsarchiver/APKBUILD           |  7 +++++++
 main/fuse/APKBUILD                 |  1 +
 main/galculator/APKBUILD           |  1 +
 main/gc/APKBUILD                   |  1 +
 main/gdl/APKBUILD                  | 11 +++++++++--
 main/geoip/APKBUILD                |  1 +
 main/giblib/APKBUILD               | 11 +++++++++--
 main/glproto/APKBUILD              | 11 +++++++++--
 main/gnuchess/APKBUILD             |  1 +
 main/gpicview/APKBUILD             |  1 +
 main/grep/APKBUILD                 | 16 +++++++++++++---
 main/gross/APKBUILD                | 25 +++++++++++++------------
 main/gsl/APKBUILD                  |  5 +++++
 main/gstreamer1/APKBUILD           |  1 +
 main/gtk-engines/APKBUILD          |  1 +
 main/gtk-vnc/APKBUILD              | 11 +++++++++--
 main/gtk-xfce-engine/APKBUILD      |  1 +
 main/gtksourceview/APKBUILD        | 11 +++++++++--
 main/gucharmap/APKBUILD            |  1 +
 main/guile/APKBUILD                |  1 +
 main/haveged/APKBUILD              |  5 +++++
 main/htop/APKBUILD                 |  5 +++++
 main/hunspell/APKBUILD             | 11 +++++++++--
 main/iceauth/APKBUILD              | 11 +++++++++--
 main/indent/APKBUILD               |  6 +++++-
 main/iperf/APKBUILD                |  5 +++++
 main/ipsec-tools/APKBUILD          |  1 +
 main/irqbalance/APKBUILD           |  1 +
 main/irssi/APKBUILD                |  1 +
 main/jansson/APKBUILD              |  1 +
 main/joe/APKBUILD                  |  1 +
 main/jwhois/APKBUILD               |  1 +
 main/keybinder/APKBUILD            |  1 +
 main/ldns/APKBUILD                 |  1 +
 main/lftp/APKBUILD                 |  1 +
 main/libao/APKBUILD                | 11 +++++++++--
 main/libart-lgpl/APKBUILD          |  5 +++++
 main/libasyncns/APKBUILD           |  5 +++++
 main/libbluray/APKBUILD            |  1 +
 main/libbonobo/APKBUILD            |  1 +
 main/libbsd/APKBUILD               |  1 +
 main/libcanberra/APKBUILD          |  1 +
 main/libcap-ng/APKBUILD            |  1 +
 main/libcddb/APKBUILD              |  1 +
 main/libcroco/APKBUILD             | 11 +++++++++--
 main/libdaemon/APKBUILD            |  5 +++++
 main/libdvbcsa/APKBUILD            |  1 +
 main/libdvbpsi/APKBUILD            |  5 +++++
 main/libestr/APKBUILD              |  1 +
 main/libetpan/APKBUILD             |  1 +
 main/libexif/APKBUILD              | 11 +++++++++--
 main/libfontenc/APKBUILD           | 11 +++++++++--
 main/libglade/APKBUILD             |  5 +++++
 main/libgsf/APKBUILD               | 11 +++++++++--
 main/libgssglue/APKBUILD           |  5 +++++
 main/libgtop/APKBUILD              |  1 +
 main/libical/APKBUILD              |  1 +
 main/libksba/APKBUILD              | 11 +++++++++--
 main/libmad/APKBUILD               |  1 +
 main/libmicrohttpd/APKBUILD        |  1 +
 main/libmms/APKBUILD               |  1 +
 main/libmnl/APKBUILD               |  5 +++++
 main/libmodplug/APKBUILD           |  1 +
 main/libmowgli/APKBUILD            |  1 +
 main/libmpeg2/APKBUILD             | 11 +++++++++--
 main/libnet/APKBUILD               | 11 +++++++++--
 main/libnfnetlink/APKBUILD         | 11 +++++++++--
 main/libotr/APKBUILD               |  1 +
 main/libotr3/APKBUILD              |  1 +
 main/libpcap/APKBUILD              |  1 +
 main/libraw1394/APKBUILD           |  1 +
 main/librsync/APKBUILD             |  5 +++++
 main/libsamplerate/APKBUILD        | 11 +++++++++--
 main/libsexy/APKBUILD              | 11 +++++++++--
 main/libsigc++/APKBUILD            | 11 +++++++++--
 main/libspf2/APKBUILD              |  1 +
 main/libunique/APKBUILD            |  1 +
 main/libunistring/APKBUILD         |  1 +
 main/libverto/APKBUILD             |  1 +
 main/libxdg-basedir/APKBUILD       |  1 +
 main/libxkbcommon/APKBUILD         |  1 +
 main/libxkbfile/APKBUILD           | 11 +++++++++--
 main/llvm/APKBUILD                 |  1 +
 main/lua-crypto/APKBUILD           |  5 +++++
 main/lua5.2-crypto/APKBUILD        |  5 +++++
 main/lvm2/APKBUILD                 | 11 +++++++++--
 main/lxc/APKBUILD                  |  1 +
 main/lxsession/APKBUILD            |  1 +
 main/makedepend/APKBUILD           |  1 +
 main/mc/APKBUILD                   |  5 +++++
 main/memcached/APKBUILD            |  1 +
 main/minicom/APKBUILD              |  5 +++++
 main/mrxvt/APKBUILD                |  1 +
 main/msmtp/APKBUILD                |  1 +
 main/mtdev/APKBUILD                |  1 +
 main/nano/APKBUILD                 | 11 +++++++++--
 main/nload/APKBUILD                |  5 +++++
 main/nrpe/APKBUILD                 | 13 ++++++++++---
 main/ntfs-3g/APKBUILD              |  5 +++++
 main/ocfs2-tools/APKBUILD          |  1 +
 main/open-vm-tools-grsec/APKBUILD  |  1 +
 main/openldap/APKBUILD             |  1 +
 main/oprofile/APKBUILD             |  1 +
 main/orc/APKBUILD                  |  1 +
 main/ortp/APKBUILD                 |  1 +
 main/pangox-compat/APKBUILD        |  1 +
 main/pgcluster/APKBUILD            | 11 +++++++++--
 main/pgpool/APKBUILD               |  5 +++++
 main/pinentry/APKBUILD             |  5 +++++
 main/poppler-gtk/APKBUILD          | 11 +++++++++--
 main/portaudio/APKBUILD            |  1 +
 main/printproto/APKBUILD           | 11 +++++++++--
 main/privoxy/APKBUILD              |  1 +
 main/procps/APKBUILD               |  1 +
 main/py-dbus/APKBUILD              |  5 +++++
 main/py-gobject/APKBUILD           |  1 +
 main/py-gobject3/APKBUILD          |  1 +
 main/qpdf/APKBUILD                 |  1 +
 main/reiserfsprogs/APKBUILD        |  5 +++++
 main/resourceproto/APKBUILD        | 11 +++++++++--
 main/rgb/APKBUILD                  | 11 +++++++++--
 main/ruby/APKBUILD                 |  1 +
 main/rxvt-unicode/APKBUILD         |  1 +
 main/scrnsaverproto/APKBUILD       | 11 +++++++++--
 main/sessreg/APKBUILD              | 11 +++++++++--
 main/sg3_utils/APKBUILD            |  1 +
 main/sipsak/APKBUILD               |  5 +++++
 main/sqsh/APKBUILD                 |  1 +
 main/startup-notification/APKBUILD | 11 +++++++++--
 main/swish-e/APKBUILD              | 11 +++++++++--
 main/tinyproxy/APKBUILD            |  1 +
 main/valgrind/APKBUILD             |  1 +
 main/vanessa_logger/APKBUILD       |  1 +
 main/vte/APKBUILD                  |  1 +
 main/wavpack/APKBUILD              |  1 +
 main/xarchiver/APKBUILD            |  1 +
 main/xauth/APKBUILD                | 11 +++++++++--
 main/xbacklight/APKBUILD           | 11 +++++++++--
 main/xcb-util-image/APKBUILD       |  1 +
 main/xcb-util-keysyms/APKBUILD     |  1 +
 main/xcb-util-renderutil/APKBUILD  |  1 +
 main/xcb-util-wm/APKBUILD          |  1 +
 main/xchat/APKBUILD                |  1 +
 main/xcmiscproto/APKBUILD          | 11 +++++++++--
 main/xcmsdb/APKBUILD               | 11 +++++++++--
 main/xf86driproto/APKBUILD         | 11 +++++++++--
 main/xf86vidmodeproto/APKBUILD     | 11 +++++++++--
 main/xfce4-dev-tools/APKBUILD      | 11 +++++++++--
 main/xfconf/APKBUILD               |  5 +++++
 main/xfsprogs/APKBUILD             |  1 +
 main/xhost/APKBUILD                | 11 +++++++++--
 main/xmlrpc-c/APKBUILD             |  1 +
 main/xmodmap/APKBUILD              | 11 +++++++++--
 main/xprop/APKBUILD                |  1 +
 main/xrandr/APKBUILD               | 11 +++++++++--
 main/xrefresh/APKBUILD             | 11 +++++++++--
 main/xwininfo/APKBUILD             |  1 +
 main/zsh/APKBUILD                  |  5 +++++
 194 files changed, 785 insertions(+), 124 deletions(-)

diff --git a/main/a2ps/APKBUILD b/main/a2ps/APKBUILD
index 72f35c7a47..9e8cefbd96 100644
--- a/main/a2ps/APKBUILD
+++ b/main/a2ps/APKBUILD
@@ -22,6 +22,7 @@ source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/alsa-utils/APKBUILD b/main/alsa-utils/APKBUILD
index 639da9d387..d1b9cb258d 100644
--- a/main/alsa-utils/APKBUILD
+++ b/main/alsa-utils/APKBUILD
@@ -20,6 +20,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/aspell/APKBUILD b/main/aspell/APKBUILD
index 7397ce1ace..a704487a12 100644
--- a/main/aspell/APKBUILD
+++ b/main/aspell/APKBUILD
@@ -14,8 +14,15 @@ install=
 source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
 	libmath.patch"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() { 
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,7 +36,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/aspell*/*.la \
 		"$pkgdir"/usr/lib/*.la || return 1
diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD
index 49bdb6d061..ff71dcf17f 100644
--- a/main/augeas/APKBUILD
+++ b/main/augeas/APKBUILD
@@ -16,6 +16,7 @@ source="http://download.augeas.net/augeas-$pkgver.tar.gz"
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -44,6 +45,8 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
+	rm -rf "$pkgdir"/usr/lib/charset.alias
+	rmdir -p "$pkgdir"/usr/lib 2>/dev/null
 	rm "$pkgdir"/usr/lib/*.la || return 1
 }
 
diff --git a/main/aumix/APKBUILD b/main/aumix/APKBUILD
index aef2bae5e9..f20b4ac9c7 100644
--- a/main/aumix/APKBUILD
+++ b/main/aumix/APKBUILD
@@ -14,6 +14,7 @@ source="http://jpj.net/~trevor/aumix/releases/aumix-$pkgver.tar.bz2
 
 prepare() { 
 	cd "$srcdir"/aumix-$pkgver
+	update_config_sub || return 1
 }
 
 build() {
diff --git a/main/babl/APKBUILD b/main/babl/APKBUILD
index e3ea93c136..1bf5808572 100644
--- a/main/babl/APKBUILD
+++ b/main/babl/APKBUILD
@@ -11,8 +11,15 @@ makedepends=
 subpackages="$pkgname-dev"
 source="ftp://ftp.gimp.org/pub/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,7 +29,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/babl*/*.la \
 		"$pkgdir"/usr/lib/*.la || return 1
diff --git a/main/bacula-client/APKBUILD b/main/bacula-client/APKBUILD
index fafa6693f3..eebea5ff2b 100644
--- a/main/bacula-client/APKBUILD
+++ b/main/bacula-client/APKBUILD
@@ -32,6 +32,7 @@ _builddir="$srcdir/$_realname-$pkgver"
 
 prepare () {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index 235c98a279..2459101181 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -38,6 +38,7 @@ _builddir="$srcdir/$pkgname-$pkgver"
 
 prepare () {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/bigreqsproto/APKBUILD b/main/bigreqsproto/APKBUILD
index da1424e9e7..7f5649c99b 100644
--- a/main/bigreqsproto/APKBUILD
+++ b/main/bigreqsproto/APKBUILD
@@ -10,8 +10,15 @@ depends=""
 makedepends=""
 source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -21,7 +28,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="1a05fb01fa1d5198894c931cf925c025  bigreqsproto-1.1.2.tar.bz2"
diff --git a/main/cdparanoia/APKBUILD b/main/cdparanoia/APKBUILD
index 10c37fc73a..56ead88e5b 100644
--- a/main/cdparanoia/APKBUILD
+++ b/main/cdparanoia/APKBUILD
@@ -16,6 +16,11 @@ source="http://downloads.xiph.org/releases/cdparanoia/$pkgname-III-$pkgver.src.t
 	$patches"
 
 _builddir="$srcdir/cdparanoia-III-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 prepare() {
 	cd "$_builddir"
 	for i in $patches; do
@@ -29,6 +34,13 @@ prepare() {
 	libtoolize || return 1
 }	
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/celt051/APKBUILD b/main/celt051/APKBUILD
index 48a1955a9e..caa933e230 100644
--- a/main/celt051/APKBUILD
+++ b/main/celt051/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/celt-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/check/APKBUILD b/main/check/APKBUILD
index f3c04742e2..037557e74d 100644
--- a/main/check/APKBUILD
+++ b/main/check/APKBUILD
@@ -15,6 +15,11 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="http://downloads.sourceforge.net/check/check-$pkgver.tar.gz"
 _builddir="$srcdir"/check-$pkgver
 
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/cmph/APKBUILD b/main/cmph/APKBUILD
index d94d85bba5..5d796470f6 100644
--- a/main/cmph/APKBUILD
+++ b/main/cmph/APKBUILD
@@ -16,6 +16,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 }
 
 build() {
diff --git a/main/conky/APKBUILD b/main/conky/APKBUILD
index f719fd9a70..f1efd9fd76 100644
--- a/main/conky/APKBUILD
+++ b/main/conky/APKBUILD
@@ -18,6 +18,7 @@ source="http://downloads.sourceforge.net/project/conky/conky/$pkgver/conky-$pkgv
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	local i
 	for i in $source; do
 		case $i in
diff --git a/main/coova-chilli/APKBUILD b/main/coova-chilli/APKBUILD
index 150321996a..388835f021 100644
--- a/main/coova-chilli/APKBUILD
+++ b/main/coova-chilli/APKBUILD
@@ -20,6 +20,7 @@ _builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
 	cd $_builddir
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/cpufreqd/APKBUILD b/main/cpufreqd/APKBUILD
index cd3961e59b..757083f659 100644
--- a/main/cpufreqd/APKBUILD
+++ b/main/cpufreqd/APKBUILD
@@ -13,9 +13,16 @@ install=
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
 	cpufreqd.initd"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build ()
 {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,7 +33,7 @@ build ()
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la || return 1
 	install -Dm 755 ../cpufreqd.initd "$pkgdir"/etc/init.d/cpufreqd \
diff --git a/main/cracklib/APKBUILD b/main/cracklib/APKBUILD
index 158439d806..f4f86bdaaf 100644
--- a/main/cracklib/APKBUILD
+++ b/main/cracklib/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/dansguardian/APKBUILD b/main/dansguardian/APKBUILD
index e13d783e86..348eb64ec3 100644
--- a/main/dansguardian/APKBUILD
+++ b/main/dansguardian/APKBUILD
@@ -23,6 +23,7 @@ source="http://downloads.sourceforge.net/project/dansguardian/dansguardian-$pkgv
 _builddir="$srcdir"/dansguardian-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/dri2proto/APKBUILD b/main/dri2proto/APKBUILD
index b70e46ac7d..a0b5de05b9 100644
--- a/main/dri2proto/APKBUILD
+++ b/main/dri2proto/APKBUILD
@@ -11,6 +11,11 @@ makedepends=""
 source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD
index 003e0aa3d3..f798d43185 100644
--- a/main/dropbear/APKBUILD
+++ b/main/dropbear/APKBUILD
@@ -19,6 +19,7 @@ _progs="dropbear dbclient dropbearkey dropbearconvert scp"
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	patch -p1 -i "$srcdir"/dropbear-0.53.1-static_build_fix.patch
 }
 
diff --git a/main/eggdrop/APKBUILD b/main/eggdrop/APKBUILD
index b6eada515c..c3391c1e54 100644
--- a/main/eggdrop/APKBUILD
+++ b/main/eggdrop/APKBUILD
@@ -19,6 +19,7 @@ _builddir="$srcdir/${pkgname}${pkgver}"
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/elinks/APKBUILD b/main/elinks/APKBUILD
index ddb3fbd85b..465162c17f 100644
--- a/main/elinks/APKBUILD
+++ b/main/elinks/APKBUILD
@@ -17,6 +17,7 @@ source="http://elinks.or.cz/download/elinks-$_ver.tar.bz2"
 _builddir="$srcdir"/$pkgname-$_ver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 }
 
 build() {
@@ -35,8 +36,9 @@ build() {
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
-	
+	make DESTDIR="$pkgdir" install || return 1
+	rm -rf "$pkgdir"/usr/lib/charset.alias
+	rmdir -p "$pkgdir"/usr/lib 2>/dev/null
 	#fix conflict with gettext
 	rm "$pkgdir"/usr/share/locale/locale.alias
 }
diff --git a/main/enca/APKBUILD b/main/enca/APKBUILD
index 166fe99d7c..dd45a1621f 100644
--- a/main/enca/APKBUILD
+++ b/main/enca/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	# apply patches here
 }
 
diff --git a/main/exiv2/APKBUILD b/main/exiv2/APKBUILD
index 43b413618c..95bbf96071 100644
--- a/main/exiv2/APKBUILD
+++ b/main/exiv2/APKBUILD
@@ -13,6 +13,11 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="http://www.exiv2.org/exiv2-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/faac/APKBUILD b/main/faac/APKBUILD
index de6769d156..8c571953ae 100644
--- a/main/faac/APKBUILD
+++ b/main/faac/APKBUILD
@@ -14,7 +14,8 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t
 "
 
 prepare() {
-        cd "$srcdir/$pkgname-$pkgver"
+	cd "$srcdir/$pkgname-$pkgver"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/faad2/APKBUILD b/main/faad2/APKBUILD
index 78168f53e2..adfffac6a1 100644
--- a/main/faad2/APKBUILD
+++ b/main/faad2/APKBUILD
@@ -15,6 +15,7 @@ source="http://downloads.sourceforge.net/sourceforge/faac/$pkgname-$pkgver.tar.b
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/fastjar/APKBUILD b/main/fastjar/APKBUILD
index 95c7aa1338..83e89996e0 100644
--- a/main/fastjar/APKBUILD
+++ b/main/fastjar/APKBUILD
@@ -17,6 +17,7 @@ _builddir=$srcdir/$pkgname-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -41,6 +42,9 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
+	rm -rf "$pkgdir"/usr/lib/charset.alias
+	rmdir -p "$pkgdir"/usr/lib 2>/dev/null
+	return 0
 }
 
 md5sums="d2d264d343d4d0e1575832cc1023c3bf  fastjar-0.98.tar.gz"
diff --git a/main/fetchmail/APKBUILD b/main/fetchmail/APKBUILD
index 57dbfaf21e..43f4663e58 100644
--- a/main/fetchmail/APKBUILD
+++ b/main/fetchmail/APKBUILD
@@ -15,8 +15,15 @@ install="fetchmail.pre-install"
 subpackages="$pkgname-doc fetchmailconf"
 source="http://download.berlios.de/fetchmail/$pkgname-$pkgver.tar.bz2
 	fetchmail.initd"
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 
 	./configure \
 		--build=$CBUILD \
@@ -32,7 +39,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm755 "$srcdir"/fetchmail.initd "$pkgdir"/etc/init.d/fetchmail
 	install -o fetchmail -g fetchmail -d "$pkgdir"/var/lib/fetchmail \
diff --git a/main/fftw/APKBUILD b/main/fftw/APKBUILD
index 7430f5949e..52d11bb47e 100644
--- a/main/fftw/APKBUILD
+++ b/main/fftw/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 }
 
 build() {
diff --git a/main/findutils/APKBUILD b/main/findutils/APKBUILD
index 7bb9d79ac0..353d2bf044 100644
--- a/main/findutils/APKBUILD
+++ b/main/findutils/APKBUILD
@@ -14,6 +14,11 @@ subpackages="$pkgname-doc"
 source="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/findutils-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 
diff --git a/main/flac/APKBUILD b/main/flac/APKBUILD
index 7ebcf4dc12..5c3d75fca9 100644
--- a/main/flac/APKBUILD
+++ b/main/flac/APKBUILD
@@ -11,8 +11,15 @@ depends=
 makedepends="libogg-dev !libiconv"
 source="http://downloads.xiph.org/releases/flac/flac-${pkgver}.tar.xz"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build () {
-	cd "$srcdir"/$pkgname-$pkgver || return 1
+	cd "$_builddir"
 
 	./configure \
 		--build=$CBUILD \
@@ -30,7 +37,7 @@ build () {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver || return 1
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la
 
diff --git a/main/font-util/APKBUILD b/main/font-util/APKBUILD
index 94be113358..b167d57a3f 100644
--- a/main/font-util/APKBUILD
+++ b/main/font-util/APKBUILD
@@ -12,8 +12,15 @@ install=
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() { 
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,7 +31,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install || return 1
 }
 md5sums="5c735ae6916b65186f3c876d76c27ce3  font-util-1.1.1.tar.bz2"
diff --git a/main/fontsproto/APKBUILD b/main/fontsproto/APKBUILD
index fde07dbcb2..eee8340cfe 100644
--- a/main/fontsproto/APKBUILD
+++ b/main/fontsproto/APKBUILD
@@ -10,8 +10,15 @@ depends=""
 makedepends=""
 source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -21,7 +28,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="c5f4f1fb4ba7766eedbc9489e81f3be2  fontsproto-2.1.2.tar.bz2"
diff --git a/main/fping/APKBUILD b/main/fping/APKBUILD
index b39056dfaa..320f04bed8 100644
--- a/main/fping/APKBUILD
+++ b/main/fping/APKBUILD
@@ -13,6 +13,11 @@ source="http://fping.org/dist/fping-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build () { 
 	cd "$_builddir"
 	./configure \
diff --git a/main/fprobe-ulog/APKBUILD b/main/fprobe-ulog/APKBUILD
index 4e88be2960..ff8afad471 100644
--- a/main/fprobe-ulog/APKBUILD
+++ b/main/fprobe-ulog/APKBUILD
@@ -20,6 +20,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd $_builddir
+	update_config_sub || return 1
 	for i in ../*.patch
 	do
 		msg "Applying $i"
diff --git a/main/fribidi/APKBUILD b/main/fribidi/APKBUILD
index 3b2ec1b8cb..21254a7a9d 100644
--- a/main/fribidi/APKBUILD
+++ b/main/fribidi/APKBUILD
@@ -11,9 +11,16 @@ depends=
 makedepends=
 source="http://fribidi.org/download/fribidi-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build ()
 {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,7 +30,7 @@ build ()
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la || return 1
 }
diff --git a/main/fsarchiver/APKBUILD b/main/fsarchiver/APKBUILD
index 772cf9abaf..037cce7c01 100644
--- a/main/fsarchiver/APKBUILD
+++ b/main/fsarchiver/APKBUILD
@@ -11,6 +11,13 @@ subpackages="$pkgname-doc"
 makedepends='attr-dev bzip2-dev e2fsprogs-dev lzo-dev xz-dev libgcrypt-dev zlib-dev'
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure \
diff --git a/main/fuse/APKBUILD b/main/fuse/APKBUILD
index ba3b3aaead..32869adea2 100644
--- a/main/fuse/APKBUILD
+++ b/main/fuse/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/galculator/APKBUILD b/main/galculator/APKBUILD
index b42cb3f745..633ba2d680 100644
--- a/main/galculator/APKBUILD
+++ b/main/galculator/APKBUILD
@@ -14,6 +14,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
 _builddir="$srcdir/galculator-$pkgver"
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/gc/APKBUILD b/main/gc/APKBUILD
index 5db186532b..29fb2783ad 100644
--- a/main/gc/APKBUILD
+++ b/main/gc/APKBUILD
@@ -16,6 +16,7 @@ source="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-$pkgver.tar.gz
 _builddir="$srcdir"/gc-${pkgver%[a-z]}
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/gdl/APKBUILD b/main/gdl/APKBUILD
index 415b5f911d..19e2f6796e 100644
--- a/main/gdl/APKBUILD
+++ b/main/gdl/APKBUILD
@@ -10,8 +10,15 @@ makedepends="gtk+-dev libxml2-dev intltool"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() { 
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,7 +31,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm -f "$pkgdir"/usr/lib/*.la
 }
diff --git a/main/geoip/APKBUILD b/main/geoip/APKBUILD
index 2c18cae4f9..d86caaecf2 100644
--- a/main/geoip/APKBUILD
+++ b/main/geoip/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/$_realname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	return 0
 }
 
diff --git a/main/giblib/APKBUILD b/main/giblib/APKBUILD
index cb1196d8a9..11f5122fe0 100644
--- a/main/giblib/APKBUILD
+++ b/main/giblib/APKBUILD
@@ -12,8 +12,15 @@ makedepends="imlib2-dev libxext-dev libx11-dev freetype-dev zlib-dev"
 source="http://linuxbrit.co.uk/downloads/$pkgname-$pkgver.tar.gz"
 
 depends_dev="imlib2-dev freetype-dev zlib-dev libx11-dev libxext-dev"
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,7 +30,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" docsdir=/usr/share/doc/giblib install || return 1
 	rm "$pkgdir"/usr/lib/*.la
 	install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
diff --git a/main/glproto/APKBUILD b/main/glproto/APKBUILD
index d6b9af13a1..9c95c70de7 100644
--- a/main/glproto/APKBUILD
+++ b/main/glproto/APKBUILD
@@ -10,8 +10,15 @@ depends=""
 makedepends=""
 source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() { 
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -21,7 +28,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="3847963c1b88fd04a030b932b0aece07  glproto-1.4.16.tar.bz2"
diff --git a/main/gnuchess/APKBUILD b/main/gnuchess/APKBUILD
index bc98ebeaaa..3708da77d2 100644
--- a/main/gnuchess/APKBUILD
+++ b/main/gnuchess/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/gnuchess-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/gpicview/APKBUILD b/main/gpicview/APKBUILD
index ad26d8cd19..a8f2847724 100644
--- a/main/gpicview/APKBUILD
+++ b/main/gpicview/APKBUILD
@@ -13,6 +13,7 @@ source="http://ftp.de.debian.org/debian/pool/main/g/$pkgname/${pkgname}_${pkgver
 "
 prepare() {
 	cd "$srcdir/$pkgname-$pkgver"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/grep/APKBUILD b/main/grep/APKBUILD
index 3303e7bd69..9f7d618f5b 100644
--- a/main/grep/APKBUILD
+++ b/main/grep/APKBUILD
@@ -13,8 +13,15 @@ install=
 subpackages="$pkgname-doc"
 source="http://mirrors.kernel.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 
 	./configure \
 		--build=$CBUILD \
@@ -29,8 +36,11 @@ build() {
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -rf "$pkgdir"/usr/lib/charset.alias
+	rmdir -p "$pkgdir"/usr/lib 2>/dev/null
+	return 0
 }
 
 md5sums="d4a3f03849d1e17ce56ab76aa5a24cab  grep-2.14.tar.xz"
diff --git a/main/gross/APKBUILD b/main/gross/APKBUILD
index 9855424217..2075327126 100644
--- a/main/gross/APKBUILD
+++ b/main/gross/APKBUILD
@@ -21,13 +21,14 @@ source="http://gross.googlecode.com/files/$pkgname-$pkgver.tar.gz
 
 _builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
-        local i
-        cd "$_builddir"
-        for i in $source; do
-                case $i in
-                *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-                esac
-        done
+	local i
+	cd "$_builddir"
+	update_config_sub || return 1
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
 }
 
 
@@ -42,18 +43,18 @@ build() {
 		--infodir=/usr/share/info \
 		|| return 1
 
-        make -j1 || return 1
+	make -j1 || return 1
 }
 
 package() {
 	cd "$_builddir"
 
-        make -j1 DESTDIR="$pkgdir" install
+	make -j1 DESTDIR="$pkgdir" install
 	rm "$pkgdir"/usr/lib/*.la
 
-        install -dD "$pkgdir"/var/run/gross
-        install -m755 -D "$srcdir"/grossd.initd "$pkgdir"/etc/init.d/grossd
-        install -m644 -D "$srcdir"/grossd.confd "$pkgdir"/etc/conf.d/grossd
+	install -dD "$pkgdir"/var/run/gross
+	install -m755 -D "$srcdir"/grossd.initd "$pkgdir"/etc/init.d/grossd
+	install -m644 -D "$srcdir"/grossd.confd "$pkgdir"/etc/conf.d/grossd
 }
 
 md5sums="cb88d88553161c01e9bed7a74c3e9263  gross-1.0.2.tar.gz
diff --git a/main/gsl/APKBUILD b/main/gsl/APKBUILD
index 479e571d52..238c6dd006 100644
--- a/main/gsl/APKBUILD
+++ b/main/gsl/APKBUILD
@@ -13,6 +13,11 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="http://ftp.gnu.org/gnu/gsl/gsl-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/gstreamer1/APKBUILD b/main/gstreamer1/APKBUILD
index 93496b6cbb..0c1c7066b8 100644
--- a/main/gstreamer1/APKBUILD
+++ b/main/gstreamer1/APKBUILD
@@ -16,6 +16,7 @@ source="http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$pkgver.tar.xz
 _builddir="$srcdir"/gstreamer-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case "$i" in
 		*.patch)
diff --git a/main/gtk-engines/APKBUILD b/main/gtk-engines/APKBUILD
index 50baa5cbf1..9f2e3284b1 100644
--- a/main/gtk-engines/APKBUILD
+++ b/main/gtk-engines/APKBUILD
@@ -23,6 +23,7 @@ _builddir="${srcdir}/${pkgname}-${pkgver}"
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/gtk-vnc/APKBUILD b/main/gtk-vnc/APKBUILD
index 0304bda523..498f25f8b8 100644
--- a/main/gtk-vnc/APKBUILD
+++ b/main/gtk-vnc/APKBUILD
@@ -13,8 +13,15 @@ makedepends="$depends_dev libiconv-dev gettext-dev intltool expat-dev
 source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
 
 subpackages="$pkgname-dev gvncviewer $pkgname-lang $pkgname-doc"
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build () {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,7 +35,7 @@ build () {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la
 }
diff --git a/main/gtk-xfce-engine/APKBUILD b/main/gtk-xfce-engine/APKBUILD
index 9fa4fc0abf..26e9079e3d 100644
--- a/main/gtk-xfce-engine/APKBUILD
+++ b/main/gtk-xfce-engine/APKBUILD
@@ -14,6 +14,7 @@ source="http://archive.xfce.org/src/xfce/gtk-xfce-engine/${pkgver%.*}/gtk-xfce-e
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/gtksourceview/APKBUILD b/main/gtksourceview/APKBUILD
index 5a9da5c9d7..f6f9e19354 100644
--- a/main/gtksourceview/APKBUILD
+++ b/main/gtksourceview/APKBUILD
@@ -12,8 +12,15 @@ makedepends="$depends_dev gobject-introspection-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="http://ftp.gnome.org/pub/gnome/sources/gtksourceview/${pkgver%.*}/gtksourceview-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() { 
-	cd "$srcdir"/gtksourceview-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,7 +33,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/gtksourceview-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	find "$pkgdir" -name '*.la' -delete
 }
diff --git a/main/gucharmap/APKBUILD b/main/gucharmap/APKBUILD
index e7078e43ef..52d1e544d6 100644
--- a/main/gucharmap/APKBUILD
+++ b/main/gucharmap/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 }
 
 build() {
diff --git a/main/guile/APKBUILD b/main/guile/APKBUILD
index 7166bb65cb..5c034fbd23 100644
--- a/main/guile/APKBUILD
+++ b/main/guile/APKBUILD
@@ -17,6 +17,7 @@ source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case "$i" in
 		*.patch)
diff --git a/main/haveged/APKBUILD b/main/haveged/APKBUILD
index 7490e314fd..63b09862b5 100644
--- a/main/haveged/APKBUILD
+++ b/main/haveged/APKBUILD
@@ -14,6 +14,11 @@ source="http://www.issihosts.com/haveged/haveged-$pkgver.tar.gz
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
   cd "$_builddir"
   ./configure \
diff --git a/main/htop/APKBUILD b/main/htop/APKBUILD
index c7c89133fc..20fafeb4ff 100644
--- a/main/htop/APKBUILD
+++ b/main/htop/APKBUILD
@@ -12,6 +12,11 @@ subpackages="$pkgname-doc"
 source="http://surfnet.dl.sourceforge.net/sourceforge/htop/$pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/hunspell/APKBUILD b/main/hunspell/APKBUILD
index f629a1e46c..26aa2c844c 100644
--- a/main/hunspell/APKBUILD
+++ b/main/hunspell/APKBUILD
@@ -11,8 +11,15 @@ depends=
 makedepends="gettext-dev"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir/hunspell-$pkgver"
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,7 +31,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir/hunspell-$pkgver"
+	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la || return 1
 }
diff --git a/main/iceauth/APKBUILD b/main/iceauth/APKBUILD
index 77fad92b3b..d75a8e9dae 100644
--- a/main/iceauth/APKBUILD
+++ b/main/iceauth/APKBUILD
@@ -10,8 +10,15 @@ subpackages="$pkgname-doc"
 depends=
 makedepends="pkgconfig libice-dev"
 source="http://xorg.freedesktop.org/releases/individual/app/iceauth-$pkgver.tar.bz2"
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,7 +29,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="975ade3f238c1eb10705da0a91e6e8e7  iceauth-1.0.3.tar.bz2"
diff --git a/main/indent/APKBUILD b/main/indent/APKBUILD
index 65c247549d..b68b71f259 100644
--- a/main/indent/APKBUILD
+++ b/main/indent/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	# apply patches here
 }
 
@@ -37,7 +38,10 @@ build() {
 
 package() {
 	cd "$_builddir"
-	make SUBDIRS="intl po src man" DESTDIR="$pkgdir" install
+	make SUBDIRS="intl po src man" DESTDIR="$pkgdir" install || return 1
+	rm -rf "$pkgdir"/usr/lib/charset.alias
+	rmdir -p "$pkgdir"/usr/lib 2>/dev/null
+	return 0
 }
 
 md5sums="98beafca62472805a3739d3867d5d70f  indent-2.2.11.tar.gz"
diff --git a/main/iperf/APKBUILD b/main/iperf/APKBUILD
index ede37bdf00..54553f0afe 100644
--- a/main/iperf/APKBUILD
+++ b/main/iperf/APKBUILD
@@ -14,6 +14,11 @@ subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD
index 661e2e98b9..17109a385a 100644
--- a/main/ipsec-tools/APKBUILD
+++ b/main/ipsec-tools/APKBUILD
@@ -25,6 +25,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in ../*.patch; do
 		msg "Applying $i..."
 		patch -p1 -i $i || return 1
diff --git a/main/irqbalance/APKBUILD b/main/irqbalance/APKBUILD
index 45dbc9eec3..43417ae396 100644
--- a/main/irqbalance/APKBUILD
+++ b/main/irqbalance/APKBUILD
@@ -20,6 +20,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	return 0
 }
 
diff --git a/main/irssi/APKBUILD b/main/irssi/APKBUILD
index 9e4d9aae8e..73bbffb154 100644
--- a/main/irssi/APKBUILD
+++ b/main/irssi/APKBUILD
@@ -19,6 +19,7 @@ _builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/jansson/APKBUILD b/main/jansson/APKBUILD
index 8811086f37..919b6b4993 100644
--- a/main/jansson/APKBUILD
+++ b/main/jansson/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/jansson-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/joe/APKBUILD b/main/joe/APKBUILD
index 51e07aa880..623d5f06b1 100644
--- a/main/joe/APKBUILD
+++ b/main/joe/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/jwhois/APKBUILD b/main/jwhois/APKBUILD
index 8bc206fdea..817d4c7d79 100644
--- a/main/jwhois/APKBUILD
+++ b/main/jwhois/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/keybinder/APKBUILD b/main/keybinder/APKBUILD
index 94ea810679..a6bee0f428 100644
--- a/main/keybinder/APKBUILD
+++ b/main/keybinder/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/keybinder-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/ldns/APKBUILD b/main/ldns/APKBUILD
index b389817232..4b0dfe7514 100644
--- a/main/ldns/APKBUILD
+++ b/main/ldns/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/ldns-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/lftp/APKBUILD b/main/lftp/APKBUILD
index f2c9d7fe31..cd98c82631 100644
--- a/main/lftp/APKBUILD
+++ b/main/lftp/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	# fix eglibc-2.16 build issue
 	sed -i -e '/gets is a/d' \
 		lib/stdio.in.h || return 1
diff --git a/main/libao/APKBUILD b/main/libao/APKBUILD
index cfffd994b2..03a1846a56 100644
--- a/main/libao/APKBUILD
+++ b/main/libao/APKBUILD
@@ -11,8 +11,15 @@ depends=
 makedepends="alsa-lib-dev"
 source="http://downloads.xiph.org/releases/ao/$pkgname-$pkgver.tar.gz"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build () {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,7 +32,7 @@ build () {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	rm "$pkgdir"/usr/lib/*.la \
 		"$pkgdir"/usr/lib/ao/plugins*/*.la
diff --git a/main/libart-lgpl/APKBUILD b/main/libart-lgpl/APKBUILD
index 436c460a02..26611efbd0 100644
--- a/main/libart-lgpl/APKBUILD
+++ b/main/libart-lgpl/APKBUILD
@@ -13,6 +13,11 @@ source="http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-$pkgv
 	"
 
 _builddir="$srcdir"/libart_lgpl-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/libasyncns/APKBUILD b/main/libasyncns/APKBUILD
index 366f3f0828..49e3d42754 100644
--- a/main/libasyncns/APKBUILD
+++ b/main/libasyncns/APKBUILD
@@ -15,6 +15,11 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$pkgver.tar.gz"
 _builddir="$srcdir"/$pkgname-$pkgver
 
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/libbluray/APKBUILD b/main/libbluray/APKBUILD
index 8472993e9b..06ae5e149e 100644
--- a/main/libbluray/APKBUILD
+++ b/main/libbluray/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/libbluray-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/libbonobo/APKBUILD b/main/libbonobo/APKBUILD
index 65bf599129..0b3ea40732 100644
--- a/main/libbonobo/APKBUILD
+++ b/main/libbonobo/APKBUILD
@@ -19,6 +19,7 @@ _builddir="${srcdir}/${pkgname}-${pkgver}"
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/libbsd/APKBUILD b/main/libbsd/APKBUILD
index 1499eb93d4..100ab14a70 100644
--- a/main/libbsd/APKBUILD
+++ b/main/libbsd/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/libbsd-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/libcanberra/APKBUILD b/main/libcanberra/APKBUILD
index 26705f7225..78d2fe574a 100644
--- a/main/libcanberra/APKBUILD
+++ b/main/libcanberra/APKBUILD
@@ -19,6 +19,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 }
 
 build() {
diff --git a/main/libcap-ng/APKBUILD b/main/libcap-ng/APKBUILD
index 6421b4ff9a..1db2bd2618 100644
--- a/main/libcap-ng/APKBUILD
+++ b/main/libcap-ng/APKBUILD
@@ -16,6 +16,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	# apply patches here
 }
 
diff --git a/main/libcddb/APKBUILD b/main/libcddb/APKBUILD
index 4a03352067..3ca9d0619e 100644
--- a/main/libcddb/APKBUILD
+++ b/main/libcddb/APKBUILD
@@ -20,6 +20,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	# apply patches here
 }
 
diff --git a/main/libcroco/APKBUILD b/main/libcroco/APKBUILD
index a183994cce..02850cd019 100644
--- a/main/libcroco/APKBUILD
+++ b/main/libcroco/APKBUILD
@@ -13,8 +13,15 @@ source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar
 
 depends_dev="glib-dev libxml2-dev pkgconfig"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,7 +32,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la || return 1
 }
diff --git a/main/libdaemon/APKBUILD b/main/libdaemon/APKBUILD
index a6adb55fd4..6a0c395957 100644
--- a/main/libdaemon/APKBUILD
+++ b/main/libdaemon/APKBUILD
@@ -12,6 +12,11 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="http://0pointer.de/lennart/projects/libdaemon/libdaemon-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build () {
 	cd "$_builddir"
 	./configure \
diff --git a/main/libdvbcsa/APKBUILD b/main/libdvbcsa/APKBUILD
index 75a173d7d7..6595ce0eb4 100644
--- a/main/libdvbcsa/APKBUILD
+++ b/main/libdvbcsa/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/libdvbcsa-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/libdvbpsi/APKBUILD b/main/libdvbpsi/APKBUILD
index bbe543c846..ee0b4bfc13 100644
--- a/main/libdvbpsi/APKBUILD
+++ b/main/libdvbpsi/APKBUILD
@@ -12,6 +12,11 @@ subpackages="$pkgname-dev"
 source="http://download.videolan.org/pub/libdvbpsi/$pkgver/$pkgname-$pkgver.tar.bz2"
 
 _builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/libestr/APKBUILD b/main/libestr/APKBUILD
index eb58b5d001..e95c8b7e81 100644
--- a/main/libestr/APKBUILD
+++ b/main/libestr/APKBUILD
@@ -13,6 +13,7 @@ source="http://libestr.adiscon.com/files/download/$pkgname-$pkgver.tar.gz"
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
diff --git a/main/libetpan/APKBUILD b/main/libetpan/APKBUILD
index 055df1d48a..f104b568ad 100644
--- a/main/libetpan/APKBUILD
+++ b/main/libetpan/APKBUILD
@@ -15,6 +15,7 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/libexif/APKBUILD b/main/libexif/APKBUILD
index 7380981b98..76726ba661 100644
--- a/main/libexif/APKBUILD
+++ b/main/libexif/APKBUILD
@@ -11,8 +11,15 @@ depends=
 makedepends=
 source="http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,7 +29,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la || return 1
 }
diff --git a/main/libfontenc/APKBUILD b/main/libfontenc/APKBUILD
index 6b4c625b76..41a17b51fa 100644
--- a/main/libfontenc/APKBUILD
+++ b/main/libfontenc/APKBUILD
@@ -11,8 +11,15 @@ makedepends="pkgconfig xproto zlib-dev"
 subpackages="$pkgname-dev"
 source="http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,7 +33,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la
 }
diff --git a/main/libglade/APKBUILD b/main/libglade/APKBUILD
index 17a55d58a1..aba553fcbd 100644
--- a/main/libglade/APKBUILD
+++ b/main/libglade/APKBUILD
@@ -17,6 +17,11 @@ source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.6/$pkgname-$pkgver.tar
 
 depends_dev="gtk+-dev libxml2-dev"
 _builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 package() {
 	cd "$_builddir"
 	patch -Np1 -i "$srcdir"/libglade-2.0.1-nowarning.patch || return 1
diff --git a/main/libgsf/APKBUILD b/main/libgsf/APKBUILD
index 3211df0f58..f03a907a70 100644
--- a/main/libgsf/APKBUILD
+++ b/main/libgsf/APKBUILD
@@ -13,8 +13,15 @@ source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.ta
 
 depends_dev="glib-dev bzip2-dev libxml2-dev pkgconfig"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	sed -i -e 's/gsf-gnome//' -e 's/thumbnailer//' Makefile.* || return 1
 	./configure \
 		--build=$CBUILD \
@@ -31,7 +38,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la || return 1
 	rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1
diff --git a/main/libgssglue/APKBUILD b/main/libgssglue/APKBUILD
index fc10ce7239..3812424175 100644
--- a/main/libgssglue/APKBUILD
+++ b/main/libgssglue/APKBUILD
@@ -12,6 +12,11 @@ source="http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver
 	gssapi_mech.conf"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/libgtop/APKBUILD b/main/libgtop/APKBUILD
index e9370e46c1..27bdb4002e 100644
--- a/main/libgtop/APKBUILD
+++ b/main/libgtop/APKBUILD
@@ -18,6 +18,7 @@ _builddir="${srcdir}/${pkgname}-${pkgver}"
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/libical/APKBUILD b/main/libical/APKBUILD
index f900cc9000..38c2d87bfc 100644
--- a/main/libical/APKBUILD
+++ b/main/libical/APKBUILD
@@ -13,6 +13,7 @@ source="http://downloads.sourceforge.net/freeassociation/$pkgname-$pkgver.tar.gz
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch)
diff --git a/main/libksba/APKBUILD b/main/libksba/APKBUILD
index f257c8e804..0b4c6cb16f 100644
--- a/main/libksba/APKBUILD
+++ b/main/libksba/APKBUILD
@@ -11,8 +11,15 @@ makedepends="libgpg-error-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build () {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,7 +29,7 @@ build () {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la
 }
diff --git a/main/libmad/APKBUILD b/main/libmad/APKBUILD
index 360430ef17..95aef54a29 100644
--- a/main/libmad/APKBUILD
+++ b/main/libmad/APKBUILD
@@ -20,6 +20,7 @@ source="http://downloads.sourceforge.net/sourceforge/mad/$pkgname-$pkgver.tar.gz
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/libmicrohttpd/APKBUILD b/main/libmicrohttpd/APKBUILD
index 943815c059..f2c142afad 100644
--- a/main/libmicrohttpd/APKBUILD
+++ b/main/libmicrohttpd/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	# apply patches here
 }
 
diff --git a/main/libmms/APKBUILD b/main/libmms/APKBUILD
index c217d56278..0df0e5699f 100644
--- a/main/libmms/APKBUILD
+++ b/main/libmms/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 }
 
 build() {
diff --git a/main/libmnl/APKBUILD b/main/libmnl/APKBUILD
index 309be9782f..eb330b0a58 100644
--- a/main/libmnl/APKBUILD
+++ b/main/libmnl/APKBUILD
@@ -14,6 +14,11 @@ install=""
 subpackages="$pkgname-dev"
 source="http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"
 _builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/libmodplug/APKBUILD b/main/libmodplug/APKBUILD
index 40f098d776..2760fd57d7 100644
--- a/main/libmodplug/APKBUILD
+++ b/main/libmodplug/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	# apply patches here
 }
 
diff --git a/main/libmowgli/APKBUILD b/main/libmowgli/APKBUILD
index 8e6b992b49..fa455b9799 100644
--- a/main/libmowgli/APKBUILD
+++ b/main/libmowgli/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/libmowgli-2-$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	# workaround bug in busybox
 	sed -e "/touch/s/0001010000/200001010000/g" \
 		-i configure
diff --git a/main/libmpeg2/APKBUILD b/main/libmpeg2/APKBUILD
index f5d4a723f9..4ade978a68 100644
--- a/main/libmpeg2/APKBUILD
+++ b/main/libmpeg2/APKBUILD
@@ -11,8 +11,15 @@ depends=
 makedepends="libx11-dev libice-dev libsm-dev libxext-dev libxv-dev"
 source="http://$pkgname.sourceforge.net/files/$pkgname-$pkgver.tar.gz"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,7 +33,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la
 }
diff --git a/main/libnet/APKBUILD b/main/libnet/APKBUILD
index 295eaef34c..a07acb8714 100644
--- a/main/libnet/APKBUILD
+++ b/main/libnet/APKBUILD
@@ -12,8 +12,15 @@ makedepends="autoconf automake libtool"
 subpackages="$pkgname-dev"
 source="http://downloads.sourceforge.net/project/libnet-dev/libnet-$pkgver.tar.gz"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 
 	./configure \
 		--build=$CBUILD \
@@ -24,7 +31,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la
 }
diff --git a/main/libnfnetlink/APKBUILD b/main/libnfnetlink/APKBUILD
index 3931f27c17..41641eae1b 100644
--- a/main/libnfnetlink/APKBUILD
+++ b/main/libnfnetlink/APKBUILD
@@ -12,8 +12,15 @@ makedepends=""
 subpackages="$pkgname-dev"
 source="http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 
 	./configure \
 		--build=$CBUILD \
@@ -27,7 +34,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la
 }
diff --git a/main/libotr/APKBUILD b/main/libotr/APKBUILD
index 72926f5400..9fd2487bdf 100644
--- a/main/libotr/APKBUILD
+++ b/main/libotr/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir/libotr-$pkgver"
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/libotr3/APKBUILD b/main/libotr3/APKBUILD
index 03c44342ab..a463d2f984 100644
--- a/main/libotr3/APKBUILD
+++ b/main/libotr3/APKBUILD
@@ -19,6 +19,7 @@ _builddir="$srcdir/libotr-$pkgver"
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/libpcap/APKBUILD b/main/libpcap/APKBUILD
index 91c0ccf0c2..c52588fe46 100644
--- a/main/libpcap/APKBUILD
+++ b/main/libpcap/APKBUILD
@@ -16,6 +16,7 @@ subpackages="$pkgname-doc $pkgname-dev"
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in "$srcdir"/*.patch; do
 		[ -r "$i" ] || continue
 		msg "Applying $i..."
diff --git a/main/libraw1394/APKBUILD b/main/libraw1394/APKBUILD
index 8c8e36648e..55170c5f99 100644
--- a/main/libraw1394/APKBUILD
+++ b/main/libraw1394/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/librsync/APKBUILD b/main/librsync/APKBUILD
index 3e42bf7007..15b6f98cdd 100644
--- a/main/librsync/APKBUILD
+++ b/main/librsync/APKBUILD
@@ -15,6 +15,11 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
 	cd "$_builddir"
 
diff --git a/main/libsamplerate/APKBUILD b/main/libsamplerate/APKBUILD
index c8d3e9bfbe..1bb00c0592 100644
--- a/main/libsamplerate/APKBUILD
+++ b/main/libsamplerate/APKBUILD
@@ -10,8 +10,15 @@ license="GPL"
 depends=""
 source="http://www.mega-nerd.com/SRC/$pkgname-$pkgver.tar.gz"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build () {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -21,7 +28,7 @@ build () {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la || return 1
 }
diff --git a/main/libsexy/APKBUILD b/main/libsexy/APKBUILD
index e3423d53b6..ea37def32e 100644
--- a/main/libsexy/APKBUILD
+++ b/main/libsexy/APKBUILD
@@ -10,9 +10,16 @@ subpackages="$pkgname-dev $pkgname-doc"
 makedepends="gtk+-dev libxml2-dev iso-codes"
 source="http://releases.chipx86.com/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build ()
 {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,7 +30,7 @@ build ()
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	rm -f "$pkgdir"/usr/lib/libsexy.a
 	find "$pkgdir" -name '*.la' -delete
diff --git a/main/libsigc++/APKBUILD b/main/libsigc++/APKBUILD
index e7e44d9a82..6da1bf843a 100644
--- a/main/libsigc++/APKBUILD
+++ b/main/libsigc++/APKBUILD
@@ -11,8 +11,15 @@ makedepends="m4 perl tar"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.2/$pkgname-$pkgver.tar.xz"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,7 +29,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la
 }
diff --git a/main/libspf2/APKBUILD b/main/libspf2/APKBUILD
index 5bfa649f65..79ce6ca9e2 100644
--- a/main/libspf2/APKBUILD
+++ b/main/libspf2/APKBUILD
@@ -20,6 +20,7 @@ source="http://www.libspf2.org/spf/libspf2-$pkgver.tar.gz
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/libunique/APKBUILD b/main/libunique/APKBUILD
index f0f304f90d..c9573d9626 100644
--- a/main/libunique/APKBUILD
+++ b/main/libunique/APKBUILD
@@ -15,6 +15,7 @@ source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/1.1/$pkgname-$pkgver.tar
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return;;
diff --git a/main/libunistring/APKBUILD b/main/libunistring/APKBUILD
index 12d220a122..fd67d2c32c 100644
--- a/main/libunistring/APKBUILD
+++ b/main/libunistring/APKBUILD
@@ -19,6 +19,7 @@ _builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/libverto/APKBUILD b/main/libverto/APKBUILD
index c0a371e0f9..9ef7adf8da 100644
--- a/main/libverto/APKBUILD
+++ b/main/libverto/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/libverto-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/libxdg-basedir/APKBUILD b/main/libxdg-basedir/APKBUILD
index 65934815a6..a9e9fd586a 100644
--- a/main/libxdg-basedir/APKBUILD
+++ b/main/libxdg-basedir/APKBUILD
@@ -18,6 +18,7 @@ _builddir="${srcdir}/${pkgname}-${pkgver}"
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/libxkbcommon/APKBUILD b/main/libxkbcommon/APKBUILD
index fdd72b6499..b9e5d0d94a 100644
--- a/main/libxkbcommon/APKBUILD
+++ b/main/libxkbcommon/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/libxkbcommon-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/libxkbfile/APKBUILD b/main/libxkbfile/APKBUILD
index 351c5ace4c..ac8e5644f9 100644
--- a/main/libxkbfile/APKBUILD
+++ b/main/libxkbfile/APKBUILD
@@ -12,8 +12,15 @@ subpackages="$pkgname-dev"
 source="http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
 
 depends_dev="libx11-dev kbproto"
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build () {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,7 +31,7 @@ build () {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la || return 1
 	install -D -m644 "$srcdir"/$pkgname-$pkgver/COPYING \
diff --git a/main/llvm/APKBUILD b/main/llvm/APKBUILD
index 2fbcd1d404..668ee739d0 100644
--- a/main/llvm/APKBUILD
+++ b/main/llvm/APKBUILD
@@ -34,6 +34,7 @@ prepare() {
 	msg "Patching LLVM core..."
 
 	cd "$srcdir"/$pkgname-$pkgver.src || return 1
+	update_config_sub || return 1
 
 	for i in $source; do
 		case $i in
diff --git a/main/lua-crypto/APKBUILD b/main/lua-crypto/APKBUILD
index 471ff267d4..c95a44a2dd 100644
--- a/main/lua-crypto/APKBUILD
+++ b/main/lua-crypto/APKBUILD
@@ -14,6 +14,11 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="luacrypto-$pkgver.tar.gz::https://github.com/mkottman/luacrypto/archive/$pkgver.tar.gz"
 
 _builddir="$srcdir"/luacrypto-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	LUA_CFLAGS="$(pkg-config lua$_luaver --cflags)" \
diff --git a/main/lua5.2-crypto/APKBUILD b/main/lua5.2-crypto/APKBUILD
index 6cdb4668ad..9e7665085a 100644
--- a/main/lua5.2-crypto/APKBUILD
+++ b/main/lua5.2-crypto/APKBUILD
@@ -14,6 +14,11 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="luacrypto-$pkgver.tar.gz::https://github.com/mkottman/luacrypto/archive/$pkgver.tar.gz"
 
 _builddir="$srcdir"/luacrypto-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	LUA_CFLAGS="$(pkg-config lua$_luaver --cflags)" \
diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD
index 7c0c355ee6..6be6330e61 100644
--- a/main/lvm2/APKBUILD
+++ b/main/lvm2/APKBUILD
@@ -14,8 +14,15 @@ source="ftp://sources.redhat.com/pub/$pkgname/LVM2.$pkgver.tgz
 	"
 subpackages="$pkgname-dev $pkgname-doc device-mapper:dm $pkgname-libs"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build () {
-	cd "$srcdir"/LVM2.$pkgver
+	cd "$_builddir"
 
 	./configure \
 		--build=$CBUILD \
@@ -37,7 +44,7 @@ build () {
 }
 
 package() {
-	cd "$srcdir"/LVM2.$pkgver
+	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" \
 		install || return 1
 		#usrlibdir="$pkgdir"/lib \
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD
index 29da5b9ae2..25b900750d 100644
--- a/main/lxc/APKBUILD
+++ b/main/lxc/APKBUILD
@@ -25,6 +25,7 @@ _builddir="${srcdir}/${pkgname}-${_mypkgver}"
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/lxsession/APKBUILD b/main/lxsession/APKBUILD
index 108512e5f2..42454bf02d 100644
--- a/main/lxsession/APKBUILD
+++ b/main/lxsession/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/lxsession-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/makedepend/APKBUILD b/main/makedepend/APKBUILD
index 69240b980b..da5eeb5c3a 100644
--- a/main/makedepend/APKBUILD
+++ b/main/makedepend/APKBUILD
@@ -18,6 +18,7 @@ _builddir="${srcdir}/${pkgname}-${pkgver}"
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/mc/APKBUILD b/main/mc/APKBUILD
index f2915486ac..ac5723b7e3 100644
--- a/main/mc/APKBUILD
+++ b/main/mc/APKBUILD
@@ -12,6 +12,11 @@ makedepends="e2fsprogs-dev glib-dev pcre-dev slang-dev"
 source="http://www.midnight-commander.org/downloads/mc-$pkgver.tar.bz2"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/memcached/APKBUILD b/main/memcached/APKBUILD
index 1cd66a905d..2ed54a1954 100644
--- a/main/memcached/APKBUILD
+++ b/main/memcached/APKBUILD
@@ -21,6 +21,7 @@ _builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/minicom/APKBUILD b/main/minicom/APKBUILD
index d9a6742f5a..85e81bd582 100644
--- a/main/minicom/APKBUILD
+++ b/main/minicom/APKBUILD
@@ -14,6 +14,11 @@ subpackages="$pkgname-doc $pkgname-lang"
 source="http://alioth.debian.org/frs/download.php/3869/minicom-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/mrxvt/APKBUILD b/main/mrxvt/APKBUILD
index 17cd30c6a3..59ef8de94d 100644
--- a/main/mrxvt/APKBUILD
+++ b/main/mrxvt/APKBUILD
@@ -18,6 +18,7 @@ source="
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	patch -p1 < ../mrxvt-0.5.4-002-fix-segfault-when-wd-empty.patch || return 1
 }
 
diff --git a/main/msmtp/APKBUILD b/main/msmtp/APKBUILD
index 76ebbb0b02..9bf50831d0 100644
--- a/main/msmtp/APKBUILD
+++ b/main/msmtp/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/msmtp-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/mtdev/APKBUILD b/main/mtdev/APKBUILD
index be94cd7b28..7283ce918b 100644
--- a/main/mtdev/APKBUILD
+++ b/main/mtdev/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/mtdev-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/nano/APKBUILD b/main/nano/APKBUILD
index 560d0950b6..e8efe62325 100644
--- a/main/nano/APKBUILD
+++ b/main/nano/APKBUILD
@@ -13,8 +13,15 @@ install=
 subpackages="$pkgname-doc"
 source="http://www.nano-editor.org/dist/v${pkgver%.*}/$pkgname-$pkgver.tar.gz"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 
 	./configure \
 		--build=$CBUILD \
@@ -30,7 +37,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 
 	mkdir -p "$pkgdir"/etc
diff --git a/main/nload/APKBUILD b/main/nload/APKBUILD
index ac7f0a82b8..7838080cff 100644
--- a/main/nload/APKBUILD
+++ b/main/nload/APKBUILD
@@ -15,6 +15,11 @@ source="http://www.roland-riegel.de/nload/nload-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/nrpe/APKBUILD b/main/nrpe/APKBUILD
index 6ceaf0b42d..ee5db43301 100644
--- a/main/nrpe/APKBUILD
+++ b/main/nrpe/APKBUILD
@@ -16,8 +16,15 @@ source="http://downloads.sourceforge.net/nagios/$pkgname-$pkgver.tar.gz
 	nrpe.initd
 	nrpe.confd"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 
 	./configure \
 		--build=$CBUILD \
@@ -33,7 +40,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install install-daemon-config
 	#remove plugin since its in separate package
 	rm -rf "$pkgdir"/usr/lib
@@ -43,7 +50,7 @@ package() {
 
 plugin() {
 	pkgdesc="Nagios plugin to check result via NRPE daemon"
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$subpkgdir" install-plugin
 }
 
diff --git a/main/ntfs-3g/APKBUILD b/main/ntfs-3g/APKBUILD
index 8f5024a0dd..d657e14c6a 100644
--- a/main/ntfs-3g/APKBUILD
+++ b/main/ntfs-3g/APKBUILD
@@ -13,6 +13,11 @@ subpackages="$pkgname-doc $pkgname-dev"
 source="http://tuxera.com/opensource/ntfs-3g_ntfsprogs-$pkgver.tgz"
 
 _builddir="$srcdir"/ntfs-3g_ntfsprogs-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/ocfs2-tools/APKBUILD b/main/ocfs2-tools/APKBUILD
index a08724a96d..e49de3f742 100644
--- a/main/ocfs2-tools/APKBUILD
+++ b/main/ocfs2-tools/APKBUILD
@@ -24,6 +24,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	local i
 	for i in ../*.patch
 	do
diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD
index cf9712678b..071c38dfff 100644
--- a/main/open-vm-tools-grsec/APKBUILD
+++ b/main/open-vm-tools-grsec/APKBUILD
@@ -51,6 +51,7 @@ _builddir="$srcdir/$_realname-$_ver"
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
         for i in $source; do
                 case $i in
                 *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD
index afff0d03b4..e3570252c1 100644
--- a/main/openldap/APKBUILD
+++ b/main/openldap/APKBUILD
@@ -26,6 +26,7 @@ source="ftp://ftp.$pkgname.org/pub/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tg
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/oprofile/APKBUILD b/main/oprofile/APKBUILD
index d71a8f6acc..c0dc424dc9 100644
--- a/main/oprofile/APKBUILD
+++ b/main/oprofile/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 }
                                                         
 build() {
diff --git a/main/orc/APKBUILD b/main/orc/APKBUILD
index a5a954ea9b..da75d1c64a 100644
--- a/main/orc/APKBUILD
+++ b/main/orc/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/orc-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/ortp/APKBUILD b/main/ortp/APKBUILD
index dba936a87d..1de18be9dd 100644
--- a/main/ortp/APKBUILD
+++ b/main/ortp/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/ortp-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/pangox-compat/APKBUILD b/main/pangox-compat/APKBUILD
index 577ddade07..dbcdc03921 100644
--- a/main/pangox-compat/APKBUILD
+++ b/main/pangox-compat/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/pangox-compat-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/pgcluster/APKBUILD b/main/pgcluster/APKBUILD
index f3fdf8be7f..e68949d676 100644
--- a/main/pgcluster/APKBUILD
+++ b/main/pgcluster/APKBUILD
@@ -17,8 +17,15 @@ source="http://pgfoundry.org/frs/download.php/1705/$pkgname-$_myver.tar.gz
 
 [ "$ALPINE_LIBC" = "eglibc" ] && arch=
 
+_builddir="$srcdir/$pkgname-$_myver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$_myver || return 1
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,7 +39,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$_myver || return 1
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 
 	install -D -m755 "$srcdir"/$pkgname.initd \
diff --git a/main/pgpool/APKBUILD b/main/pgpool/APKBUILD
index b56ad8becf..24ab161ff9 100644
--- a/main/pgpool/APKBUILD
+++ b/main/pgpool/APKBUILD
@@ -14,6 +14,11 @@ source="$_opkgname-$pkgver.tar.gz::http://www.pgpool.net/download.php?f=$_opkgna
 		$pkgname.initd"
 
 _builddir="$srcdir"/$_opkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/pinentry/APKBUILD b/main/pinentry/APKBUILD
index 63f5b95d69..c543d814f2 100644
--- a/main/pinentry/APKBUILD
+++ b/main/pinentry/APKBUILD
@@ -13,6 +13,11 @@ subpackages="$pkgname-doc $pkgname-gtk"
 source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build () {
 	cd "$_builddir"
 	./configure \
diff --git a/main/poppler-gtk/APKBUILD b/main/poppler-gtk/APKBUILD
index bb71f05cd9..6417a2214e 100644
--- a/main/poppler-gtk/APKBUILD
+++ b/main/poppler-gtk/APKBUILD
@@ -31,8 +31,15 @@ prepare() {
 	return 0
 }
 
+_builddir="$srcdir/$_realname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$_realname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -53,7 +60,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$_realname-$pkgver
+	cd "$_builddir"
 	install -D -m644 poppler-glib.pc "$pkgdir"/usr/lib/pkgconfig/poppler-glib.pc
 	cd glib
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/main/portaudio/APKBUILD b/main/portaudio/APKBUILD
index 8fb8b917ee..1e2b27949f 100644
--- a/main/portaudio/APKBUILD
+++ b/main/portaudio/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/portaudio
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/printproto/APKBUILD b/main/printproto/APKBUILD
index 82e0eb4f03..62fe68e5bb 100644
--- a/main/printproto/APKBUILD
+++ b/main/printproto/APKBUILD
@@ -11,8 +11,15 @@ depends_dev="util-macros"
 makedepends="$depends_dev"
 source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() { 
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,7 +29,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="99d0e25feea2fead7d8325b7000b41c3  printproto-1.0.5.tar.bz2"
diff --git a/main/privoxy/APKBUILD b/main/privoxy/APKBUILD
index dc8dc03298..ad05528194 100644
--- a/main/privoxy/APKBUILD
+++ b/main/privoxy/APKBUILD
@@ -21,6 +21,7 @@ source="http://downloads.sourceforge.net/ijbswa/$pkgname-$pkgver-stable-src.tar.
 _builddir="$srcdir"/$pkgname-$pkgver-stable
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/procps/APKBUILD b/main/procps/APKBUILD
index f383a1949c..1eaa2ef86c 100644
--- a/main/procps/APKBUILD
+++ b/main/procps/APKBUILD
@@ -14,6 +14,7 @@ source="http://downloads.sourceforge.net/procps-ng/procps-ng-$pkgver.tar.xz"
 _builddir="$srcdir"/procps-ng-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	aclocal && autoconf && automake --add-missing
 }
 
diff --git a/main/py-dbus/APKBUILD b/main/py-dbus/APKBUILD
index c75f0e1bd1..ff1ce59f0b 100644
--- a/main/py-dbus/APKBUILD
+++ b/main/py-dbus/APKBUILD
@@ -12,6 +12,11 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="http://dbus.freedesktop.org/releases/dbus-python/dbus-python-$pkgver.tar.gz"
 
 _builddir="$srcdir"/dbus-python-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/py-gobject/APKBUILD b/main/py-gobject/APKBUILD
index 8fe8cb2373..97ac226d5f 100644
--- a/main/py-gobject/APKBUILD
+++ b/main/py-gobject/APKBUILD
@@ -16,6 +16,7 @@ source="http://ftp.gnome.org/pub/GNOME/sources/pygobject/${pkgver%.*}/pygobject-
 _builddir="$srcdir"/pygobject-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	# apply patches here
 }
 
diff --git a/main/py-gobject3/APKBUILD b/main/py-gobject3/APKBUILD
index ece598d95e..57df103ac6 100644
--- a/main/py-gobject3/APKBUILD
+++ b/main/py-gobject3/APKBUILD
@@ -16,6 +16,7 @@ source="http://ftp.gnome.org/pub/GNOME/sources/pygobject/${pkgver%.*}/pygobject-
 _builddir="$srcdir"/pygobject-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	# apply patches here
 }
 
diff --git a/main/qpdf/APKBUILD b/main/qpdf/APKBUILD
index 3cffa9bfd6..e295a6b883 100644
--- a/main/qpdf/APKBUILD
+++ b/main/qpdf/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/qpdf-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/reiserfsprogs/APKBUILD b/main/reiserfsprogs/APKBUILD
index 97f3bb482d..6e468acc1d 100644
--- a/main/reiserfsprogs/APKBUILD
+++ b/main/reiserfsprogs/APKBUILD
@@ -15,6 +15,11 @@ source="http://ftp.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v$pkgv
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 #prepare() {
 #	cd "$_builddir"
 #	apply patches here
diff --git a/main/resourceproto/APKBUILD b/main/resourceproto/APKBUILD
index 4e14da433f..da14e1f28a 100644
--- a/main/resourceproto/APKBUILD
+++ b/main/resourceproto/APKBUILD
@@ -10,8 +10,15 @@ depends=""
 makedepends=""
 source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build () {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -21,7 +28,7 @@ build () {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="cfdb57dae221b71b2703f8e2980eaaf4  resourceproto-1.2.0.tar.bz2"
diff --git a/main/rgb/APKBUILD b/main/rgb/APKBUILD
index e84d2d3710..c264a1a3f6 100644
--- a/main/rgb/APKBUILD
+++ b/main/rgb/APKBUILD
@@ -11,8 +11,15 @@ depends=
 makedepends="pkgconfig xproto"
 source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,7 +30,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="44ea16cc3104de6401bc74035f642357  rgb-1.0.3.tar.bz2"
diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD
index 7005572d8a..0a1867d107 100644
--- a/main/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
@@ -43,6 +43,7 @@ esac
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $patches; do
 		msg $i
 		patch -p1 -i "$srcdir"/$i || return 1
diff --git a/main/rxvt-unicode/APKBUILD b/main/rxvt-unicode/APKBUILD
index aa73472f47..7945e9d326 100644
--- a/main/rxvt-unicode/APKBUILD
+++ b/main/rxvt-unicode/APKBUILD
@@ -17,6 +17,7 @@ _builddir="${srcdir}/${pkgname}-${pkgver}"
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	local i
 	for i in $source; do
 		case $i in
diff --git a/main/scrnsaverproto/APKBUILD b/main/scrnsaverproto/APKBUILD
index e391421b5d..6ffc382201 100644
--- a/main/scrnsaverproto/APKBUILD
+++ b/main/scrnsaverproto/APKBUILD
@@ -10,8 +10,15 @@ depends=""
 makedepends=""
 source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -21,7 +28,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	install -m755 -d "$pkgdir"/usr/share/licenses/$pkgname
 	install -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/ || return 1
diff --git a/main/sessreg/APKBUILD b/main/sessreg/APKBUILD
index eb5b7f7503..9e1af1244d 100644
--- a/main/sessreg/APKBUILD
+++ b/main/sessreg/APKBUILD
@@ -11,8 +11,15 @@ depends=
 makedepends="pkgconfig xproto"
 source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build () {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,7 +30,7 @@ build () {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="00e834c3cbfd990e9d7d5ddc834242df  sessreg-1.0.5.tar.bz2"
diff --git a/main/sg3_utils/APKBUILD b/main/sg3_utils/APKBUILD
index b52278e286..044003372e 100644
--- a/main/sg3_utils/APKBUILD
+++ b/main/sg3_utils/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	# apply patches here
 }
 
diff --git a/main/sipsak/APKBUILD b/main/sipsak/APKBUILD
index b93d5a815c..6ca63999dd 100644
--- a/main/sipsak/APKBUILD
+++ b/main/sipsak/APKBUILD
@@ -13,6 +13,11 @@ subpackages="$pkgname-doc"
 source="http://download.berlios.de/$pkgname/$pkgname-$pkgver-1.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/sqsh/APKBUILD b/main/sqsh/APKBUILD
index 5e2ea2f9a6..ac9366e31e 100644
--- a/main/sqsh/APKBUILD
+++ b/main/sqsh/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/startup-notification/APKBUILD b/main/startup-notification/APKBUILD
index 4111bce7ff..bb1bff538a 100644
--- a/main/startup-notification/APKBUILD
+++ b/main/startup-notification/APKBUILD
@@ -12,8 +12,15 @@ makedepends="libx11-dev libsm-dev xcb-util-dev"
 source="http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.gz"
 
 depends_dev="libsm-dev xcb-util-dev"
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,7 +32,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm -f "$pkgdir"/usr/lib/*.a "$pkgdir"/usr/lib/*.la
 }
diff --git a/main/swish-e/APKBUILD b/main/swish-e/APKBUILD
index 9b9af9a264..1fa029734f 100644
--- a/main/swish-e/APKBUILD
+++ b/main/swish-e/APKBUILD
@@ -13,8 +13,15 @@ install=
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://www.swish-e.org/distribution/$pkgname-$pkgver.tar.gz"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 
 	./configure \
 		--build=$CBUILD \
@@ -28,7 +35,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 
 	# Move SwishSpiderConfig.pl because spider.pl won't run without default settings 
diff --git a/main/tinyproxy/APKBUILD b/main/tinyproxy/APKBUILD
index fba98ec283..63f03ec23d 100644
--- a/main/tinyproxy/APKBUILD
+++ b/main/tinyproxy/APKBUILD
@@ -21,6 +21,7 @@ source="https://www.banu.com/pub/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
 _builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/valgrind/APKBUILD b/main/valgrind/APKBUILD
index cdf0555d41..f2ef6a9c0c 100644
--- a/main/valgrind/APKBUILD
+++ b/main/valgrind/APKBUILD
@@ -23,6 +23,7 @@ source="http://$pkgname.org/downloads/$pkgname-$pkgver.tar.bz2
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/vanessa_logger/APKBUILD b/main/vanessa_logger/APKBUILD
index 53c6533f6d..826faee9d2 100644
--- a/main/vanessa_logger/APKBUILD
+++ b/main/vanessa_logger/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	return 0
 }
 
diff --git a/main/vte/APKBUILD b/main/vte/APKBUILD
index 9d41d5110b..135f9a0084 100644
--- a/main/vte/APKBUILD
+++ b/main/vte/APKBUILD
@@ -15,6 +15,7 @@ source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$p
 depends_dev="glib-dev pango-dev gtk+-dev"
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch)
diff --git a/main/wavpack/APKBUILD b/main/wavpack/APKBUILD
index 83658b91b1..781916e8a9 100644
--- a/main/wavpack/APKBUILD
+++ b/main/wavpack/APKBUILD
@@ -21,6 +21,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/xarchiver/APKBUILD b/main/xarchiver/APKBUILD
index 2ba0696b9a..291a00390c 100644
--- a/main/xarchiver/APKBUILD
+++ b/main/xarchiver/APKBUILD
@@ -15,6 +15,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
 
 prepare() {
 	cd "$srcdir/xarchiver-$pkgver"
+	update_config_sub || return 1
 	patch -p1 -i "$srcdir"/xarchiver-0.5.2-stack-smash.patch
 }
 
diff --git a/main/xauth/APKBUILD b/main/xauth/APKBUILD
index cf3696dd25..2dbccfcfa1 100644
--- a/main/xauth/APKBUILD
+++ b/main/xauth/APKBUILD
@@ -10,8 +10,15 @@ depends=
 makedepends="pkgconfig libxau-dev libxext-dev libxmu-dev libx11-dev"
 source="http://xorg.freedesktop.org/releases/individual/app/xauth-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/xauth-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -21,7 +28,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/xauth-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
diff --git a/main/xbacklight/APKBUILD b/main/xbacklight/APKBUILD
index 42aa3d1f31..9f33d9af23 100644
--- a/main/xbacklight/APKBUILD
+++ b/main/xbacklight/APKBUILD
@@ -11,8 +11,15 @@ depends=
 makedepends="pkgconfig libx11-dev libxrandr-dev"
 source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,7 +30,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="51b4a1c0ae2b3bd77417306fd78a3e94  xbacklight-1.1.tar.bz2"
diff --git a/main/xcb-util-image/APKBUILD b/main/xcb-util-image/APKBUILD
index 06f479b8a9..46d28782a5 100644
--- a/main/xcb-util-image/APKBUILD
+++ b/main/xcb-util-image/APKBUILD
@@ -19,6 +19,7 @@ _builddir="$srcdir"/xcb-util-image-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/xcb-util-keysyms/APKBUILD b/main/xcb-util-keysyms/APKBUILD
index 8b29510250..f47368984d 100644
--- a/main/xcb-util-keysyms/APKBUILD
+++ b/main/xcb-util-keysyms/APKBUILD
@@ -19,6 +19,7 @@ _builddir="$srcdir"/xcb-util-keysyms-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/xcb-util-renderutil/APKBUILD b/main/xcb-util-renderutil/APKBUILD
index d61122a9b8..dabbb9c010 100644
--- a/main/xcb-util-renderutil/APKBUILD
+++ b/main/xcb-util-renderutil/APKBUILD
@@ -19,6 +19,7 @@ _builddir="$srcdir"/xcb-util-renderutil-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/xcb-util-wm/APKBUILD b/main/xcb-util-wm/APKBUILD
index a9ab2a8230..ce2578fe4d 100644
--- a/main/xcb-util-wm/APKBUILD
+++ b/main/xcb-util-wm/APKBUILD
@@ -19,6 +19,7 @@ _builddir="$srcdir"/xcb-util-wm-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/xchat/APKBUILD b/main/xchat/APKBUILD
index 2091d59ea8..81d7972071 100644
--- a/main/xchat/APKBUILD
+++ b/main/xchat/APKBUILD
@@ -18,6 +18,7 @@ source="http://www.$pkgname.org/files/source/2.8/$pkgname-$pkgver.tar.bz2
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg "$i"; patch -p1 -i "$srcdir"/$i || return 1 ;;
diff --git a/main/xcmiscproto/APKBUILD b/main/xcmiscproto/APKBUILD
index 3f7edb9a5b..8041de116d 100644
--- a/main/xcmiscproto/APKBUILD
+++ b/main/xcmiscproto/APKBUILD
@@ -10,8 +10,15 @@ depends=""
 makedepends=""
 source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build () {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -21,7 +28,7 @@ build () {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="5f4847c78e41b801982c8a5e06365b24  xcmiscproto-1.2.2.tar.bz2"
diff --git a/main/xcmsdb/APKBUILD b/main/xcmsdb/APKBUILD
index 526a59111a..32b0e2b74e 100644
--- a/main/xcmsdb/APKBUILD
+++ b/main/xcmsdb/APKBUILD
@@ -11,8 +11,15 @@ depends=
 makedepends="pkgconfig libx11-dev"
 source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,7 +30,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="7f2bed9f4dd3301d18d83eb296c3be0d  xcmsdb-1.0.2.tar.bz2"
diff --git a/main/xf86driproto/APKBUILD b/main/xf86driproto/APKBUILD
index 797052d939..9911d5fdf9 100644
--- a/main/xf86driproto/APKBUILD
+++ b/main/xf86driproto/APKBUILD
@@ -10,8 +10,15 @@ depends=""
 makedepends=""
 source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -21,7 +28,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="1d716d0dac3b664e5ee20c69d34bc10e  xf86driproto-2.1.1.tar.bz2"
diff --git a/main/xf86vidmodeproto/APKBUILD b/main/xf86vidmodeproto/APKBUILD
index 9041b65499..2713dc984a 100644
--- a/main/xf86vidmodeproto/APKBUILD
+++ b/main/xf86vidmodeproto/APKBUILD
@@ -10,8 +10,15 @@ depends=""
 makedepends=""
 source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -21,7 +28,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="e793ecefeaecfeabd1aed6a01095174e  xf86vidmodeproto-2.3.1.tar.bz2"
diff --git a/main/xfce4-dev-tools/APKBUILD b/main/xfce4-dev-tools/APKBUILD
index f567894fae..fc6f7b999b 100644
--- a/main/xfce4-dev-tools/APKBUILD
+++ b/main/xfce4-dev-tools/APKBUILD
@@ -10,8 +10,15 @@ depends="automake autoconf make intltool pkgconfig libtool gtk-doc glib-dev"
 makedepends=
 source="http://archive.xfce.org/src/xfce/xfce4-dev-tools/${pkgver%.*}/xfce4-dev-tools-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,7 +32,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 
diff --git a/main/xfconf/APKBUILD b/main/xfconf/APKBUILD
index a33d73ffd2..ceb24a5b7e 100644
--- a/main/xfconf/APKBUILD
+++ b/main/xfconf/APKBUILD
@@ -14,6 +14,11 @@ source="http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.
 
 
 _builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/xfsprogs/APKBUILD b/main/xfsprogs/APKBUILD
index 81d3a58658..36cc6d4c46 100644
--- a/main/xfsprogs/APKBUILD
+++ b/main/xfsprogs/APKBUILD
@@ -16,6 +16,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	sed -i -e 's/--best//' Makefile doc/Makefile
 }
 	
diff --git a/main/xhost/APKBUILD b/main/xhost/APKBUILD
index e00fdd1144..56427358c3 100644
--- a/main/xhost/APKBUILD
+++ b/main/xhost/APKBUILD
@@ -11,8 +11,15 @@ depends=
 makedepends="pkgconfig libx11-dev libxmu-dev libxau-dev"
 source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build () {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,7 +30,7 @@ build () {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="c7f91b4a750d297f269c2a0a3206a1b2  xhost-1.0.3.tar.bz2"
diff --git a/main/xmlrpc-c/APKBUILD b/main/xmlrpc-c/APKBUILD
index 5f9a1f7791..a612a03559 100644
--- a/main/xmlrpc-c/APKBUILD
+++ b/main/xmlrpc-c/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/xmodmap/APKBUILD b/main/xmodmap/APKBUILD
index cf7405096c..b5b3f7fdef 100644
--- a/main/xmodmap/APKBUILD
+++ b/main/xmodmap/APKBUILD
@@ -11,8 +11,15 @@ depends=
 makedepends="pkgconfig libx11-dev"
 source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build () {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,7 +30,7 @@ build () {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="bbe021f812e0014a8ee3692317788119  xmodmap-1.0.4.tar.bz2"
diff --git a/main/xprop/APKBUILD b/main/xprop/APKBUILD
index dd972dde83..eee3c1548c 100644
--- a/main/xprop/APKBUILD
+++ b/main/xprop/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/xprop-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/xrandr/APKBUILD b/main/xrandr/APKBUILD
index 8c32a5ffb0..19a782cbcd 100644
--- a/main/xrandr/APKBUILD
+++ b/main/xrandr/APKBUILD
@@ -11,8 +11,15 @@ depends=
 makedepends="pkgconfig libxrandr-dev libxrender-dev libx11-dev"
 source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build () {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,7 +30,7 @@ build () {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="4d68317238bb14a33c0e419233d57d87  xrandr-1.4.0.tar.bz2"
diff --git a/main/xrefresh/APKBUILD b/main/xrefresh/APKBUILD
index ef3d04bc32..ae658ea881 100644
--- a/main/xrefresh/APKBUILD
+++ b/main/xrefresh/APKBUILD
@@ -11,8 +11,15 @@ depends=
 makedepends="pkgconfig libx11-dev"
 source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,7 +30,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="8f4fafcfb77b3c6972cc44bb3f1c899c  xrefresh-1.0.3.tar.bz2"
diff --git a/main/xwininfo/APKBUILD b/main/xwininfo/APKBUILD
index 4d348ae382..3289321c6e 100644
--- a/main/xwininfo/APKBUILD
+++ b/main/xwininfo/APKBUILD
@@ -15,6 +15,7 @@ source="http://xorg.freedesktop.org/releases/individual/app/xwininfo-$pkgver.tar
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 }
 
 build() {
diff --git a/main/zsh/APKBUILD b/main/zsh/APKBUILD
index 49a28e437f..9813091544 100644
--- a/main/zsh/APKBUILD
+++ b/main/zsh/APKBUILD
@@ -14,6 +14,11 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
 $install"
 _builddir="$srcdir"/$pkgname-$pkgver
 
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
 	cd "$_builddir"
 	./configure \
-- 
cgit v1.2.3