diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:35:50 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:35:50 +0000 |
| commit | f1bb12de8e50bf76ae21f37debda60994ec7fd99 (patch) | |
| tree | 1671d4beef381f12d939e34b344eb385a3af4f19 /graphics/py-cairo | |
| parent | 29adee7bb42244f34736c5c24ed18a9b269d0925 (diff) | |
| download | ports-f1bb12de8e50bf76ae21f37debda60994ec7fd99.tar.gz ports-f1bb12de8e50bf76ae21f37debda60994ec7fd99.zip | |
Notes
Diffstat (limited to 'graphics/py-cairo')
| -rw-r--r-- | graphics/py-cairo/Makefile | 18 | ||||
| -rw-r--r-- | graphics/py-cairo/distinfo | 6 | ||||
| -rw-r--r-- | graphics/py-cairo/files/patch-cairo_pycairo-font.c | 19 | ||||
| -rw-r--r-- | graphics/py-cairo/pkg-plist | 2 |
4 files changed, 7 insertions, 38 deletions
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile index f5deff12f13d..7b35c95741b6 100644 --- a/graphics/py-cairo/Makefile +++ b/graphics/py-cairo/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/py-cairo/Makefile,v 1.15 2005/10/12 16:31:53 ahze Exp $ +# $MCom: ports/graphics/py-cairo/Makefile,v 1.20 2006/09/06 22:05:06 marcus Exp $ # PORTNAME= cairo -PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTVERSION= 1.2.2 CATEGORIES= graphics python MASTER_SITES= http://cairographics.org/releases/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -26,20 +25,11 @@ USE_GMAKE= yes USE_GNOME= gnometarget gnomehack GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-pygtk +CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ + LDFLAGS="-L${X11BASE}/lib" .include <bsd.port.pre.mk> -.if defined(WITHOUT_SVG) && !exists(${LOCALBASE}/lib/libsvg-cairo.a) -PLIST_SUB+= SVG="@comment " -.else -PLIST_SUB+= SVG="" -LIB_DEPENDS+= svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo -.endif - -pre-everything:: - @${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|' \ diff --git a/graphics/py-cairo/distinfo b/graphics/py-cairo/distinfo index 5c11a7531ec6..875475752ea9 100644 --- a/graphics/py-cairo/distinfo +++ b/graphics/py-cairo/distinfo @@ -1,3 +1,3 @@ -MD5 (pycairo-1.0.2.tar.gz) = 5bb6a202ebc3990712bced1da6dfb7a8 -SHA256 (pycairo-1.0.2.tar.gz) = f4827f7d8f5fd423b58fef33c95790c6615cd6fad7d68dc780c343ed292b8d9a -SIZE (pycairo-1.0.2.tar.gz) = 469704 +MD5 (pycairo-1.2.2.tar.gz) = 83a2e06d9fc3530753701d580a18087e +SHA256 (pycairo-1.2.2.tar.gz) = ab10b00c209e9feaebfff944d411f300ca032d09d3ebb64e3498acf9fea09c6d +SIZE (pycairo-1.2.2.tar.gz) = 482417 diff --git a/graphics/py-cairo/files/patch-cairo_pycairo-font.c b/graphics/py-cairo/files/patch-cairo_pycairo-font.c deleted file mode 100644 index ca7321d6f549..000000000000 --- a/graphics/py-cairo/files/patch-cairo_pycairo-font.c +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 bfc5bf308852..0d5ac3d2b6d6 100644 --- a/graphics/py-cairo/pkg-plist +++ b/graphics/py-cairo/pkg-plist @@ -4,8 +4,6 @@ include/pycairo/pycairo.h %%PYTHON_SITELIBDIR%%/cairo/__init__.pyo %%PYTHON_SITELIBDIR%%/cairo/_cairo.la %%PYTHON_SITELIBDIR%%/cairo/_cairo.so -%%SVG%%%%PYTHON_SITELIBDIR%%/cairo/svg.la -%%SVG%%%%PYTHON_SITELIBDIR%%/cairo/svg.so libdata/pkgconfig/pycairo.pc @dirrm %%PYTHON_SITELIBDIR%%/cairo @dirrm include/pycairo |