3 files changed, 103 insertions, 4 deletions

diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index f61736dd76dc..6f096dbc9441 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 
 PORTNAME=	networkx
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	math python
 MASTER_SITES=	http://networkx.lanl.gov/download/networkx/ \
 		CHEESESHOP
diff --git a/math/py-networkx/distinfo b/math/py-networkx/distinfo
index d67be3d86302..a415b55c97e1 100644
--- a/math/py-networkx/distinfo
+++ b/math/py-networkx/distinfo
@@ -1,3 +1,2 @@
-MD5 (networkx-1.2.tar.gz) = b78ee2f9d82012e875cdcddb06ed7f06
-SHA256 (networkx-1.2.tar.gz) = 267b9fb80fb3ee8e6873a61828163da73cf9e162f985612f653e1e1e12f121e4
-SIZE (networkx-1.2.tar.gz) = 585851
+SHA256 (networkx-1.3.tar.gz) = 852feba8c6a46a4121d862590cdc232ffa74f68e35c19c2c0f3d76088641b65c
+SIZE (networkx-1.3.tar.gz) = 596993
diff --git a/math/py-networkx/pkg-plist b/math/py-networkx/pkg-plist
index e0423cd6a192..6b77477fc644 100644
--- a/math/py-networkx/pkg-plist
+++ b/math/py-networkx/pkg-plist
@@ -49,6 +49,9 @@
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/centrality/tests/test_betweenness_centrality_subset.py
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/centrality/tests/test_betweenness_centrality_subset.pyc
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/centrality/tests/test_betweenness_centrality_subset.pyo
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/centrality/tests/test_closeness_centrality.py
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/centrality/tests/test_closeness_centrality.pyc
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/centrality/tests/test_closeness_centrality.pyo
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/centrality/tests/test_current_flow_betweenness_centrality.py
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/centrality/tests/test_current_flow_betweenness_centrality.pyc
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/centrality/tests/test_current_flow_betweenness_centrality.pyo
@@ -121,12 +124,18 @@
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/flow/maxflow.py
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/flow/maxflow.pyc
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/flow/maxflow.pyo
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/flow/mincost.py
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/flow/mincost.pyc
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/flow/mincost.pyo
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/flow/tests/test_maxflow.py
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/flow/tests/test_maxflow.pyc
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/flow/tests/test_maxflow.pyo
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/flow/tests/test_maxflow_large_graph.py
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/flow/tests/test_maxflow_large_graph.pyc
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/flow/tests/test_maxflow_large_graph.pyo
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/flow/tests/test_mincost.py
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/flow/tests/test_mincost.pyc
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/flow/tests/test_mincost.pyo
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/isolates.py
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/isolates.pyc
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/isolates.pyo
@@ -143,6 +152,9 @@
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/isomorphism/tests/iso_r01_s80.B99
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/isomorphism/tests/si2_b06_m200.A99
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/isomorphism/tests/si2_b06_m200.B99
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/isomorphism/tests/test_isomorphism.py
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/isomorphism/tests/test_isomorphism.pyc
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/isomorphism/tests/test_isomorphism.pyo
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/isomorphism/tests/test_isomorphvf2.py
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/isomorphism/tests/test_isomorphvf2.pyc
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/isomorphism/tests/test_isomorphvf2.pyo
@@ -215,18 +227,33 @@
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_block.py
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_block.pyc
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_block.pyo
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_boundary.py
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_boundary.pyc
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_boundary.pyo
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_clique.py
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_clique.pyc
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_clique.pyo
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_cluster.py
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_cluster.pyc
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_cluster.pyo
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_core.py
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_core.pyc
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_core.pyo
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_cycles.py
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_cycles.pyc
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_cycles.pyo
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_dag.py
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_dag.pyc
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_dag.pyo
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_distance_measures.py
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_distance_measures.pyc
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_distance_measures.pyo
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_euler.py
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_euler.pyc
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_euler.pyo
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_matching.py
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_matching.pyc
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_matching.pyo
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_mixing_attributes.py
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_mixing_attributes.pyc
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests/test_mixing_attributes.pyo
@@ -251,6 +278,9 @@
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/traversal/depth_first_search.py
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/traversal/depth_first_search.pyc
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/traversal/depth_first_search.pyo
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/traversal/tests/test_dfs.py
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/traversal/tests/test_dfs.pyc
+%%PYTHON_SITELIBDIR%%/networkx/algorithms/traversal/tests/test_dfs.pyo
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/vitality.py
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/vitality.pyc
 %%PYTHON_SITELIBDIR%%/networkx/algorithms/vitality.pyo
@@ -272,15 +302,24 @@
 %%PYTHON_SITELIBDIR%%/networkx/classes/multigraph.py
 %%PYTHON_SITELIBDIR%%/networkx/classes/multigraph.pyc
 %%PYTHON_SITELIBDIR%%/networkx/classes/multigraph.pyo
+%%PYTHON_SITELIBDIR%%/networkx/classes/tests/historical_tests.py
+%%PYTHON_SITELIBDIR%%/networkx/classes/tests/historical_tests.pyc
+%%PYTHON_SITELIBDIR%%/networkx/classes/tests/historical_tests.pyo
 %%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_digraph.py
 %%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_digraph.pyc
 %%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_digraph.pyo
+%%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_digraph_historical.py
+%%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_digraph_historical.pyc
+%%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_digraph_historical.pyo
 %%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_function.py
 %%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_function.pyc
 %%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_function.pyo
 %%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_graph.py
 %%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_graph.pyc
 %%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_graph.pyo
+%%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_graph_historical.py
+%%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_graph_historical.pyc
+%%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_graph_historical.pyo
 %%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_multidigraph.py
 %%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_multidigraph.pyc
 %%PYTHON_SITELIBDIR%%/networkx/classes/tests/test_multidigraph.pyo
@@ -359,9 +398,45 @@
 %%PYTHON_SITELIBDIR%%/networkx/generators/stochastic.py
 %%PYTHON_SITELIBDIR%%/networkx/generators/stochastic.pyc
 %%PYTHON_SITELIBDIR%%/networkx/generators/stochastic.pyo
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_atlas.py
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_atlas.pyc
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_atlas.pyo
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_bipartite.py
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_bipartite.pyc
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_bipartite.pyo
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_classic.py
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_classic.pyc
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_classic.pyo
 %%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_degree_seq.py
 %%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_degree_seq.pyc
 %%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_degree_seq.pyo
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_directed.py
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_directed.pyc
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_directed.pyo
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_ego.py
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_ego.pyc
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_ego.pyo
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_geometric.py
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_geometric.pyc
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_geometric.pyo
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_hybrid.py
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_hybrid.pyc
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_hybrid.pyo
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_line.py
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_line.pyc
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_line.pyo
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_random_graphs.py
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_random_graphs.pyc
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_random_graphs.pyo
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_small.py
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_small.pyc
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_small.pyo
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_stochastic.py
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_stochastic.pyc
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_stochastic.pyo
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_threshold.py
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_threshold.pyc
+%%PYTHON_SITELIBDIR%%/networkx/generators/tests/test_threshold.pyo
 %%PYTHON_SITELIBDIR%%/networkx/generators/threshold.py
 %%PYTHON_SITELIBDIR%%/networkx/generators/threshold.pyc
 %%PYTHON_SITELIBDIR%%/networkx/generators/threshold.pyo
@@ -398,6 +473,9 @@
 %%PYTHON_SITELIBDIR%%/networkx/readwrite/leda.py
 %%PYTHON_SITELIBDIR%%/networkx/readwrite/leda.pyc
 %%PYTHON_SITELIBDIR%%/networkx/readwrite/leda.pyo
+%%PYTHON_SITELIBDIR%%/networkx/readwrite/multiline_adjlist.py
+%%PYTHON_SITELIBDIR%%/networkx/readwrite/multiline_adjlist.pyc
+%%PYTHON_SITELIBDIR%%/networkx/readwrite/multiline_adjlist.pyo
 %%PYTHON_SITELIBDIR%%/networkx/readwrite/nx_yaml.py
 %%PYTHON_SITELIBDIR%%/networkx/readwrite/nx_yaml.pyc
 %%PYTHON_SITELIBDIR%%/networkx/readwrite/nx_yaml.pyo
@@ -419,9 +497,21 @@
 %%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_gml.py
 %%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_gml.pyc
 %%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_gml.pyo
+%%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_gpickle.py
+%%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_gpickle.pyc
+%%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_gpickle.pyo
 %%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_graphml.py
 %%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_graphml.pyc
 %%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_graphml.pyo
+%%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_leda.py
+%%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_leda.pyc
+%%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_leda.pyo
+%%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_pajek.py
+%%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_pajek.pyc
+%%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_pajek.pyo
+%%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_sparsegraph6.py
+%%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_sparsegraph6.pyc
+%%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_sparsegraph6.pyo
 %%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_yaml.py
 %%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_yaml.pyc
 %%PYTHON_SITELIBDIR%%/networkx/readwrite/tests/test_yaml.pyo
@@ -437,12 +527,21 @@
 %%PYTHON_SITELIBDIR%%/networkx/tests/test.py
 %%PYTHON_SITELIBDIR%%/networkx/tests/test.pyc
 %%PYTHON_SITELIBDIR%%/networkx/tests/test.pyo
+%%PYTHON_SITELIBDIR%%/networkx/tests/test_convert.py
+%%PYTHON_SITELIBDIR%%/networkx/tests/test_convert.pyc
+%%PYTHON_SITELIBDIR%%/networkx/tests/test_convert.pyo
 %%PYTHON_SITELIBDIR%%/networkx/tests/test_convert_numpy.py
 %%PYTHON_SITELIBDIR%%/networkx/tests/test_convert_numpy.pyc
 %%PYTHON_SITELIBDIR%%/networkx/tests/test_convert_numpy.pyo
 %%PYTHON_SITELIBDIR%%/networkx/tests/test_convert_scipy.py
 %%PYTHON_SITELIBDIR%%/networkx/tests/test_convert_scipy.pyc
 %%PYTHON_SITELIBDIR%%/networkx/tests/test_convert_scipy.pyo
+%%PYTHON_SITELIBDIR%%/networkx/tests/test_exceptions.py
+%%PYTHON_SITELIBDIR%%/networkx/tests/test_exceptions.pyc
+%%PYTHON_SITELIBDIR%%/networkx/tests/test_exceptions.pyo
+%%PYTHON_SITELIBDIR%%/networkx/tests/test_utils.py
+%%PYTHON_SITELIBDIR%%/networkx/tests/test_utils.pyc
+%%PYTHON_SITELIBDIR%%/networkx/tests/test_utils.pyo
 %%PYTHON_SITELIBDIR%%/networkx/utils.py
 %%PYTHON_SITELIBDIR%%/networkx/utils.pyc
 %%PYTHON_SITELIBDIR%%/networkx/utils.pyo
@@ -521,6 +620,7 @@
 @dirrm %%PYTHON_SITELIBDIR%%/networkx/drawing
 @dirrm %%PYTHON_SITELIBDIR%%/networkx/classes/tests
 @dirrm %%PYTHON_SITELIBDIR%%/networkx/classes
+@dirrm %%PYTHON_SITELIBDIR%%/networkx/algorithms/traversal/tests
 @dirrm %%PYTHON_SITELIBDIR%%/networkx/algorithms/traversal
 @dirrm %%PYTHON_SITELIBDIR%%/networkx/algorithms/tests
 @dirrm %%PYTHON_SITELIBDIR%%/networkx/algorithms/shortest_paths/tests