Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Jan 2015 15:21:52 +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: r377743 - in head: astro/astrometry graphics/mypaint math/rpy math/rpy2 science/py-hcluster science/py-mlpy science/pycdf
Message-ID:  <201501231521.t0NFLqPR031048@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Fri Jan 23 15:21:52 2015
New Revision: 377743
URL: https://svnweb.freebsd.org/changeset/ports/377743
QAT: https://qat.redports.org/buildarchive/r377743/

Log:
  Canonicalize some dependencies on numpy

Modified:
  head/astro/astrometry/Makefile
  head/graphics/mypaint/Makefile
  head/math/rpy/Makefile
  head/math/rpy2/Makefile
  head/science/py-hcluster/Makefile
  head/science/py-mlpy/Makefile
  head/science/pycdf/Makefile

Modified: head/astro/astrometry/Makefile
==============================================================================
--- head/astro/astrometry/Makefile	Fri Jan 23 15:04:24 2015	(r377742)
+++ head/astro/astrometry/Makefile	Fri Jan 23 15:21:52 2015	(r377743)
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}.net-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Describes an astronomical image
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy
+BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
 		libcfitsio.so:${PORTSDIR}/astro/cfitsio \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \

Modified: head/graphics/mypaint/Makefile
==============================================================================
--- head/graphics/mypaint/Makefile	Fri Jan 23 15:04:24 2015	(r377742)
+++ head/graphics/mypaint/Makefile	Fri Jan 23 15:21:52 2015	(r377743)
@@ -11,8 +11,8 @@ MASTER_SITES=	http://download.gna.org/my
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast painting/scribbling program
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
-		${PYTHON_SITELIBDIR}/cairo:${PORTSDIR}/graphics/py-cairo \
+RUN_DEPENDS=	${PYNUMPY} \
+		${PYTHON_PKGNAMEPREFIX}cairo>0:${PORTSDIR}/graphics/py-cairo \
 		${PYTHON_PKGNAMEPREFIX}protobuf>0:${PORTSDIR}/devel/py-protobuf
 LIB_DEPENDS=	libjson-c.so:${PORTSDIR}/devel/json-c \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2

Modified: head/math/rpy/Makefile
==============================================================================
--- head/math/rpy/Makefile	Fri Jan 23 15:04:24 2015	(r377742)
+++ head/math/rpy/Makefile	Fri Jan 23 15:21:52 2015	(r377743)
@@ -13,9 +13,9 @@ COMMENT=	Python interface to the R Progr
 LICENSE=	GPLv2 LGPL21 MPL
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
+BUILD_DEPENDS=	${PYNUMPY} \
 		R:${PORTSDIR}/math/R
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
+RUN_DEPENDS=	${PYNUMPY} \
 		R:${PORTSDIR}/math/R
 
 USES=		python

Modified: head/math/rpy2/Makefile
==============================================================================
--- head/math/rpy2/Makefile	Fri Jan 23 15:04:24 2015	(r377742)
+++ head/math/rpy2/Makefile	Fri Jan 23 15:21:52 2015	(r377743)
@@ -12,9 +12,9 @@ COMMENT=	Python interface to the R Progr
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
+BUILD_DEPENDS=	${PYNUMPY} \
 		R:${PORTSDIR}/math/R
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
+RUN_DEPENDS=	${PYNUMPY} \
 		R:${PORTSDIR}/math/R
 
 USES=		python readline

Modified: head/science/py-hcluster/Makefile
==============================================================================
--- head/science/py-hcluster/Makefile	Fri Jan 23 15:04:24 2015	(r377742)
+++ head/science/py-hcluster/Makefile	Fri Jan 23 15:21:52 2015	(r377743)
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	Hierarchical Clustering Package For Scipy
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
+BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 

Modified: head/science/py-mlpy/Makefile
==============================================================================
--- head/science/py-mlpy/Makefile	Fri Jan 23 15:04:24 2015	(r377742)
+++ head/science/py-mlpy/Makefile	Fri Jan 23 15:21:52 2015	(r377743)
@@ -13,7 +13,7 @@ COMMENT=	High performance Python package
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
+BUILD_DEPENDS=	${PYNUMPY} \
 		cython>0:${PORTSDIR}/lang/cython
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl

Modified: head/science/pycdf/Makefile
==============================================================================
--- head/science/pycdf/Makefile	Fri Jan 23 15:04:24 2015	(r377742)
+++ head/science/pycdf/Makefile	Fri Jan 23 15:21:52 2015	(r377743)
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-0.6-3b
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python Interface to the Unidata NetCDF Library
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy
+BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 



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