Update to 1.0.2.

Submitted by:	ahze

4 files changed, 47 insertions, 26 deletions

diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index b22b0e0794f9..6be28b49c76e 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -3,12 +3,13 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#	$MCom: ports/graphics/py-cairo/Makefile,v 1.15 2005/10/12 16:31:53 ahze Exp $
 #
 
 PORTNAME=	cairo
-PORTVERSION=	0.4.0
+PORTVERSION=	1.0.2
 CATEGORIES=	graphics python
-MASTER_SITES=	http://cairographics.org/snapshots/
+MASTER_SITES=	http://cairographics.org/releases/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
@@ -16,36 +17,36 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python bindings for Cairo
 
 BUILD_DEPENDS=	${PYNUMERIC}
-LIB_DEPENDS=	cairo.1:${PORTSDIR}/graphics/cairo
-RUN_DEPENDS=	${BUILD_DEPENDS}
+LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
+RUN_DEPENDS=	${PYNUMERIC}
 
 USE_PYTHON=	yes
-WANT_GNOME=	yes
-USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnometarget gnomehack
+USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ARGS=	--without-pygtk
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mpygtk2}!=""
-WITH_PYGTK=	yes
-.endif
-
-.if defined(WITHOUT_PYGTK) && !defined(WITH_PYGTK)
-PLIST_SUB+=	GTK="@comment "
+.if defined(WITHOUT_SVG) && !exists(${LOCALBASE}/lib/libsvg-cairo.a)
+PLIST_SUB+=	SVG="@comment "
 .else
-USE_GNOME=	pygtk2
-PLIST_SUB+=	GTK=""
-.endif
-
-.if defined(WITH_SVG) || exists(${LOCALBASE}/lib/libsvg-cairo.a)
-LIB_DEPENDS+=	svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo
 PLIST_SUB+=	SVG=""
-.else
-PLIST_SUB+=	SVG="@comment "
+LIB_DEPENDS+=	svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo
 .endif
 
 pre-everything::
-	@${ECHO_MSG} "Enable SVG support by defining WITH_SVG"
-	@${ECHO_MSG} "Enable PyGtk support by defining WITH_PYGTK"
+	@${ECHO_MSG} "Disable SVG support by defining WITHOUT_SVG"
 	@${ECHO_MSG}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \
+		s|SUBDIRS = cairo examples test|SUBDIRS = cairo examples|' \
+		${WRKSRC}/Makefile.in
+.if ${OSVERSION} < 500000
+	@${REINPLACE_CMD} -e 's|-std=c99||' \
+		${WRKSRC}/configure
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/graphics/py-cairo/distinfo b/graphics/py-cairo/distinfo
index 8a276e00e978..0c52ee134770 100644
--- a/graphics/py-cairo/distinfo
+++ b/graphics/py-cairo/distinfo
@@ -1,2 +1,2 @@
-MD5 (pycairo-0.4.0.tar.gz) = 5e8d7fa07b1f367b47f366811bbe4ac9
-SIZE (pycairo-0.4.0.tar.gz) = 341788
+MD5 (pycairo-1.0.2.tar.gz) = 5bb6a202ebc3990712bced1da6dfb7a8
+SIZE (pycairo-1.0.2.tar.gz) = 469704
diff --git a/graphics/py-cairo/files/patch-cairo_pycairo-font.c b/graphics/py-cairo/files/patch-cairo_pycairo-font.c
new file mode 100644
index 000000000000..ca7321d6f549
--- /dev/null
+++ b/graphics/py-cairo/files/patch-cairo_pycairo-font.c
@@ -0,0 +1,19 @@
+--- cairo/pycairo-font.c.orig	Mon Aug  1 05:31:41 2005
++++ cairo/pycairo-font.c	Wed Aug  3 01:09:38 2005
+@@ -196,6 +196,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,
+@@ -204,7 +205,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) {
+ 	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/pkg-plist b/graphics/py-cairo/pkg-plist
index 18ea7d7a64c0..ffe3641abd49 100644
--- a/graphics/py-cairo/pkg-plist
+++ b/graphics/py-cairo/pkg-plist
@@ -1,8 +1,9 @@
+include/pycairo/pycairo.h
 %%PYTHON_SITELIBDIR%%/cairo/__init__.py
 %%PYTHON_SITELIBDIR%%/cairo/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cairo/__init__.pyo
 %%PYTHON_SITELIBDIR%%/cairo/_cairo.so
-%%GTK%%%%PYTHON_SITELIBDIR%%/cairo/gtk.so
 %%SVG%%%%PYTHON_SITELIBDIR%%/cairo/svg.so
-%%PYTHON_SITELIBDIR%%/cairo/numpy.so
+libdata/pkgconfig/pycairo.pc
 @dirrm %%PYTHON_SITELIBDIR%%/cairo
+@dirrm include/pycairo