3 files changed, 67 insertions, 4 deletions
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 3bacde42679..1fab100986f 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.54 2010/09/15 18:35:38 wiz Exp $
+$NetBSD: distinfo,v 1.55 2010/10/12 19:50:34 joerg Exp $
 
 SHA1 (cairo-1.10.0.tar.gz) = efe7e47408d5188690228ccadc8523652f6bf702
 RMD160 (cairo-1.10.0.tar.gz) = fa65d4f3926308857d13f3ed0c100f89f075dc01
 Size (cairo-1.10.0.tar.gz) = 24022822 bytes
 SHA1 (patch-aa) = f211b2a5fce4ff65f280f79fbb78e1a530b9b165
-SHA1 (patch-ab) = cf6031bdbda5162ac6929be5cd2b8313882c75ed
+SHA1 (patch-ab) = 25875f1d578335a952d9ec83cf95f01de0efe5df
 SHA1 (patch-ac) = 76f29729c2b0ed3b1dc98960e1d9c9061a1b1440
+SHA1 (patch-ad) = 5cd279612743e42a1ac2d5487cf273681b3f6f3e
diff --git a/graphics/cairo/patches/patch-ab b/graphics/cairo/patches/patch-ab
index a8e82cd5893..e8eb7949345 100644
--- a/graphics/cairo/patches/patch-ab
+++ b/graphics/cairo/patches/patch-ab
@@ -1,8 +1,9 @@
-$NetBSD: patch-ab,v 1.12 2010/09/13 12:23:01 wiz Exp $
+$NetBSD: patch-ab,v 1.13 2010/10/12 19:50:35 joerg Exp $
 
 Fix unportable test construct.
+LD_PRELOAD is supported on DragonFly.
 
---- configure.orig	2010-09-13 11:08:31.000000000 +0000
+--- configure.orig	2010-09-06 16:16:46.000000000 +0000
 +++ configure
 @@ -21447,7 +21447,7 @@ xlib_xcb_NONPKGCONFIG_LIBS="$ac_env_xlib
  xlib_xcb_NONPKGCONFIG_EXTRA_LIBS="$ac_env_xlib_xcb_NONPKGCONFIG_EXTRA_LIBS_value"
@@ -40,3 +41,12 @@ Fix unportable test construct.
        xcb_drm_REQUIRES="xcb-dri2"
  
  pkg_failed=no
+@@ -33603,7 +33603,7 @@ _ACEOF
+ 
+ 
+ case $host in
+-*-linux*|*-*bsd*|*-solaris*|*-*-darwin*)
++*-linux*|*-*bsd*|*-solaris*|*-*-darwin*|*-dragonfly*)
+ 	have_ld_preload="yes"
+ 	;;
+ *)
diff --git a/graphics/cairo/patches/patch-ad b/graphics/cairo/patches/patch-ad
new file mode 100644
index 00000000000..7492dd47c14
--- /dev/null
+++ b/graphics/cairo/patches/patch-ad
@@ -0,0 +1,52 @@
+$NetBSD: patch-ad,v 1.9 2010/10/12 19:50:35 joerg Exp $
+
+Fix unportable test construct.
+LD_PRELOAD is supported on DragonFly.
+
+--- configure.ac.orig	2010-09-06 12:11:22.000000000 +0000
++++ configure.ac
+@@ -99,7 +99,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(xcb, XCB, n
+ ])
+ 
+ CAIRO_ENABLE_FUNCTIONS(xlib_xcb, Xlib/XCB, no, [
+-  if test "x$use_xcb" == "xyes" -a "x$use_xlib" == "xyes"; then
++  if test "x$use_xcb" = "xyes" -a "x$use_xlib" = "xyes"; then
+     xlib_xcb_REQUIRES="x11-xcb"
+     PKG_CHECK_MODULES(xlib_xcb, $xlib_xcb_REQUIRES, ,
+ 		      [use_xlib_xcb="no (requires $xlib_xcb_REQUIRES http://xcb.freedesktop.org)"])
+@@ -110,7 +110,7 @@ CAIRO_ENABLE_FUNCTIONS(xlib_xcb, Xlib/XC
+ AM_CONDITIONAL(BUILD_XLIB_XCB, test "x$use_xlib_xcb" = "xyes")
+ 
+ CAIRO_ENABLE_FUNCTIONS(xcb_shm, XCB/SHM, auto, [
+-  if test "x$use_xcb" == "xyes"; then
++  if test "x$use_xcb" = "xyes"; then
+       xcb_shm_REQUIRES="xcb-shm"
+       PKG_CHECK_MODULES(xcb_shm, $xcb_shm_REQUIRES, ,
+ 			[AC_MSG_RESULT(no)
+@@ -232,7 +232,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(drm, DRM, n
+ ])
+ 
+ CAIRO_ENABLE_FUNCTIONS(drm_xr, DRM Xr (DDX), no, [
+-  if test "x$use_drm" == "xyes"; then
++  if test "x$use_drm" = "xyes"; then
+       drm_xr_REQUIRES="xorg-server >= 1.6 xproto xextproto >= 7.0.99.1 renderproto x11"
+       PKG_CHECK_MODULES(drm_xr, $drm_xr_REQUIRES, ,
+ 			[AC_MSG_RESULT(no)
+@@ -262,7 +262,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(gallium, Ga
+ ])
+ 
+ CAIRO_ENABLE_FUNCTIONS(xcb_drm, XCB/DRM, no, [
+-  if test "x$use_xcb" == "xyes" -a "x$use_drm" == "xyes"; then
++  if test "x$use_xcb" = "xyes" -a "x$use_drm" = "xyes"; then
+       xcb_drm_REQUIRES="xcb-dri2"
+       PKG_CHECK_MODULES(xcb_drm, $xcb_drm_REQUIRES, ,
+ 			[AC_MSG_RESULT(no)
+@@ -708,7 +708,7 @@ dnl The tracing utility requires LD_PREL
+ dnl that are known to work.
+ 
+ case $host in
+-*-linux*|*-*bsd*|*-solaris*|*-*-darwin*)
++*-linux*|*-*bsd*|*-solaris*|*-*-darwin*|*-dragonfly*)
+ 	have_ld_preload="yes"
+ 	;;
+ *)