diff options
| author | prlw1 <prlw1> | 2014-02-12 00:30:03 +0000 |
|---|---|---|
| committer | prlw1 <prlw1> | 2014-02-12 00:30:03 +0000 |
| commit | 89ded5bc867fa0f03cca50090257532963d906e8 (patch) | |
| tree | 11a8d632c013cbe85b7388c16ee8de7fb97e98a9 /graphics | |
| parent | e549f815f84d0bde9cb8c9dece290f71591d2efa (diff) | |
| download | pkgsrc-89ded5bc867fa0f03cca50090257532963d906e8.tar.gz | |
Python 2.6 and 2.7 versions of py-cairo conflict, but they don't conflict
with the python 3.3 version, so remove PYTHON_SELF_CONFLICT and leave
it up to PLIST conflict detection.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/py-cairo/Makefile | 6 | ||||
| -rw-r--r-- | graphics/py-cairo3/Makefile | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile index 602ce348ff0..fe79179eac3 100644 --- a/graphics/py-cairo/Makefile +++ b/graphics/py-cairo/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.43 2014/01/23 11:12:43 wiz Exp $ +# $NetBSD: Makefile,v 1.44 2014/02/12 00:30:03 prlw1 Exp $ DISTNAME= py2cairo-1.10.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py2//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ EXTRACT_SUFX= .tar.bz2 @@ -22,8 +22,6 @@ PKGCONFIG_OVERRIDE+= pycairo.pc.in PY_PATCHPLIST= yes PYTHON_VERSIONS_INCOMPATIBLE= 33 -PYTHON_SELF_CONFLICT= yes - post-extract: cd ${WRKSRC} && touch ChangeLog && aclocal && automake -a diff --git a/graphics/py-cairo3/Makefile b/graphics/py-cairo3/Makefile index e0ca8c8800b..af0adbfb442 100644 --- a/graphics/py-cairo3/Makefile +++ b/graphics/py-cairo3/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:09 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2014/02/12 00:30:03 prlw1 Exp $ DISTNAME= pycairo-1.10.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ EXTRACT_SUFX= .tar.bz2 @@ -18,7 +19,6 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} PKGCONFIG_OVERRIDE+= py3cairo.pc.in -PYTHON_SELF_CONFLICT= yes PYTHON_VERSIONS_INCOMPATIBLE= 26 27 PY_PATCHPLIST= yes # waf is not smart enough for this as of 1.10.0 |