Fri Jul 15 07:24:06 2016 UTC ()
Do not include py-numexpr/bl3.mk, just DEPEND on it.


(wiz)
diff -r1.10 -r1.11 pkgsrc/math/py-pandas/Makefile
diff -r1.31 -r1.32 pkgsrc/math/py-pytables/Makefile
cvs diff -r1.10 -r1.11 pkgsrc/math/py-pandas/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-pandas/Makefile 2016/06/08 17:43:35 1.10
+++ pkgsrc/math/py-pandas/Makefile 2016/07/15 07:24:06 1.11
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: Makefile,v 1.10 2016/06/08 17:43:35 wiz Exp $ 1# $NetBSD: Makefile,v 1.11 2016/07/15 07:24:06 wiz Exp $
2 2
3DISTNAME= pandas-0.17.1 3DISTNAME= pandas-0.17.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= math graphics python 5CATEGORIES= math graphics python
6MASTER_SITES= ${MASTER_SITE_PYPI:=p/pandas/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=p/pandas/}
7 7
8MAINTAINER= bad@NetBSD.org 8MAINTAINER= bad@NetBSD.org
9HOMEPAGE= http://pandas.pydata.org/ 9HOMEPAGE= http://pandas.pydata.org/
10COMMENT= Python Data Analysis Library 10COMMENT= Python Data Analysis Library
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
 13DEPENDS+= ${PYPKGPREFIX}-numexpr-[0-9]*:../../math/py-numexpr
13DEPENDS+= ${PYPKGPREFIX}-pytz>=1.5:../../time/py-pytz 14DEPENDS+= ${PYPKGPREFIX}-pytz>=1.5:../../time/py-pytz
14DEPENDS+= ${PYPKGPREFIX}-scipy>=0.7:../../math/py-scipy 15DEPENDS+= ${PYPKGPREFIX}-scipy>=0.7:../../math/py-scipy
15DEPENDS+= ${PYPKGPREFIX}-pytables>=2.2:../../math/py-pytables 16DEPENDS+= ${PYPKGPREFIX}-pytables>=2.2:../../math/py-pytables
16BUILDLINK_API_DEPENDS.pynumpy+= ${PYPKGPREFIX}-numpy>=1.7.0 17BUILDLINK_API_DEPENDS.pynumpy+= ${PYPKGPREFIX}-numpy>=1.7.0
17 18
18PYTHON_VERSIONED_DEPENDENCIES= dateutil 19PYTHON_VERSIONED_DEPENDENCIES= dateutil
19 20
20PYDISTUTILSPKG= yes 21PYDISTUTILSPKG= yes
21PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} 22PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
22USE_LANGUAGES= c c++ 23USE_LANGUAGES= c c++
23 24
24# XXX Avoid picking up other compilers when installed 25# XXX Avoid picking up other compilers when installed
25.include "../../mk/compiler.mk" 26.include "../../mk/compiler.mk"
26 27
27# XXX want py-bottleneck 28# XXX want py-bottleneck
28.include "../../lang/python/egg.mk" 29.include "../../lang/python/egg.mk"
29.include "../../lang/python/versioned_dependencies.mk" 30.include "../../lang/python/versioned_dependencies.mk"
30.include "../../math/py-numpy/buildlink3.mk" 31.include "../../math/py-numpy/buildlink3.mk"
31.include "../../math/py-numexpr/buildlink3.mk" 
32.include "../../graphics/py-matplotlib/buildlink3.mk" 32.include "../../graphics/py-matplotlib/buildlink3.mk"
33.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.31 -r1.32 pkgsrc/math/py-pytables/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-pytables/Attic/Makefile 2014/09/20 17:56:36 1.31
+++ pkgsrc/math/py-pytables/Attic/Makefile 2016/07/15 07:24:06 1.32
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1# $NetBSD: Makefile,v 1.31 2014/09/20 17:56:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.32 2016/07/15 07:24:06 wiz Exp $
2 2
3DISTNAME= tables-3.1.1 3DISTNAME= tables-3.1.1
4PKGNAME= ${PYPKGPREFIX}-py${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-py${DISTNAME}
5CATEGORIES= math python 5CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pytables/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pytables/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.pytables.org/ 9HOMEPAGE= http://www.pytables.org/
10COMMENT= Database package for large amounts of data 10COMMENT= Database package for large amounts of data
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13PYSETUPBUILDARGS+= --hdf5=${BUILDLINK_PREFIX.hdf5} 13PYSETUPBUILDARGS+= --hdf5=${BUILDLINK_PREFIX.hdf5}
14PYSETUPINSTALLARGS= ${PYSETUPBUILDARGS} 14PYSETUPINSTALLARGS= ${PYSETUPBUILDARGS}
15PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} 15PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
16 16
 17DEPENDS+= ${PYPKGPREFIX}-numexpr>=2.0:../../math/py-numexpr
 18
17USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
18 20
19.include "options.mk" 21.include "options.mk"
20 22
21post-install: 23post-install:
22 cd ${DESTDIR}${PREFIX}/bin && \ 24 cd ${DESTDIR}${PREFIX}/bin && \
23 mv pt2to3 pt2to3${PYVERSSUFFIX} && \ 25 mv pt2to3 pt2to3${PYVERSSUFFIX} && \
24 mv ptdump ptdump${PYVERSSUFFIX} && \ 26 mv ptdump ptdump${PYVERSSUFFIX} && \
25 mv ptrepack ptrepack${PYVERSSUFFIX} 27 mv ptrepack ptrepack${PYVERSSUFFIX}
26 28
27do-test: 29do-test:
28 (cd ${WRKSRC}/tables/tests && ${PYTHONBIN} test_all.py) 30 (cd ${WRKSRC}/tables/tests && ${PYTHONBIN} test_all.py)
29 31
30.include "../../lang/python/distutils.mk" 32.include "../../lang/python/distutils.mk"
31.include "../../devel/hdf5/buildlink3.mk" 33.include "../../devel/hdf5/buildlink3.mk"
32.include "../../devel/zlib/buildlink3.mk" 34.include "../../devel/zlib/buildlink3.mk"
33.include "../../archivers/bzip2/buildlink3.mk" 35.include "../../archivers/bzip2/buildlink3.mk"
34.include "../../math/py-numpy/buildlink3.mk" 36.include "../../math/py-numpy/buildlink3.mk"
35BUILDLINK_API_DEPENDS.pycython+= ${PYPKGPREFIX}-cython>=0.13 37BUILDLINK_API_DEPENDS.pycython+= ${PYPKGPREFIX}-cython>=0.13
36.include "../../devel/py-cython/buildlink3.mk" 38.include "../../devel/py-cython/buildlink3.mk"
37BUILDLINK_API_DEPENDS.pynumexpr+= ${PYPKGPREFIX}-numexpr>=2.0 
38.include "../../math/py-numexpr/buildlink3.mk" 
39.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"