CVS commit: pkgsrc/math

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jul 15 07:24:06 UTC 2016

Modified Files:
        pkgsrc/math/py-pandas: Makefile
        pkgsrc/math/py-pytables: Makefile

Log Message:
Do not include py-numexpr/bl3.mk, just DEPEND on it.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/math/py-pandas/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/math/py-pytables/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/py-pandas/Makefile
diff -u pkgsrc/math/py-pandas/Makefile:1.10 pkgsrc/math/py-pandas/Makefile:1.11
--- pkgsrc/math/py-pandas/Makefile:1.10 Wed Jun  8 17:43:35 2016
+++ pkgsrc/math/py-pandas/Makefile      Fri Jul 15 07:24:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/06/08 17:43:35 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2016/07/15 07:24:06 wiz Exp $
 
 DISTNAME=      pandas-0.17.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,6 +10,7 @@ HOMEPAGE=     http://pandas.pydata.org/
 COMMENT=       Python Data Analysis Library
 LICENSE=       modified-bsd
 
+DEPENDS+=      ${PYPKGPREFIX}-numexpr-[0-9]*:../../math/py-numexpr
 DEPENDS+=      ${PYPKGPREFIX}-pytz>=1.5:../../time/py-pytz
 DEPENDS+=      ${PYPKGPREFIX}-scipy>=0.7:../../math/py-scipy
 DEPENDS+=      ${PYPKGPREFIX}-pytables>=2.2:../../math/py-pytables
@@ -28,6 +29,5 @@ USE_LANGUAGES=        c c++
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-.include "../../math/py-numexpr/buildlink3.mk"
 .include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/py-pytables/Makefile
diff -u pkgsrc/math/py-pytables/Makefile:1.31 pkgsrc/math/py-pytables/Makefile:1.32
--- pkgsrc/math/py-pytables/Makefile:1.31       Sat Sep 20 17:56:36 2014
+++ pkgsrc/math/py-pytables/Makefile    Fri Jul 15 07:24:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2014/09/20 17:56:36 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2016/07/15 07:24:06 wiz Exp $
 
 DISTNAME=              tables-3.1.1
 PKGNAME=               ${PYPKGPREFIX}-py${DISTNAME}
@@ -14,6 +14,8 @@ PYSETUPBUILDARGS+=    --hdf5=${BUILDLINK_PR
 PYSETUPINSTALLARGS=    ${PYSETUPBUILDARGS}
 PLIST_SUBST+=          PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
+DEPENDS+=              ${PYPKGPREFIX}-numexpr>=2.0:../../math/py-numexpr
+
 USE_LANGUAGES=         c c++
 
 .include "options.mk"
@@ -34,6 +36,4 @@ do-test:
 .include "../../math/py-numpy/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pycython+=       ${PYPKGPREFIX}-cython>=0.13
 .include "../../devel/py-cython/buildlink3.mk"
-BUILDLINK_API_DEPENDS.pynumexpr+=      ${PYPKGPREFIX}-numexpr>=2.0
-.include "../../math/py-numexpr/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"