Alexandr Shadchin <[email protected]> writes:
> * fix license
> * fix .pyc file
> * simplify test (without install package)
>
> OK ?
All those make sense to me. Further cleanup items:
- refresh WANTLIB
- kill the gettext module
- regen PLIST, _cairo.a and _cairo.la (already commented out) aren't
installed any more
ok for your diff, please commit the updated diff below if you agree with
the points above.
Index: Makefile
===================================================================
RCS file: /d/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 6 Nov 2016 16:07:57 -0000
@@ -9,30 +9,29 @@ VERSION= 1.10.0
DISTNAME= pycairo-${VERSION}
PKGNAME= py3-cairo-${VERSION}
EXTRACT_SUFX= .tar.bz2
-REVISION= 2
+REVISION= 3
CATEGORIES= graphics
HOMEPAGE= http://cairographics.org/pycairo/
-# LGPLv2.1 / MPL 1.1
+# LGPLv3
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ${MODPY_WANTLIB}
-WANTLIB += GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender Xxf86vm cairo
-WANTLIB += drm expat fontconfig freetype glib-2.0 gobject-2.0 m pcre
-WANTLIB += pixman-1 png pthread pthread-stubs util xcb xcb-render
-WANTLIB += xcb-shm z
+WANTLIB += X11 Xau Xdmcp Xext Xrender cairo expat fontconfig freetype
+WANTLIB += glib-2.0 gobject-2.0 intl m pcre pixman-1 png pthread
+WANTLIB += pthread-stubs util xcb xcb-render xcb-shm z
MASTER_SITES= http://cairographics.org/releases/
-MODULES= lang/python \
- devel/gettext
+MODULES= lang/python
MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
+ devel/gettext \
graphics/cairo
TEST_DEPENDS=devel/py-test${MODPY_FLAVOR}
@@ -46,16 +45,18 @@ 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
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+ ${WRKINST}${MODPY_SITEPKG}
-do-test: install
+do-test: fake
sed -i "s/python/python${MODPY_VERSION}/g"
${WRKSRC}/test/examples_test.py
- cd ${WRKSRC}/test && py.test${MODPY_BIN_SUFFIX}
+ cd ${WRKSRC} && PYTHONPATH=${WRKINST}${MODPY_SITEPKG} ${MODPY_BIN} -m
pytest
.include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /d/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 6 Nov 2016 16:08:03 -0000
@@ -4,8 +4,6 @@ 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
-@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/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/cairo/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cairo/_cairo.so
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
