9 files changed, 71 insertions, 11 deletions
diff --git a/main/igmpproxy/APKBUILD b/main/igmpproxy/APKBUILD
index 792cb2f7eb..76c15d9345 100644
--- a/main/igmpproxy/APKBUILD
+++ b/main/igmpproxy/APKBUILD
@@ -13,8 +13,14 @@ install=
 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 "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 
 	# our kernel have a patch that changes MAXVIFS
 	# note that this is ABI incompatible
@@ -30,6 +36,10 @@ build() {
 		--infodir=/usr/share/info \
 		|| return 1
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 
 	# install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
@@ -37,3 +47,5 @@ build() {
 }
 
 md5sums="c56f41ec195bc1fe016369bf74efc5a1  igmpproxy-0.1.tar.gz"
+sha256sums="ee18ff3d8c3ae3a29dccb7e5eedf332337330020168bd95a11cece8d7d7ee6ae  igmpproxy-0.1.tar.gz"
+sha512sums="1a569814d8984610402313d8c4adb78ff362f82ae28c968a8ba0fb411e12a704d1b51b387111b51517ab8fb2e86952bbd196f27eccd311c11ce288fc6fa25ad4  igmpproxy-0.1.tar.gz"
diff --git a/main/libdrm/APKBUILD b/main/libdrm/APKBUILD
index eed186ec8d..52af2c6936 100644
--- a/main/libdrm/APKBUILD
+++ b/main/libdrm/APKBUILD
@@ -13,6 +13,7 @@ source="http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2"
 
 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/lynx/APKBUILD b/main/lynx/APKBUILD
index 234a503e3f..75b6925283 100644
--- a/main/lynx/APKBUILD
+++ b/main/lynx/APKBUILD
@@ -20,6 +20,7 @@ _builddir="$srcdir/${pkgname}${_d}"
 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/mtx/APKBUILD b/main/mtx/APKBUILD
index 5fb9a720f3..294003ee5a 100644
--- a/main/mtx/APKBUILD
+++ b/main/mtx/APKBUILD
@@ -13,8 +13,15 @@ install=""
 subpackages=""
 source="http://downloads.sourceforge.net/mtx/$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 \
@@ -22,6 +29,10 @@ build() {
 		--datadir=/usr/share \
 		|| return 1
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make prefix="$pkgdir" install
 }
 
diff --git a/main/oidentd/APKBUILD b/main/oidentd/APKBUILD
index b16a23344c..cace1bd24c 100644
--- a/main/oidentd/APKBUILD
+++ b/main/oidentd/APKBUILD
@@ -15,9 +15,14 @@ oidentd.conf
 oidentd.initd
 oidentd.confd"
 
-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,6 +32,10 @@ build() {
 		--infodir=/usr/share/info \
 		|| return 1
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	install -D -m755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
diff --git a/main/pjproject/APKBUILD b/main/pjproject/APKBUILD
index d3ecc25bea..77265b9a7f 100644
--- a/main/pjproject/APKBUILD
+++ b/main/pjproject/APKBUILD
@@ -15,6 +15,7 @@ source="http://www.pjsip.org/release/$pkgver/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
 	cd "$srcdir/$pkgname-$pkgver"
+	update_config_sub || return 1
 	# Remove target name from lib names
 	sed -i -e 's/-$(TARGET_NAME)//g' \
 		-e 's/= $(TARGET_NAME).a/= .a/g' \
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index bfe6ab75b1..8e57987246 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
 pkgver=4.1.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="http://www.samba.org"
 arch="all"
@@ -19,6 +19,7 @@ makedepends="popt-dev ncurses-dev openldap-dev heimdal-dev e2fsprogs-dev
 	libiconv-dev talloc-dev tdb-dev ldb-dev cups-dev python-dev libcap-dev
 	tevent-dev iniparser-dev perl subunit-dev"
 source="http://us1.samba.org/samba/ftp/stable/samba-$pkgver.tar.gz
+	fix-libreplace.patch
 	samba.initd
 	samba.confd
 	samba.logrotate
@@ -287,14 +288,17 @@ libs() {
 }
 
 md5sums="a5dbfe87f4cb3d9d91e15e5df99a59a1  samba-4.1.3.tar.gz
+b8c06c1a37bce8a7feea3b6896483da0  fix-libreplace.patch
 044c756d3c33c2d610c40bcd76cfb75c  samba.initd
 c150433426e18261e6e3eed3930e1a76  samba.confd
 b7cafabfb4fa5b3ab5f2e857d8d1c733  samba.logrotate"
 sha256sums="71da208d412b8d15ee26d2a76b2247df357242177d995fe5d9320355432e24db  samba-4.1.3.tar.gz
+13617f691c648b44867c1a76d8be7c185021e8a8f3b695f8689a9f6244e65827  fix-libreplace.patch
 86646cb845aababd9e8655994379526f03327a2cc33b489c3a7dea83ab689c8f  samba.initd
 1d12f98a7727967b04eb123109b34cfffef320822dc0e8059286b6e3394c3fc0  samba.confd
 4c2b7d529126b2fc4f62fb09d99e49a87632d723a2d9d289a61e37dd84145be1  samba.logrotate"
 sha512sums="c3e08df4e23c02ab759e819809ac8b146972508bbbbfc666e47ac180dea75dde85564e839aa4935e43f9b894bdf650fd3ed36463e70e9065c6e1c745142984d5  samba-4.1.3.tar.gz
+4adbbeb75de6c55199e10f284e741ee252f403b7809251caf4baf378669770be01d469b23e12f8119ed5dca5080dd45bda1b5b78cc7a791be44c1eb6fb8c0fa2  fix-libreplace.patch
 59d05252b8ebbe6ba6a419edc86b66b9541d0bac9dbe810cccb20e64f6044e2900cc6c0979e077741ed00fbbf2d51f9184c83715013299782707b44e39aa99b1  samba.initd
 4faf581ecef3ec38319e3c4ab6d3995c51fd7ba83180dc5553a2ff4dfb92efadb43030c543292130c4ed0c281dc0972c6973d52d48062c5edb39bb1c4bbb6dd6  samba.confd
 f88ebe59ca3a9e9b77dd5993c13ef3e73a838efb8ed858088b464a330132d662f33e25c27819e38835389dee23057a3951de11bae1eef55db8ff5e1ec6760053  samba.logrotate"
diff --git a/main/setxkbmap/APKBUILD b/main/setxkbmap/APKBUILD
index 766cc56971..4f88a0755b 100644
--- a/main/setxkbmap/APKBUILD
+++ b/main/setxkbmap/APKBUILD
@@ -10,16 +10,26 @@ depends=
 makedepends="pkgconfig libxkbfile-dev"
 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 \
 		--prefix=/usr \
 		|| return 1
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR=""$pkgdir"" install || return 1
 }
 md5sums="2f902e0a89aaf2b19e06e7f26c6efb3a  setxkbmap-1.1.0.tar.bz2"
+sha256sums="932f2b314a4bf6dfccd16d63c633073abf650d8e136f481904e972ef3d4faf64  setxkbmap-1.1.0.tar.bz2"
+sha512sums="ca006e59b097c4cbb3434dc84eef3e0fcfb25af0f6a2b85b900a2db11c471592cd206ff048c3b8887d6e4bf48aa9168ed12f4e54b5b3b16d10ca8aa6a189ae45  setxkbmap-1.1.0.tar.bz2"
diff --git a/main/swfdec-mozilla/APKBUILD b/main/swfdec-mozilla/APKBUILD
index 40e462cb48..f9716209e2 100644
--- a/main/swfdec-mozilla/APKBUILD
+++ b/main/swfdec-mozilla/APKBUILD
@@ -10,9 +10,14 @@ makedepends="swfdec-dev"
 depends=
 source="http://swfdec.freedesktop.org/download/$pkgname/0.8/$pkgname-$pkgver.tar.gz"
 
-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 \
@@ -21,8 +26,14 @@ build ()
 		--with-plugin-dir=/usr/lib/mozilla/plugins/ \
 		|| return 1
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" -name '*.la' -delete
 }
 
 md5sums="716632e0d35b3c1582c180569ba30346  swfdec-mozilla-0.8.2.tar.gz"
+sha256sums="49fd905f41b67832e7b2cfa2cf664657ab08f8fef4a2324e74202fc951396cd5  swfdec-mozilla-0.8.2.tar.gz"
+sha512sums="47e70610722be17b2dfe81180a28c8dd8dd454009cc301ddd9caa650b530e2c452276f5cbfab9c7194167a54a3ef3a27f76254e725c4b7aa7fa38e8f3b703411  swfdec-mozilla-0.8.2.tar.gz"