main/[various]: fix build against musl (add update_config_sub)

main/apcupsd/APKBUILD

@@ -17,7 +17,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 _builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
 	cd "$_builddir"
-	update_config_sub
+	update_config_sub || return 1
 }
 
 build() {

main/arpwatch/APKBUILD

@@ -48,7 +48,7 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
-	update_config_sub
+	update_config_sub || return 1
 }
 
 build() {

main/atk/APKBUILD

@@ -8,12 +8,19 @@ arch="all"
 license="LGPL"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends=
+depends_dev="glib-dev"
 makedepends="glib-dev gobject-introspection-dev"
 source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
 
-depends_dev="glib-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 \

main/beecrypt/APKBUILD

@@ -21,7 +21,7 @@ prepare() {
 		msg "Applying $i..."
 		patch -p1 < $i || return 1
 	done
-	update_config_sub
+	update_config_sub || return 1
 }
 
 build() {

main/cairo/APKBUILD

@@ -14,6 +14,12 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-gobject $pkgname-tools"
 source="http://cairographics.org/releases/$pkgname-$pkgver.tar.xz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
 	cd "$_builddir"
 	./configure \

main/clamav/APKBUILD

@@ -26,6 +26,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"
 	./configure \

main/compositeproto/APKBUILD

@@ -10,8 +10,15 @@ depends="fixesproto"
 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 \

main/consolekit/APKBUILD

@@ -20,6 +20,7 @@ _builddir="$srcdir"/ConsoleKit-$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;;

main/damageproto/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 \

main/db/APKBUILD

@@ -15,8 +15,14 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-utils $pkgname-c++:cxx"
 source="http://download.oracle.com/berkeley-db/db-$pkgver.tar.gz
 	"
 
+_builddir="$srcdir/db-$_ver"
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build () { 
-	cd "$srcdir"/db-$_ver
+	cd "$_builddir"
 	for i in ../patch.*; do
 		[ -r "$i" ] || continue
 		msg "Applying $i..."

main/dbus-glib/APKBUILD

@@ -12,8 +12,15 @@ makedepends="pkgconfig dbus-dev glib-dev libiconv-dev gettext-dev expat-dev"
 source="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
 depends_dev="glib-dev dbus-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 \

main/eggdbus/APKBUILD

@@ -17,7 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
-	# apply patches here
+	update_config_sub || return 1
 }
 
 build() {

main/fixesproto/APKBUILD

@@ -10,8 +10,15 @@ depends="xextproto"
 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 \

main/gconf/APKBUILD

@@ -21,6 +21,7 @@ _builddir="${srcdir}/GConf-${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;;

main/gettext/APKBUILD

@@ -32,9 +32,6 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	# http://bugs.gentoo.org/show_bug.cgi?id=81628
-	export CPPFLAGS="$CPPFLAGS -I/usr/include/libxml2"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -56,10 +53,16 @@ package() {
 libintl() {
 	replaces="gettext"
 	mkdir -p "$subpkgdir"/usr/lib
+
+	rm -rf "$pkgdir"/usr/lib/charset.alias
+	rmdir -p "$pkgdir"/usr/lib 2>/dev/null
+
 	if [ "$ALPINE_LIBC" != "eglibc" ]; then
 		mv "$pkgdir"/usr/lib/libintl.so.* \
 			"$subpkgdir"/usr/lib || return 1
 	fi
+
+	return 0
 }
 
 md5sums="3fc808f7d25487fc72b5759df7419e02  gettext-0.18.3.1.tar.gz"

main/glib/APKBUILD

@@ -37,6 +37,7 @@ build() {
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--disable-gtk-doc \
+		--disable-compile-warnings \
 		|| return 1
 	make || return 1
 }

main/gnome-doc-utils/APKBUILD

@@ -13,8 +13,10 @@ subpackages="$pkgname-lang"
 source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 }
 
 build() {

main/gnome-mime-data/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;;

main/groff/APKBUILD

@@ -25,7 +25,11 @@ build () {
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
+	rm -rf "$pkgdir"/usr/lib/charset.alias
+	rmdir -p "$pkgdir"/usr/lib 2>/dev/null
+	return 0
 }
+
 md5sums="9f4cd592a5efc7e36481d8d8d8af6d16  groff-1.22.2.tar.gz"
 sha256sums="380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076  groff-1.22.2.tar.gz"
 sha512sums="ea34db53f075b6816827b07ac3d6a19ed50529c939044337eb3124575ac3b41363e1d81bbd5bf552a7a10f6b1dd233d6e7acaf646e18cfe94464c59dc20ffe80  groff-1.22.2.tar.gz"

main/gstreamer/APKBUILD

@@ -18,6 +18,8 @@ depends_dev="glib-dev libxml2-dev"
 _builddir="$srcdir"/gstreamer-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return  1
+
 	# fix building with gnu make 3.82
 	find -name Makefile.in | xargs sed -i -e "s/^        /\t/" || return 1