CVS commit: pkgsrc/math/py-pytables

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Mar 29 18:08:27 UTC 2018

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

Log Message:
py-pytables: fixed building

PYSETUPINSTALLARGS must not use PYSETUPBUILDARGS
It's an egg package
Depend on blosc.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/math/py-pytables/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/math/py-pytables/PLIST

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-pytables/Makefile
diff -u pkgsrc/math/py-pytables/Makefile:1.36 pkgsrc/math/py-pytables/Makefile:1.37
--- pkgsrc/math/py-pytables/Makefile:1.36       Sun May 21 07:52:55 2017
+++ pkgsrc/math/py-pytables/Makefile    Thu Mar 29 18:08:27 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2017/05/21 07:52:55 adam Exp $
+# $NetBSD: Makefile,v 1.37 2018/03/29 18:08:27 adam Exp $
 
 DISTNAME=      tables-3.4.2
 PKGNAME=       ${PYPKGPREFIX}-py${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=t/tables/}
 
@@ -10,10 +11,10 @@ HOMEPAGE=   http://www.pytables.org/
 COMMENT=       Database package for large amounts of data
 LICENSE=       modified-bsd
 
+PYSETUPBUILDARGS+=     --blosc=${BUILDLINK_PREFIX.blosc}
 PYSETUPBUILDARGS+=     --bzip2=${BUILDLINK_PREFIX.bzip2}
 PYSETUPBUILDARGS+=     --hdf5=${BUILDLINK_PREFIX.hdf5}
 PYSETUPBUILDARGS+=     --lzo=${BUILDLINK_PREFIX.lzo}
-PYSETUPINSTALLARGS=    ${PYSETUPBUILDARGS}
 
 DEPENDS+=      ${PYPKGPREFIX}-cython-[0-9]*:../../devel/py-cython
 DEPENDS+=      ${PYPKGPREFIX}-numexpr>=2.0:../../math/py-numexpr
@@ -28,12 +29,13 @@ post-install:
                mv pttree pttree${PYVERSSUFFIX}
 
 do-test:
-       (cd ${WRKSRC}/tables/tests && ${PYTHONBIN} test_all.py)
+       cd ${WRKSRC}/tables/tests && ${PYTHONBIN} test_all.py
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/lzo/buildlink3.mk"
+.include "../../devel/blosc/buildlink3.mk"
 .include "../../devel/hdf5/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/py-pytables/PLIST
diff -u pkgsrc/math/py-pytables/PLIST:1.15 pkgsrc/math/py-pytables/PLIST:1.16
--- pkgsrc/math/py-pytables/PLIST:1.15  Sun May 21 07:52:55 2017
+++ pkgsrc/math/py-pytables/PLIST       Thu Mar 29 18:08:27 2018
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.15 2017/05/21 07:52:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2018/03/29 18:08:27 adam Exp $
 bin/pt2to3${PYVERSSUFFIX}
 bin/ptdump${PYVERSSUFFIX}
 bin/ptrepack${PYVERSSUFFIX}
 bin/pttree${PYVERSSUFFIX}
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/entry_points.txt
-${PYSITELIB}/${EGG_FILE}/not-zip-safe
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/tables/__init__.py
 ${PYSITELIB}/tables/__init__.pyc
 ${PYSITELIB}/tables/__init__.pyo