Update to 1.8.8:

General Changes:
    Pycairo 1.8.8 requires cairo 1.8.8 (or later).
    Move from CVS to git.
    Add support for the waf build tool.

Updated methods
    The PDF/PS/SVGSurface constructors now accept None as a filename.

5 files changed, 95 insertions, 66 deletions

diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index 7f847411add..795efd5766d 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2009/08/15 14:26:38 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2009/08/31 08:04:32 wiz Exp $
 #
 
-DISTNAME=		pycairo-1.8.6
+DISTNAME=		pycairo-1.8.8
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=		graphics
 MASTER_SITES=		http://cairographics.org/releases/
@@ -29,9 +29,8 @@ PY_PATCHPLIST=		yes
 BUILDLINK_TRANSFORM+=	rm:-std=c99
 .endif
 
-BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.8.4nb1
-
 .include "../../lang/python/extension.mk"
 .include "../../math/py-Numeric/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.8.8
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-cairo/distinfo b/graphics/py-cairo/distinfo
index bb89a5d69b2..8a560c84922 100644
--- a/graphics/py-cairo/distinfo
+++ b/graphics/py-cairo/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2009/07/22 12:55:20 wiz Exp $
+$NetBSD: distinfo,v 1.12 2009/08/31 08:04:32 wiz Exp $
 
-SHA1 (pycairo-1.8.6.tar.gz) = 228772017a11f0fbf2db63559649cd3c7d9f7996
-RMD160 (pycairo-1.8.6.tar.gz) = 8281a55d2a1cf98e7d9d8c86ed9e687e0e410513
-Size (pycairo-1.8.6.tar.gz) = 538013 bytes
-SHA1 (patch-aa) = 37c49d908bd008d0fb15614e3de5bcbcc8acc449
-SHA1 (patch-ab) = fdb6a547d43d48110efdd0cfbcfa5571c27df419
-SHA1 (patch-ac) = 0021fa070a132c0580a3e93a3685b21aeaf31e3a
+SHA1 (pycairo-1.8.8.tar.gz) = b127ed59bd876ca0fe5d0cf0f69735835c599e9b
+RMD160 (pycairo-1.8.8.tar.gz) = d7e40be061140992e05f714b45182c498ae19311
+Size (pycairo-1.8.8.tar.gz) = 475651 bytes
+SHA1 (patch-aa) = 54d8e83b0fd23ced64878cad943f1ed1019a283e
+SHA1 (patch-ab) = fea4d5ff3f03414e2014d32fd4a7fb7b5a379100
+SHA1 (patch-ac) = 9047c33f8bd7cdc1e537d3b083b33601bcbe8954
diff --git a/graphics/py-cairo/patches/patch-aa b/graphics/py-cairo/patches/patch-aa
index f744473cdc3..3b9fe6b5402 100644
--- a/graphics/py-cairo/patches/patch-aa
+++ b/graphics/py-cairo/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2009/05/13 12:56:47 obache Exp $
+$NetBSD: patch-aa,v 1.5 2009/08/31 08:04:32 wiz Exp $
 
---- configure.orig	2009-03-19 08:46:52.000000000 +0000
+--- configure.orig	2009-08-26 11:04:28.000000000 +0000
 +++ configure
-@@ -19941,12 +19941,12 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+@@ -11107,13 +11107,13 @@ CC="$lt_save_CC"
  
          if test -n "$PYTHON"; then
        # If the user set $PYTHON, use it and don't search something else.
@@ -10,11 +10,32 @@ $NetBSD: patch-aa,v 1.4 2009/05/13 12:56:47 obache Exp $
 -$as_echo_n "checking whether $PYTHON version >= 2.6... " >&6; }
 +      { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.4" >&5
 +$as_echo_n "checking whether $PYTHON version >= 2.4... " >&6; }
-       prog="import sys, string
+       prog="import sys
  # split strings by '.' and convert to numeric.  Append some zeros
  # because we need at least 4 digits for the hex conversion.
--minver = map(int, string.split('2.6', '.')) + [0, 0, 0]
-+minver = map(int, string.split('2.4', '.')) + [0, 0, 0]
+ # map returns an iterator in Python 3.0 and a list in 2.x
+-minver = list(map(int, '2.6'.split('.'))) + [0, 0, 0]
++minver = list(map(int, '2.4'.split('.'))) + [0, 0, 0]
  minverhex = 0
- for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
- sys.exit(sys.hexversion < minverhex)"
+ # xrange is not present in Python 3.0 and range returns an iterator
+ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
+@@ -11135,8 +11135,8 @@ fi
+     else
+       # Otherwise, try each interpreter until we find one that satisfies
+       # VERSION.
+-      { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.6" >&5
+-$as_echo_n "checking for a Python interpreter with version >= 2.6... " >&6; }
++      { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.4" >&5
++$as_echo_n "checking for a Python interpreter with version >= 2.4... " >&6; }
+ if test "${am_cv_pathless_PYTHON+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+@@ -11147,7 +11147,7 @@ else
+ # split strings by '.' and convert to numeric.  Append some zeros
+ # because we need at least 4 digits for the hex conversion.
+ # map returns an iterator in Python 3.0 and a list in 2.x
+-minver = list(map(int, '2.6'.split('.'))) + [0, 0, 0]
++minver = list(map(int, '2.4'.split('.'))) + [0, 0, 0]
+ minverhex = 0
+ # xrange is not present in Python 3.0 and range returns an iterator
+ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
diff --git a/graphics/py-cairo/patches/patch-ab b/graphics/py-cairo/patches/patch-ab
index 422a88cb604..8ac02482ff4 100644
--- a/graphics/py-cairo/patches/patch-ab
+++ b/graphics/py-cairo/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2009/05/13 12:56:47 obache Exp $
+$NetBSD: patch-ab,v 1.3 2009/08/31 08:04:32 wiz Exp $
 
---- cairo/pycairo-matrix.c.orig	2008-12-27 08:25:55.000000000 +0000
-+++ cairo/pycairo-matrix.c
-@@ -222,7 +222,7 @@ matrix_translate (PycairoMatrix *o, PyOb
+--- src/matrix.c.orig	2009-08-26 10:59:35.000000000 +0000
++++ src/matrix.c
+@@ -206,7 +206,7 @@ matrix_translate (PycairoMatrix *o, PyOb
  }
  
  static PyObject *
--matrix_item (PycairoMatrix *o, Py_ssize_t i)
-+matrix_item (PycairoMatrix *o, int i)
- {
-     switch (i) {
-     case 0:
-@@ -282,14 +282,13 @@ static PyNumberMethods matrix_as_number 
+-matrix_item (PycairoMatrix *o, Py_ssize_t i) {
++matrix_item (PycairoMatrix *o, int i) {
+   switch (i) {
+   case 0:
+     return Py_BuildValue("d", o->matrix.xx);
+@@ -265,14 +265,13 @@ static PyNumberMethods matrix_as_number 
    0,	           /* nb_true_divide */
    0,		   /* nb_inplace_floor_divide */
    0,		   /* nb_inplace_true_divide */
@@ -19,11 +19,11 @@ $NetBSD: patch-ab,v 1.2 2009/05/13 12:56:47 obache Exp $
  };
  
  static PySequenceMethods matrix_as_sequence = {
-     0,                  		/* sq_length */
-     0,                  		/* sq_concat */
-     0,                  		/* sq_repeat */
--    (ssizeargfunc)matrix_item,		/* sq_item */
-+    (intargfunc)matrix_item,		/* sq_item */
-     0,                     		/* sq_slice */
-     0,					/* sq_ass_item */
-     0,					/* sq_ass_slice */
+   0,                  		/* sq_length */
+   0,                  		/* sq_concat */
+   0,                  		/* sq_repeat */
+-  (ssizeargfunc)matrix_item,	/* sq_item */
++  (intargfunc)matrix_item,	/* sq_item */
+   0,                     	/* sq_slice */
+   0,				/* sq_ass_item */
+   0,				/* sq_ass_slice */
diff --git a/graphics/py-cairo/patches/patch-ac b/graphics/py-cairo/patches/patch-ac
index 16bd9cc821c..cddc20e3d9a 100644
--- a/graphics/py-cairo/patches/patch-ac
+++ b/graphics/py-cairo/patches/patch-ac
@@ -1,37 +1,46 @@
-$NetBSD: patch-ac,v 1.2 2009/05/13 12:56:47 obache Exp $
+$NetBSD: patch-ac,v 1.3 2009/08/31 08:04:32 wiz Exp $
 
---- cairo/pycairo-surface.c.orig	2009-03-03 11:11:20.000000000 +0000
-+++ cairo/pycairo-surface.c
-@@ -123,7 +123,7 @@ _write_func (void *closure, const unsign
- {
-     PyGILState_STATE gstate = PyGILState_Ensure();
-     PyObject *res = PyObject_CallMethod ((PyObject *)closure, "write", "(s#)",
--					 data, (Py_ssize_t)length);
-+					 data, length);
-     if (res == NULL) {
- 	/* an exception has occurred, it will be picked up later by
- 	 * Pycairo_Check_Status()
-@@ -424,7 +424,7 @@ image_surface_create_for_data (PyTypeObj
-     cairo_format_t format;
-     unsigned char *buffer;
-     int width, height, stride = -1, res;
--    Py_ssize_t buffer_len;
-+    int buffer_len;
-     PyObject *obj;
+--- src/surface.c.orig	2009-08-26 10:59:35.000000000 +0000
++++ src/surface.c
+@@ -118,7 +118,7 @@ static cairo_status_t
+ _write_func (void *closure, const unsigned char *data, unsigned int length) {
+   PyGILState_STATE gstate = PyGILState_Ensure();
+   PyObject *res = PyObject_CallMethod ((PyObject *)closure, "write", "(s#)",
+-				       data, (Py_ssize_t)length);
++				       data, length);
+   if (res == NULL) {
+     /* an exception has occurred, it will be picked up later by
+      * Pycairo_Check_Status()
+@@ -401,7 +401,7 @@ image_surface_create_for_data (PyTypeObj
+   cairo_format_t format;
+   unsigned char *buffer;
+   int width, height, stride = -1, res;
+-  Py_ssize_t buffer_len;
++  int buffer_len;
+   PyObject *obj;
  
-     if (!PyArg_ParseTuple(args, "Oiii|i:Surface.create_for_data",
-@@ -616,10 +616,10 @@ image_surface_buffer_getsegcount (Pycair
+   if (!PyArg_ParseTuple(args, "Oiii|i:Surface.create_for_data",
+@@ -445,7 +445,7 @@ image_surface_create_for_data (PyTypeObj
+ static cairo_status_t
+ _read_func (void *closure, unsigned char *data, unsigned int length) {
+   char *buffer;
+-  Py_ssize_t str_length;
++  int str_length;
+   cairo_status_t status = CAIRO_STATUS_READ_ERROR;
+   PyGILState_STATE gstate = PyGILState_Ensure();
+   PyObject *pystr = PyObject_CallMethod ((PyObject *)closure, "read", "(i)",
+@@ -585,10 +585,10 @@ image_surface_buffer_getsegcount (Pycair
  
  /* See Python C API Manual 10.7 */
  static PyBufferProcs image_surface_as_buffer = {
--    (readbufferproc) image_surface_buffer_getreadbuf,
--    (writebufferproc)image_surface_buffer_getwritebuf,
--    (segcountproc)   image_surface_buffer_getsegcount,
--    (charbufferproc) NULL,
-+    (getreadbufferproc) image_surface_buffer_getreadbuf,
-+    (getwritebufferproc)image_surface_buffer_getwritebuf,
-+    (getsegcountproc)   image_surface_buffer_getsegcount,
-+    (getcharbufferproc) NULL,
+-  (readbufferproc) image_surface_buffer_getreadbuf,
+-  (writebufferproc)image_surface_buffer_getwritebuf,
+-  (segcountproc)   image_surface_buffer_getsegcount,
+-  (charbufferproc) NULL,
++  (getreadbufferproc) image_surface_buffer_getreadbuf,
++  (getwritebufferproc)image_surface_buffer_getwritebuf,
++  (getsegcountproc)   image_surface_buffer_getsegcount,
++  (getcharbufferproc) NULL,
  };
  
  static PyMethodDef image_surface_methods[] = {