Update pycairo to 1.8.4.

Based on maintainer update request by PR 41063.
While here, add commented out LICENSE (LGPL-2.1 or MPL-1.1).

Overview of changes from pycairo 1.8.2 to pycairo 1.8.4
=======================================================
General Changes:
    Pycairo 1.8.4 requires cairo 1.8.4 (or later) and Python 2.6

Bug Fixes:
    20674: Add get/set_extend for Gradient Patterns

New Classes:
    cairo.ToyFontFace

New Methods:
    Pattern.get_extend
    Pattern.set_extend
    ToyFontFace.get_family
    ToyFontFace.get_slant
    ToyFontFace.get_weight

Deleted Methods:
    SurfacePattern.get_extend
    SurfacePattern.set_extend

Other Changes:
    Threading for surfaces with stream functions has been reenabled.
    Documentation updates.

5 files changed, 33 insertions, 24 deletions

diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index eab963b11d0..8db29008327 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2009/04/19 15:05:53 snj Exp $
+# $NetBSD: Makefile,v 1.18 2009/05/13 12:56:46 obache Exp $
 #
 
-DISTNAME=		pycairo-1.8.2
+DISTNAME=		pycairo-1.8.4
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=		graphics
 MASTER_SITES=		http://cairographics.org/releases/
@@ -10,6 +10,8 @@ MAINTAINER=		leuzi@trash.net
 HOMEPAGE=		http://cairographics.org/pycairo/
 COMMENT=		Python bindings for cairo
 
+#LICENSE=		gnu-lgpl-v2.1 OR mpl-v1.1
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_PKGLOCALEDIR=	yes
@@ -28,7 +30,7 @@ PY_PATCHPLIST=		yes
 BUILDLINK_TRANSFORM+=	rm:-std=c99
 .endif
 
-BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.8.0
+BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.8.4nb1
 
 .include "../../lang/python/extension.mk"
 .include "../../math/py-Numeric/buildlink3.mk"
diff --git a/graphics/py-cairo/distinfo b/graphics/py-cairo/distinfo
index dbd7ff64d81..14d2f99125a 100644
--- a/graphics/py-cairo/distinfo
+++ b/graphics/py-cairo/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2009/01/18 17:12:56 wiz Exp $
+$NetBSD: distinfo,v 1.10 2009/05/13 12:56:46 obache Exp $
 
-SHA1 (pycairo-1.8.2.tar.gz) = b457949ccfa3af82afcffae8a396a1c840a9428a
-RMD160 (pycairo-1.8.2.tar.gz) = ce48a6b71b802f07d0e0d3cfa140fd39ab5fe4d7
-Size (pycairo-1.8.2.tar.gz) = 519064 bytes
-SHA1 (patch-aa) = 1177a5421d80273721a80603dbd4cfca0fdf1b18
-SHA1 (patch-ab) = e8fcf835f97b38df476f09d7bcfe1f84b0264aa3
-SHA1 (patch-ac) = 93cc7fa29f90872dad22b83bc783acf9f1279093
+SHA1 (pycairo-1.8.4.tar.gz) = 450b59376ffea41910f60a0dfc9fd01d277e3950
+RMD160 (pycairo-1.8.4.tar.gz) = 1be18a8516d797694d370f0d02273cad18115320
+Size (pycairo-1.8.4.tar.gz) = 521136 bytes
+SHA1 (patch-aa) = 37c49d908bd008d0fb15614e3de5bcbcc8acc449
+SHA1 (patch-ab) = fdb6a547d43d48110efdd0cfbcfa5571c27df419
+SHA1 (patch-ac) = 0021fa070a132c0580a3e93a3685b21aeaf31e3a
diff --git a/graphics/py-cairo/patches/patch-aa b/graphics/py-cairo/patches/patch-aa
index 3d686f21d3d..f744473cdc3 100644
--- a/graphics/py-cairo/patches/patch-aa
+++ b/graphics/py-cairo/patches/patch-aa
@@ -1,12 +1,19 @@
-$NetBSD: patch-aa,v 1.3 2008/11/18 12:46:52 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2009/05/13 12:56:47 obache Exp $
 
---- configure.orig	2008-11-18 12:40:01.000000000 +0100
+--- configure.orig	2009-03-19 08:46:52.000000000 +0000
 +++ configure
-@@ -19384,7 +19384,7 @@ echo $ECHO_N "checking whether $PYTHON v
+@@ -19941,12 +19941,12 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+ 
+         if test -n "$PYTHON"; then
+       # If the user set $PYTHON, use it and don't search something else.
+-      { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.6" >&5
+-$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
  # 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.5', '.')) + [0, 0, 0]
+-minver = map(int, string.split('2.6', '.')) + [0, 0, 0]
 +minver = map(int, string.split('2.4', '.')) + [0, 0, 0]
  minverhex = 0
  for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
diff --git a/graphics/py-cairo/patches/patch-ab b/graphics/py-cairo/patches/patch-ab
index 83ea57a0a34..422a88cb604 100644
--- a/graphics/py-cairo/patches/patch-ab
+++ b/graphics/py-cairo/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2008/11/18 12:46:52 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2009/05/13 12:56:47 obache Exp $
 
---- cairo/pycairo-matrix.c.orig	2008-11-18 12:43:06.000000000 +0100
+--- cairo/pycairo-matrix.c.orig	2008-12-27 08:25:55.000000000 +0000
 +++ cairo/pycairo-matrix.c
-@@ -206,7 +206,7 @@ matrix_transform_point (PycairoMatrix *o
+@@ -222,7 +222,7 @@ matrix_translate (PycairoMatrix *o, PyOb
  }
  
  static PyObject *
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1 2008/11/18 12:46:52 drochner Exp $
  {
      switch (i) {
      case 0:
-@@ -266,14 +266,13 @@ static PyNumberMethods matrix_as_number 
+@@ -282,14 +282,13 @@ static PyNumberMethods matrix_as_number 
    0,	           /* nb_true_divide */
    0,		   /* nb_inplace_floor_divide */
    0,		   /* nb_inplace_true_divide */
diff --git a/graphics/py-cairo/patches/patch-ac b/graphics/py-cairo/patches/patch-ac
index 765dc31bda1..16bd9cc821c 100644
--- a/graphics/py-cairo/patches/patch-ac
+++ b/graphics/py-cairo/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.1 2008/11/18 12:46:52 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2009/05/13 12:56:47 obache Exp $
 
---- cairo/pycairo-surface.c.orig	2008-11-18 12:50:34.000000000 +0100
+--- cairo/pycairo-surface.c.orig	2009-03-03 11:11:20.000000000 +0000
 +++ cairo/pycairo-surface.c
-@@ -122,7 +122,7 @@ static cairo_status_t
- _write_func (void *closure, const unsigned char *data, unsigned int length)
+@@ -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()
-@@ -392,7 +392,7 @@ image_surface_create_for_data (PyTypeObj
+@@ -424,7 +424,7 @@ image_surface_create_for_data (PyTypeObj
      cairo_format_t format;
      unsigned char *buffer;
      int width, height, stride = -1, res;
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.1 2008/11/18 12:46:52 drochner Exp $
      PyObject *obj;
  
      if (!PyArg_ParseTuple(args, "Oiii|i:Surface.create_for_data",
-@@ -570,10 +570,10 @@ image_surface_buffer_getsegcount (Pycair
+@@ -616,10 +616,10 @@ image_surface_buffer_getsegcount (Pycair
  
  /* See Python C API Manual 10.7 */
  static PyBufferProcs image_surface_as_buffer = {