diff options
| author | joerg <joerg> | 2014-06-29 15:04:40 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2014-06-29 15:04:40 +0000 |
| commit | d4569868c9d73b4d95eccbbed001993f4da30b68 (patch) | |
| tree | 5b75cf03b0606378c3241ed48ac6b71a17912ae5 /graphics/py-cairo3 | |
| parent | b0ae0c09d1ff28498a1fd2a13a58252a6489ea4b (diff) | |
| download | pkgsrc-d4569868c9d73b4d95eccbbed001993f4da30b68.tar.gz | |
Remove some unnecessary dependencies. Invoke python-config without
explicit interpreter, for Python 3.3 it is a Python script and for 3.4 a
shell script.
Diffstat (limited to 'graphics/py-cairo3')
| -rw-r--r-- | graphics/py-cairo3/Makefile | 7 | ||||
| -rw-r--r-- | graphics/py-cairo3/distinfo | 3 | ||||
| -rw-r--r-- | graphics/py-cairo3/patches/patch-.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6_waflib_Tools_python.py | 13 |
3 files changed, 20 insertions, 3 deletions
diff --git a/graphics/py-cairo3/Makefile b/graphics/py-cairo3/Makefile index 79d8da752bb..6132ddadfe2 100644 --- a/graphics/py-cairo3/Makefile +++ b/graphics/py-cairo3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/05/05 00:47:59 ryoon Exp $ +# $NetBSD: Makefile,v 1.7 2014/06/29 15:04:40 joerg Exp $ DISTNAME= pycairo-1.10.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -14,7 +14,6 @@ LICENSE= gnu-lgpl-v2.1 OR mpl-1.1 USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -USE_TOOLS+= aclocal automake pkg-config GNU_CONFIGURE= yes CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} @@ -24,6 +23,10 @@ PY_PATCHPLIST= yes # waf is not smart enough for this as of 1.10.0 PY_PEP3147= no +pre-patch: + cd ${WRKSRC:Q} && \ + ${SETENV} ${CONFIGURE_ENV} ${PYTHONBIN} ./waf --help + do-configure: cd ${WRKSRC:Q} && \ ${SETENV} ${CONFIGURE_ENV} ${PYTHONBIN} ./waf configure \ diff --git a/graphics/py-cairo3/distinfo b/graphics/py-cairo3/distinfo index 9c811899482..5d5e4475e70 100644 --- a/graphics/py-cairo3/distinfo +++ b/graphics/py-cairo3/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2014/01/23 11:11:09 wiz Exp $ +$NetBSD: distinfo,v 1.2 2014/06/29 15:04:40 joerg Exp $ SHA1 (pycairo-1.10.0.tar.bz2) = b4283aa1cc9aafd12fd72ad371303a486da1d014 RMD160 (pycairo-1.10.0.tar.bz2) = 7d1c1c05113e5bbad32dbe96c65c918b170cac33 Size (pycairo-1.10.0.tar.bz2) = 246556 bytes +SHA1 (patch-.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6_waflib_Tools_python.py) = 44bd5b6f82476df48bec7976da5e488063ff9f07 diff --git a/graphics/py-cairo3/patches/patch-.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6_waflib_Tools_python.py b/graphics/py-cairo3/patches/patch-.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6_waflib_Tools_python.py new file mode 100644 index 00000000000..9d35873308a --- /dev/null +++ b/graphics/py-cairo3/patches/patch-.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6_waflib_Tools_python.py @@ -0,0 +1,13 @@ +$NetBSD: patch-.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6_waflib_Tools_python.py,v 1.1 2014/06/29 15:04:40 joerg Exp $ + +--- .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py.orig 2014-06-29 14:32:41.000000000 +0000 ++++ .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py +@@ -169,7 +169,7 @@ def check_python_headers(conf): + conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False) + includes=[] + if conf.env.PYTHON_CONFIG: +- for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split(): ++ for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split(): + if(incstr.startswith('-I')or incstr.startswith('/I')): + incstr=incstr[2:] + if incstr not in includes: |