aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/Makefile2
-rw-r--r--graphics/py-graphviz/files/patch-setup.py13
-rw-r--r--graphics/py-graphviz/pkg-descr3
-rw-r--r--graphics/py-graphviz/pkg-plist71
-rw-r--r--graphics/py-pygraphviz/Makefile (renamed from graphics/py-graphviz/Makefile)23
-rw-r--r--graphics/py-pygraphviz/distinfo (renamed from graphics/py-graphviz/distinfo)0
-rw-r--r--graphics/py-pygraphviz/files/patch-setup.py32
-rw-r--r--graphics/py-pygraphviz/pkg-descr6
8 files changed, 52 insertions, 98 deletions
diff --git a/graphics/Makefile b/graphics/Makefile
index c2f96aa8b479..3ccd847d48d8 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -839,7 +839,6 @@
SUBDIR += py-graph
SUBDIR += py-graph-core
SUBDIR += py-graph-dot
- SUBDIR += py-graphviz
SUBDIR += py-graphy
SUBDIR += py-gvgen
SUBDIR += py-imaging
@@ -864,6 +863,7 @@
SUBDIR += py-pyganim
SUBDIR += py-pyggel
SUBDIR += py-pyglet
+ SUBDIR += py-pygraphviz
SUBDIR += py-pygooglechart
SUBDIR += py-pyproj
SUBDIR += py-qt4-svg
diff --git a/graphics/py-graphviz/files/patch-setup.py b/graphics/py-graphviz/files/patch-setup.py
deleted file mode 100644
index 41995609ca0a..000000000000
--- a/graphics/py-graphviz/files/patch-setup.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
- )
diff --git a/graphics/py-graphviz/pkg-descr b/graphics/py-graphviz/pkg-descr
deleted file mode 100644
index fe05d7e32010..000000000000
--- a/graphics/py-graphviz/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-A Python interface to the agraph component of graphviz.
-
-WWW: http://networkx.lanl.gov/pygraphviz/
diff --git a/graphics/py-graphviz/pkg-plist b/graphics/py-graphviz/pkg-plist
deleted file mode 100644
index d519ad6a1d20..000000000000
--- a/graphics/py-graphviz/pkg-plist
+++ /dev/null
@@ -1,71 +0,0 @@
-%%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/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/version.py
-%%PYTHON_SITELIBDIR%%/pygraphviz/version.pyc
-%%PYTHON_SITELIBDIR%%/pygraphviz/version.pyo
-%%DOCSDIR%%/INSTALL.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
diff --git a/graphics/py-graphviz/Makefile b/graphics/py-pygraphviz/Makefile
index 42c4023684f0..bbcd3c70afe8 100644
--- a/graphics/py-graphviz/Makefile
+++ b/graphics/py-pygraphviz/Makefile
@@ -1,25 +1,25 @@
# Created by: Hye-Shik Chang <perky@fallin.lv>
# $FreeBSD$
-PORTNAME= graphviz
+PORTNAME= pygraphviz
PORTVERSION= 1.3.1
CATEGORIES= graphics python
-MASTER_SITES= CHEESESHOP \
- http://networkx.lanl.gov/download/pygraphviz/
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= pygraphviz-${PORTVERSION}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= python@FreeBSD.org
COMMENT= Python interface to GraphViz agraph
-BUILD_DEPENDS= dot:${PORTSDIR}/graphics/graphviz
-RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz
+
+LIB_DEPENDS= libcgraph.so:${PORTSDIR}/graphics/graphviz
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0.10.1:${PORTSDIR}/devel/py-nose
USES= pkgconfig python
-USE_PYTHON= distutils
-PYDISTUTILS_PKGNAME= pygraphviz
+USE_PYTHON= autoplist concurrent distutils
-DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
+PYDISTUTILS_BUILD_TARGET= build build_ext
+PYDISTUTILS_BUILDARGS= --include-dirs=${LOCALBASE}/include \
+ --library-dirs=${LOCALBASE}/lib/graphviz
post-patch:
@${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+; \
@@ -28,4 +28,7 @@ post-patch:
post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pygraphviz/_graphviz.so
+do-test:
+ @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+
.include <bsd.port.mk>
diff --git a/graphics/py-graphviz/distinfo b/graphics/py-pygraphviz/distinfo
index f7df1ba65aba..f7df1ba65aba 100644
--- a/graphics/py-graphviz/distinfo
+++ b/graphics/py-pygraphviz/distinfo
diff --git a/graphics/py-pygraphviz/files/patch-setup.py b/graphics/py-pygraphviz/files/patch-setup.py
new file mode 100644
index 000000000000..117b152c4869
--- /dev/null
+++ b/graphics/py-pygraphviz/files/patch-setup.py
@@ -0,0 +1,32 @@
+--- setup.py.orig 2016-02-07 08:48:26 UTC
++++ setup.py
+@@ -36,14 +36,6 @@ release.write_versionfile()
+ sys.path.pop(0)
+
+ packages = ["pygraphviz", "pygraphviz.tests"]
+-docdirbase = 'share/doc/pygraphviz-%s' % release.version
+-data = [
+- (docdirbase, glob("*.txt")),
+- (os.path.join(docdirbase, 'examples'), glob("examples/*.py")),
+- (os.path.join(docdirbase, 'examples'), glob("examples/*.dat")),
+- (os.path.join(docdirbase, 'examples'), glob("examples/*.dat.gz")),
+-]
+-package_data = {'': ['*.txt'], }
+
+ if __name__ == "__main__":
+ define_macros = []
+@@ -75,14 +67,11 @@ if __name__ == "__main__":
+ download_url=release.download_url,
+ classifiers=release.classifiers,
+ packages=packages,
+- data_files=data,
+ ext_modules=extension,
+ cmdclass={
+ 'install': AddExtensionInstallCommand,
+ 'develop': AddExtensionDevelopCommand,
+ },
+- package_data=package_data,
+- include_package_data = True,
+ test_suite='nose.collector',
+ tests_require=['nose>=0.10.1', 'doctest-ignore-unicode>=0.1.0',],
+ )
diff --git a/graphics/py-pygraphviz/pkg-descr b/graphics/py-pygraphviz/pkg-descr
new file mode 100644
index 000000000000..110028fe4fc9
--- /dev/null
+++ b/graphics/py-pygraphviz/pkg-descr
@@ -0,0 +1,6 @@
+PyGraphviz is a Python interface to the Graphviz graph layout and
+visualization package. With PyGraphviz you can create, edit, read,
+write, and draw graphs using Python to access the Graphviz graph
+data structure and layout algorithms.
+
+WWW: http://pygraphviz.github.io