diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template
index 97e59d8f60b..65469c25b04 100644
--- a/srcpkgs/cairo/template
+++ b/srcpkgs/cairo/template
@@ -1,9 +1,10 @@
 # Template build file for 'cairo'.
 pkgname=cairo
 version=1.12.16
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-static --enable-tee"
+configure_args="--disable-static --enable-tee
+ $(vopt_enable opengl gl) $(vopt_enable gles2 egl) $(vopt_enable gles2 glesv2)"
 short_desc="Vector graphics library with cross-device output support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1, MPL-1.1"
@@ -21,36 +22,15 @@ pre_configure() {
 
 # Package build options
 build_options="gles2 opengl"
-
-# Enable gles2 by default on x86.
-if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	build_options_default="gles2"
-fi
-
-if [ "$build_option_opengl" ]; then
-	configure_args+=" --enable-gl"
-else
-	configure_args+=" --disable-gl"
-fi
-
-if [ "$build_option_gles2" ]; then
-	configure_args+=" --enable-egl --enable-glesv2"
-else
-	configure_args+=" --disable-egl --disable-glesv2"
-fi
+build_options_default="gles2"
 
 if [ "$build_option_opengl" -o "$build_option_gles2" ]; then
 	makedepends+=" MesaLib-devel"
 fi
 
 cairo-devel_package() {
-	depends="fontconfig-devel glib-devel libpng-devel>=1.6 libXrender-devel>=0.9.7_3 pixman-devel cairo>=${version}_${revision}"
+	depends="${makedepends} cairo>=${version}_${revision}"
 	short_desc+=" - development files"
-
-	if [ "$build_option_opengl" -o "$build_option_gles2" ]; then
-		depends+=" MesaLib-devel"
-	fi
-
 	pkg_install() {
 		vmove usr/include
 		vmove usr/share