math/py-networkx: Update 2.1 -> 2.4

PR:		241352
Approved by:	dikshie@sfc.wide.ad.jp (maintainer)

3 files changed, 13 insertions, 50 deletions

diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index 680049aa004a..9eb0a67ede9d 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	networkx
-DISTVERSION=	2.1
-PORTREVISION=	2
+DISTVERSION=	2.4
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,8 +17,8 @@ RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}decorator>=4.1.0:devel/py-decorator@${PY_FL
 #		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${PY_FLAVOR}
 
-USES=		python shebangfix zip
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python:3.5+ shebangfix
+USE_PYTHON=	autoplist distutils
 SHEBANG_GLOB=	*.py
 NO_ARCH=	yes
 
@@ -27,7 +26,7 @@ CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}networkx1
 
 PLIST_SUB+=	PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER}
 
-OPTIONS_DEFINE=	EXAMPLES YAML
+OPTIONS_DEFINE=	YAML
 OPTIONS_GROUP=	MATRIX RENDER
 OPTIONS_GROUP_MATRIX=	NUMPY SCIPY
 OPTIONS_GROUP_RENDER=	MPL GRAPHVIZ
@@ -49,10 +48,13 @@ GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraph
 YAML_DESC=	Reading and writing YAML files
 YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
 
-PORTEXAMPLES=	*
+POST_PLIST=	rm-examples-docs-from-plist
+
+rm-examples-docs-from-plist:
+	@${REINPLACE_CMD} '/.*\/examples\//d' ${TMPPLIST}
+	@${REINPLACE_CMD} '/.*\/doc\//d' ${TMPPLIST}
 
 post-install:
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+	@${RM} -r ${STAGEDIR}${PREFIX}/share
 
 .include <bsd.port.mk>
diff --git a/math/py-networkx/distinfo b/math/py-networkx/distinfo
index 4a5467755c16..f54df8b3c0aa 100644
--- a/math/py-networkx/distinfo
+++ b/math/py-networkx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534738249
-SHA256 (networkx-2.1.zip) = 64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1
-SIZE (networkx-2.1.zip) = 1612593
+TIMESTAMP = 1571523367
+SHA256 (networkx-2.4.tar.gz) = f8f4ff0b6f96e4f9b16af6b84622597b5334bf9cae8cf9b2e42e7985d5c95c64
+SIZE (networkx-2.4.tar.gz) = 1462338
diff --git a/math/py-networkx/files/patch-setup.py b/math/py-networkx/files/patch-setup.py
deleted file mode 100644
index 5ae341839a65..000000000000
--- a/math/py-networkx/files/patch-setup.py
+++ /dev/null
@@ -1,39 +0,0 @@
---- setup.py.orig	2018-08-20 04:50:16 UTC
-+++ setup.py
-@@ -57,28 +57,6 @@ packages = ["networkx",
-             "networkx.testing",
-             "networkx.utils"]
- 
--docdirbase = 'share/doc/networkx-%s' % version
--# add basic documentation
--data = [(docdirbase, glob("*.txt"))]
--# add examples
--for d in ['advanced',
--          'algorithms',
--          'basic',
--          '3d_drawing',
--          'drawing',
--          'graph',
--          'javascript',
--          'jit',
--          'pygraphviz',
--          'subclass']:
--    dd = os.path.join(docdirbase, 'examples', d)
--    pp = os.path.join('examples', d)
--    data.append((dd, glob(os.path.join(pp, "*.py"))))
--    data.append((dd, glob(os.path.join(pp, "*.bz2"))))
--    data.append((dd, glob(os.path.join(pp, "*.gz"))))
--    data.append((dd, glob(os.path.join(pp, "*.mbox"))))
--    data.append((dd, glob(os.path.join(pp, "*.edgelist"))))
--
- # add the tests
- package_data = {
-     'networkx': ['tests/*.py'],
-@@ -130,7 +108,6 @@ if __name__ == "__main__":
-         download_url=release.download_url,
-         classifiers=release.classifiers,
-         packages=packages,
--        data_files=data,
-         package_data=package_data,
-         install_requires=install_requires,
-         extras_require=extras_require,