summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/py-cairo/DESCR2
-rw-r--r--graphics/py-cairo/Makefile5
-rw-r--r--graphics/py-cairo/buildlink3.mk13
-rw-r--r--graphics/py-cairo3/DESCR2
-rw-r--r--graphics/py-cairo3/Makefile4
5 files changed, 13 insertions, 13 deletions
diff --git a/graphics/py-cairo/DESCR b/graphics/py-cairo/DESCR
index 68f97ac7813..eaed0163f7d 100644
--- a/graphics/py-cairo/DESCR
+++ b/graphics/py-cairo/DESCR
@@ -3,4 +3,4 @@ devices. Currently supported output targets include the X Window
System, win32, and image buffers. Experimental backends include OpenGL
(through glitz), Quartz, XCB, PostScript and PDF file output.
-This package contains the Python bindings for Cairo.
+This package contains the Python bindings for Cairo for Python 2.x.
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index 0eae71af44b..602ce348ff0 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2013/09/02 19:50:40 adam Exp $
+# $NetBSD: Makefile,v 1.43 2014/01/23 11:12:43 wiz Exp $
DISTNAME= py2cairo-1.10.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py2//}
@@ -9,7 +9,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= leuzi@trash.net
HOMEPAGE= http://cairographics.org/pycairo/
-COMMENT= Python bindings for cairo
+COMMENT= Python bindings for cairo (python-2.x version)
LICENSE= gnu-lgpl-v2.1 OR mpl-1.1
USE_PKGLOCALEDIR= yes
@@ -20,6 +20,7 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
PKGCONFIG_OVERRIDE+= pycairo.pc.in
PY_PATCHPLIST= yes
+PYTHON_VERSIONS_INCOMPATIBLE= 33
PYTHON_SELF_CONFLICT= yes
diff --git a/graphics/py-cairo/buildlink3.mk b/graphics/py-cairo/buildlink3.mk
index 33fa6b55692..9680a7704e6 100644
--- a/graphics/py-cairo/buildlink3.mk
+++ b/graphics/py-cairo/buildlink3.mk
@@ -1,17 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.21 2013/09/02 19:50:40 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2014/01/23 11:12:43 wiz Exp $
-BUILDLINK_TREE+= pycairo
+BUILDLINK_TREE+= py-cairo
.if !defined(PY_CAIRO_BUILDLINK3_MK)
PY_CAIRO_BUILDLINK3_MK:=
. include "../../lang/python/pyversion.mk"
-BUILDLINK_API_DEPENDS.pycairo+= ${PYPKGPREFIX}-cairo>=1.0.2
-BUILDLINK_ABI_DEPENDS.pycairo+= ${PYPKGPREFIX}-cairo>=1.10.0nb1
-BUILDLINK_PKGSRCDIR.pycairo?= ../../graphics/py-cairo
+BUILDLINK_API_DEPENDS.py-cairo+= ${PYPKGPREFIX}-cairo>=1.10.0
+BUILDLINK_PKGSRCDIR.py-cairo?= ../../graphics/py-cairo
.include "../../graphics/cairo/buildlink3.mk"
-.endif # PY_CAIRO_BUILDLINK3_MK
+.endif # PY_CAIRO_BUILDLINK3_MK
-BUILDLINK_TREE+= -pycairo
+BUILDLINK_TREE+= -py-cairo
diff --git a/graphics/py-cairo3/DESCR b/graphics/py-cairo3/DESCR
index 68f97ac7813..1e0a9f9d2a9 100644
--- a/graphics/py-cairo3/DESCR
+++ b/graphics/py-cairo3/DESCR
@@ -3,4 +3,4 @@ devices. Currently supported output targets include the X Window
System, win32, and image buffers. Experimental backends include OpenGL
(through glitz), Quartz, XCB, PostScript and PDF file output.
-This package contains the Python bindings for Cairo.
+This package contains the Python bindings for Cairo for Python 3.x.
diff --git a/graphics/py-cairo3/Makefile b/graphics/py-cairo3/Makefile
index 8713c30bb4e..f717c08116c 100644
--- a/graphics/py-cairo3/Makefile
+++ b/graphics/py-cairo3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/01/23 11:11:09 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2014/01/23 11:12:43 wiz Exp $
DISTNAME= pycairo-1.10.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -8,7 +8,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= leuzi@trash.net
HOMEPAGE= http://cairographics.org/pycairo/
-COMMENT= Python bindings for cairo
+COMMENT= Python bindings for cairo (python-3.x version)
LICENSE= gnu-lgpl-v2.1 OR mpl-1.1
USE_PKGLOCALEDIR= yes