main/[various]: update config.sub

13 files changed, 62 insertions, 12 deletions

diff --git a/main/cifs-utils/APKBUILD b/main/cifs-utils/APKBUILD
index 2aa1293dcb..9dc3d52109 100644
--- a/main/cifs-utils/APKBUILD
+++ b/main/cifs-utils/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/clamsmtp/APKBUILD b/main/clamsmtp/APKBUILD
index ef4fbe7e68..cdcefb7a7b 100644
--- a/main/clamsmtp/APKBUILD
+++ b/main/clamsmtp/APKBUILD
@@ -16,9 +16,15 @@ source="http://thewalter.net/stef/software/clamsmtp/clamsmtp-$pkgver.tar.gz
 	clamsmtpd.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 \
@@ -28,6 +34,10 @@ build() {
 		--infodir=/usr/share/info \
 		|| return 1
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 
 	# set default clam address and user
diff --git a/main/gnumeric/APKBUILD b/main/gnumeric/APKBUILD
index 59521236fc..83a2c1b0b5 100644
--- a/main/gnumeric/APKBUILD
+++ b/main/gnumeric/APKBUILD
@@ -15,6 +15,7 @@ source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/1.12/$pkgname-$pkgver.ta
 _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/gst-plugins-good1/APKBUILD b/main/gst-plugins-good1/APKBUILD
index 6396fd86b3..d179e6b664 100644
--- a/main/gst-plugins-good1/APKBUILD
+++ b/main/gst-plugins-good1/APKBUILD
@@ -47,6 +47,7 @@ _builddir="$srcdir"/gst-plugins-good-$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/mpdscribble/APKBUILD b/main/mpdscribble/APKBUILD
index 16f82ed02f..af29bff4be 100644
--- a/main/mpdscribble/APKBUILD
+++ b/main/mpdscribble/APKBUILD
@@ -19,6 +19,7 @@ _builddir="$srcdir"/mpdscribble-$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/npth/APKBUILD b/main/npth/APKBUILD
index 8ed9f52e2a..f9064ef13d 100644
--- a/main/npth/APKBUILD
+++ b/main/npth/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/npth-$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/remmina-xfce/APKBUILD b/main/remmina-xfce/APKBUILD
index 96afcda0c1..1a25a2456e 100644
--- a/main/remmina-xfce/APKBUILD
+++ b/main/remmina-xfce/APKBUILD
@@ -13,9 +13,14 @@ subpackages="$pkgname-lang"
 source="http://downloads.sourceforge.net/project/remmina/${pkgver%.*}/remmina-xfce-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
-build () 
-{ 
-	cd $srcdir/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
+build() {
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
diff --git a/main/snort/APKBUILD b/main/snort/APKBUILD
index cf9b01b68d..3a5c3a7bdf 100644
--- a/main/snort/APKBUILD
+++ b/main/snort/APKBUILD
@@ -23,7 +23,8 @@ pkggroups="snort"
 
 _builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
-        cd "$_builddir"
+	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/spice/APKBUILD b/main/spice/APKBUILD
index 08fae70d39..285dc65af8 100644
--- a/main/spice/APKBUILD
+++ b/main/spice/APKBUILD
@@ -21,6 +21,7 @@ _builddir="$srcdir"/spice-$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/xauth/APKBUILD b/main/xauth/APKBUILD
index 7594dcea07..d874d53e6e 100644
--- a/main/xauth/APKBUILD
+++ b/main/xauth/APKBUILD
@@ -12,6 +12,11 @@ source="http://xorg.freedesktop.org/releases/individual/app/xauth-$pkgver.tar.bz
 
 _builddir="$srcdir/$pkgname-$pkgver"
 
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/xdpyinfo/APKBUILD b/main/xdpyinfo/APKBUILD
index 5e57ff0d96..516dfae42d 100644
--- a/main/xdpyinfo/APKBUILD
+++ b/main/xdpyinfo/APKBUILD
@@ -10,9 +10,16 @@ subpackages="$pkgname-doc"
 makedepends="pkgconfig libxtst-dev"
 depends=
 source="http://xorg.freedesktop.org/releases/individual/app/$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 \
@@ -20,6 +27,10 @@ build ()
 		--mandir=/usr/share/man \
 		|| return 1
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 
diff --git a/main/xdriinfo/APKBUILD b/main/xdriinfo/APKBUILD
index a28c0ebae7..4414cefd19 100644
--- a/main/xdriinfo/APKBUILD
+++ b/main/xdriinfo/APKBUILD
@@ -10,9 +10,16 @@ subpackages="$pkgname-doc"
 makedepends="pkgconfig libx11-dev glproto mesa-dev"
 depends=
 source="http://xorg.freedesktop.org/releases/individual/app/$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 \
@@ -20,6 +27,10 @@ build ()
 		--mandir=/usr/share/man \
 		|| return 1
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 
diff --git a/main/xf86-video-qxl/APKBUILD b/main/xf86-video-qxl/APKBUILD
index 884bc0a648..3bb81d502d 100644
--- a/main/xf86-video-qxl/APKBUILD
+++ b/main/xf86-video-qxl/APKBUILD
@@ -19,6 +19,7 @@ _builddir="$srcdir"/xf86-video-qxl-$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;;