math/py-networkx: prefix doc directory with python version

so package doesn't conflict with other versions of itself.
Bump PKGREVISION

2 files changed, 63 insertions, 59 deletions

diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index 0527dd1ce12..d60894c2c01 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2017/09/27 13:25:54 adam Exp $
+# $NetBSD: Makefile,v 1.24 2017/11/15 23:22:28 markd Exp $
 
 DISTNAME=	networkx-2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=n/networkx/}
 EXTRACT_SUFX=	.zip
@@ -33,6 +34,9 @@ REPLACE_PYTHON+=	networkx/readwrite/tests/*.py
 REPLACE_PYTHON+=	networkx/tests/*.py
 REPLACE_PYTHON+=	networkx/utils/tests/*.py
 
+post-install:
+	mv ${DESTDIR}${PREFIX}/share/doc/${DISTNAME} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-networkx/PLIST b/math/py-networkx/PLIST
index 15f2009bcdc..185587e3c9d 100644
--- a/math/py-networkx/PLIST
+++ b/math/py-networkx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2017/09/27 13:25:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2017/11/15 23:22:28 markd Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -1352,60 +1352,60 @@ ${PYSITELIB}/networkx/utils/union_find.pyo
 ${PYSITELIB}/networkx/version.py
 ${PYSITELIB}/networkx/version.pyc
 ${PYSITELIB}/networkx/version.pyo
-share/doc/networkx-${PKGVERSION}/LICENSE.txt
-share/doc/networkx-${PKGVERSION}/examples/3d_drawing/mayavi2_spring.py
-share/doc/networkx-${PKGVERSION}/examples/advanced/iterated_dynamical_systems.py
-share/doc/networkx-${PKGVERSION}/examples/advanced/plot_eigenvalues.py
-share/doc/networkx-${PKGVERSION}/examples/advanced/plot_heavy_metal_umlaut.py
-share/doc/networkx-${PKGVERSION}/examples/advanced/plot_parallel_betweenness.py
-share/doc/networkx-${PKGVERSION}/examples/algorithms/beam_search.py
-share/doc/networkx-${PKGVERSION}/examples/algorithms/hartford_drug.edgelist
-share/doc/networkx-${PKGVERSION}/examples/algorithms/plot_blockmodel.py
-share/doc/networkx-${PKGVERSION}/examples/algorithms/plot_davis_club.py
-share/doc/networkx-${PKGVERSION}/examples/algorithms/plot_krackhardt_centrality.py
-share/doc/networkx-${PKGVERSION}/examples/algorithms/rcm.py
-share/doc/networkx-${PKGVERSION}/examples/basic/plot_properties.py
-share/doc/networkx-${PKGVERSION}/examples/basic/plot_read_write.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/chess_masters_WCC.pgn.bz2
-share/doc/networkx-${PKGVERSION}/examples/drawing/knuth_miles.txt.gz
-share/doc/networkx-${PKGVERSION}/examples/drawing/lanl_routes.edgelist
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_atlas.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_chess_masters.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_circular_tree.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_degree_histogram.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_degree_rank.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_edge_colormap.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_ego_graph.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_four_grids.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_giant_component.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_house_with_colors.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_knuth_miles.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_labels_and_colors.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_lanl_routes.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_node_colormap.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_random_geometric_graph.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_sampson.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_simple_path.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_unix_email.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/plot_weighted_graph.py
-share/doc/networkx-${PKGVERSION}/examples/drawing/unix_email.mbox
-share/doc/networkx-${PKGVERSION}/examples/graph/atlas2.py
-share/doc/networkx-${PKGVERSION}/examples/graph/expected_degree_sequence.py
-share/doc/networkx-${PKGVERSION}/examples/graph/plot_degree_sequence.py
-share/doc/networkx-${PKGVERSION}/examples/graph/plot_erdos_renyi.py
-share/doc/networkx-${PKGVERSION}/examples/graph/plot_football.py
-share/doc/networkx-${PKGVERSION}/examples/graph/plot_karate_club.py
-share/doc/networkx-${PKGVERSION}/examples/graph/plot_napoleon_russian_campaign.py
-share/doc/networkx-${PKGVERSION}/examples/graph/plot_roget.py
-share/doc/networkx-${PKGVERSION}/examples/graph/roget_dat.txt.gz
-share/doc/networkx-${PKGVERSION}/examples/graph/words.py
-share/doc/networkx-${PKGVERSION}/examples/graph/words_dat.txt.gz
-share/doc/networkx-${PKGVERSION}/examples/javascript/force.py
-share/doc/networkx-${PKGVERSION}/examples/jit/plot_rgraph.py
-share/doc/networkx-${PKGVERSION}/examples/pygraphviz/pygraphviz_attributes.py
-share/doc/networkx-${PKGVERSION}/examples/pygraphviz/pygraphviz_draw.py
-share/doc/networkx-${PKGVERSION}/examples/pygraphviz/pygraphviz_simple.py
-share/doc/networkx-${PKGVERSION}/examples/pygraphviz/write_dotfile.py
-share/doc/networkx-${PKGVERSION}/examples/subclass/plot_antigraph.py
-share/doc/networkx-${PKGVERSION}/examples/subclass/plot_printgraph.py
-share/doc/networkx-${PKGVERSION}/requirements.txt
+share/doc/${PKGBASE}/LICENSE.txt
+share/doc/${PKGBASE}/examples/3d_drawing/mayavi2_spring.py
+share/doc/${PKGBASE}/examples/advanced/iterated_dynamical_systems.py
+share/doc/${PKGBASE}/examples/advanced/plot_eigenvalues.py
+share/doc/${PKGBASE}/examples/advanced/plot_heavy_metal_umlaut.py
+share/doc/${PKGBASE}/examples/advanced/plot_parallel_betweenness.py
+share/doc/${PKGBASE}/examples/algorithms/beam_search.py
+share/doc/${PKGBASE}/examples/algorithms/hartford_drug.edgelist
+share/doc/${PKGBASE}/examples/algorithms/plot_blockmodel.py
+share/doc/${PKGBASE}/examples/algorithms/plot_davis_club.py
+share/doc/${PKGBASE}/examples/algorithms/plot_krackhardt_centrality.py
+share/doc/${PKGBASE}/examples/algorithms/rcm.py
+share/doc/${PKGBASE}/examples/basic/plot_properties.py
+share/doc/${PKGBASE}/examples/basic/plot_read_write.py
+share/doc/${PKGBASE}/examples/drawing/chess_masters_WCC.pgn.bz2
+share/doc/${PKGBASE}/examples/drawing/knuth_miles.txt.gz
+share/doc/${PKGBASE}/examples/drawing/lanl_routes.edgelist
+share/doc/${PKGBASE}/examples/drawing/plot_atlas.py
+share/doc/${PKGBASE}/examples/drawing/plot_chess_masters.py
+share/doc/${PKGBASE}/examples/drawing/plot_circular_tree.py
+share/doc/${PKGBASE}/examples/drawing/plot_degree_histogram.py
+share/doc/${PKGBASE}/examples/drawing/plot_degree_rank.py
+share/doc/${PKGBASE}/examples/drawing/plot_edge_colormap.py
+share/doc/${PKGBASE}/examples/drawing/plot_ego_graph.py
+share/doc/${PKGBASE}/examples/drawing/plot_four_grids.py
+share/doc/${PKGBASE}/examples/drawing/plot_giant_component.py
+share/doc/${PKGBASE}/examples/drawing/plot_house_with_colors.py
+share/doc/${PKGBASE}/examples/drawing/plot_knuth_miles.py
+share/doc/${PKGBASE}/examples/drawing/plot_labels_and_colors.py
+share/doc/${PKGBASE}/examples/drawing/plot_lanl_routes.py
+share/doc/${PKGBASE}/examples/drawing/plot_node_colormap.py
+share/doc/${PKGBASE}/examples/drawing/plot_random_geometric_graph.py
+share/doc/${PKGBASE}/examples/drawing/plot_sampson.py
+share/doc/${PKGBASE}/examples/drawing/plot_simple_path.py
+share/doc/${PKGBASE}/examples/drawing/plot_unix_email.py
+share/doc/${PKGBASE}/examples/drawing/plot_weighted_graph.py
+share/doc/${PKGBASE}/examples/drawing/unix_email.mbox
+share/doc/${PKGBASE}/examples/graph/atlas2.py
+share/doc/${PKGBASE}/examples/graph/expected_degree_sequence.py
+share/doc/${PKGBASE}/examples/graph/plot_degree_sequence.py
+share/doc/${PKGBASE}/examples/graph/plot_erdos_renyi.py
+share/doc/${PKGBASE}/examples/graph/plot_football.py
+share/doc/${PKGBASE}/examples/graph/plot_karate_club.py
+share/doc/${PKGBASE}/examples/graph/plot_napoleon_russian_campaign.py
+share/doc/${PKGBASE}/examples/graph/plot_roget.py
+share/doc/${PKGBASE}/examples/graph/roget_dat.txt.gz
+share/doc/${PKGBASE}/examples/graph/words.py
+share/doc/${PKGBASE}/examples/graph/words_dat.txt.gz
+share/doc/${PKGBASE}/examples/javascript/force.py
+share/doc/${PKGBASE}/examples/jit/plot_rgraph.py
+share/doc/${PKGBASE}/examples/pygraphviz/pygraphviz_attributes.py
+share/doc/${PKGBASE}/examples/pygraphviz/pygraphviz_draw.py
+share/doc/${PKGBASE}/examples/pygraphviz/pygraphviz_simple.py
+share/doc/${PKGBASE}/examples/pygraphviz/write_dotfile.py
+share/doc/${PKGBASE}/examples/subclass/plot_antigraph.py
+share/doc/${PKGBASE}/examples/subclass/plot_printgraph.py
+share/doc/${PKGBASE}/requirements.txt