Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Jul 2015 10:44:36 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r392870 - head/math/py-networkx
Message-ID:  <201507251044.t6PAiaYA076134@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Sat Jul 25 10:44:35 2015
New Revision: 392870
URL: https://svnweb.freebsd.org/changeset/ports/392870

Log:
  Allow for many run dependencies to be OPTIONs,
  as by upstream suggestion
  
  PR:		201349
  Submitted by:	john@saltant.com
  Approved by:	maintainer timeout

Modified:
  head/math/py-networkx/Makefile
  head/math/py-networkx/pkg-descr

Modified: head/math/py-networkx/Makefile
==============================================================================
--- head/math/py-networkx/Makefile	Sat Jul 25 10:39:43 2015	(r392869)
+++ head/math/py-networkx/Makefile	Sat Jul 25 10:44:35 2015	(r392870)
@@ -3,6 +3,7 @@
 
 PORTNAME=	networkx
 PORTVERSION=	1.9.1
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	http://networkx.lanl.gov/download/networkx/ \
 		CHEESESHOP
@@ -13,14 +14,10 @@ COMMENT=	Tools for complex networks
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}graphviz>=1.2:${PORTSDIR}/graphics/py-graphviz \
-		${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:${PORTSDIR}/devel/py-decorator \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:${PORTSDIR}/math/py-matplotlib \
-		${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2:${PORTSDIR}/math/py-numpy \
-		${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:${PORTSDIR}/science/py-scipy \
-		${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:${PORTSDIR}/science/py-scikit-sparse \
-		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:${PORTSDIR}/textproc/py-sphinx \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0.12:${PORTSDIR}/textproc/py-docutils
+RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:${PORTSDIR}/devel/py-decorator
+
+#		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:${PORTSDIR}/textproc/py-sphinx \
+#		${PYTHON_PKGNAMEPREFIX}docutils>=0.12:${PORTSDIR}/textproc/py-docutils
 
 USES=		python shebangfix
 USE_PYTHON=	distutils autoplist
@@ -28,6 +25,24 @@ USE_PYTHON=	distutils autoplist
 PLIST_SUB+=	PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER}
 
 OPTIONS_DEFINE=	EXAMPLES
+OPTIONS_GROUP=	MATRIX RENDER
+OPTIONS_GROUP_MATRIX=	NUMPY SCIPY
+OPTIONS_GROUP_RENDER=	MPL GRAPHVIZ
+OPTIONS_DEFAULT=	NUMPY SCIPY MPL GRAPHVIZ
+
+NUMPY_DESC=	Support matrix representation of graphs
+NUMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2:${PORTSDIR}/math/py-numpy
+
+SCIPY_DESC=	Support sparse matrix representation of graphs
+SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:${PORTSDIR}/science/py-scipy \
+			${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:${PORTSDIR}/science/py-scikit-sparse
+
+MPL_DESC=	Support flexible graph rendering
+MPL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:${PORTSDIR}/math/py-matplotlib
+
+GRAPHVIZ_DESC=	Support additional graph layout and rendering algorithms
+GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graphviz>=1.2:${PORTSDIR}/graphics/py-graphviz
+
 EXAMPLESDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 PORTEXAMPLES=	*
 

Modified: head/math/py-networkx/pkg-descr
==============================================================================
--- head/math/py-networkx/pkg-descr	Sat Jul 25 10:39:43 2015	(r392869)
+++ head/math/py-networkx/pkg-descr	Sat Jul 25 10:44:35 2015	(r392870)
@@ -18,4 +18,4 @@ Additional benefits due to Python:
 * Multi-platform
 * Allows easy access to almost any database
 
-WWW: http://networkx.lanl.gov 
+WWW: https://networkx.github.io/



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