diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index f9cb54f6ec6..d9797ebd2bb 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,7 +1,7 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
 version=10.2.4
-revision=7
+revision=8
 wrksrc="Mesa-${version}"
 build_style=gnu-configure
 configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
@@ -51,6 +51,7 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" --with-dri-driverdir=/usr/lib/xorg/modules/drivers";;
 esac
 
+replaces="MesaLib-git>=0"
 conf_files="/etc/drirc"
 
 pre_configure() {
@@ -66,7 +67,7 @@ post_install() {
 libglapi_package() {
 	depends="libudev"
 	short_desc="Free implementation of the GL API - shared library"
-	replaces="MesaLib<7.11_2"
+	replaces="libglapi-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libglapi.so.*"
 	}
@@ -74,7 +75,7 @@ libglapi_package() {
 
 libgbm_package() {
 	short_desc="Mesa Generic buffer management API - runtime"
-	replaces="MesaLib<9.0.2"
+	replaces="libgbm-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libgbm.so.*"
 		vmove usr/lib/gbm/gbm_gallium_drm.so
@@ -83,7 +84,7 @@ libgbm_package() {
 
 libEGL_package() {
 	short_desc="Free implementation of the EGL API - runtime"
-	replaces="MesaLib<7.11_2"
+	replaces="libEGL-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libEGL*.so.*"
 	}
@@ -92,7 +93,7 @@ libEGL_package() {
 libGLES_package() {
 	depends="libudev"
 	short_desc="Free implementation of the OpenGL|ES 1.x and 2.x API"
-	replaces="MesaLib<7.11_2"
+	replaces="libGLES-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libGLES*.so.*"
 	}
@@ -101,7 +102,7 @@ libGLES_package() {
 libGL_package() {
 	depends="libudev"
 	short_desc="Free implementation of the OpenGL API - GLX runtime"
-	replaces="MesaLib<7.11_2"
+	replaces="libGL-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libGL.so.*"
 		vmove usr/lib/xorg/modules/extensions
@@ -110,7 +111,7 @@ libGL_package() {
 
 libOpenVG_package() {
 	short_desc="Free implementation of the OpenVG API - runtime"
-	replaces="MesaLib<7.11_2"
+	replaces="libOpenVG-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libOpenVG.so.*"
 	}
@@ -118,7 +119,7 @@ libOpenVG_package() {
 
 libOSMesa_package() {
 	short_desc="Mesa Off-Screen interface library"
-	replaces="MesaLib<7.11_2"
+	replaces="libOSMesa-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libOSMesa.so.*"
 	}
@@ -126,6 +127,7 @@ libOSMesa_package() {
 
 libwayland-egl_package() {
 	short_desc="Free implementation of the EGL API - wayland runtime"
+	replaces="libwaylang-egl-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libwayland-egl.so.*"
 		vmove usr/lib/egl
@@ -143,6 +145,7 @@ MesaLib-devel_package() {
 	if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		depends+=" libxatracker>=${version}_${revision}"
 	fi
+	replaces="MesaLib-devel-git>=0"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -153,7 +156,7 @@ MesaLib-devel_package() {
 
 mesa-swraster-dri_package() {
 	short_desc="Mesa DRI drivers for the Software Rasterizer"
-	replaces="MesaLib<9.0.2"
+	replaces="mesa-swraster-dri-git>=0"
 	pkg_install() {
 		vmove "usr/lib/xorg/modules/drivers/swrast*"
 		vmove "usr/lib/gallium-pipe/pipe_swrast.so"
@@ -162,7 +165,7 @@ mesa-swraster-dri_package() {
 
 libxatracker_package() {
 	short_desc="Mesa XA tracker interface library"
-	replaces="MesaLib<10.0.0_2"
+	replaces="libxatracker-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libxatracker*.so.*"
 	}
@@ -170,7 +173,7 @@ libxatracker_package() {
 
 mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs"
-	replaces="MesaLib<9.0.2"
+	replaces="mesa-ati-dri-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libXvMCr[36]00.so*"
 		vmove "usr/lib/vdpau/libvdpau_r[36]00.so*"
@@ -184,6 +187,7 @@ mesa-ati-dri_package() {
 
 mesa-intel-dri_package() {
 	short_desc="Mesa DRI drivers for Intel GPUs"
+	replaces="mesa-intel-dri-git>=0"
 	pkg_install() {
 		vmove "usr/lib/xorg/modules/drivers/i9[16]5_dri.*"
 	}
@@ -191,7 +195,7 @@ mesa-intel-dri_package() {
 
 mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (nouveau dri)"
-	replaces="MesaLib<9.0.2"
+	replaces="mesa-nouveau-dri-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libXvMCnouveau.so*"
 		vmove "usr/lib/vdpau/libvdpau_nouveau.so*"
@@ -202,7 +206,7 @@ mesa-nouveau-dri_package() {
 
 mesa-vmwgfx-dri_package() {
 	short_desc="Mesa DRI drivers for VMware"
-	replaces="MesaLib<9.0.2"
+	replaces="mesa-vmwgfx-dri-git>=0"
 	pkg_install() {
 		vmove "usr/lib/xorg/modules/drivers/vmwgfx*"
 		vmove usr/lib/gallium-pipe/pipe_vmwgfx.so
@@ -212,6 +216,7 @@ mesa-vmwgfx-dri_package() {
 mesa-opencl_package() {
 	short_desc="Mesa implementation of OpenCL (r600+ only)"
 	depends="libclc-r600 libOpenCL"
+	replaces="mesa-opencl-git>=0"
 	pkg_install() {
 		vmove etc/OpenCL
 		vmove "/usr/lib/lib*OpenCL*"