Update to 1.8.1

Upstream changes:
Networkx-1.8.1
Release date: 4 August 2013

Bugfix release for missing files in source packaging

Networkx-1.8
Release date: 28 July 2013

Highlights
Faster (linear-time) graphicality tests and Havel-Hakimi graph generators
Directed Laplacian matrix generator
Katz centrality algorithm
Functions to generate all simple paths
Improved shapefile reader
More flexible weighted projection of bipartite graphs
Faster topological sort, decendents and ancestors of DAGs
Scaling parameter for force-directed layout
Bug Fixes
Error with average weighted connectivity for digraphs, correct normalized laplacian with self-loops, load betweenness for single node graphs, isolated nodes missing from dfs/bfs trees, normalize HITS using l1, handle density of graphs with self loops
Cleaner handling of current figure status with Matplotlib, Pajek files now don't write troublesome header line, default alpha value for GEXF files, read curved edges from yEd GraphML

3 files changed, 59 insertions, 17 deletions

diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index 1934c85cc25..a8451351db4 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2014/05/09 07:37:11 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2014/06/10 12:04:58 wen Exp $
 
-DISTNAME=	networkx-1.7
+DISTNAME=	networkx-1.8.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	http://pypi.python.org/packages/source/n/networkx/ \
 		http://networkx.lanl.gov/download/networkx/
@@ -15,5 +14,27 @@ LICENSE=	modified-bsd
 PYTHON_SELF_CONFLICT=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34
 
+SUBST_CLASSES+=		python
+SUBST_STAGE.python=	post-patch
+SUBST_FILES.python+=	networkx/readwrite/tests/*.py
+SUBST_FILES.python+=	networkx/utils/tests/*.py
+SUBST_FILES.python+=	networkx/tests/*.py
+SUBST_FILES.python+=	networkx/generators/tests/*.py
+SUBST_FILES.python+=	networkx/classes/tests/*.py
+SUBST_FILES.python+=	networkx/algorithms/tests/*.py
+SUBST_FILES.python+=	networkx/algorithms/approximation/tests/*.py
+SUBST_FILES.python+=	networkx/algorithms/assortativity/tests/*.py
+SUBST_FILES.python+=	networkx/algorithms/bipartite/tests/*.py
+SUBST_FILES.python+=	networkx/algorithms/centrality/tests/*.py
+SUBST_FILES.python+=	networkx/algorithms/chordal/tests/*.py
+SUBST_FILES.python+=	networkx/algorithms/community/tests/*.py
+SUBST_FILES.python+=	networkx/algorithms/components/tests/*.py
+SUBST_FILES.python+=	networkx/algorithms/isomorphism/tests/*.py
+SUBST_FILES.python+=	networkx/algorithms/link_analysis/tests/*.py
+SUBST_FILES.python+=	networkx/algorithms/shortest_paths/tests/*.py
+SUBST_FILES.python+=	networkx/algorithms/traversal/tests/*.py
+SUBST_MESSAGE.python=	Fixing path to Python interpreter.
+SUBST_SED.python=	-e "s,/usr/bin/env python,${PYTHONBIN},g"
+
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-networkx/PLIST b/math/py-networkx/PLIST
index eefef7234b4..ca38e701551 100644
--- a/math/py-networkx/PLIST
+++ b/math/py-networkx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2012/07/13 14:00:32 wen Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/06/10 12:04:58 wen Exp $
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/networkx/__init__.py
 ${PYSITELIB}/networkx/__init__.pyc
@@ -156,6 +156,9 @@ ${PYSITELIB}/networkx/algorithms/centrality/eigenvector.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/flow_matrix.py
 ${PYSITELIB}/networkx/algorithms/centrality/flow_matrix.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/flow_matrix.pyo
+${PYSITELIB}/networkx/algorithms/centrality/katz.py
+${PYSITELIB}/networkx/algorithms/centrality/katz.pyc
+${PYSITELIB}/networkx/algorithms/centrality/katz.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/load.py
 ${PYSITELIB}/networkx/algorithms/centrality/load.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/load.pyo
@@ -186,6 +189,9 @@ ${PYSITELIB}/networkx/algorithms/centrality/tests/test_degree_centrality.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
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_katz_centrality.py
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_katz_centrality.pyc
+${PYSITELIB}/networkx/algorithms/centrality/tests/test_katz_centrality.pyo
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_load_centrality.py
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_load_centrality.pyc
 ${PYSITELIB}/networkx/algorithms/centrality/tests/test_load_centrality.pyo
@@ -246,6 +252,21 @@ ${PYSITELIB}/networkx/algorithms/components/tests/test_weakly_connected.pyo
 ${PYSITELIB}/networkx/algorithms/components/weakly_connected.py
 ${PYSITELIB}/networkx/algorithms/components/weakly_connected.pyc
 ${PYSITELIB}/networkx/algorithms/components/weakly_connected.pyo
+${PYSITELIB}/networkx/algorithms/connectivity/__init__.py
+${PYSITELIB}/networkx/algorithms/connectivity/__init__.pyc
+${PYSITELIB}/networkx/algorithms/connectivity/__init__.pyo
+${PYSITELIB}/networkx/algorithms/connectivity/connectivity.py
+${PYSITELIB}/networkx/algorithms/connectivity/connectivity.pyc
+${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/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/core.py
 ${PYSITELIB}/networkx/algorithms/core.pyc
 ${PYSITELIB}/networkx/algorithms/core.pyo
@@ -577,12 +598,12 @@ ${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/_decorator.py
-${PYSITELIB}/networkx/external/decorator/_decorator.pyc
-${PYSITELIB}/networkx/external/decorator/_decorator.pyo
-${PYSITELIB}/networkx/external/decorator/_decorator3.py
-${PYSITELIB}/networkx/external/decorator/_decorator3.pyc
-${PYSITELIB}/networkx/external/decorator/_decorator3.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
@@ -697,9 +718,9 @@ ${PYSITELIB}/networkx/linalg/spectrum.pyo
 ${PYSITELIB}/networkx/linalg/tests/test_graphmatrix.py
 ${PYSITELIB}/networkx/linalg/tests/test_graphmatrix.pyc
 ${PYSITELIB}/networkx/linalg/tests/test_graphmatrix.pyo
-${PYSITELIB}/networkx/linalg/tests/test_laplaican.py
-${PYSITELIB}/networkx/linalg/tests/test_laplaican.pyc
-${PYSITELIB}/networkx/linalg/tests/test_laplaican.pyo
+${PYSITELIB}/networkx/linalg/tests/test_laplacian.py
+${PYSITELIB}/networkx/linalg/tests/test_laplacian.pyc
+${PYSITELIB}/networkx/linalg/tests/test_laplacian.pyo
 ${PYSITELIB}/networkx/linalg/tests/test_spectrum.py
 ${PYSITELIB}/networkx/linalg/tests/test_spectrum.pyc
 ${PYSITELIB}/networkx/linalg/tests/test_spectrum.pyo
diff --git a/math/py-networkx/distinfo b/math/py-networkx/distinfo
index 921798e2b8a..90512a2bf00 100644
--- a/math/py-networkx/distinfo
+++ b/math/py-networkx/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2012/07/13 14:00:32 wen Exp $
+$NetBSD: distinfo,v 1.6 2014/06/10 12:04:58 wen Exp $
 
-SHA1 (networkx-1.7.tar.gz) = 1a83dbbac6fb4abc6bfd644ae3c4a6af8ebb1c33
-RMD160 (networkx-1.7.tar.gz) = 90c35abf42a0ec68b3ece14cac02f4b47b6c0a20
-Size (networkx-1.7.tar.gz) = 728145 bytes
+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