Attachment #201087 for bug #232240

Lines 23-28 Link Here

(-)py-networkx/Makefile (+2 lines)
23	SHEBANG_GLOB= *.py	23	SHEBANG_GLOB= *.py
24	NO_ARCH= yes	24	NO_ARCH= yes
25		25
		26	CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}networkx1
		27
26	PLIST_SUB+= PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER}	28	PLIST_SUB+= PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER}
27		29
28	OPTIONS_DEFINE= EXAMPLES YAML	30	OPTIONS_DEFINE= EXAMPLES YAML




--- setup.py.orig	2015-11-15 23:06:39 UTC
+++ setup.py
@@ -59,27 +59,6 @@ packages=["networkx",
           "networkx.testing",
           "networkx.utils"]
 
-docdirbase  = 'share/doc/networkx-%s' % version
-# add basic documentation
-data = [(docdirbase, glob("*.txt"))]
-# add examples

-          '3d_drawing',
-          'drawing',
-          'graph',
-          'multigraph',
-          'jit',
-          'pygraphviz',
-          'readwrite']:
-    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'],
@@ -131,7 +110,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,
         test_suite       = 'nose.collector',




# $FreeBSD$

PORTNAME=	networkx
PORTVERSION=	1.11
PORTREVISION=	1
CATEGORIES=	math python
MASTER_SITES=	http://networkx.lanl.gov/download/networkx/ \
		CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX=	1

MAINTAINER=	freebsd_ports@k-worx.org
COMMENT=	Tools for complex networks / Backported version

LICENSE=	BSD3CLAUSE

RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${PY_FLAVOR}

USES=		python shebangfix
USE_PYTHON=	autoplist concurrent distutils

USES=		python shebangfix zip
USE_PYTHON=	autoplist concurrent distutils
SHEBANG_GLOB=	*.py
NO_ARCH=	yes
PORTSCOUT=	limit:^5\.
PORTEXAMPLES=	*
SHEBANG_FILES=	examples/graph/atlas.py \
		examples/multigraph/chess_masters.py \
		networkx/generators/tests/test_random_graphs.py

CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}py-networkx

OPTIONS_DEFINE=	EXAMPLES YAML
OPTIONS_GROUP=	MATRIX RENDER
OPTIONS_GROUP_MATRIX=	NUMPY SCIPY
OPTIONS_GROUP_RENDER=	GRAPHVIZ MPL
OPTIONS_DEFAULT=	GRAPHVIZ MPL NUMPY SCIPY YAML

GRAPHVIZ_DESC=		Additional graph layout and rendering algorithms
GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz@${PY_FLAVOR}

MPL_DESC=		Flexible graph rendering
MPL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:math/py-matplotlib@${PY_FLAVOR}

NUMPY_DESC=		Matrix representation of graphs
NUMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy@${PY_FLAVOR}

SCIPY_DESC=		Sparse matrix representation of graphs
SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:science/py-scipy@${PY_FLAVOR} \
			${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:science/py-scikit-sparse@${PY_FLAVOR}

YAML_DESC=		Reading and writing YAML files
MPL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:math/py-matplotlib@${PY_FLAVOR}

GRAPHVIZ_DESC=	Additional graph layout and rendering algorithms
GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz@${PY_FLAVOR}

YAML_DESC=	Reading and writing YAML files
YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}

PORTEXAMPLES=	*

post-install:
	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}

Lines 1-3 Link Here

(-)py-networkx1/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1534738249	1	TIMESTAMP = 1539454780
2	SHA256 (networkx-2.1.zip) = 64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1	2	SHA256 (networkx-1.11.tar.gz) = 0d0e70e10dfb47601cbb3425a00e03e2a2e97477be6f80638fef91d54dd1e4b8
3	SIZE (networkx-2.1.zip) = 1612593	3	SIZE (networkx-1.11.tar.gz) = 1315737




--- setup.py.orig	2015-12-26 17:06:48 UTC
+++ setup.py
@@ -59,27 +59,6 @@ packages=["networkx",
           "networkx.testing",
           "networkx.utils"]
 
-docdirbase  = 'share/doc/networkx-%s' % version
-# add basic documentation
-data = [(docdirbase, glob("*.txt"))]
-# add examples

-          '3d_drawing',
-          'drawing',
-          'graph',
-          'multigraph',
-          'jit',
-          'pygraphviz',
-          'readwrite']:
-    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'],
@@ -131,7 +110,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,
         test_suite       = 'nose.collector',

Lines 18-21 Link Here

(-)py-networkx1/pkg-descr (+2 lines)
18	* Multi-platform	18	* Multi-platform
19	* Allows easy access to almost any database	19	* Allows easy access to almost any database
20		20
		21	Note: This is a backported version of the 1.x branch.
		22
21	WWW: https://networkx.github.io/	23	WWW: https://networkx.github.io/

Return to bug 232240

Lines 1-10 Link Here

(-)py-networkx/files/patch-setup.py (-23 / +22 lines)
1	--- setup.py.orig 2018-08-20 04:50:16 UTC	1	--- setup.py.orig 2015-11-15 23:06:39 UTC
2	+++ setup.py	2	+++ setup.py
3	@@ -57,28 +57,6 @@ packages = ["networkx",	3	@@ -59,27 +59,6 @@ packages=["networkx",
4	"networkx.testing",	4	"networkx.testing",
5	"networkx.utils"]	5	"networkx.utils"]
6		6
7	-docdirbase = 'share/doc/networkx-%s' % version	7	-docdirbase = 'share/doc/networkx-%s' % version
8	-# add basic documentation	8	-# add basic documentation
9	-data = [(docdirbase, glob("*.txt"))]	9	-data = [(docdirbase, glob("*.txt"))]
10	-# add examples	10	-# add examples
Lines 14-39 Link Here
14	- '3d_drawing',	14	- '3d_drawing',
15	- 'drawing',	15	- 'drawing',
16	- 'graph',	16	- 'graph',
17	- 'javascript',	17	- 'multigraph',
18	- 'jit',
19	- 'pygraphviz',	18	- 'pygraphviz',
20	- 'subclass']:	19	- 'readwrite']:
21	- dd = os.path.join(docdirbase, 'examples', d)	20	- dd = os.path.join(docdirbase,'examples', d)
22	- pp = os.path.join('examples', d)	21	- pp = os.path.join('examples', d)
23	- data.append((dd, glob(os.path.join(pp, "*.py"))))	22	- data.append((dd, glob(os.path.join(pp ,"*.py"))))
24	- data.append((dd, glob(os.path.join(pp, "*.bz2"))))	23	- data.append((dd, glob(os.path.join(pp ,"*.bz2"))))
25	- data.append((dd, glob(os.path.join(pp, "*.gz"))))	24	- data.append((dd, glob(os.path.join(pp ,"*.gz"))))
26	- data.append((dd, glob(os.path.join(pp, "*.mbox"))))	25	- data.append((dd, glob(os.path.join(pp ,"*.mbox"))))
27	- data.append((dd, glob(os.path.join(pp, "*.edgelist"))))	26	- data.append((dd, glob(os.path.join(pp ,"*.edgelist"))))
28	-	27	-
29	# add the tests	28	# add the tests
30	package_data = {	29	package_data = {
31	'networkx': ['tests/*.py'],	30	'networkx': ['tests/*.py'],
32	@@ -130,7 +108,6 @@ if __name__ == "__main__":	31	@@ -131,7 +110,6 @@ if __name__ == "__main__":
33	download_url=release.download_url,	32	download_url = release.download_url,
34	classifiers=release.classifiers,	33	classifiers = release.classifiers,
35	packages=packages,	34	packages = packages,
36	- data_files=data,	35	- data_files = data,
37	package_data=package_data,	36	package_data = package_data,
38	install_requires=install_requires,	37	install_requires = install_requires,
39	extras_require=extras_require,	38	test_suite = 'nose.collector',

Lines 2-54 Link Here

(-)py-networkx1/Makefile (-25 / +26 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= networkx	4	PORTNAME= networkx
5	DISTVERSION= 2.1	5	PORTVERSION= 1.11
6	PORTREVISION= 1
7	CATEGORIES= math python	6	CATEGORIES= math python
8	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= http://networkx.lanl.gov/download/networkx/ \
		8	CHEESESHOP
9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
		10	PKGNAMESUFFIX= 1
10		11
11	MAINTAINER= dikshie@sfc.wide.ad.jp	12	MAINTAINER= freebsd_ports@k-worx.org
12	COMMENT= Tools for complex networks	13	COMMENT= Tools for complex networks / Backported version
13		14
14	LICENSE= BSD3CLAUSE	15	LICENSE= BSD3CLAUSE
15		16
16	RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}decorator>=4.1.0:devel/py-decorator@${PY_FLAVOR}	17	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${PY_FLAVOR}
17		18
18	# ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx@${PY_FLAVOR} \	19	USES= python shebangfix
19	# ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${PY_FLAVOR}	20	USE_PYTHON= autoplist concurrent distutils
20		21
21	USES= python shebangfix zip
22	USE_PYTHON= autoplist concurrent distutils
23	SHEBANG_GLOB= *.py
24	NO_ARCH= yes	22	NO_ARCH= yes
		23	PORTSCOUT= limit:^5\.
		24	PORTEXAMPLES= *
		25	SHEBANG_FILES= examples/graph/atlas.py \
		26	examples/multigraph/chess_masters.py \
		27	networkx/generators/tests/test_random_graphs.py
25		28
26	PLIST_SUB+= PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER}	29	CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}py-networkx
27		30
28	OPTIONS_DEFINE= EXAMPLES YAML	31	OPTIONS_DEFINE= EXAMPLES YAML
29	OPTIONS_GROUP= MATRIX RENDER	32	OPTIONS_GROUP= MATRIX RENDER
30	OPTIONS_GROUP_MATRIX= NUMPY SCIPY	33	OPTIONS_GROUP_MATRIX= NUMPY SCIPY
31	OPTIONS_GROUP_RENDER= MPL GRAPHVIZ	34	OPTIONS_GROUP_RENDER= GRAPHVIZ MPL
32	OPTIONS_DEFAULT= NUMPY SCIPY MPL GRAPHVIZ YAML	35	OPTIONS_DEFAULT= GRAPHVIZ MPL NUMPY SCIPY YAML
33		36
34	NUMPY_DESC= Matrix representation of graphs	37	GRAPHVIZ_DESC= Additional graph layout and rendering algorithms
		38	GRAPHVIZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz@${PY_FLAVOR}
		39
		40	MPL_DESC= Flexible graph rendering
		41	MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:math/py-matplotlib@${PY_FLAVOR}
		42
		43	NUMPY_DESC= Matrix representation of graphs
35	NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy@${PY_FLAVOR}	44	NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy@${PY_FLAVOR}
36		45
37	SCIPY_DESC= Sparse matrix representation of graphs	46	SCIPY_DESC= Sparse matrix representation of graphs
38	SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:science/py-scipy@${PY_FLAVOR} \	47	SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:science/py-scipy@${PY_FLAVOR} \
39	${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:science/py-scikit-sparse@${PY_FLAVOR}	48	${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:science/py-scikit-sparse@${PY_FLAVOR}
40		49
41	MPL_DESC= Flexible graph rendering	50	YAML_DESC= Reading and writing YAML files
42	MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:math/py-matplotlib@${PY_FLAVOR}
43
44	GRAPHVIZ_DESC= Additional graph layout and rendering algorithms
45	GRAPHVIZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz@${PY_FLAVOR}
46
47	YAML_DESC= Reading and writing YAML files
48	YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}	51	YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
49		52
50	PORTEXAMPLES= *
51
52	post-install:	53	post-install:
53	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	54	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
54	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}	55	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}

Lines 1-10 Link Here

(-)py-networkx1/files/patch-setup.py (-23 / +22 lines)
1	--- setup.py.orig 2018-08-20 04:50:16 UTC	1	--- setup.py.orig 2015-12-26 17:06:48 UTC
2	+++ setup.py	2	+++ setup.py
3	@@ -57,28 +57,6 @@ packages = ["networkx",	3	@@ -59,27 +59,6 @@ packages=["networkx",
4	"networkx.testing",	4	"networkx.testing",
5	"networkx.utils"]	5	"networkx.utils"]
6		6
7	-docdirbase = 'share/doc/networkx-%s' % version	7	-docdirbase = 'share/doc/networkx-%s' % version
8	-# add basic documentation	8	-# add basic documentation
9	-data = [(docdirbase, glob("*.txt"))]	9	-data = [(docdirbase, glob("*.txt"))]
10	-# add examples	10	-# add examples
Lines 14-39 Link Here
14	- '3d_drawing',	14	- '3d_drawing',
15	- 'drawing',	15	- 'drawing',
16	- 'graph',	16	- 'graph',
17	- 'javascript',	17	- 'multigraph',
18	- 'jit',
19	- 'pygraphviz',	18	- 'pygraphviz',
20	- 'subclass']:	19	- 'readwrite']:
21	- dd = os.path.join(docdirbase, 'examples', d)	20	- dd = os.path.join(docdirbase,'examples', d)
22	- pp = os.path.join('examples', d)	21	- pp = os.path.join('examples', d)
23	- data.append((dd, glob(os.path.join(pp, "*.py"))))	22	- data.append((dd, glob(os.path.join(pp ,"*.py"))))
24	- data.append((dd, glob(os.path.join(pp, "*.bz2"))))	23	- data.append((dd, glob(os.path.join(pp ,"*.bz2"))))
25	- data.append((dd, glob(os.path.join(pp, "*.gz"))))	24	- data.append((dd, glob(os.path.join(pp ,"*.gz"))))
26	- data.append((dd, glob(os.path.join(pp, "*.mbox"))))	25	- data.append((dd, glob(os.path.join(pp ,"*.mbox"))))
27	- data.append((dd, glob(os.path.join(pp, "*.edgelist"))))	26	- data.append((dd, glob(os.path.join(pp ,"*.edgelist"))))
28	-	27	-
29	# add the tests	28	# add the tests
30	package_data = {	29	package_data = {
31	'networkx': ['tests/*.py'],	30	'networkx': ['tests/*.py'],
32	@@ -130,7 +108,6 @@ if __name__ == "__main__":	31	@@ -131,7 +110,6 @@ if __name__ == "__main__":
33	download_url=release.download_url,	32	download_url = release.download_url,
34	classifiers=release.classifiers,	33	classifiers = release.classifiers,
35	packages=packages,	34	packages = packages,
36	- data_files=data,	35	- data_files = data,
37	package_data=package_data,	36	package_data = package_data,
38	install_requires=install_requires,	37	install_requires = install_requires,
39	extras_require=extras_require,	38	test_suite = 'nose.collector',