Wed Nov 15 23:22:28 2017 UTC ()
math/py-networkx: prefix doc directory with python version

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


(markd)
diff -r1.23 -r1.24 pkgsrc/math/py-networkx/Makefile
diff -r1.13 -r1.14 pkgsrc/math/py-networkx/PLIST
cvs diff -r1.23 -r1.24 pkgsrc/math/py-networkx/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-networkx/Makefile 2017/09/27 13:25:54 1.23
+++ pkgsrc/math/py-networkx/Makefile 2017/11/15 23:22:28 1.24
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.23 2017/09/27 13:25:54 adam Exp $ 1# $NetBSD: Makefile,v 1.24 2017/11/15 23:22:28 markd Exp $
2 2
3DISTNAME= networkx-2.0 3DISTNAME= networkx-2.0
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= math python 6CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=n/networkx/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=n/networkx/}
7EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://networkx.github.io/ 11HOMEPAGE= http://networkx.github.io/
11COMMENT= Python package for creating and manipulating graphs and networks 12COMMENT= Python package for creating and manipulating graphs and networks
12LICENSE= modified-bsd 13LICENSE= modified-bsd
13 14
14DEPENDS+= ${PYPKGPREFIX}-decorator>=4.1.0:../../devel/py-decorator 15DEPENDS+= ${PYPKGPREFIX}-decorator>=4.1.0:../../devel/py-decorator
15 16
16USE_LANGUAGES= # none 17USE_LANGUAGES= # none
17 18
@@ -23,16 +24,19 @@ REPLACE_PYTHON+= networkx/algorithms/cho @@ -23,16 +24,19 @@ REPLACE_PYTHON+= networkx/algorithms/cho
23REPLACE_PYTHON+= networkx/algorithms/community/tests/*.py 24REPLACE_PYTHON+= networkx/algorithms/community/tests/*.py
24REPLACE_PYTHON+= networkx/algorithms/components/tests/*.py 25REPLACE_PYTHON+= networkx/algorithms/components/tests/*.py
25REPLACE_PYTHON+= networkx/algorithms/isomorphism/tests/*.py 26REPLACE_PYTHON+= networkx/algorithms/isomorphism/tests/*.py
26REPLACE_PYTHON+= networkx/algorithms/link_analysis/tests/*.py 27REPLACE_PYTHON+= networkx/algorithms/link_analysis/tests/*.py
27REPLACE_PYTHON+= networkx/algorithms/shortest_paths/tests/*.py 28REPLACE_PYTHON+= networkx/algorithms/shortest_paths/tests/*.py
28REPLACE_PYTHON+= networkx/algorithms/tests/*.py 29REPLACE_PYTHON+= networkx/algorithms/tests/*.py
29REPLACE_PYTHON+= networkx/algorithms/traversal/tests/*.py 30REPLACE_PYTHON+= networkx/algorithms/traversal/tests/*.py
30REPLACE_PYTHON+= networkx/classes/tests/*.py 31REPLACE_PYTHON+= networkx/classes/tests/*.py
31REPLACE_PYTHON+= networkx/generators/tests/*.py 32REPLACE_PYTHON+= networkx/generators/tests/*.py
32REPLACE_PYTHON+= networkx/readwrite/tests/*.py 33REPLACE_PYTHON+= networkx/readwrite/tests/*.py
33REPLACE_PYTHON+= networkx/tests/*.py 34REPLACE_PYTHON+= networkx/tests/*.py
34REPLACE_PYTHON+= networkx/utils/tests/*.py 35REPLACE_PYTHON+= networkx/utils/tests/*.py
35 36
 37post-install:
 38 mv ${DESTDIR}${PREFIX}/share/doc/${DISTNAME} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 39
36.include "../../lang/python/application.mk" 40.include "../../lang/python/application.mk"
37.include "../../lang/python/egg.mk" 41.include "../../lang/python/egg.mk"
38.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/math/py-networkx/PLIST (expand / switch to unified diff)

--- pkgsrc/math/py-networkx/PLIST 2017/09/27 13:25:54 1.13
+++ pkgsrc/math/py-networkx/PLIST 2017/11/15 23:22:28 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13 2017/09/27 13:25:54 adam Exp $ 1@comment $NetBSD: PLIST,v 1.14 2017/11/15 23:22:28 markd Exp $
2${PYSITELIB}/${EGG_INFODIR}/PKG-INFO 2${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
3${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt 3${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
4${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt 4${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
5${PYSITELIB}/${EGG_INFODIR}/not-zip-safe 5${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
6${PYSITELIB}/${EGG_INFODIR}/requires.txt 6${PYSITELIB}/${EGG_INFODIR}/requires.txt
7${PYSITELIB}/${EGG_INFODIR}/top_level.txt 7${PYSITELIB}/${EGG_INFODIR}/top_level.txt
8${PYSITELIB}/networkx/__init__.py 8${PYSITELIB}/networkx/__init__.py
9${PYSITELIB}/networkx/__init__.pyc 9${PYSITELIB}/networkx/__init__.pyc
10${PYSITELIB}/networkx/__init__.pyo 10${PYSITELIB}/networkx/__init__.pyo
11${PYSITELIB}/networkx/algorithms/__init__.py 11${PYSITELIB}/networkx/algorithms/__init__.py
12${PYSITELIB}/networkx/algorithms/__init__.pyc 12${PYSITELIB}/networkx/algorithms/__init__.pyc
13${PYSITELIB}/networkx/algorithms/__init__.pyo 13${PYSITELIB}/networkx/algorithms/__init__.pyo
14${PYSITELIB}/networkx/algorithms/approximation/__init__.py 14${PYSITELIB}/networkx/algorithms/approximation/__init__.py
@@ -1342,70 +1342,70 @@ ${PYSITELIB}/networkx/utils/tests/test_r @@ -1342,70 +1342,70 @@ ${PYSITELIB}/networkx/utils/tests/test_r
1342${PYSITELIB}/networkx/utils/tests/test_random_sequence.pyo 1342${PYSITELIB}/networkx/utils/tests/test_random_sequence.pyo
1343${PYSITELIB}/networkx/utils/tests/test_rcm.py 1343${PYSITELIB}/networkx/utils/tests/test_rcm.py
1344${PYSITELIB}/networkx/utils/tests/test_rcm.pyc 1344${PYSITELIB}/networkx/utils/tests/test_rcm.pyc
1345${PYSITELIB}/networkx/utils/tests/test_rcm.pyo 1345${PYSITELIB}/networkx/utils/tests/test_rcm.pyo
1346${PYSITELIB}/networkx/utils/tests/test_unionfind.py 1346${PYSITELIB}/networkx/utils/tests/test_unionfind.py
1347${PYSITELIB}/networkx/utils/tests/test_unionfind.pyc 1347${PYSITELIB}/networkx/utils/tests/test_unionfind.pyc
1348${PYSITELIB}/networkx/utils/tests/test_unionfind.pyo 1348${PYSITELIB}/networkx/utils/tests/test_unionfind.pyo
1349${PYSITELIB}/networkx/utils/union_find.py 1349${PYSITELIB}/networkx/utils/union_find.py
1350${PYSITELIB}/networkx/utils/union_find.pyc 1350${PYSITELIB}/networkx/utils/union_find.pyc
1351${PYSITELIB}/networkx/utils/union_find.pyo 1351${PYSITELIB}/networkx/utils/union_find.pyo
1352${PYSITELIB}/networkx/version.py 1352${PYSITELIB}/networkx/version.py
1353${PYSITELIB}/networkx/version.pyc 1353${PYSITELIB}/networkx/version.pyc
1354${PYSITELIB}/networkx/version.pyo 1354${PYSITELIB}/networkx/version.pyo
1355share/doc/networkx-${PKGVERSION}/LICENSE.txt 1355share/doc/${PKGBASE}/LICENSE.txt
1356share/doc/networkx-${PKGVERSION}/examples/3d_drawing/mayavi2_spring.py 1356share/doc/${PKGBASE}/examples/3d_drawing/mayavi2_spring.py
1357share/doc/networkx-${PKGVERSION}/examples/advanced/iterated_dynamical_systems.py 1357share/doc/${PKGBASE}/examples/advanced/iterated_dynamical_systems.py
1358share/doc/networkx-${PKGVERSION}/examples/advanced/plot_eigenvalues.py 1358share/doc/${PKGBASE}/examples/advanced/plot_eigenvalues.py
1359share/doc/networkx-${PKGVERSION}/examples/advanced/plot_heavy_metal_umlaut.py 1359share/doc/${PKGBASE}/examples/advanced/plot_heavy_metal_umlaut.py
1360share/doc/networkx-${PKGVERSION}/examples/advanced/plot_parallel_betweenness.py 1360share/doc/${PKGBASE}/examples/advanced/plot_parallel_betweenness.py
1361share/doc/networkx-${PKGVERSION}/examples/algorithms/beam_search.py 1361share/doc/${PKGBASE}/examples/algorithms/beam_search.py
1362share/doc/networkx-${PKGVERSION}/examples/algorithms/hartford_drug.edgelist 1362share/doc/${PKGBASE}/examples/algorithms/hartford_drug.edgelist
1363share/doc/networkx-${PKGVERSION}/examples/algorithms/plot_blockmodel.py 1363share/doc/${PKGBASE}/examples/algorithms/plot_blockmodel.py
1364share/doc/networkx-${PKGVERSION}/examples/algorithms/plot_davis_club.py 1364share/doc/${PKGBASE}/examples/algorithms/plot_davis_club.py
1365share/doc/networkx-${PKGVERSION}/examples/algorithms/plot_krackhardt_centrality.py 1365share/doc/${PKGBASE}/examples/algorithms/plot_krackhardt_centrality.py
1366share/doc/networkx-${PKGVERSION}/examples/algorithms/rcm.py 1366share/doc/${PKGBASE}/examples/algorithms/rcm.py
1367share/doc/networkx-${PKGVERSION}/examples/basic/plot_properties.py 1367share/doc/${PKGBASE}/examples/basic/plot_properties.py
1368share/doc/networkx-${PKGVERSION}/examples/basic/plot_read_write.py 1368share/doc/${PKGBASE}/examples/basic/plot_read_write.py
1369share/doc/networkx-${PKGVERSION}/examples/drawing/chess_masters_WCC.pgn.bz2 1369share/doc/${PKGBASE}/examples/drawing/chess_masters_WCC.pgn.bz2
1370share/doc/networkx-${PKGVERSION}/examples/drawing/knuth_miles.txt.gz 1370share/doc/${PKGBASE}/examples/drawing/knuth_miles.txt.gz
1371share/doc/networkx-${PKGVERSION}/examples/drawing/lanl_routes.edgelist 1371share/doc/${PKGBASE}/examples/drawing/lanl_routes.edgelist
1372share/doc/networkx-${PKGVERSION}/examples/drawing/plot_atlas.py 1372share/doc/${PKGBASE}/examples/drawing/plot_atlas.py
1373share/doc/networkx-${PKGVERSION}/examples/drawing/plot_chess_masters.py 1373share/doc/${PKGBASE}/examples/drawing/plot_chess_masters.py
1374share/doc/networkx-${PKGVERSION}/examples/drawing/plot_circular_tree.py 1374share/doc/${PKGBASE}/examples/drawing/plot_circular_tree.py
1375share/doc/networkx-${PKGVERSION}/examples/drawing/plot_degree_histogram.py 1375share/doc/${PKGBASE}/examples/drawing/plot_degree_histogram.py
1376share/doc/networkx-${PKGVERSION}/examples/drawing/plot_degree_rank.py 1376share/doc/${PKGBASE}/examples/drawing/plot_degree_rank.py
1377share/doc/networkx-${PKGVERSION}/examples/drawing/plot_edge_colormap.py 1377share/doc/${PKGBASE}/examples/drawing/plot_edge_colormap.py
1378share/doc/networkx-${PKGVERSION}/examples/drawing/plot_ego_graph.py 1378share/doc/${PKGBASE}/examples/drawing/plot_ego_graph.py
1379share/doc/networkx-${PKGVERSION}/examples/drawing/plot_four_grids.py 1379share/doc/${PKGBASE}/examples/drawing/plot_four_grids.py
1380share/doc/networkx-${PKGVERSION}/examples/drawing/plot_giant_component.py 1380share/doc/${PKGBASE}/examples/drawing/plot_giant_component.py
1381share/doc/networkx-${PKGVERSION}/examples/drawing/plot_house_with_colors.py 1381share/doc/${PKGBASE}/examples/drawing/plot_house_with_colors.py
1382share/doc/networkx-${PKGVERSION}/examples/drawing/plot_knuth_miles.py 1382share/doc/${PKGBASE}/examples/drawing/plot_knuth_miles.py
1383share/doc/networkx-${PKGVERSION}/examples/drawing/plot_labels_and_colors.py 1383share/doc/${PKGBASE}/examples/drawing/plot_labels_and_colors.py
1384share/doc/networkx-${PKGVERSION}/examples/drawing/plot_lanl_routes.py 1384share/doc/${PKGBASE}/examples/drawing/plot_lanl_routes.py
1385share/doc/networkx-${PKGVERSION}/examples/drawing/plot_node_colormap.py 1385share/doc/${PKGBASE}/examples/drawing/plot_node_colormap.py
1386share/doc/networkx-${PKGVERSION}/examples/drawing/plot_random_geometric_graph.py 1386share/doc/${PKGBASE}/examples/drawing/plot_random_geometric_graph.py
1387share/doc/networkx-${PKGVERSION}/examples/drawing/plot_sampson.py 1387share/doc/${PKGBASE}/examples/drawing/plot_sampson.py
1388share/doc/networkx-${PKGVERSION}/examples/drawing/plot_simple_path.py 1388share/doc/${PKGBASE}/examples/drawing/plot_simple_path.py
1389share/doc/networkx-${PKGVERSION}/examples/drawing/plot_unix_email.py 1389share/doc/${PKGBASE}/examples/drawing/plot_unix_email.py
1390share/doc/networkx-${PKGVERSION}/examples/drawing/plot_weighted_graph.py 1390share/doc/${PKGBASE}/examples/drawing/plot_weighted_graph.py
1391share/doc/networkx-${PKGVERSION}/examples/drawing/unix_email.mbox 1391share/doc/${PKGBASE}/examples/drawing/unix_email.mbox
1392share/doc/networkx-${PKGVERSION}/examples/graph/atlas2.py 1392share/doc/${PKGBASE}/examples/graph/atlas2.py
1393share/doc/networkx-${PKGVERSION}/examples/graph/expected_degree_sequence.py 1393share/doc/${PKGBASE}/examples/graph/expected_degree_sequence.py
1394share/doc/networkx-${PKGVERSION}/examples/graph/plot_degree_sequence.py 1394share/doc/${PKGBASE}/examples/graph/plot_degree_sequence.py
1395share/doc/networkx-${PKGVERSION}/examples/graph/plot_erdos_renyi.py 1395share/doc/${PKGBASE}/examples/graph/plot_erdos_renyi.py
1396share/doc/networkx-${PKGVERSION}/examples/graph/plot_football.py 1396share/doc/${PKGBASE}/examples/graph/plot_football.py
1397share/doc/networkx-${PKGVERSION}/examples/graph/plot_karate_club.py 1397share/doc/${PKGBASE}/examples/graph/plot_karate_club.py
1398share/doc/networkx-${PKGVERSION}/examples/graph/plot_napoleon_russian_campaign.py 1398share/doc/${PKGBASE}/examples/graph/plot_napoleon_russian_campaign.py
1399share/doc/networkx-${PKGVERSION}/examples/graph/plot_roget.py 1399share/doc/${PKGBASE}/examples/graph/plot_roget.py
1400share/doc/networkx-${PKGVERSION}/examples/graph/roget_dat.txt.gz 1400share/doc/${PKGBASE}/examples/graph/roget_dat.txt.gz
1401share/doc/networkx-${PKGVERSION}/examples/graph/words.py 1401share/doc/${PKGBASE}/examples/graph/words.py
1402share/doc/networkx-${PKGVERSION}/examples/graph/words_dat.txt.gz 1402share/doc/${PKGBASE}/examples/graph/words_dat.txt.gz
1403share/doc/networkx-${PKGVERSION}/examples/javascript/force.py 1403share/doc/${PKGBASE}/examples/javascript/force.py
1404share/doc/networkx-${PKGVERSION}/examples/jit/plot_rgraph.py 1404share/doc/${PKGBASE}/examples/jit/plot_rgraph.py
1405share/doc/networkx-${PKGVERSION}/examples/pygraphviz/pygraphviz_attributes.py 1405share/doc/${PKGBASE}/examples/pygraphviz/pygraphviz_attributes.py
1406share/doc/networkx-${PKGVERSION}/examples/pygraphviz/pygraphviz_draw.py 1406share/doc/${PKGBASE}/examples/pygraphviz/pygraphviz_draw.py
1407share/doc/networkx-${PKGVERSION}/examples/pygraphviz/pygraphviz_simple.py 1407share/doc/${PKGBASE}/examples/pygraphviz/pygraphviz_simple.py
1408share/doc/networkx-${PKGVERSION}/examples/pygraphviz/write_dotfile.py 1408share/doc/${PKGBASE}/examples/pygraphviz/write_dotfile.py
1409share/doc/networkx-${PKGVERSION}/examples/subclass/plot_antigraph.py 1409share/doc/${PKGBASE}/examples/subclass/plot_antigraph.py
1410share/doc/networkx-${PKGVERSION}/examples/subclass/plot_printgraph.py 1410share/doc/${PKGBASE}/examples/subclass/plot_printgraph.py
1411share/doc/networkx-${PKGVERSION}/requirements.txt 1411share/doc/${PKGBASE}/requirements.txt