Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Oct 2019 05:32:16 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r515167 - in head/math/py-networkx: . files
Message-ID:  <201910220532.x9M5WG8u078817@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Tue Oct 22 05:32:15 2019
New Revision: 515167
URL: https://svnweb.freebsd.org/changeset/ports/515167

Log:
  Revert r515077 and unbreak bulk -a
  
  Reported by:	pkg-fallout
  Pointy hat:	yuri

Added:
  head/math/py-networkx/files/
     - copied from r515076, head/math/py-networkx/files/
Modified:
  head/math/py-networkx/Makefile
  head/math/py-networkx/distinfo

Modified: head/math/py-networkx/Makefile
==============================================================================
--- head/math/py-networkx/Makefile	Tue Oct 22 03:04:55 2019	(r515166)
+++ head/math/py-networkx/Makefile	Tue Oct 22 05:32:15 2019	(r515167)
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	networkx
-DISTVERSION=	2.4
+DISTVERSION=	2.1
+PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,8 +18,8 @@ RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}decorator>=4.1.0:
 #		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${PY_FLAVOR}
 
-USES=		python:3.5+ shebangfix
-USE_PYTHON=	autoplist distutils
+USES=		python shebangfix zip
+USE_PYTHON=	autoplist concurrent distutils
 SHEBANG_GLOB=	*.py
 NO_ARCH=	yes
 
@@ -26,7 +27,7 @@ CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}networkx1
 
 PLIST_SUB+=	PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER}
 
-OPTIONS_DEFINE=	YAML
+OPTIONS_DEFINE=	EXAMPLES YAML
 OPTIONS_GROUP=	MATRIX RENDER
 OPTIONS_GROUP_MATRIX=	NUMPY SCIPY
 OPTIONS_GROUP_RENDER=	MPL GRAPHVIZ
@@ -48,13 +49,10 @@ GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphvi
 YAML_DESC=	Reading and writing YAML files
 YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
 
-POST_PLIST=	rm-examples-docs-from-plist
+PORTEXAMPLES=	*
 
-rm-examples-docs-from-plist:
-	@${REINPLACE_CMD} '/.*\/examples\//d' ${TMPPLIST}
-	@${REINPLACE_CMD} '/.*\/doc\//d' ${TMPPLIST}
-
 post-install:
-	@${RM} -r ${STAGEDIR}${PREFIX}/share
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/math/py-networkx/distinfo
==============================================================================
--- head/math/py-networkx/distinfo	Tue Oct 22 03:04:55 2019	(r515166)
+++ head/math/py-networkx/distinfo	Tue Oct 22 05:32:15 2019	(r515167)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571523367
-SHA256 (networkx-2.4.tar.gz) = f8f4ff0b6f96e4f9b16af6b84622597b5334bf9cae8cf9b2e42e7985d5c95c64
-SIZE (networkx-2.4.tar.gz) = 1462338
+TIMESTAMP = 1534738249
+SHA256 (networkx-2.1.zip) = 64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1
+SIZE (networkx-2.1.zip) = 1612593



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910220532.x9M5WG8u078817>