diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index b875d2e6c9e..e2d8e2c1c96 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,7 +1,7 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
 version=10.3.2
-revision=1
+revision=2
 wrksrc="Mesa-${version}"
 build_style=gnu-configure
 configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
@@ -53,7 +53,6 @@ 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() {
@@ -69,21 +68,18 @@ post_install() {
 libglapi_package() {
 	depends="libudev"
 	short_desc="Free implementation of the GL API - shared library"
-	replaces="libglapi-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libglapi.so.*"
 	}
 }
 libgbm_package() {
 	short_desc="Mesa Generic buffer management API - runtime"
-	replaces="libgbm-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libgbm.so.*"
 	}
 }
 libEGL_package() {
 	short_desc="Free implementation of the EGL API - runtime"
-	replaces="libEGL-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libEGL*.so.*"
 	}
@@ -91,7 +87,6 @@ libEGL_package() {
 libGLES_package() {
 	depends="libudev"
 	short_desc="Free implementation of the OpenGL|ES 1.x and 2.x API"
-	replaces="libGLES-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libGLES*.so.*"
 	}
@@ -99,7 +94,6 @@ libGLES_package() {
 libGL_package() {
 	depends="libudev"
 	short_desc="Free implementation of the OpenGL API - GLX runtime"
-	replaces="libGL-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libGL.so*"
 		vmove usr/lib/xorg/modules/extensions
@@ -107,14 +101,12 @@ libGL_package() {
 }
 libOSMesa_package() {
 	short_desc="Mesa Off-Screen interface library"
-	replaces="libOSMesa-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libOSMesa.so.*"
 	}
 }
 libwayland-egl_package() {
 	short_desc="Free implementation of the EGL API - wayland runtime"
-	replaces="libwayland-egl-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libwayland-egl.so.*"
 	}
@@ -130,7 +122,6 @@ 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
@@ -140,7 +131,6 @@ MesaLib-devel_package() {
 }
 mesa-swraster-dri_package() {
 	short_desc="Mesa DRI drivers for the Software Rasterizer"
-	replaces="mesa-swraster-dri-git>=0"
 	pkg_install() {
 		vmove "usr/lib/xorg/modules/drivers/swrast*"
 		vmove usr/lib/xorg/modules/drivers/kms_swrast_dri.so
@@ -155,14 +145,12 @@ mesa-swraster-dri_package() {
 }
 libxatracker_package() {
 	short_desc="Mesa XA tracker interface library"
-	replaces="libxatracker-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libxatracker*.so.*"
 	}
 }
 mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs"
-	replaces="mesa-ati-dri-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libXvMCr[36]00.so*"
 		vmove "usr/lib/vdpau/libvdpau_r[36]00.so*"
@@ -175,14 +163,12 @@ 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.*"
 	}
 }
 mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (nouveau dri)"
-	replaces="mesa-nouveau-dri-git>=0"
 	pkg_install() {
 		vmove "usr/lib/libXvMCnouveau.so*"
 		vmove "usr/lib/vdpau/libvdpau_nouveau.so*"
@@ -192,7 +178,6 @@ mesa-nouveau-dri_package() {
 }
 mesa-vmwgfx-dri_package() {
 	short_desc="Mesa DRI drivers for VMware"
-	replaces="mesa-vmwgfx-dri-git>=0"
 	pkg_install() {
 		vmove "usr/lib/xorg/modules/drivers/vmwgfx*"
 		vmove usr/lib/gallium-pipe/pipe_vmwgfx.so
@@ -201,7 +186,6 @@ 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*"