svn commit: r376593 - in head/graphics/py3-cairo: . files

[Koop Mast]

Author: kwm
Date: Fri Jan  9 11:11:59 2015
New Revision: 376593
URL: https://svnweb.freebsd.org/changeset/ports/376593
QAT: https://qat.redports.org/buildarchive/r376593/

Log:
  Make py3-cairo build with python 3.4.
  
  Submitted by:	antoine@

Added:
  head/graphics/py3-cairo/files/pycairo-1.10.0-waf-py3_4.patch   (contents, props changed)
Modified:
  head/graphics/py3-cairo/Makefile

Modified: head/graphics/py3-cairo/Makefile
==============================================================================
--- head/graphics/py3-cairo/Makefile	Fri Jan  9 11:00:24 2015	(r376592)
+++ head/graphics/py3-cairo/Makefile	Fri Jan  9 11:11:59 2015	(r376593)
@@ -29,6 +29,11 @@ post-patch:
 		${WRKSRC}/test/examples_test.py
 
 do-configure:
+# Run waf configure twice, once to extract waflib and patch and then actual configure
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
+		./waf configure || :
+	@cd ${WRKSRC}/.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/ && \
+		${PATCH} -p1 < ${FILESDIR}/pycairo-1.10.0-waf-py3_4.patch
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./waf configure
 

Added: head/graphics/py3-cairo/files/pycairo-1.10.0-waf-py3_4.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/py3-cairo/files/pycairo-1.10.0-waf-py3_4.patch	Fri Jan  9 11:11:59 2015	(r376593)
@@ -0,0 +1,11 @@
+--- a/waflib/Tools/python.py
++++ b/waflib/Tools/python.py
+@@ -169,7 +169,7 @@
+ 		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: