math/py-networkx: update to 1.10

- update to 1.10
- add YAML option (on by default)
- remove gratuitous word from option descriptions
- USE_PYTHON=concurrent instead of setting EXAMPLESDIR
- alphabetize USE_PYTHON
- discard pkg-message given all options are enabled by default

While here limit python version to 2.x, because it's dependencies
graphics/py-graphviz and math/py-matplotlib failed to configure
with python3.

PR:		204594
Submitted by:	John W. O'Brien <john@saltant.com>
Approved by:	dikshie@sfc.wide.ad.jp (maintainer)

5 files changed, 31 insertions, 25 deletions

diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index 9678c78d605c..065a88d2c419 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	networkx
-PORTVERSION=	1.9.1
-PORTREVISION=	1
+PORTVERSION=	1.10
 CATEGORIES=	math python
 MASTER_SITES=	http://networkx.lanl.gov/download/networkx/ \
 		CHEESESHOP
@@ -19,31 +18,34 @@ RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:${PORTSDIR}/devel/py-decor
 #		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:${PORTSDIR}/textproc/py-sphinx \
 #		${PYTHON_PKGNAMEPREFIX}docutils>=0.12:${PORTSDIR}/textproc/py-docutils
 
-USES=		python shebangfix
-USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
+USES=		python:2 shebangfix
+USE_PYTHON=	autoplist concurrent distutils
 
 PLIST_SUB+=	PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER}
 
-OPTIONS_DEFINE=	EXAMPLES
+OPTIONS_DEFINE=	EXAMPLES YAML
 OPTIONS_GROUP=	MATRIX RENDER
 OPTIONS_GROUP_MATRIX=	NUMPY SCIPY
 OPTIONS_GROUP_RENDER=	MPL GRAPHVIZ
-OPTIONS_DEFAULT=	NUMPY SCIPY MPL GRAPHVIZ
+OPTIONS_DEFAULT=	NUMPY SCIPY MPL GRAPHVIZ YAML
 
-NUMPY_DESC=	Support matrix representation of graphs
+NUMPY_DESC=	Matrix representation of graphs
 NUMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2:${PORTSDIR}/math/py-numpy
 
-SCIPY_DESC=	Support sparse matrix representation of graphs
+SCIPY_DESC=	Sparse matrix representation of graphs
 SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:${PORTSDIR}/science/py-scipy \
 			${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:${PORTSDIR}/science/py-scikit-sparse
 
-MPL_DESC=	Support flexible graph rendering
+MPL_DESC=	Flexible graph rendering
 MPL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:${PORTSDIR}/math/py-matplotlib
 
-GRAPHVIZ_DESC=	Support additional graph layout and rendering algorithms
+GRAPHVIZ_DESC=	Additional graph layout and rendering algorithms
 GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graphviz>=1.2:${PORTSDIR}/graphics/py-graphviz
 
-EXAMPLESDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
+YAML_DESC=	Reading and writing YAML files
+YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml
+
 PORTEXAMPLES=	*
 
 post-install:
diff --git a/math/py-networkx/distinfo b/math/py-networkx/distinfo
index 8a410e61ba23..d38deb0a65be 100644
--- a/math/py-networkx/distinfo
+++ b/math/py-networkx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (networkx-1.9.1.tar.gz) = 6380eb38d0b5770d7e50813c8a48ff7c373b2187b4220339c1adce803df01c59
-SIZE (networkx-1.9.1.tar.gz) = 1035784
+SHA256 (networkx-1.10.tar.gz) = ced4095ab83b7451cec1172183eff419ed32e21397ea4e1971d92a5808ed6fb8
+SIZE (networkx-1.10.tar.gz) = 1189291
diff --git a/math/py-networkx/files/patch-setup.py b/math/py-networkx/files/patch-setup.py
index 577f9e55eeb8..0312b0a4e0a8 100644
--- a/math/py-networkx/files/patch-setup.py
+++ b/math/py-networkx/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2015-06-06 09:03:01 UTC
+--- setup.py.orig	2015-11-15 23:06:39 UTC
 +++ setup.py
-@@ -58,26 +58,7 @@ packages=["networkx",
+@@ -59,27 +59,6 @@ packages=["networkx",
            "networkx.testing",
            "networkx.utils"]
  
@@ -24,7 +24,15 @@
 -    data.append((dd, glob(os.path.join(pp ,"*.gz"))))
 -    data.append((dd, glob(os.path.join(pp ,"*.mbox"))))
 -    data.append((dd, glob(os.path.join(pp ,"*.edgelist"))))
-+data = [ ]
- 
+-
  # add the tests
  package_data     = {
+     'networkx': ['tests/*.py'],
+@@ -131,7 +110,6 @@ if __name__ == "__main__":
+         download_url     = release.download_url,
+         classifiers      = release.classifiers,
+         packages         = packages,
+-        data_files       = data,
+         package_data     = package_data,
+         install_requires = install_requires,
+         test_suite       = 'nose.collector',
diff --git a/math/py-networkx/pkg-descr b/math/py-networkx/pkg-descr
index 8b19bac1c5a5..524f6a9f5a69 100644
--- a/math/py-networkx/pkg-descr
+++ b/math/py-networkx/pkg-descr
@@ -1,13 +1,13 @@
-NetworkX (NX) is a Python package for the creation, manipulation, and 
+NetworkX (NX) is a Python package for the creation, manipulation, and
 study of the structure, dynamics, and functions of complex networks.
 Features:
 * Includes standard graph-theoretic and statistical physics functions
-* Easy exchange of network algorithms between applications, disciplines, 
+* Easy exchange of network algorithms between applications, disciplines,
   and platforms
 * Includes many classic graphs and synthetic networks
-* Nodes and edges can be "anything" (e.g. time-series, text, images, 
+* Nodes and edges can be "anything" (e.g. time-series, text, images,
   XML records)
-* Exploits existing code from high-quality legacy software in C, C++, 
+* Exploits existing code from high-quality legacy software in C, C++,
   Fortran, etc.
 * Open source (encourages community input)
 * Unit-tested
diff --git a/math/py-networkx/pkg-message b/math/py-networkx/pkg-message
deleted file mode 100644
index e05ce25f7fef..000000000000
--- a/math/py-networkx/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-----------------------------------------------------------
-It is better if you also install py-numpy, py-graphviz and
-py-matplotlib so you can use all features of py-networkx.
-----------------------------------------------------------