From f96be1bbaba5ddfb10577140b05423be1e3c2314 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 25 Aug 2014 17:53:09 +0200
Subject: [PATCH] MesaLib: make sure -devel is processed the last one.

... otherwise the 32bit pkg could have incorrect dependencies.
---
 srcpkgs/MesaLib/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index 57df55be1fc..a9aac077753 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,7 +1,7 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
 version=10.2.6
-revision=2
+revision=3
 wrksrc="Mesa-${version}"
 build_style=gnu-configure
 configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
@@ -25,7 +25,7 @@ makedepends="
 
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
 subpackages="libglapi libgbm libEGL libGL libGLES libOpenVG libOSMesa
- libwayland-egl MesaLib-devel mesa-swraster-dri"
+ libwayland-egl mesa-swraster-dri"
 
 case "$XBPS_TARGET_MACHINE" in
 i686*|x86_64*)
@@ -46,6 +46,9 @@ i686*|x86_64*)
 	;;
 esac
 
+# -devel must be the last one for proper order.
+subpackages+=" MesaLib-devel"
+
 case "$XBPS_TARGET_MACHINE" in
 	i686*) configure_args+=" --with-dri-driverdir=/usr/lib32/xorg/modules/drivers";;
 	*) configure_args+=" --with-dri-driverdir=/usr/lib/xorg/modules/drivers";;
@@ -219,7 +222,6 @@ mesa-opencl_package() {
 	replaces="mesa-opencl-git>=0"
 	pkg_install() {
 		vmove etc/OpenCL
-		vmove "/usr/lib/lib*OpenCL*"
-		mv ${XBPS_DESTDIR}/MesaLib-devel-${version}/usr/lib/lib*OpenCL.so ${PKGDESTDIR}/usr/lib
+		vmove "usr/lib/lib*OpenCL*"
 	}
 }