graphics/py-graphviz: Move to py-pygraphviz, Fix 3.x build

There are numerous graphviz related packages in PyPI, including:
graphviz, graphviz-python and pygraphviz.

This port, py-graphviz, is not and does not provide the same package
as the 'graphviz' package on PyPI (CHEESESHOP).

Further, it blocks the creation of a correctly named py-graphviz port,
is a POLA violation in terms of users expecting to find and recieve
the package they expect based on a standard search, and is likely to
create confusion among other ports if they depend on a python graphviz
package, which could result in incorrect packages/dependencies.

This is why among other reasons, Python packages should be named
exactly what they are called in PyPI, or inside install_requires,
setup_requires or tests_requires as dependencies in other packages.

This change moves py-graphviz to py-pygraphviz to correct the above
incorrect naming.

While I'm here:

- Remove backup (http) MASTER_SITES, CHEESESHOP is highly-available
  and provides a Geo-aware CDN by Fastly.
- Remove {BUILD,RUN}_DEPENDS in favour of the actual LIB_DEPENDS
- Use PYDISTUTILS_* framework variables to customise the build instead
  of hack patching setup.py
- Enable autoplist, fixing builds on Python 3.x [1]
- Enable concurrent (Python version) installation
  - Hack patch setup.py to preclude docs installation, as it adds a
    directory to --record and breaks pkg-plist output [2]
- Remove DOCSDIR override (no longer necessary)
- Assign MAINTAINER'ship to python@
- Add TEST_DEPENDS and test target
- pkg-descr: Match WWW URL to setup.py:homepage field
- pkg-descr: Improve package description text (matching upstream)

While I'm sweeping dependencies:

- Fix a typo in science/gramps: s|>-|>=

[2] https://wiki.freebsd.org/Python (Open task for install_data bug)

Reported by:	Ben Woods (via IRC) [1]

12 files changed, 59 insertions, 104 deletions

diff --git a/MOVED b/MOVED
index c200921f4063..e94e52ad6e8a 100644
--- a/MOVED
+++ b/MOVED
@@ -8133,3 +8133,4 @@ databases/py32-sqlite3||2016-02-02|Has expired: Full EOL reached. Please update
 x11-toolkits/py32-tkinter||2016-02-02|Has expired: Full EOL reached. Please update to Python 3.5
 sysutils/puppet|sysutils/puppet38|2016-02-05|Renamed
 devel/etcdctl|devel/etcd|2016-02-06|Has expired: etcdctl is now part of etcd, following the change from the upstream
+graphics/py-graphviz|graphics/py-pygraphviz|2016-02-07|Renamed to match upstream (PyPI) name
diff --git a/devel/py-fsm/Makefile b/devel/py-fsm/Makefile
index 35191420ac81..4296bfbf34dc 100644
--- a/devel/py-fsm/Makefile
+++ b/devel/py-fsm/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	fsm
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	GOOGLE_CODE
 PROJECTHOST=	python-${PORTNAME}
@@ -14,7 +14,7 @@ COMMENT=	Pure Python Implementation of a Finite State Machine
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graphviz>=1.0:${PORTSDIR}/graphics/py-graphviz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.0:${PORTSDIR}/graphics/py-pygraphviz
 
 USES=		python
 USE_PYTHON=	distutils
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
diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index ad8e136949bd..9de25ecf720e 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	networkx
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	http://networkx.lanl.gov/download/networkx/ \
 		CHEESESHOP
@@ -42,7 +42,7 @@ MPL_DESC=	Flexible graph rendering
 MPL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:${PORTSDIR}/math/py-matplotlib
 
 GRAPHVIZ_DESC=	Additional graph layout and rendering algorithms
-GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graphviz>=1.2:${PORTSDIR}/graphics/py-graphviz
+GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:${PORTSDIR}/graphics/py-pygraphviz
 
 YAML_DESC=	Reading and writing YAML files
 YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml
diff --git a/science/gramps/Makefile b/science/gramps/Makefile
index 2a2a996ede7a..0175df874c6a 100644
--- a/science/gramps/Makefile
+++ b/science/gramps/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gramps
 PORTVERSION=	3.4.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science gnome python
 MASTER_SITES=	SF/${PORTNAME}/Stable/${PORTVERSION}
 
@@ -37,7 +37,7 @@ EXIV_DESC=		Managing exiv metadata support
 ENCHANT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}enchant>=0:${PORTSDIR}/textproc/py-enchant
 EXIV_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}exiv2>=0.1.3:${PORTSDIR}/graphics/py-exiv2
 GNOME_USE=		GNOME=pygnome2,gnomedocutils
-GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graphviz>-0:${PORTSDIR}/graphics/py-graphviz
+GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=0:${PORTSDIR}/graphics/py-pygraphviz
 PYWEBKITGTK_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:${PORTSDIR}/www/py-webkitgtk
 
 pre-extract: