main/xf86-video-*: modernise, add check, add util-macros makedep

author: A. Wilcox <AWilcox@Wilcox-Tech.com> 2018-02-10 16:02:24 -0600
committer: William Pitcock <nenolod@dereferenced.org> 2018-02-16 17:00:09 +0000
commit: b77ae1ee38e93dbc0a5bf9d2d99633fce8b81e68 (patch)
tree: 37fbdc1676221eaa9ab7bc183d7de83b35a6bb77
parent: 2c5123b65b79192075ab2718c286a798d640ffa2 (diff)
download: aports-b77ae1ee38e93dbc0a5bf9d2d99633fce8b81e68.tar.bz2
aports-b77ae1ee38e93dbc0a5bf9d2d99633fce8b81e68.tar.xz
26 files changed, 264 insertions, 189 deletions
diff --git a/main/xf86-video-amdgpu/APKBUILD b/main/xf86-video-amdgpu/APKBUILD
index 2c3e973862..abe005254a 100644
--- a/main/xf86-video-amdgpu/APKBUILD
+++ b/main/xf86-video-amdgpu/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Linus Swälas <linus.swalas@borderless.se>
 pkgname=xf86-video-amdgpu
 pkgver=1.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="AMD Rx/HDxxxx video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -11,7 +11,7 @@ options="!check"
 depends="mesa-dri-ati"
 makedepends="xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto libdrm-dev xf86driproto glproto mesa-dev
-	xineramaproto eudev-dev pixman-dev"
+	xineramaproto eudev-dev pixman-dev util-macros"
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 builddir="$srcdir/$pkgname-$pkgver"
 
@@ -26,6 +26,11 @@ build() {
 	make
 }
 
+check() {
+	cd "$builddir"
+	make check
+}
+
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
diff --git a/main/xf86-video-apm/APKBUILD b/main/xf86-video-apm/APKBUILD
index e7846c96f8..b9448354d3 100644
--- a/main/xf86-video-apm/APKBUILD
+++ b/main/xf86-video-apm/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-apm
 pkgver=1.2.5
-pkgrel=8
+pkgrel=9
 pkgdesc="Alliance ProMotion video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto"
 
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
@@ -16,31 +16,31 @@ source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
 	"
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
+	cd "$builddir"
+	update_config_sub
 	default_prepare
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="bce02d48c66932d082786167af22835a  xf86-video-apm-1.2.5.tar.bz2
-8be9e7447c739b7cf9a80ea8ce9da852  mibstore.patch"
-sha256sums="953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f  xf86-video-apm-1.2.5.tar.bz2
-be06cce5eb0b8eb070321e293f5cd9b7aa947d920d23cc962f7121191ba4180b  mibstore.patch"
 sha512sums="652307d5e21fcd0df890b941821f409cc0c9846133cf7e522799710d28ebf0d8ff2d8ead3235d8207169f416a6561bc14b4fedb1baaddb1bddf03007372af622  xf86-video-apm-1.2.5.tar.bz2
 f27a8f9f3206de54ce9f05596d78829832e7576b5d515d22b0052e39c70fef63e85f016c2c1dfad45aa6d09cb59582d101854552fc44970275f1b38688924d52  mibstore.patch"
diff --git a/main/xf86-video-ark/APKBUILD b/main/xf86-video-ark/APKBUILD
index 112122b4e7..5709860bd6 100644
--- a/main/xf86-video-ark/APKBUILD
+++ b/main/xf86-video-ark/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-ark
 pkgver=0.7.5
-pkgrel=7
+pkgrel=8
 pkgdesc="X.Org driver for ark cards"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto"
 
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
@@ -17,7 +17,7 @@ source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
 builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$builddir"
-	update_config_sub || return 1
+	update_config_sub
 	default_prepare
 }
 
@@ -27,19 +27,19 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="2e9809b5ae3f01a56be0d6e5441da03c  xf86-video-ark-0.7.5.tar.bz2
-d4625a8bf75d55959faebadcae02e3e4  mibstore.patch"
-sha256sums="c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e  xf86-video-ark-0.7.5.tar.bz2
-32130c11a9af2d125a8376c0fc5cc7a94ecec5b88f33005ec9cc54423feeffb9  mibstore.patch"
 sha512sums="67c2b4e2109bf9d84a007c9679d35e7c0a4e4ddcdb7be9fa5070ce7e2f666e018d8421ddd4890cf3abb4eb37e060a10666c62a9efbb5369eb7cd8647ee18a644  xf86-video-ark-0.7.5.tar.bz2
 f7ef3d7003e75ae6d27f4ec1100e6cb42546f3dd5871a2d92ad779909ebd1243976679f14e1a8443ba17bb3cd36fa755cdbda4be3627a49af0033513309ad6bb  mibstore.patch"
diff --git a/main/xf86-video-ast/APKBUILD b/main/xf86-video-ast/APKBUILD
index 9566ad0094..efc60e9695 100644
--- a/main/xf86-video-ast/APKBUILD
+++ b/main/xf86-video-ast/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-ast
 pkgver=1.1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org driver for ASpeedTech cards"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto"
 
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
@@ -21,16 +21,18 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="4f85febe48d51e53624550a96fc9e9ee  xf86-video-ast-1.1.5.tar.bz2"
-sha256sums="1edbbc55d47d3fd71dec99b15c2483e22738c642623a0fb86ef4a81a9067a2de  xf86-video-ast-1.1.5.tar.bz2"
 sha512sums="067c2ce3e74c83fe1531213308753cb80482d177c93009c99dc49e95bfa6ff058d81cc716d6c343b9ca1e0eb7aedf3b84beb12ad08b8cd4d9f43e11f9e192e8e  xf86-video-ast-1.1.5.tar.bz2"
diff --git a/main/xf86-video-chips/APKBUILD b/main/xf86-video-chips/APKBUILD
index 1ecbb3023b..ff26208401 100644
--- a/main/xf86-video-chips/APKBUILD
+++ b/main/xf86-video-chips/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-chips
 pkgver=1.2.7
-pkgrel=0
+pkgrel=1
 pkgdesc="Chips and Technologies video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto"
 
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
@@ -20,14 +20,18 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 sha512sums="12a98b79b9eba42fd408b9ac9568600dd3b1e7552841dff9b86afad78f3730e354e9ce0df1f6229a06933b7f4d7598a36227f203749447076eb63c4a9c9811f9  xf86-video-chips-1.2.7.tar.bz2"
diff --git a/main/xf86-video-dummy/APKBUILD b/main/xf86-video-dummy/APKBUILD
index 69b4a0a597..e3a7e579a6 100644
--- a/main/xf86-video-dummy/APKBUILD
+++ b/main/xf86-video-dummy/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-dummy
 pkgver=0.3.8
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org driver for dummy cards"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto xf86dgaproto"
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
@@ -19,14 +19,18 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 sha512sums="f534113fd9987e44d2e0d0c53bd1b71be4ba69ec239ecec4aba8fcdcc10597722c54cbc01da38e0975ac7660e4e4028330e4cdd369e755c25ec059d2dfabad80  xf86-video-dummy-0.3.8.tar.bz2"
diff --git a/main/xf86-video-fbdev/APKBUILD b/main/xf86-video-fbdev/APKBUILD
index c60e6d6a4b..e45bc1726c 100644
--- a/main/xf86-video-fbdev/APKBUILD
+++ b/main/xf86-video-fbdev/APKBUILD
@@ -1,36 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-fbdev
 pkgver=0.4.4
-pkgrel=5
+pkgrel=6
 pkgdesc="video driver for framebuffer device"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto"
 
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
 builddir="$srcdir"/$pkgname-$pkgver
-
 build() {
 	cd "$builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="3931c0e19d441cc576dc088f9eb9fd73  xf86-video-fbdev-0.4.4.tar.bz2"
-sha256sums="9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b  xf86-video-fbdev-0.4.4.tar.bz2"
 sha512sums="942ccf7e528b7cf0af19ef0efc9f5c60ab558bd865aad330f1c58a9ef063f9b38b4e62e5622270c0bfc237cb3cbc579d43b854aaa64fa2a9130eede73b1e55e9  xf86-video-fbdev-0.4.4.tar.bz2"
diff --git a/main/xf86-video-glint/APKBUILD b/main/xf86-video-glint/APKBUILD
index afd9367bee..40182d0f7d 100644
--- a/main/xf86-video-glint/APKBUILD
+++ b/main/xf86-video-glint/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-glint
 pkgver=1.2.9
-pkgrel=0
+pkgrel=1
 pkgdesc="GLINT/Permedia video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto xf86dgaproto glproto libdrm-dev xf86driproto
 	mesa-dev"
 
@@ -22,14 +22,18 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 sha512sums="29b573abc2c77992562ab72ea99dfac5fa4baee99404747c53494680fe750b9c096833cd6c8013aa85f7fb5db5bdbee2a9b26dff633a6a4fe2dc8cd9f0adff12  xf86-video-glint-1.2.9.tar.bz2"
diff --git a/main/xf86-video-i128/APKBUILD b/main/xf86-video-i128/APKBUILD
index b983b21251..3fefd1f8c8 100644
--- a/main/xf86-video-i128/APKBUILD
+++ b/main/xf86-video-i128/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-i128
 pkgver=1.3.6
-pkgrel=8
+pkgrel=9
 pkgdesc="Number 9 I128 video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto"
 
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
@@ -16,6 +16,7 @@ source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
 
 builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
+	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
@@ -26,19 +27,19 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="0b0d365dce2c567b807562a32f7fe66e  xf86-video-i128-1.3.6.tar.bz2
-01ba59049028fd4c65d620fb898a23e8  mibstore.patch"
-sha256sums="f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c  xf86-video-i128-1.3.6.tar.bz2
-a33da9fb125697fa9c3178bfa11f40f88f69947cd0934ac37139ba1c1a950d52  mibstore.patch"
 sha512sums="688956107fe473941da9d22914dc1aa1889b8a1bb75678692d40630396eca5426a4506bb0a536c48b6ed7a2b580a80af5b8b5d3199e2b04d8f24c404f60d3c34  xf86-video-i128-1.3.6.tar.bz2
 3cfe390f1f812250ed3abde0dc8bd699419bf71d6642328d69163012b813906b995acf942c31febe6fc6909109181436e1c7dfcb74d08feae6c9b7434ea63df9  mibstore.patch"
diff --git a/main/xf86-video-i740/APKBUILD b/main/xf86-video-i740/APKBUILD
index 9c0d5ea7ac..65fe3f5022 100644
--- a/main/xf86-video-i740/APKBUILD
+++ b/main/xf86-video-i740/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-i740
 pkgver=1.3.6
-pkgrel=0
+pkgrel=1
 pkgdesc="Intel i740 video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto"
 
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
@@ -22,14 +22,18 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 sha512sums="82a3932e8c7f89550afdf69adadba4cc7a1b28f7a15ab018bff948d99767c57b61510967be7997131e2e1e87acf7b0ea28018deb1c907c284e68fc866d2b4139  xf86-video-i740-1.3.6.tar.bz2"
diff --git a/main/xf86-video-intel/APKBUILD b/main/xf86-video-intel/APKBUILD
index 5b646eb560..5bbf275e2d 100644
--- a/main/xf86-video-intel/APKBUILD
+++ b/main/xf86-video-intel/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-intel
 pkgver=2.99.917_git20170325
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org driver for Intel cards"
 url="http://xorg.freedesktop.org/"
 arch="x86 x86_64"
@@ -34,14 +34,18 @@ build() {
 		--prefix=/usr \
 		--enable-xvmc \
 		--disable-selective-werror \
-		--with-default-dri=3 \
-		|| return 1
-	make || return 1
+		--with-default-dri=3
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 
 	# http://bugs.alpinelinux.org/issues/3312
diff --git a/main/xf86-video-nouveau/APKBUILD b/main/xf86-video-nouveau/APKBUILD
index 87665dbbdc..56371df8b5 100644
--- a/main/xf86-video-nouveau/APKBUILD
+++ b/main/xf86-video-nouveau/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-nouveau
 pkgver=1.0.15
-pkgrel=0
+pkgrel=1
 pkgdesc="Open-source X.org drivers for nVidia video cards"
 url="https://nouveau.freedesktop.org/"
 arch="all"
@@ -25,14 +25,18 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
+		--localstatedir=/var
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="69a8f8e7920d893f17d14fd9f05e35de246d980a243f3b3b00c05deae7f6bd97e0f51e6ddfa322b4d0815233fe5f656d4e55f54461249f3f24c3bc025a682285  xf86-video-nouveau-1.0.15.tar.bz2"
diff --git a/main/xf86-video-nv/APKBUILD b/main/xf86-video-nv/APKBUILD
index e3aa939222..3ef5263110 100644
--- a/main/xf86-video-nv/APKBUILD
+++ b/main/xf86-video-nv/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-nv
 pkgver=2.1.21
-pkgrel=0
+pkgrel=1
 pkgdesc="Nvidia video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto"
 
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
@@ -20,14 +20,18 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
+		--prefix=/usr
 	make
 }
 
+check() {
+	cd "$builddir"
+	make check
+}
+
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 sha512sums="97cec43100b00609d43cf45937bafea387fd656cb5e321fcbed426973320097ba6601e4e548026618b3cf0c480f58956874a201791dc0cc39297b5fd54979ca7  xf86-video-nv-2.1.21.tar.bz2"
diff --git a/main/xf86-video-openchrome/APKBUILD b/main/xf86-video-openchrome/APKBUILD
index 0ee5a1a67e..4b41116320 100644
--- a/main/xf86-video-openchrome/APKBUILD
+++ b/main/xf86-video-openchrome/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-openchrome
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org driver for VIA/S3G cards"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -10,7 +10,7 @@ subpackages="$pkgname-doc"
 depends=
 makedepends="xorg-server-dev libxi-dev libxvmc-dev fontsproto glproto
 	randrproto videoproto renderproto xf86driproto mesa-dev
-	"
+	util-macros"
 
 source="http://www.x.org/releases/individual/driver/xf86-video-openchrome-$pkgver.tar.bz2
 	openchrome.xinf
@@ -29,14 +29,18 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 	install -Dm644 "$srcdir"/openchrome.xinf \
 		"$pkgdir"/usr/share/hwdata/videoaliases/openchrome.xinf
diff --git a/main/xf86-video-r128/APKBUILD b/main/xf86-video-r128/APKBUILD
index b8ac66ecc1..4d31a43f82 100644
--- a/main/xf86-video-r128/APKBUILD
+++ b/main/xf86-video-r128/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-r128
 pkgver=6.10.2
-pkgrel=0
+pkgrel=1
 pkgdesc="ATI Rage128 video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -24,14 +24,18 @@ build() {
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--enable-dri \
-		|| return 1
-	make || return 1
+		--enable-dri
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 sha512sums="564b65454ee538c1b9dc5d22a52a57bdff0c1f94e1832719a8310699cee7167c1ca8fcd26243dfc4089832b1fcbab9efafb69c9061b328532f689d02a0acac23  xf86-video-r128-6.10.2.tar.bz2"
diff --git a/main/xf86-video-rendition/APKBUILD b/main/xf86-video-rendition/APKBUILD
index a411bda5d8..82e30c6806 100644
--- a/main/xf86-video-rendition/APKBUILD
+++ b/main/xf86-video-rendition/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-rendition
 pkgver=4.2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Rendition video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -9,7 +9,7 @@ license="MIT"
 subpackages="$pkgname-doc"
 depends=
 options="!strip"
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto"
 
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
@@ -17,19 +17,23 @@ source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 builddir=$srcdir/$pkgname-$pkgver
 
 build() {
-	cd $builddir
+	cd "$builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
+		--prefix=/usr
 	make
 }
 
+check() {
+	cd "$builddir"
+	make check
+}
+
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 
 	# Stripping manually
 	strip $pkgdir/usr/lib/xorg/modules/drivers/rendition_drv.so
diff --git a/main/xf86-video-s3/APKBUILD b/main/xf86-video-s3/APKBUILD
index b83fcdff8d..e485bfe4c4 100644
--- a/main/xf86-video-s3/APKBUILD
+++ b/main/xf86-video-s3/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-s3
 pkgver=0.6.5
-pkgrel=8
+pkgrel=9
 pkgdesc="X.Org driver for s3 cards"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto"
 
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
@@ -17,7 +17,7 @@ source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
 builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$builddir"
-	update_config_sub || return 1
+	update_config_sub
 	default_prepare
 }
 
@@ -27,19 +27,19 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="37248d5c5a04d7f91c6f634cc592b304  xf86-video-s3-0.6.5.tar.bz2
-39197ff01d61fd5e536a04c275568cd3  mibstore.patch"
-sha256sums="4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39  xf86-video-s3-0.6.5.tar.bz2
-7cdf5381c9ad1a9f654e803f767a2b2b07346088501cc6293fcce1992a78fe66  mibstore.patch"
 sha512sums="bd7d93008dae33b0b7943b2c81de5f39b1d8224ccebd0cdb9e8d22e7ea7fb0981adf6afd44e24162fa8a076d3e250f93316fd3a25cada2d65166a6bc4d13c267  xf86-video-s3-0.6.5.tar.bz2
 72a4176d178f968e769b8cd61e2f2eed6524c75f8f0c9d2f51acece24e0b7ad1953c9c4d271c9af02b4ee68ad75dd06d9cce71b3bce6fdf5965e1e9b40d6eb49  mibstore.patch"
diff --git a/main/xf86-video-s3virge/APKBUILD b/main/xf86-video-s3virge/APKBUILD
index 3195d37831..a3ec302941 100644
--- a/main/xf86-video-s3virge/APKBUILD
+++ b/main/xf86-video-s3virge/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-s3virge
 pkgver=1.10.7
-pkgrel=1
+pkgrel=2
 pkgdesc="S3 ViRGE video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto"
 
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
@@ -21,16 +21,18 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="9d4dd8060544d95a1ce7d0ce0853cbe6  xf86-video-s3virge-1.10.7.tar.bz2"
-sha256sums="5dbe68de05483f902fdc48e97ce8d9fdd1d2ade14cb53c0c3642f0259f65a4da  xf86-video-s3virge-1.10.7.tar.bz2"
 sha512sums="bbeb3af1558eeb25768ec86e14687d442d54046913af6f4f4eb49c0b9641377b0d6f0e85629b16e46db07adb2358053cbfbe7b366d0cb9a817a011a1c7703e57  xf86-video-s3virge-1.10.7.tar.bz2"
diff --git a/main/xf86-video-savage/APKBUILD b/main/xf86-video-savage/APKBUILD
index de9cb3ffbb..965f7bb01c 100644
--- a/main/xf86-video-savage/APKBUILD
+++ b/main/xf86-video-savage/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-savage
 pkgver=2.3.9
-pkgrel=0
+pkgrel=1
 pkgdesc="S3 Savage video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto libdrm-dev xf86driproto mesa-dev glproto
 	"
 
@@ -23,14 +23,18 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 sha512sums="35fe52651fe5799bbbc6e7b3608a655102547e8f8f2189288d3f5b477f819bfc56a9a8eef39813ca455e56076e4f7c36304480c3ccddbac6c794672828cf705a  xf86-video-savage-2.3.9.tar.bz2"
diff --git a/main/xf86-video-siliconmotion/APKBUILD b/main/xf86-video-siliconmotion/APKBUILD
index 083473b01e..754a87ac2a 100644
--- a/main/xf86-video-siliconmotion/APKBUILD
+++ b/main/xf86-video-siliconmotion/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-siliconmotion
 pkgver=1.7.9
-pkgrel=0
+pkgrel=1
 pkgdesc="Silicon Motion video driver"
 url="http://xorg.freedesktop.org/"
 arch="x86_64 x86"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto"
 
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
@@ -22,14 +22,18 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 sha512sums="13085945ca496f83521c28b25c394077e010031dbdc2374347a932a52650ada02f525269a81d0b0bb20b48e371d5435a7a73cb7555a07dc5a784e77152608c63  xf86-video-siliconmotion-1.7.9.tar.bz2"
diff --git a/main/xf86-video-sis/APKBUILD b/main/xf86-video-sis/APKBUILD
index a42d51ab54..d4de61a9ea 100644
--- a/main/xf86-video-sis/APKBUILD
+++ b/main/xf86-video-sis/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-sis
 pkgver=0.10.9
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org SiS video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev videoproto renderproto xproto
+makedepends="xorg-server-dev videoproto renderproto xproto util-macros
 	fontsproto xf86dgaproto xineramaproto randrproto xextproto mesa-dev
 	xf86driproto glproto libxi-dev"
 
@@ -24,14 +24,18 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 sha512sums="7cb11d2f1f8be8d92159af7e322a9e4fe4e3436c38932d6d665b8854c2009495e99ff075c7a14d9db9c781114afc8397f0e8c1225d9a2f4bbf1b6a4b6cd6745d  xf86-video-sis-0.10.9.tar.bz2"
diff --git a/main/xf86-video-sunleo/APKBUILD b/main/xf86-video-sunleo/APKBUILD
index 58d1cef829..65bcbdc625 100644
--- a/main/xf86-video-sunleo/APKBUILD
+++ b/main/xf86-video-sunleo/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-sunleo
 pkgver=1.2.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Leo video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto"
 
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
@@ -21,14 +21,18 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 sha512sums="467559e608b59dcf2a50cbaddc218ad0778e88515906fed9d6346db09187f3f7645482113882bcf81428d4af3d3f2cccec7f24663c12c23a411f8a87551ef23f  xf86-video-sunleo-1.2.2.tar.bz2"
diff --git a/main/xf86-video-tdfx/APKBUILD b/main/xf86-video-tdfx/APKBUILD
index 5ceab61659..3326b84584 100644
--- a/main/xf86-video-tdfx/APKBUILD
+++ b/main/xf86-video-tdfx/APKBUILD
@@ -1,37 +1,39 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-tdfx
 pkgver=1.4.7
-pkgrel=0
+pkgrel=1
 pkgdesc="3Dfx video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto libdrm-dev xf86driproto mesa-dev glproto
 	"
 
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
 	"
 
-
 builddir="$srcdir"/$pkgname-$pkgver
-
 build() {
 	cd "$builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 sha512sums="573eea7a6b05ed33a963f8e2f80ac1cb14632b7fd10d8d90da16c07db432e73641ced885ee979f68e4ead8429b39506b2f231ca4ac296a0780c9f6d223c3b405  xf86-video-tdfx-1.4.7.tar.bz2"
diff --git a/main/xf86-video-vesa/APKBUILD b/main/xf86-video-vesa/APKBUILD
index e5a2444054..565afd3a6a 100644
--- a/main/xf86-video-vesa/APKBUILD
+++ b/main/xf86-video-vesa/APKBUILD
@@ -1,19 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-vesa
 pkgver=2.3.4
-pkgrel=2
-pkgdesc="X.org vesa video driver"
+pkgrel=3
+pkgdesc="X.org generic VESA video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libxi-dev fontsproto randrproto
+makedepends="xorg-server-dev libxi-dev fontsproto randrproto util-macros
 	videoproto renderproto"
-
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
-
 builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$builddir"
@@ -21,16 +19,18 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="a893c37c589f7a31cea929a5d896a0e2  xf86-video-vesa-2.3.4.tar.bz2"
-sha256sums="7bddf4d879dd6f67088ecb203a31e12334aab980174bd0909930a21f32e251c1  xf86-video-vesa-2.3.4.tar.bz2"
 sha512sums="5a01c295a03f367281f49bb186a003a91da3aa4cff7c37ef3fb83889b595f641745899c62e4c0954a1daf4b18bd0e1bcbbe1b87d2863d1ce71feffa1744e892d  xf86-video-vesa-2.3.4.tar.bz2"
diff --git a/main/xf86-video-vmware/APKBUILD b/main/xf86-video-vmware/APKBUILD
index 8e7f85c5a6..0199bb4927 100644
--- a/main/xf86-video-vmware/APKBUILD
+++ b/main/xf86-video-vmware/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-vmware
 pkgver=13.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org VMWare video driver"
 url="http://xorg.freedesktop.org/"
 arch="x86 x86_64"
@@ -10,14 +10,14 @@ subpackages="$pkgname-doc"
 depends=
 makedepends="xorg-server-dev videoproto renderproto xproto libdrm-dev
 	fontsproto xf86dgaproto xineramaproto randrproto xextproto libxi-dev
-	eudev-dev"
+	eudev-dev util-macros"
 
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
 	"
 
-builddir="$srcdir"/xf86-video-vmware-$pkgver
 prepare() {
 	cd "$builddir"
+	chmod a+w config.sub
 	update_config_sub
 	default_prepare
 }
@@ -25,18 +25,21 @@ prepare() {
 build() {
 	cd "$builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 sha512sums="9c48eaf5be6ece5685e07a53842083d091edba482ac0ea8318ac5b0adb9fc468f932685e4bdaf7e565f7a1cf723dcea2731616613798ebde2bbc18418a369a9d  xf86-video-vmware-13.2.1.tar.bz2"
diff --git a/main/xf86-video-xgixp/APKBUILD b/main/xf86-video-xgixp/APKBUILD
index 5be06dafc7..70b0259307 100644
--- a/main/xf86-video-xgixp/APKBUILD
+++ b/main/xf86-video-xgixp/APKBUILD
@@ -1,39 +1,42 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-xgixp
 pkgver=1.8.1
-pkgrel=8
+pkgrel=9
 pkgdesc="X.org XGIXP video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
 depends=
-makedepends="xorg-server-dev libdrm-dev xf86driproto glproto mesa-dev"
+makedepends="xorg-server-dev libdrm-dev xf86driproto glproto mesa-dev util-macros"
 source="http://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
 	git-fixes.patch"
 
 builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$builddir"
-	update_config_sub || return 1
+	update_config_sub
 	default_prepare
 }
 
 build() {
 	cd "$builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 sha512sums="ab45909e4b48cc9dfa3daf5d2cb50dff6ad7d841fe1dc75ea699a7c555d70a6f565d97b7c68f4c58da16ad022b973892e229f8d0f4059c8712cf513c1ec10f84  xf86-video-xgixp-1.8.1.tar.bz2
author	A. Wilcox <AWilcox@Wilcox-Tech.com>	2018-02-10 16:02:24 -0600
committer	William Pitcock <nenolod@dereferenced.org>	2018-02-16 17:00:09 +0000
commit	b77ae1ee38e93dbc0a5bf9d2d99633fce8b81e68 (patch)
tree	37fbdc1676221eaa9ab7bc183d7de83b35a6bb77
parent	2c5123b65b79192075ab2718c286a798d640ffa2 (diff)
download	aports-b77ae1ee38e93dbc0a5bf9d2d99633fce8b81e68.tar.bz2 aports-b77ae1ee38e93dbc0a5bf9d2d99633fce8b81e68.tar.xz