diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index 19ba37c03ea..2a7d1536126 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.9 2007/03/26 20:32:11 alek Exp $
+# $OpenBSD: Makefile,v 1.10 2007/05/22 21:08:17 steven Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	"cairo bindings for Python"
 
-DISTNAME=	pycairo-1.2.6
-PKGNAME=	${DISTNAME:S/py/py-/}
+V=		1.4.0
+DISTNAME=	pycairo-${V}
+PKGNAME=	py-cairo-${V}
 CATEGORIES=	graphics
 
 HOMEPAGE=	http://cairographics.org/introduction/
@@ -20,17 +21,14 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	http://cairographics.org/releases/
 
-WANTLIB=	X11 Xext Xrender fontconfig freetype m z glitz png
+WANTLIB=	X11 Xrender Xau Xdmcp expat fontconfig freetype m z glitz png
 
 MODULES=	lang/python
-LIB_DEPENDS=	cairo.>=4::graphics/cairo
-RUN_DEPENDS=	:py-Numeric-*:math/py-Numeric
-BUILD_DEPENDS=	${RUN_DEPENDS}
+LIB_DEPENDS=	cairo.>=6::graphics/cairo
 USE_LIBTOOL=	Yes
 USE_X11=	Yes
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	--without-pygtk
 CONFIGURE_ENV=	PYTHON=${MODPY_BIN}
 
 pre-install:
diff --git a/graphics/py-cairo/distinfo b/graphics/py-cairo/distinfo
index 8e45d22398a..8fda91144f0 100644
--- a/graphics/py-cairo/distinfo
+++ b/graphics/py-cairo/distinfo
@@ -1,5 +1,5 @@
-MD5 (pycairo-1.2.6.tar.gz) = FmsExIAMAauhpsixTofgvA==
-RMD160 (pycairo-1.2.6.tar.gz) = e0bvp4/TwwOqegEb9ey+cTJV7aw=
-SHA1 (pycairo-1.2.6.tar.gz) = QumuZNK+WeRuUD5S01xxUGUns+k=
-SHA256 (pycairo-1.2.6.tar.gz) = KPAXKZRnIb7CNhSA8oAtpQFeEnHOXNvm/5ehRCoZxZU=
-SIZE (pycairo-1.2.6.tar.gz) = 480714
+MD5 (pycairo-1.4.0.tar.gz) = 4m53kZtgYRP1ZdcANsH1BA==
+RMD160 (pycairo-1.4.0.tar.gz) = X7OkALJzkznuZi94AJXgXRb6H2U=
+SHA1 (pycairo-1.4.0.tar.gz) = eZkFV4EBJJ0DxhMHSDR2OL54dNo=
+SHA256 (pycairo-1.4.0.tar.gz) = khKv/+5yfjmumUBrWlmrMkhVa8/r+uJNgngxNngUfjI=
+SIZE (pycairo-1.4.0.tar.gz) = 479455
diff --git a/graphics/py-cairo/patches/patch-cairo_pycairo-font_c b/graphics/py-cairo/patches/patch-cairo_pycairo-font_c
deleted file mode 100644
index e0ab663571f..00000000000
--- a/graphics/py-cairo/patches/patch-cairo_pycairo-font_c
+++ /dev/null
@@ -1,20 +0,0 @@
-$OpenBSD: patch-cairo_pycairo-font_c,v 1.2 2007/03/26 20:32:11 alek Exp $
---- cairo/pycairo-font.c.orig	Sun Mar 25 21:17:08 2007
-+++ cairo/pycairo-font.c	Sun Mar 25 21:18:57 2007
-@@ -197,6 +197,7 @@ scaled_font_new (PyTypeObject *type, PyO
-     PycairoFontFace *ff;
-     PycairoFontOptions *fo;
-     PycairoMatrix *mx1, *mx2;
-+    PyObject *o;
- 
-     if (!PyArg_ParseTuple(args, "O!O!O!O!:ScaledFont.__new__",
- 			  &PycairoFontFace_Type, &ff,
-@@ -205,7 +206,7 @@ scaled_font_new (PyTypeObject *type, PyO
- 			  &PycairoFontOptions_Type, &fo))
- 	return NULL;
- 
--    PyObject *o = type->tp_alloc(type, 0);
-+    o = type->tp_alloc(type, 0);
-     if (o != NULL) {
- 	cairo_scaled_font_t *scaled_font = cairo_scaled_font_create
- 	    (ff->font_face, &mx1->matrix, &mx2->matrix, fo->font_options);
diff --git a/graphics/py-cairo/patches/patch-configure b/graphics/py-cairo/patches/patch-configure
new file mode 100644
index 00000000000..a35e8c2d8ad
--- /dev/null
+++ b/graphics/py-cairo/patches/patch-configure
@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure,v 1.1 2007/05/22 21:08:17 steven Exp $
+--- configure.orig	Tue May 22 18:09:01 2007
++++ configure	Tue May 22 18:09:27 2007
+@@ -18838,7 +18838,7 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" >&6
+ # Checks for libraries ---
+ 
+ # get rid of the -export-dynamic stuff from the configure flags ...
+-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | SED=/usr/bin/sed sh`
+ 
+ # cairo
+