On Sat, Apr 23, 2016 at 11:24:47PM -0400, Daniel Dickman wrote:
> naddy@ reported a build failure of the py3 flavor of matplotlib.
>
> Looking at his logs, it seems like the problem might actually be in
> py3-cairo. I *think* the fix is easy and is at the bottom of this email.
>
> While here, fix the license marker and a comment in py3-cairo.
>
> ok?
>
make sense, small rework, ok shadchin@
--
Alexandr Shadchin
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/py3-cairo/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 8 Oct 2015 12:02:03 -0000 1.9
+++ Makefile 25 Apr 2016 19:36:29 -0000
@@ -9,7 +9,7 @@ VERSION= 1.10.0
DISTNAME= pycairo-${VERSION}
PKGNAME= py3-cairo-${VERSION}
EXTRACT_SUFX= .tar.bz2
-REVISION= 2
+REVISION= 3
CATEGORIES= graphics
@@ -46,13 +46,17 @@ post-extract:
do-configure:
cd ${WRKSRC} && env PYTHON=${MODPY_BIN} \
LDFLAGS="$$(python${MODPY_VERSION}-config --libs)" \
- ${MODPY_BIN} ./waf configure
+ ${MODPY_BIN} ./waf configure --nopyc --nopyo
do-build:
cd ${WRKBUILD} && ${MODPY_BIN} ./waf build
do-install:
cd ${WRKBUILD} && ${MODPY_BIN} ./waf install
+
+post-install:
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+ ${WRKINST}${MODPY_SITEPKG}
do-test: install
sed -i "s/python/python${MODPY_VERSION}/g"
${WRKSRC}/test/examples_test.py
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/py3-cairo/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 30 Mar 2012 07:12:28 -0000 1.1.1.1
+++ pkg/PLIST 25 Apr 2016 19:36:29 -0000
@@ -4,8 +4,8 @@ include/pycairo/py3cairo.h
lib/pkgconfig/py3cairo.pc
lib/python${MODPY_VERSION}/site-packages/cairo/
lib/python${MODPY_VERSION}/site-packages/cairo/__init__.py
-lib/python${MODPY_VERSION}/site-packages/cairo/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/cairo/__init__.pyo
+lib/python${MODPY_VERSION}/site-packages/cairo/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/cairo/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
@comment lib/python${MODPY_VERSION}/site-packages/cairo/_cairo.a
@comment lib/python${MODPY_VERSION}/site-packages/cairo/_cairo.la
lib/python${MODPY_VERSION}/site-packages/cairo/_cairo.so
