main/[various]: update config.sub

52 files changed, 183 insertions, 41 deletions

diff --git a/main/avahi/APKBUILD b/main/avahi/APKBUILD
index 2c471a268b..5c3dc310a6 100644
--- a/main/avahi/APKBUILD
+++ b/main/avahi/APKBUILD
@@ -24,14 +24,14 @@ source="http://www.avahi.org/download/avahi-$pkgver.tar.gz
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $patches; do
 		patch -p1 -i "$srcdir"/$i || return 1
 	done
 }
 
-build () 
-{ 
-	cd "$srcdir/$pkgname-$pkgver"
+build() {
+	cd "$_builddir"
 	# we dont build autoipd since dhcpcd does same job
 	./configure \
 		--build=$CBUILD \
diff --git a/main/avfs/APKBUILD b/main/avfs/APKBUILD
index f4db7bb02f..a2796c9e4c 100644
--- a/main/avfs/APKBUILD
+++ b/main/avfs/APKBUILD
@@ -18,6 +18,7 @@ source="http://downloads.sourceforge.net/project/avf/avfs/$pkgver/avfs-$pkgver.t
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 }
 
 build() {
diff --git a/main/cups-filters/APKBUILD b/main/cups-filters/APKBUILD
index 04fd0ec3f2..b53efe8c2b 100644
--- a/main/cups-filters/APKBUILD
+++ b/main/cups-filters/APKBUILD
@@ -20,6 +20,7 @@ _builddir="$srcdir"/cups-filters-$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/enchant/APKBUILD b/main/enchant/APKBUILD
index 9788bead6c..8caf159a6b 100644
--- a/main/enchant/APKBUILD
+++ b/main/enchant/APKBUILD
@@ -12,8 +12,15 @@ depends_dev="glib-dev"
 makedepends="aspell-dev dbus-glib-dev hunspell-dev libiconv-dev gettext-dev"
 source="http://www.abisource.com/downloads/$pkgname/$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 \
 		--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
 	find "$pkgdir" -iname *.la -delete
diff --git a/main/geany/APKBUILD b/main/geany/APKBUILD
index 8a699339de..e6f132efc3 100644
--- a/main/geany/APKBUILD
+++ b/main/geany/APKBUILD
@@ -41,6 +41,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/gegl/APKBUILD b/main/gegl/APKBUILD
index 12d7791f17..e055206d63 100644
--- a/main/gegl/APKBUILD
+++ b/main/gegl/APKBUILD
@@ -15,6 +15,7 @@ depends_dev="babl-dev glib-dev"
 _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/gnome-screensaver/APKBUILD b/main/gnome-screensaver/APKBUILD
index 91da558467..fdb28a7a23 100644
--- a/main/gnome-screensaver/APKBUILD
+++ b/main/gnome-screensaver/APKBUILD
@@ -39,6 +39,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/gnome-session/APKBUILD b/main/gnome-session/APKBUILD
index 8710854ac4..519f91fd43 100644
--- a/main/gnome-session/APKBUILD
+++ b/main/gnome-session/APKBUILD
@@ -27,6 +27,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/gnome-settings-daemon/APKBUILD b/main/gnome-settings-daemon/APKBUILD
index 58863deb36..0f0dd85e6c 100644
--- a/main/gnome-settings-daemon/APKBUILD
+++ b/main/gnome-settings-daemon/APKBUILD
@@ -38,6 +38,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/gnome-terminal/APKBUILD b/main/gnome-terminal/APKBUILD
index 979e31ea96..930803886c 100644
--- a/main/gnome-terminal/APKBUILD
+++ b/main/gnome-terminal/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/goffice/APKBUILD b/main/goffice/APKBUILD
index eb7fcc5a3f..f774617d6e 100644
--- a/main/goffice/APKBUILD
+++ b/main/goffice/APKBUILD
@@ -17,6 +17,7 @@ source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/$_maj.$_min/$pkgname-$pk
 
 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/gphoto2/APKBUILD b/main/gphoto2/APKBUILD
index 7831471fe6..19d0f0be10 100644
--- a/main/gphoto2/APKBUILD
+++ b/main/gphoto2/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/gphoto2-$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/graphviz/APKBUILD b/main/graphviz/APKBUILD
index e3adfe625b..d43079e07b 100644
--- a/main/graphviz/APKBUILD
+++ b/main/graphviz/APKBUILD
@@ -22,6 +22,7 @@ _builddir="$srcdir"/graphviz-$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/gtkspell/APKBUILD b/main/gtkspell/APKBUILD
index 9112599b6f..9ce15f884e 100644
--- a/main/gtkspell/APKBUILD
+++ b/main/gtkspell/APKBUILD
@@ -11,8 +11,16 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="http://$pkgname.sourceforge.net/download/$pkgname-$pkgver.tar.gz"
 
 depends_dev="gtk+-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 \
@@ -22,7 +30,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la
 }
diff --git a/main/inkscape/APKBUILD b/main/inkscape/APKBUILD
index c37ae58c80..2dfac840b3 100644
--- a/main/inkscape/APKBUILD
+++ b/main/inkscape/APKBUILD
@@ -34,6 +34,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/keyutils/APKBUILD b/main/keyutils/APKBUILD
index 3e27447dfc..1df4f1c7bd 100644
--- a/main/keyutils/APKBUILD
+++ b/main/keyutils/APKBUILD
@@ -8,7 +8,7 @@ url="http://people.redhat.com/~dhowells/keyutils/"
 arch="all"
 license="GPLv2+ LGPLv2+"
 depends=""
-makedepends=""
+makedepends="file"
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
 source="http://people.redhat.com/~dhowells/keyutils/keyutils-$pkgver.tar.bz2"
diff --git a/main/libatasmart/APKBUILD b/main/libatasmart/APKBUILD
index 4a30fbe7f2..da78f9b314 100644
--- a/main/libatasmart/APKBUILD
+++ b/main/libatasmart/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	# apply patches here
 }
 
diff --git a/main/libavc1394/APKBUILD b/main/libavc1394/APKBUILD
index f392c3aa6d..190d2b41cb 100644
--- a/main/libavc1394/APKBUILD
+++ b/main/libavc1394/APKBUILD
@@ -21,6 +21,7 @@ _builddir="$srcdir"/libavc1394-$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/libdc1394/APKBUILD b/main/libdc1394/APKBUILD
index 3029cbbb7c..a05e44e343 100644
--- a/main/libdc1394/APKBUILD
+++ b/main/libdc1394/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/libdc1394-$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/libgnomekbd/APKBUILD b/main/libgnomekbd/APKBUILD
index 4c4045f6a7..187e1f4e45 100644
--- a/main/libgnomekbd/APKBUILD
+++ b/main/libgnomekbd/APKBUILD
@@ -29,6 +29,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/libgphoto2/APKBUILD b/main/libgphoto2/APKBUILD
index f0ad59d8c1..cf28bf9db3 100644
--- a/main/libgphoto2/APKBUILD
+++ b/main/libgphoto2/APKBUILD
@@ -16,6 +16,12 @@ source="http://downloads.sourceforge.net/gphoto/libgphoto2-$pkgver.tar.bz2"
 options="libtool"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
 	cd "$_builddir"
 	udevscriptdir=/lib/udev ./configure \
diff --git a/main/libiec61883/APKBUILD b/main/libiec61883/APKBUILD
index 6718faa7a8..fb4ede52e5 100644
--- a/main/libiec61883/APKBUILD
+++ b/main/libiec61883/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/libiec61883-$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/libmpdclient/APKBUILD b/main/libmpdclient/APKBUILD
index 2319966624..2d417547c8 100644
--- a/main/libmpdclient/APKBUILD
+++ b/main/libmpdclient/APKBUILD
@@ -11,8 +11,15 @@ makedepends="doxygen"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://www.musicpd.org/download/libmpdclient/${pkgver%.*}/libmpdclient-$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/libmtp/APKBUILD b/main/libmtp/APKBUILD
index 87aae32d30..07c7c766b9 100644
--- a/main/libmtp/APKBUILD
+++ b/main/libmtp/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/libmtp-$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/libnetfilter_acct/APKBUILD b/main/libnetfilter_acct/APKBUILD
index afa4e5d89e..1edae5e8c8 100644
--- a/main/libnetfilter_acct/APKBUILD
+++ b/main/libnetfilter_acct/APKBUILD
@@ -12,9 +12,15 @@ makedepends="libnfnetlink-dev libmnl-dev pkgconfig"
 subpackages="$pkgname-dev"
 source="http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"
 
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 
+build() {
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,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/libnetfilter_conntrack/APKBUILD b/main/libnetfilter_conntrack/APKBUILD
index dfb56db331..3c73431390 100644
--- a/main/libnetfilter_conntrack/APKBUILD
+++ b/main/libnetfilter_conntrack/APKBUILD
@@ -12,9 +12,15 @@ makedepends="libnfnetlink-dev libmnl-dev"
 subpackages="$pkgname-dev"
 source="http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"
 
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 
+build() {
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,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/libnetfilter_log/APKBUILD b/main/libnetfilter_log/APKBUILD
index 8345639dd3..77c0fd8029 100644
--- a/main/libnetfilter_log/APKBUILD
+++ b/main/libnetfilter_log/APKBUILD
@@ -13,8 +13,15 @@ makedepends="libnfnetlink-dev pkgconfig"
 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 "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,7 +34,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/libnetfilter_queue/APKBUILD b/main/libnetfilter_queue/APKBUILD
index 98a4251545..e39d9fb61a 100644
--- a/main/libnetfilter_queue/APKBUILD
+++ b/main/libnetfilter_queue/APKBUILD
@@ -16,6 +16,7 @@ _builddir="$srcdir"/libnetfilter_queue-$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/libnjb/APKBUILD b/main/libnjb/APKBUILD
index b5378df39a..a818998d06 100644
--- a/main/libnjb/APKBUILD
+++ b/main/libnjb/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/libnjb-$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/libxklavier/APKBUILD b/main/libxklavier/APKBUILD
index 771398a481..c9df68805c 100644
--- a/main/libxklavier/APKBUILD
+++ b/main/libxklavier/APKBUILD
@@ -21,9 +21,15 @@ source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${_v}/$pkgname-$pkgver.t
 
 depends_dev="libxml2-dev glib-dev gettext-dev libxkbfile-dev"
 
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
+build() {
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -35,7 +41,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/libxxf86misc/APKBUILD b/main/libxxf86misc/APKBUILD
index 1529d841ad..adea8e91b3 100644
--- a/main/libxxf86misc/APKBUILD
+++ b/main/libxxf86misc/APKBUILD
@@ -12,8 +12,15 @@ makedepends="pkgconfig libxext-dev libx11-dev xf86miscproto"
 source="http://xorg.freedesktop.org/releases/individual/lib/libXxf86misc-$pkgver.tar.bz2"
 depends_dev="xf86miscproto libx11-dev libxext-dev"
 
+_builddir="$srcdir/libXxf86misc-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
-	cd "$srcdir"/libXxf86misc-$pkgver
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,7 +31,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/libXxf86misc-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la
 }
diff --git a/main/nautilus/APKBUILD b/main/nautilus/APKBUILD
index 0db3a42565..9db7efebac 100644
--- a/main/nautilus/APKBUILD
+++ b/main/nautilus/APKBUILD
@@ -48,6 +48,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/nspr/APKBUILD b/main/nspr/APKBUILD
index 1b5a9f43d9..bf9a29ebf8 100644
--- a/main/nspr/APKBUILD
+++ b/main/nspr/APKBUILD
@@ -15,6 +15,7 @@ source="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$pkgver/src/nspr-$p
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	mkdir build inst
 	for i in $source; do
 		case $i in 
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index d4f4a1964e..c7e57d84c6 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -114,6 +114,7 @@ _srcdir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_srcdir"
+	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/radvd/APKBUILD b/main/radvd/APKBUILD
index fe964793e7..b30be24465 100644
--- a/main/radvd/APKBUILD
+++ b/main/radvd/APKBUILD
@@ -22,6 +22,7 @@ _builddir="$srcdir"/radvd-$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/ristretto/APKBUILD b/main/ristretto/APKBUILD
index c6e6a3b102..a32115bcc9 100644
--- a/main/ristretto/APKBUILD
+++ b/main/ristretto/APKBUILD
@@ -15,6 +15,7 @@ source="http://archive.xfce.org/src/apps/ristretto/${pkgver%.*}/ristretto-$pkgve
 
 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/rrdtool/APKBUILD b/main/rrdtool/APKBUILD
index cd87acfdc6..91adc81a5c 100644
--- a/main/rrdtool/APKBUILD
+++ b/main/rrdtool/APKBUILD
@@ -8,7 +8,7 @@ arch="all"
 license="GPL"
 depends="font-sony-misc"
 makedepends="libart-lgpl-dev libpng-dev freetype-dev perl-dev cairo-dev
-	pango-dev lua-dev python-dev man
+	pango-dev lua lua-dev python-dev man
 	autoconf automake libtool"
 subpackages="$pkgname-dev $pkgname-doc perl-rrd:perl_rrd lua-rrd:lua_rrd py-rrd:py_rrd"
 source="http://oss.oetiker.ch/$pkgname/pub/$pkgname-$pkgver.tar.gz
diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD
index a145aae4bb..5610a31fe3 100644
--- a/main/rsyslog/APKBUILD
+++ b/main/rsyslog/APKBUILD
@@ -21,6 +21,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	export LDFLAGS="-lestr"
 	./configure \
 		--build=$CBUILD \
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index 52adac6e26..0eb8d28e9f 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -21,6 +21,7 @@ pkggroups="winbind"
 _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/smokeping/APKBUILD b/main/smokeping/APKBUILD
index 24f5de44ab..32f8281215 100644
--- a/main/smokeping/APKBUILD
+++ b/main/smokeping/APKBUILD
@@ -31,6 +31,7 @@ _vendorlib=/usr/share/perl5/vendor_perl
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 
 	for i in $source; do
 		case $i in
diff --git a/main/swig/APKBUILD b/main/swig/APKBUILD
index e651169a05..ca676a9c01 100644
--- a/main/swig/APKBUILD
+++ b/main/swig/APKBUILD
@@ -10,8 +10,15 @@ depends="guile"
 makedepends="zlib-dev pcre-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
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -21,7 +28,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/main/thunar-vcs-plugin/APKBUILD b/main/thunar-vcs-plugin/APKBUILD
index c996d8cdd9..5dce61c278 100644
--- a/main/thunar-vcs-plugin/APKBUILD
+++ b/main/thunar-vcs-plugin/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/thunar-vcs-plugin-$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/thunar-volman/APKBUILD b/main/thunar-volman/APKBUILD
index ac069e484e..d7342445b6 100644
--- a/main/thunar-volman/APKBUILD
+++ b/main/thunar-volman/APKBUILD
@@ -16,6 +16,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	# apply patches here
 }
 
diff --git a/main/udev/APKBUILD b/main/udev/APKBUILD
index 390625261c..a1a03dd8d4 100644
--- a/main/udev/APKBUILD
+++ b/main/udev/APKBUILD
@@ -17,9 +17,15 @@ source="http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.ta
 	udev-postmount.initd
 	udev.initd"
 
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
+build() {
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -34,7 +40,7 @@ build ()
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 
 	# Upstream moved udevd to /lib/udev
diff --git a/main/ulogd/APKBUILD b/main/ulogd/APKBUILD
index 72a5181a8f..9fce765790 100644
--- a/main/ulogd/APKBUILD
+++ b/main/ulogd/APKBUILD
@@ -18,6 +18,11 @@ source="http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz
 
 _builddir="$srcdir/$pkgname-$pkgver"
 
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
 	cd "$_builddir"
 
diff --git a/main/upower/APKBUILD b/main/upower/APKBUILD
index 945aabddee..dc78ee1e76 100644
--- a/main/upower/APKBUILD
+++ b/main/upower/APKBUILD
@@ -13,6 +13,12 @@ makedepends="gtk+-dev udev-dev libusbx-dev polkit-dev dbus-glib-dev libxslt
 source="http://upower.freedesktop.org/releases/upower-$pkgver.tar.xz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	./configure \
diff --git a/main/usbredir/APKBUILD b/main/usbredir/APKBUILD
index 9e9bebbf68..6f11d4ea1e 100644
--- a/main/usbredir/APKBUILD
+++ b/main/usbredir/APKBUILD
@@ -17,6 +17,7 @@ _builddir="$srcdir"/usbredir-$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/usbutils/APKBUILD b/main/usbutils/APKBUILD
index 4009c0e8e4..d053451270 100644
--- a/main/usbutils/APKBUILD
+++ b/main/usbutils/APKBUILD
@@ -13,6 +13,11 @@ source="http://www.kernel.org/pub/linux/utils/usb/usbutils/${pkgname}-${pkgver}.
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/xf86dgaproto/APKBUILD b/main/xf86dgaproto/APKBUILD
index 927b216e2f..44769340d8 100644
--- a/main/xf86dgaproto/APKBUILD
+++ b/main/xf86dgaproto/APKBUILD
@@ -1,24 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86dgaproto
 pkgver=2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 Direct Graphics Access extension wire protocol"
 url="http://xorg.freedesktop.org/"
-arch="all"
+arch="noarch"
 license="custom"
 depends=""
 makedepends=""
 source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
 
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
+build() {
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		|| return 1
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="a036dc2fcbf052ec10621fd48b68dbb1  xf86dgaproto-2.1.tar.bz2"
diff --git a/main/xf86miscproto/APKBUILD b/main/xf86miscproto/APKBUILD
index 77b83bcffc..4b91c70f05 100644
--- a/main/xf86miscproto/APKBUILD
+++ b/main/xf86miscproto/APKBUILD
@@ -1,24 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86miscproto
 pkgver=0.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 XFree86-Miscellaneous extension wire protocol"
 url="http://xorg.freedesktop.org/"
-arch="all"
+arch="noarch"
 license="custom"
 depends=""
 makedepends=""
 source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.tar.bz2"
 
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
+build() {
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		|| return 1
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 md5sums="ca63bbb31cf5b7f37b2237e923ff257a  xf86miscproto-0.9.3.tar.bz2"
diff --git a/main/xfce4-xkb-plugin/APKBUILD b/main/xfce4-xkb-plugin/APKBUILD
index cfcea8833a..fe24c84e77 100644
--- a/main/xfce4-xkb-plugin/APKBUILD
+++ b/main/xfce4-xkb-plugin/APKBUILD
@@ -18,6 +18,7 @@ source="http://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/$_ver/xfce4-x
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
+	update_config_sub || return 1
 }
 
 build () {
diff --git a/main/xfdesktop/APKBUILD b/main/xfdesktop/APKBUILD
index 0d59d6ffd6..fffdc06e6c 100644
--- a/main/xfdesktop/APKBUILD
+++ b/main/xfdesktop/APKBUILD
@@ -17,6 +17,7 @@ source="http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) patch -p1 -i "$srcdir"/$i || return 1;;