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

@@ -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;;

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;;

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

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
 }
 

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() {

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

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;;

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;;

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"

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 \

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;;

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 \

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() {

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

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;;

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 \

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;;

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;;

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 \

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
 }
 

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;;

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
 }

main/enca/APKBUILD

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

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 \

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;;

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;;

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"

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 \

main/fftw/APKBUILD

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

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"
 

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
 

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"

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"

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 \

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"

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
 }

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 \

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;;

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;;

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;;

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
 }

main/geoip/APKBUILD

@@ -18,6 +18,7 @@ _builddir="$srcdir"/$_realname-$pkgver
 
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	return 0
 }
 

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 \