Index: head/graphics/py-graphviz/Makefile =================================================================== --- head/graphics/py-graphviz/Makefile (revision 403282) +++ head/graphics/py-graphviz/Makefile (revision 403283) @@ -1,32 +1,31 @@ # Created by: Hye-Shik Chang # $FreeBSD$ PORTNAME= graphviz -PORTVERSION= 1.2 -PORTREVISION= 1 +PORTVERSION= 1.3.1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP \ http://networkx.lanl.gov/download/pygraphviz/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= pygraphviz-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Python interface to GraphViz agraph BUILD_DEPENDS= dot:${PORTSDIR}/graphics/graphviz RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz -USES= python +USES= pkgconfig python USE_PYTHON= distutils PYDISTUTILS_PKGNAME= pygraphviz DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} post-patch: @${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+; \ s+^docdirbase.*=.*+docdirbase = "${DOCSDIR:S/${PREFIX}\///}"+' ${WRKSRC}/setup.py post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pygraphviz/_graphviz.so .include Index: head/graphics/py-graphviz/distinfo =================================================================== --- head/graphics/py-graphviz/distinfo (revision 403282) +++ head/graphics/py-graphviz/distinfo (revision 403283) @@ -1,2 +1,2 @@ -SHA256 (pygraphviz-1.2.tar.gz) = 2e8a82a07dcf006b9558d22c5a6357c012193d4cc681776845e515fffeccc6b3 -SIZE (pygraphviz-1.2.tar.gz) = 90913 +SHA256 (pygraphviz-1.3.1.tar.gz) = 7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408 +SIZE (pygraphviz-1.3.1.tar.gz) = 103336 Index: head/graphics/py-graphviz/files/patch-setup.py =================================================================== --- head/graphics/py-graphviz/files/patch-setup.py (revision 403282) +++ head/graphics/py-graphviz/files/patch-setup.py (revision 403283) @@ -1,22 +1,13 @@ ---- setup.py.orig 2010-08-01 21:18:02.000000000 +0800 -+++ setup.py 2010-08-02 15:59:57.000000000 +0800 -@@ -28,8 +28,8 @@ - sys.version_info[:2] - sys.exit(-1) - --library_path=None --include_path=None -+#library_path=None -+#include_path=None - - # If the setup script couldn't find your graphviz installation you can - # specify it here by uncommenting these lines or providing your own: -@@ -42,6 +42,8 @@ - # OSX, Linux, alternate location - #library_path='/usr/local/lib/graphviz' - #include_path='/usr/local/include/graphviz' -+library_path='%%LOCALBASE%%/lib/graphviz' -+include_path='%%LOCALBASE%%/include/graphviz' - - # OSX (Fink) - #library_path='/sw/lib/graphviz' +--- setup.py.orig 2015-09-06 13:49:49 UTC ++++ setup.py +@@ -54,8 +54,8 @@ if __name__ == "__main__": + Extension( + "pygraphviz._graphviz", + ["pygraphviz/graphviz_wrap.c"], +- include_dirs=[], +- library_dirs=[], ++ include_dirs=["%%LOCALBASE%%/include"], ++ library_dirs=["%%LOCALBASE%%/lib/graphviz"], + libraries=["cgraph", "cdt"], + define_macros=define_macros + ) Index: head/graphics/py-graphviz/pkg-plist =================================================================== --- head/graphics/py-graphviz/pkg-plist (revision 403282) +++ head/graphics/py-graphviz/pkg-plist (revision 403283) @@ -1,35 +1,71 @@ %%PYTHON_SITELIBDIR%%/pygraphviz/__init__.py %%PYTHON_SITELIBDIR%%/pygraphviz/__init__.pyc %%PYTHON_SITELIBDIR%%/pygraphviz/__init__.pyo %%PYTHON_SITELIBDIR%%/pygraphviz/_graphviz.so %%PYTHON_SITELIBDIR%%/pygraphviz/agraph.py %%PYTHON_SITELIBDIR%%/pygraphviz/agraph.pyc %%PYTHON_SITELIBDIR%%/pygraphviz/agraph.pyo +%%PYTHON_SITELIBDIR%%/pygraphviz/graphviz_wrap.c +%%PYTHON_SITELIBDIR%%/pygraphviz/graphviz.i %%PYTHON_SITELIBDIR%%/pygraphviz/graphviz.py %%PYTHON_SITELIBDIR%%/pygraphviz/graphviz.pyc %%PYTHON_SITELIBDIR%%/pygraphviz/graphviz.pyo %%PYTHON_SITELIBDIR%%/pygraphviz/release.py %%PYTHON_SITELIBDIR%%/pygraphviz/release.pyc %%PYTHON_SITELIBDIR%%/pygraphviz/release.pyo %%PYTHON_SITELIBDIR%%/pygraphviz/tests/__init__.py %%PYTHON_SITELIBDIR%%/pygraphviz/tests/__init__.pyc %%PYTHON_SITELIBDIR%%/pygraphviz/tests/__init__.pyo -%%PYTHON_SITELIBDIR%%/pygraphviz/tests/attributes.txt -%%PYTHON_SITELIBDIR%%/pygraphviz/tests/graph.txt -%%PYTHON_SITELIBDIR%%/pygraphviz/tests/layout_draw.txt +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_attribute_defaults.py +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_attribute_defaults.pyc +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_attribute_defaults.pyo +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_attributes.py +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_attributes.pyc +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_attributes.pyo +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_clear.py +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_clear.pyc +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_clear.pyo +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_drawing.py +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_drawing.pyc +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_drawing.pyo +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_edge_attributes.py +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_edge_attributes.pyc +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_edge_attributes.pyo +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_graph.py +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_graph.pyc +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_graph.pyo +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_html.py +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_html.pyc +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_html.pyo +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_layout.py +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_layout.pyc +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_layout.pyo +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_node_attributes.py +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_node_attributes.pyc +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_node_attributes.pyo +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_readwrite.py +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_readwrite.pyc +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_readwrite.pyo +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_string.py +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_string.pyc +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_string.pyo +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_subgraph.py +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_subgraph.pyc +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_subgraph.pyo +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_unicode.py +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_unicode.pyc +%%PYTHON_SITELIBDIR%%/pygraphviz/tests/test_unicode.pyo %%PYTHON_SITELIBDIR%%/pygraphviz/tests/test.py %%PYTHON_SITELIBDIR%%/pygraphviz/tests/test.pyc %%PYTHON_SITELIBDIR%%/pygraphviz/tests/test.pyo -%%PYTHON_SITELIBDIR%%/pygraphviz/tests/unicode.txt %%PYTHON_SITELIBDIR%%/pygraphviz/version.py %%PYTHON_SITELIBDIR%%/pygraphviz/version.pyc %%PYTHON_SITELIBDIR%%/pygraphviz/version.pyo %%DOCSDIR%%/INSTALL.txt -%%DOCSDIR%%/README.txt %%DOCSDIR%%/examples/attributes.py %%DOCSDIR%%/examples/django_simple.py %%DOCSDIR%%/examples/miles.py %%DOCSDIR%%/examples/simple.py %%DOCSDIR%%/examples/star.py %%DOCSDIR%%/examples/subgraph.py %%DOCSDIR%%/examples/utf8_encoding.py