Update to 1.9

Add missing DEPENDS

Upstream changes:
NetworkX 1.9
Release date: 21 June 2014

Support for Python 3.1 is dropped in this release.

Highlights
Completely rewritten maximum flow and flow-based connectivity algorithms with backwards incompatible interfaces
Community graph generators
Stoer-Wagner minimum cut algorithm
Linear-time Eulerian circuit algorithm
Linear algebra package changed to use SciPy sparse matrices
Algebraic connectivity, Fiedler vector, spectral ordering algorithms
Link prediction algorithms
Goldberg-Radzik shortest path algorithm
Semiconnected graph and tree recognition algorithms

3 files changed, 129 insertions, 29 deletions

diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index a8451351db4..c5e646aeb1c 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2014/06/10 12:04:58 wen Exp $
+# $NetBSD: Makefile,v 1.15 2014/07/28 12:16:23 wen Exp $
 
-DISTNAME=	networkx-1.8.1
+DISTNAME=	networkx-1.9
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	http://pypi.python.org/packages/source/n/networkx/ \
@@ -14,6 +14,10 @@ LICENSE=	modified-bsd
 PYTHON_SELF_CONFLICT=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34
 
+BUILD_DEPENDS+=	${PYPKGPREFIX}-nose>=0.11:../../devel/py-nose
+
+DEPENDS+=	${PYPKGPREFIX}-decorator>=3.4.0:../../devel/py-decorator
+
 SUBST_CLASSES+=		python
 SUBST_STAGE.python=	post-patch
 SUBST_FILES.python+=	networkx/readwrite/tests/*.py
diff --git a/math/py-networkx/PLIST b/math/py-networkx/PLIST
index ca38e701551..60ac156266b 100644
--- a/math/py-networkx/PLIST
+++ b/math/py-networkx/PLIST
@@ -1,5 +1,10 @@
-@comment $NetBSD: PLIST,v 1.9 2014/06/10 12:04:58 wen Exp $
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.10 2014/07/28 12:16:23 wen Exp $
+${PYSITELIB}/${EGG_FILE}/PKG-INFO
+${PYSITELIB}/${EGG_FILE}/SOURCES.txt
+${PYSITELIB}/${EGG_FILE}/dependency_links.txt
+${PYSITELIB}/${EGG_FILE}/not-zip-safe
+${PYSITELIB}/${EGG_FILE}/requires.txt
+${PYSITELIB}/${EGG_FILE}/top_level.txt
 ${PYSITELIB}/networkx/__init__.py
 ${PYSITELIB}/networkx/__init__.pyc
 ${PYSITELIB}/networkx/__init__.pyo
@@ -12,6 +17,9 @@ ${PYSITELIB}/networkx/algorithms/approximation/__init__.pyo
 ${PYSITELIB}/networkx/algorithms/approximation/clique.py
 ${PYSITELIB}/networkx/algorithms/approximation/clique.pyc
 ${PYSITELIB}/networkx/algorithms/approximation/clique.pyo
+${PYSITELIB}/networkx/algorithms/approximation/clustering_coefficient.py
+${PYSITELIB}/networkx/algorithms/approximation/clustering_coefficient.pyc
+${PYSITELIB}/networkx/algorithms/approximation/clustering_coefficient.pyo
 ${PYSITELIB}/networkx/algorithms/approximation/dominating_set.py
 ${PYSITELIB}/networkx/algorithms/approximation/dominating_set.pyc
 ${PYSITELIB}/networkx/algorithms/approximation/dominating_set.pyo
@@ -24,6 +32,9 @@ ${PYSITELIB}/networkx/algorithms/approximation/matching.pyo
 ${PYSITELIB}/networkx/algorithms/approximation/ramsey.py
 ${PYSITELIB}/networkx/algorithms/approximation/ramsey.pyc
 ${PYSITELIB}/networkx/algorithms/approximation/ramsey.pyo
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_approx_clust_coeff.py
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_approx_clust_coeff.pyc
+${PYSITELIB}/networkx/algorithms/approximation/tests/test_approx_clust_coeff.pyo
 ${PYSITELIB}/networkx/algorithms/approximation/tests/test_clique.py
 ${PYSITELIB}/networkx/algorithms/approximation/tests/test_clique.pyc
 ${PYSITELIB}/networkx/algorithms/approximation/tests/test_clique.pyo
@@ -150,6 +161,9 @@ ${PYSITELIB}/networkx/algorithms/centrality/current_flow_closeness.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/degree_alg.py
 ${PYSITELIB}/networkx/algorithms/centrality/degree_alg.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/degree_alg.pyo
+${PYSITELIB}/networkx/algorithms/centrality/dispersion.py
+${PYSITELIB}/networkx/algorithms/centrality/dispersion.pyc
+${PYSITELIB}/networkx/algorithms/centrality/dispersion.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/eigenvector.py
 ${PYSITELIB}/networkx/algorithms/centrality/eigenvector.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/eigenvector.pyo
@@ -186,6 +200,9 @@ ${PYSITELIB}/networkx/algorithms/centrality/tests/test_current_flow_closeness.py
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_degree_centrality.py
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_degree_centrality.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_degree_centrality.pyo
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_dispersion.py
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_dispersion.pyc
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_dispersion.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_eigenvector_centrality.py
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_eigenvector_centrality.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_eigenvector_centrality.pyo
@@ -231,6 +248,9 @@ ${PYSITELIB}/networkx/algorithms/components/biconnected.pyo
 ${PYSITELIB}/networkx/algorithms/components/connected.py
 ${PYSITELIB}/networkx/algorithms/components/connected.pyc
 ${PYSITELIB}/networkx/algorithms/components/connected.pyo
+${PYSITELIB}/networkx/algorithms/components/semiconnected.py
+${PYSITELIB}/networkx/algorithms/components/semiconnected.pyc
+${PYSITELIB}/networkx/algorithms/components/semiconnected.pyo
 ${PYSITELIB}/networkx/algorithms/components/strongly_connected.py
 ${PYSITELIB}/networkx/algorithms/components/strongly_connected.pyc
 ${PYSITELIB}/networkx/algorithms/components/strongly_connected.pyo
@@ -243,6 +263,9 @@ ${PYSITELIB}/networkx/algorithms/components/tests/test_biconnected.pyo
 ${PYSITELIB}/networkx/algorithms/components/tests/test_connected.py
 ${PYSITELIB}/networkx/algorithms/components/tests/test_connected.pyc
 ${PYSITELIB}/networkx/algorithms/components/tests/test_connected.pyo
+${PYSITELIB}/networkx/algorithms/components/tests/test_semiconnected.py
+${PYSITELIB}/networkx/algorithms/components/tests/test_semiconnected.pyc
+${PYSITELIB}/networkx/algorithms/components/tests/test_semiconnected.pyo
 ${PYSITELIB}/networkx/algorithms/components/tests/test_strongly_connected.py
 ${PYSITELIB}/networkx/algorithms/components/tests/test_strongly_connected.pyc
 ${PYSITELIB}/networkx/algorithms/components/tests/test_strongly_connected.pyo
@@ -261,12 +284,21 @@ ${PYSITELIB}/networkx/algorithms/connectivity/connectivity.pyo
 ${PYSITELIB}/networkx/algorithms/connectivity/cuts.py
 ${PYSITELIB}/networkx/algorithms/connectivity/cuts.pyc
 ${PYSITELIB}/networkx/algorithms/connectivity/cuts.pyo
+${PYSITELIB}/networkx/algorithms/connectivity/stoerwagner.py
+${PYSITELIB}/networkx/algorithms/connectivity/stoerwagner.pyc
+${PYSITELIB}/networkx/algorithms/connectivity/stoerwagner.pyo
 ${PYSITELIB}/networkx/algorithms/connectivity/tests/test_connectivity.py
 ${PYSITELIB}/networkx/algorithms/connectivity/tests/test_connectivity.pyc
 ${PYSITELIB}/networkx/algorithms/connectivity/tests/test_connectivity.pyo
 ${PYSITELIB}/networkx/algorithms/connectivity/tests/test_cuts.py
 ${PYSITELIB}/networkx/algorithms/connectivity/tests/test_cuts.pyc
 ${PYSITELIB}/networkx/algorithms/connectivity/tests/test_cuts.pyo
+${PYSITELIB}/networkx/algorithms/connectivity/tests/test_stoer_wagner.py
+${PYSITELIB}/networkx/algorithms/connectivity/tests/test_stoer_wagner.pyc
+${PYSITELIB}/networkx/algorithms/connectivity/tests/test_stoer_wagner.pyo
+${PYSITELIB}/networkx/algorithms/connectivity/utils.py
+${PYSITELIB}/networkx/algorithms/connectivity/utils.pyc
+${PYSITELIB}/networkx/algorithms/connectivity/utils.pyo
 ${PYSITELIB}/networkx/algorithms/core.py
 ${PYSITELIB}/networkx/algorithms/core.pyc
 ${PYSITELIB}/networkx/algorithms/core.pyo
@@ -282,18 +314,41 @@ ${PYSITELIB}/networkx/algorithms/distance_measures.pyo
 ${PYSITELIB}/networkx/algorithms/distance_regular.py
 ${PYSITELIB}/networkx/algorithms/distance_regular.pyc
 ${PYSITELIB}/networkx/algorithms/distance_regular.pyo
+${PYSITELIB}/networkx/algorithms/dominating.py
+${PYSITELIB}/networkx/algorithms/dominating.pyc
+${PYSITELIB}/networkx/algorithms/dominating.pyo
 ${PYSITELIB}/networkx/algorithms/euler.py
 ${PYSITELIB}/networkx/algorithms/euler.pyc
 ${PYSITELIB}/networkx/algorithms/euler.pyo
 ${PYSITELIB}/networkx/algorithms/flow/__init__.py
 ${PYSITELIB}/networkx/algorithms/flow/__init__.pyc
 ${PYSITELIB}/networkx/algorithms/flow/__init__.pyo
+${PYSITELIB}/networkx/algorithms/flow/capacityscaling.py
+${PYSITELIB}/networkx/algorithms/flow/capacityscaling.pyc
+${PYSITELIB}/networkx/algorithms/flow/capacityscaling.pyo
+${PYSITELIB}/networkx/algorithms/flow/edmondskarp.py
+${PYSITELIB}/networkx/algorithms/flow/edmondskarp.pyc
+${PYSITELIB}/networkx/algorithms/flow/edmondskarp.pyo
+${PYSITELIB}/networkx/algorithms/flow/fordfulkerson.py
+${PYSITELIB}/networkx/algorithms/flow/fordfulkerson.pyc
+${PYSITELIB}/networkx/algorithms/flow/fordfulkerson.pyo
 ${PYSITELIB}/networkx/algorithms/flow/maxflow.py
 ${PYSITELIB}/networkx/algorithms/flow/maxflow.pyc
 ${PYSITELIB}/networkx/algorithms/flow/maxflow.pyo
 ${PYSITELIB}/networkx/algorithms/flow/mincost.py
 ${PYSITELIB}/networkx/algorithms/flow/mincost.pyc
 ${PYSITELIB}/networkx/algorithms/flow/mincost.pyo
+${PYSITELIB}/networkx/algorithms/flow/networksimplex.py
+${PYSITELIB}/networkx/algorithms/flow/networksimplex.pyc
+${PYSITELIB}/networkx/algorithms/flow/networksimplex.pyo
+${PYSITELIB}/networkx/algorithms/flow/preflowpush.py
+${PYSITELIB}/networkx/algorithms/flow/preflowpush.pyc
+${PYSITELIB}/networkx/algorithms/flow/preflowpush.pyo
+${PYSITELIB}/networkx/algorithms/flow/shortestaugmentingpath.py
+${PYSITELIB}/networkx/algorithms/flow/shortestaugmentingpath.pyc
+${PYSITELIB}/networkx/algorithms/flow/shortestaugmentingpath.pyo
+${PYSITELIB}/networkx/algorithms/flow/tests/gl1.gpickle.bz2
+${PYSITELIB}/networkx/algorithms/flow/tests/gw1.gpickle.bz2
 ${PYSITELIB}/networkx/algorithms/flow/tests/test_maxflow.py
 ${PYSITELIB}/networkx/algorithms/flow/tests/test_maxflow.pyc
 ${PYSITELIB}/networkx/algorithms/flow/tests/test_maxflow.pyo
@@ -303,6 +358,10 @@ ${PYSITELIB}/networkx/algorithms/flow/tests/test_maxflow_large_graph.pyo
 ${PYSITELIB}/networkx/algorithms/flow/tests/test_mincost.py
 ${PYSITELIB}/networkx/algorithms/flow/tests/test_mincost.pyc
 ${PYSITELIB}/networkx/algorithms/flow/tests/test_mincost.pyo
+${PYSITELIB}/networkx/algorithms/flow/tests/wlm3.gpickle.bz2
+${PYSITELIB}/networkx/algorithms/flow/utils.py
+${PYSITELIB}/networkx/algorithms/flow/utils.pyc
+${PYSITELIB}/networkx/algorithms/flow/utils.pyo
 ${PYSITELIB}/networkx/algorithms/graphical.py
 ${PYSITELIB}/networkx/algorithms/graphical.pyc
 ${PYSITELIB}/networkx/algorithms/graphical.pyo
@@ -355,6 +414,9 @@ ${PYSITELIB}/networkx/algorithms/link_analysis/tests/test_hits.pyo
 ${PYSITELIB}/networkx/algorithms/link_analysis/tests/test_pagerank.py
 ${PYSITELIB}/networkx/algorithms/link_analysis/tests/test_pagerank.pyc
 ${PYSITELIB}/networkx/algorithms/link_analysis/tests/test_pagerank.pyo
+${PYSITELIB}/networkx/algorithms/link_prediction.py
+${PYSITELIB}/networkx/algorithms/link_prediction.pyc
+${PYSITELIB}/networkx/algorithms/link_prediction.pyo
 ${PYSITELIB}/networkx/algorithms/matching.py
 ${PYSITELIB}/networkx/algorithms/matching.pyc
 ${PYSITELIB}/networkx/algorithms/matching.pyo
@@ -466,6 +528,9 @@ ${PYSITELIB}/networkx/algorithms/tests/test_distance_measures.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_distance_regular.py
 ${PYSITELIB}/networkx/algorithms/tests/test_distance_regular.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_distance_regular.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_dominating.py
+${PYSITELIB}/networkx/algorithms/tests/test_dominating.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_dominating.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_euler.py
 ${PYSITELIB}/networkx/algorithms/tests/test_euler.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_euler.pyo
@@ -475,6 +540,9 @@ ${PYSITELIB}/networkx/algorithms/tests/test_graphical.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_hierarchy.py
 ${PYSITELIB}/networkx/algorithms/tests/test_hierarchy.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_hierarchy.pyo
+${PYSITELIB}/networkx/algorithms/tests/test_link_prediction.py
+${PYSITELIB}/networkx/algorithms/tests/test_link_prediction.pyc
+${PYSITELIB}/networkx/algorithms/tests/test_link_prediction.pyo
 ${PYSITELIB}/networkx/algorithms/tests/test_matching.py
 ${PYSITELIB}/networkx/algorithms/tests/test_matching.pyc
 ${PYSITELIB}/networkx/algorithms/tests/test_matching.pyo
@@ -514,6 +582,15 @@ ${PYSITELIB}/networkx/algorithms/traversal/tests/test_bfs.pyo
 ${PYSITELIB}/networkx/algorithms/traversal/tests/test_dfs.py
 ${PYSITELIB}/networkx/algorithms/traversal/tests/test_dfs.pyc
 ${PYSITELIB}/networkx/algorithms/traversal/tests/test_dfs.pyo
+${PYSITELIB}/networkx/algorithms/tree/__init__.py
+${PYSITELIB}/networkx/algorithms/tree/__init__.pyc
+${PYSITELIB}/networkx/algorithms/tree/__init__.pyo
+${PYSITELIB}/networkx/algorithms/tree/recognition.py
+${PYSITELIB}/networkx/algorithms/tree/recognition.pyc
+${PYSITELIB}/networkx/algorithms/tree/recognition.pyo
+${PYSITELIB}/networkx/algorithms/tree/tests/test_recognition.py
+${PYSITELIB}/networkx/algorithms/tree/tests/test_recognition.pyc
+${PYSITELIB}/networkx/algorithms/tree/tests/test_recognition.pyo
 ${PYSITELIB}/networkx/algorithms/vitality.py
 ${PYSITELIB}/networkx/algorithms/vitality.pyc
 ${PYSITELIB}/networkx/algorithms/vitality.pyo
@@ -562,6 +639,9 @@ ${PYSITELIB}/networkx/classes/tests/test_multigraph.pyo
 ${PYSITELIB}/networkx/convert.py
 ${PYSITELIB}/networkx/convert.pyc
 ${PYSITELIB}/networkx/convert.pyo
+${PYSITELIB}/networkx/convert_matrix.py
+${PYSITELIB}/networkx/convert_matrix.pyc
+${PYSITELIB}/networkx/convert_matrix.pyo
 ${PYSITELIB}/networkx/drawing/__init__.py
 ${PYSITELIB}/networkx/drawing/__init__.pyc
 ${PYSITELIB}/networkx/drawing/__init__.pyo
@@ -595,15 +675,6 @@ ${PYSITELIB}/networkx/exception.pyo
 ${PYSITELIB}/networkx/external/__init__.py
 ${PYSITELIB}/networkx/external/__init__.pyc
 ${PYSITELIB}/networkx/external/__init__.pyo
-${PYSITELIB}/networkx/external/decorator/__init__.py
-${PYSITELIB}/networkx/external/decorator/__init__.pyc
-${PYSITELIB}/networkx/external/decorator/__init__.pyo
-${PYSITELIB}/networkx/external/decorator/decorator2/__init__.py
-${PYSITELIB}/networkx/external/decorator/decorator2/__init__.pyc
-${PYSITELIB}/networkx/external/decorator/decorator2/__init__.pyo
-${PYSITELIB}/networkx/external/decorator/decorator2/_decorator2.py
-${PYSITELIB}/networkx/external/decorator/decorator2/_decorator2.pyc
-${PYSITELIB}/networkx/external/decorator/decorator2/_decorator2.pyo
 ${PYSITELIB}/networkx/generators/__init__.py
 ${PYSITELIB}/networkx/generators/__init__.pyc
 ${PYSITELIB}/networkx/generators/__init__.pyo
@@ -616,6 +687,9 @@ ${PYSITELIB}/networkx/generators/bipartite.pyo
 ${PYSITELIB}/networkx/generators/classic.py
 ${PYSITELIB}/networkx/generators/classic.pyc
 ${PYSITELIB}/networkx/generators/classic.pyo
+${PYSITELIB}/networkx/generators/community.py
+${PYSITELIB}/networkx/generators/community.pyc
+${PYSITELIB}/networkx/generators/community.pyo
 ${PYSITELIB}/networkx/generators/degree_seq.py
 ${PYSITELIB}/networkx/generators/degree_seq.pyc
 ${PYSITELIB}/networkx/generators/degree_seq.pyo
@@ -661,6 +735,9 @@ ${PYSITELIB}/networkx/generators/tests/test_bipartite.pyo
 ${PYSITELIB}/networkx/generators/tests/test_classic.py
 ${PYSITELIB}/networkx/generators/tests/test_classic.pyc
 ${PYSITELIB}/networkx/generators/tests/test_classic.pyo
+${PYSITELIB}/networkx/generators/tests/test_community.py
+${PYSITELIB}/networkx/generators/tests/test_community.pyc
+${PYSITELIB}/networkx/generators/tests/test_community.pyo
 ${PYSITELIB}/networkx/generators/tests/test_degree_seq.py
 ${PYSITELIB}/networkx/generators/tests/test_degree_seq.pyc
 ${PYSITELIB}/networkx/generators/tests/test_degree_seq.pyo
@@ -703,6 +780,9 @@ ${PYSITELIB}/networkx/generators/threshold.pyo
 ${PYSITELIB}/networkx/linalg/__init__.py
 ${PYSITELIB}/networkx/linalg/__init__.pyc
 ${PYSITELIB}/networkx/linalg/__init__.pyo
+${PYSITELIB}/networkx/linalg/algebraicconnectivity.py
+${PYSITELIB}/networkx/linalg/algebraicconnectivity.pyc
+${PYSITELIB}/networkx/linalg/algebraicconnectivity.pyo
 ${PYSITELIB}/networkx/linalg/attrmatrix.py
 ${PYSITELIB}/networkx/linalg/attrmatrix.pyc
 ${PYSITELIB}/networkx/linalg/attrmatrix.pyo
@@ -715,6 +795,9 @@ ${PYSITELIB}/networkx/linalg/laplacianmatrix.pyo
 ${PYSITELIB}/networkx/linalg/spectrum.py
 ${PYSITELIB}/networkx/linalg/spectrum.pyc
 ${PYSITELIB}/networkx/linalg/spectrum.pyo
+${PYSITELIB}/networkx/linalg/tests/test_algebraic_connectivity.py
+${PYSITELIB}/networkx/linalg/tests/test_algebraic_connectivity.pyc
+${PYSITELIB}/networkx/linalg/tests/test_algebraic_connectivity.pyo
 ${PYSITELIB}/networkx/linalg/tests/test_graphmatrix.py
 ${PYSITELIB}/networkx/linalg/tests/test_graphmatrix.pyc
 ${PYSITELIB}/networkx/linalg/tests/test_graphmatrix.pyo
@@ -742,6 +825,9 @@ ${PYSITELIB}/networkx/readwrite/gml.pyo
 ${PYSITELIB}/networkx/readwrite/gpickle.py
 ${PYSITELIB}/networkx/readwrite/gpickle.pyc
 ${PYSITELIB}/networkx/readwrite/gpickle.pyo
+${PYSITELIB}/networkx/readwrite/graph6.py
+${PYSITELIB}/networkx/readwrite/graph6.pyc
+${PYSITELIB}/networkx/readwrite/graph6.pyo
 ${PYSITELIB}/networkx/readwrite/graphml.py
 ${PYSITELIB}/networkx/readwrite/graphml.pyc
 ${PYSITELIB}/networkx/readwrite/graphml.pyo
@@ -754,18 +840,12 @@ ${PYSITELIB}/networkx/readwrite/json_graph/adjacency.pyo
 ${PYSITELIB}/networkx/readwrite/json_graph/node_link.py
 ${PYSITELIB}/networkx/readwrite/json_graph/node_link.pyc
 ${PYSITELIB}/networkx/readwrite/json_graph/node_link.pyo
-${PYSITELIB}/networkx/readwrite/json_graph/serialize.py
-${PYSITELIB}/networkx/readwrite/json_graph/serialize.pyc
-${PYSITELIB}/networkx/readwrite/json_graph/serialize.pyo
 ${PYSITELIB}/networkx/readwrite/json_graph/tests/test_adjacency.py
 ${PYSITELIB}/networkx/readwrite/json_graph/tests/test_adjacency.pyc
 ${PYSITELIB}/networkx/readwrite/json_graph/tests/test_adjacency.pyo
 ${PYSITELIB}/networkx/readwrite/json_graph/tests/test_node_link.py
 ${PYSITELIB}/networkx/readwrite/json_graph/tests/test_node_link.pyc
 ${PYSITELIB}/networkx/readwrite/json_graph/tests/test_node_link.pyo
-${PYSITELIB}/networkx/readwrite/json_graph/tests/test_serialize.py
-${PYSITELIB}/networkx/readwrite/json_graph/tests/test_serialize.pyc
-${PYSITELIB}/networkx/readwrite/json_graph/tests/test_serialize.pyo
 ${PYSITELIB}/networkx/readwrite/json_graph/tests/test_tree.py
 ${PYSITELIB}/networkx/readwrite/json_graph/tests/test_tree.pyc
 ${PYSITELIB}/networkx/readwrite/json_graph/tests/test_tree.pyo
@@ -790,9 +870,9 @@ ${PYSITELIB}/networkx/readwrite/p2g.pyo
 ${PYSITELIB}/networkx/readwrite/pajek.py
 ${PYSITELIB}/networkx/readwrite/pajek.pyc
 ${PYSITELIB}/networkx/readwrite/pajek.pyo
-${PYSITELIB}/networkx/readwrite/sparsegraph6.py
-${PYSITELIB}/networkx/readwrite/sparsegraph6.pyc
-${PYSITELIB}/networkx/readwrite/sparsegraph6.pyo
+${PYSITELIB}/networkx/readwrite/sparse6.py
+${PYSITELIB}/networkx/readwrite/sparse6.pyc
+${PYSITELIB}/networkx/readwrite/sparse6.pyo
 ${PYSITELIB}/networkx/readwrite/tests/test_adjlist.py
 ${PYSITELIB}/networkx/readwrite/tests/test_adjlist.pyc
 ${PYSITELIB}/networkx/readwrite/tests/test_adjlist.pyo
@@ -808,6 +888,9 @@ ${PYSITELIB}/networkx/readwrite/tests/test_gml.pyo
 ${PYSITELIB}/networkx/readwrite/tests/test_gpickle.py
 ${PYSITELIB}/networkx/readwrite/tests/test_gpickle.pyc
 ${PYSITELIB}/networkx/readwrite/tests/test_gpickle.pyo
+${PYSITELIB}/networkx/readwrite/tests/test_graph6.py
+${PYSITELIB}/networkx/readwrite/tests/test_graph6.pyc
+${PYSITELIB}/networkx/readwrite/tests/test_graph6.pyo
 ${PYSITELIB}/networkx/readwrite/tests/test_graphml.py
 ${PYSITELIB}/networkx/readwrite/tests/test_graphml.pyc
 ${PYSITELIB}/networkx/readwrite/tests/test_graphml.pyo
@@ -823,9 +906,9 @@ ${PYSITELIB}/networkx/readwrite/tests/test_pajek.pyo
 ${PYSITELIB}/networkx/readwrite/tests/test_shp.py
 ${PYSITELIB}/networkx/readwrite/tests/test_shp.pyc
 ${PYSITELIB}/networkx/readwrite/tests/test_shp.pyo
-${PYSITELIB}/networkx/readwrite/tests/test_sparsegraph6.py
-${PYSITELIB}/networkx/readwrite/tests/test_sparsegraph6.pyc
-${PYSITELIB}/networkx/readwrite/tests/test_sparsegraph6.pyo
+${PYSITELIB}/networkx/readwrite/tests/test_sparse6.py
+${PYSITELIB}/networkx/readwrite/tests/test_sparse6.pyc
+${PYSITELIB}/networkx/readwrite/tests/test_sparse6.pyo
 ${PYSITELIB}/networkx/readwrite/tests/test_yaml.py
 ${PYSITELIB}/networkx/readwrite/tests/test_yaml.pyc
 ${PYSITELIB}/networkx/readwrite/tests/test_yaml.pyo
@@ -871,9 +954,15 @@ ${PYSITELIB}/networkx/tests/test_relabel.pyo
 ${PYSITELIB}/networkx/utils/__init__.py
 ${PYSITELIB}/networkx/utils/__init__.pyc
 ${PYSITELIB}/networkx/utils/__init__.pyo
+${PYSITELIB}/networkx/utils/contextmanagers.py
+${PYSITELIB}/networkx/utils/contextmanagers.pyc
+${PYSITELIB}/networkx/utils/contextmanagers.pyo
 ${PYSITELIB}/networkx/utils/decorators.py
 ${PYSITELIB}/networkx/utils/decorators.pyc
 ${PYSITELIB}/networkx/utils/decorators.pyo
+${PYSITELIB}/networkx/utils/heaps.py
+${PYSITELIB}/networkx/utils/heaps.pyc
+${PYSITELIB}/networkx/utils/heaps.pyo
 ${PYSITELIB}/networkx/utils/misc.py
 ${PYSITELIB}/networkx/utils/misc.pyc
 ${PYSITELIB}/networkx/utils/misc.pyo
@@ -883,9 +972,15 @@ ${PYSITELIB}/networkx/utils/random_sequence.pyo
 ${PYSITELIB}/networkx/utils/rcm.py
 ${PYSITELIB}/networkx/utils/rcm.pyc
 ${PYSITELIB}/networkx/utils/rcm.pyo
+${PYSITELIB}/networkx/utils/tests/test_contextmanager.py
+${PYSITELIB}/networkx/utils/tests/test_contextmanager.pyc
+${PYSITELIB}/networkx/utils/tests/test_contextmanager.pyo
 ${PYSITELIB}/networkx/utils/tests/test_decorators.py
 ${PYSITELIB}/networkx/utils/tests/test_decorators.pyc
 ${PYSITELIB}/networkx/utils/tests/test_decorators.pyo
+${PYSITELIB}/networkx/utils/tests/test_heaps.py
+${PYSITELIB}/networkx/utils/tests/test_heaps.pyc
+${PYSITELIB}/networkx/utils/tests/test_heaps.pyo
 ${PYSITELIB}/networkx/utils/tests/test_misc.py
 ${PYSITELIB}/networkx/utils/tests/test_misc.pyc
 ${PYSITELIB}/networkx/utils/tests/test_misc.pyo
@@ -908,6 +1003,7 @@ share/doc/networkx-${PKGVERSION}/examples/3d_drawing/mayavi2_spring.py
 share/doc/networkx-${PKGVERSION}/examples/advanced/eigenvalues.py
 share/doc/networkx-${PKGVERSION}/examples/advanced/heavy_metal_umlaut.py
 share/doc/networkx-${PKGVERSION}/examples/advanced/iterated_dynamical_systems.py
+share/doc/networkx-${PKGVERSION}/examples/advanced/parallel_betweenness.py
 share/doc/networkx-${PKGVERSION}/examples/algorithms/blockmodel.py
 share/doc/networkx-${PKGVERSION}/examples/algorithms/davis_club.py
 share/doc/networkx-${PKGVERSION}/examples/algorithms/hartford_drug.edgelist
diff --git a/math/py-networkx/distinfo b/math/py-networkx/distinfo
index 90512a2bf00..f2265cf5581 100644
--- a/math/py-networkx/distinfo
+++ b/math/py-networkx/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2014/06/10 12:04:58 wen Exp $
+$NetBSD: distinfo,v 1.7 2014/07/28 12:16:23 wen Exp $
 
-SHA1 (networkx-1.8.1.tar.gz) = d6c1524724d3e47f7621bb2072863463924bfb99
-RMD160 (networkx-1.8.1.tar.gz) = 2add3237d7c30c4aecb68cd4c01dd8401005a6ea
-Size (networkx-1.8.1.tar.gz) = 806766 bytes
+SHA1 (networkx-1.9.tar.gz) = c69e50b6272a79112358fdda811a03582012ea57
+RMD160 (networkx-1.9.tar.gz) = 4818fd7f17289a5b9725de850a9c69100c8dd9eb
+Size (networkx-1.9.tar.gz) = 1035166 bytes