Index: head/devel/py-tables/Makefile =================================================================== --- head/devel/py-tables/Makefile (revision 391349) +++ head/devel/py-tables/Makefile (revision 391350) @@ -1,69 +1,73 @@ # Created by: ijliao@FreeBSD.org # $FreeBSD$ PORTNAME= tables -PORTVERSION= 3.1.1 -PORTREVISION= 2 +PORTVERSION= 3.2.0 CATEGORIES= devel python MASTER_SITES= SF/py${PORTNAME:tl}/py${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTFILES= tables-${PORTVERSION}.tar.gz pytablesmanual-${PORTVERSION}.pdf EXTRACT_ONLY= tables-${PORTVERSION}.tar.gz MAINTAINER= wen@FreeBSD.org COMMENT= Hierarchical database for Python LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYNUMPY} \ ${LOCALBASE}/bin/cython:${PORTSDIR}/lang/cython \ ${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:${PORTSDIR}/math/py-numexpr LIB_DEPENDS= libhdf5.so:${PORTSDIR}/science/hdf5 \ liblzo2.so:${PORTSDIR}/archivers/lzo2 \ libucl.so:${PORTSDIR}/archivers/ucl RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python -USE_PYTHON= distutils +USES= fortran python +USE_PYTHON= distutils -PLIST_FILES= bin/pt2to3 bin/ptdump bin/ptrepack +PLIST_FILES= bin/pt2to3 bin/ptdump bin/ptrepack bin/pttree -OPTIONS_DEFINE= PYREX DOCS EXAMPLES -PYREX_DESC= Use code generated by Pyrex to build +OPTIONS_DEFINE= PYREX DOCS EXAMPLES +PYREX_DESC= Use code generated by Pyrex to build +PYREX_BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex +OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options - .include -.if ${PORT_OPTIONS:MPYREX} -BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex -.endif - post-patch: @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/setup.py post-install: @${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tables ! -type d | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tables -type d | ${SORT} -r | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/pytablesmanual-${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR} ${ECHO} '${STAGEDIR}${DOCSDIR}/pytablesmanual-${PORTVERSION}.pdf' | ${SED} 's,^${STAGEDIR}${PREFIX}/,,' \ - >> ${TMPPLIST} + >> ${TMPPLIST} ${ECHO} '${STAGEDIR}${DOCSDIR}' | ${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' \ >> ${TMPPLIST} .endif .if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*.py ${STAGEDIR}${EXAMPLESDIR} @${FIND} ${STAGEDIR}${EXAMPLESDIR} ! -type d | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${STAGEDIR}${EXAMPLESDIR} -type d | ${SORT} -r | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} .endif + + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tables/_comp_bzip2.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tables/_comp_lzo.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tables/tableextension.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tables/hdf5extension.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tables/indexesextension.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tables/linkextension.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tables/utilsextension.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tables/lrucacheextension.so .include Index: head/devel/py-tables/distinfo =================================================================== --- head/devel/py-tables/distinfo (revision 391349) +++ head/devel/py-tables/distinfo (revision 391350) @@ -1,4 +1,4 @@ -SHA256 (tables-3.1.1.tar.gz) = 39b9036376f1185599771c19276f13b5b9119d98f9108f58595745ded3fe2da3 -SIZE (tables-3.1.1.tar.gz) = 6715786 -SHA256 (pytablesmanual-3.1.1.pdf) = a21ca95e2386c503d4835686b69543e96c15ea85f305e1243a45de25959774fe -SIZE (pytablesmanual-3.1.1.pdf) = 2527370 +SHA256 (tables-3.2.0.tar.gz) = 60980e44676bfe463cdd2582ecdacc0b0763b259477015e866f8af72b4cdba44 +SIZE (tables-3.2.0.tar.gz) = 7039718 +SHA256 (pytablesmanual-3.2.0.pdf) = d92d8b008c63c2f3566eb9685103b0a6b891d2d353876a0868871dd436dbf69f +SIZE (pytablesmanual-3.2.0.pdf) = 2578022 Index: head/devel/py-tables/files/patch-setup.py =================================================================== --- head/devel/py-tables/files/patch-setup.py (revision 391349) +++ head/devel/py-tables/files/patch-setup.py (revision 391350) @@ -1,57 +1,13 @@ ---- setup.py.orig 2014-03-26 04:49:03.000000000 +0800 -+++ setup.py 2014-10-01 21:25:20.000000000 +0800 -@@ -25,6 +25,7 @@ - from distutils.dep_util import newer - from distutils.util import convert_path - from distutils.ccompiler import new_compiler -+from distutils.version import LooseVersion - - cmdclass = {} - setuptools_kwargs = {} -@@ -122,21 +123,21 @@ - - # Check if Cython is installed or not (requisite) - try: -+ from Cython import __version__ as cython_version - from Cython.Distutils import build_ext -- from Cython.Compiler.Main import Version - cmdclass['build_ext'] = build_ext - except ImportError: - exit_with_error( - "You need %(pkgname)s %(pkgver)s or greater to compile PyTables!" - % {'pkgname': 'Cython', 'pkgver': min_cython_version}) - --if Version.version < min_cython_version: -+if LooseVersion(cython_version) < min_cython_version: - exit_with_error( -- "At least Cython %s is needed so as to generate extensions!" -- % (min_cython_version)) -+ "You need %(pkgname)s %(pkgver)s or greater to run PyTables!" -+ % {'pkgname': 'Cython', 'pkgver': min_cython_version}) - else: - print("* Found %(pkgname)s %(pkgver)s package installed." -- % {'pkgname': 'Cython', 'pkgver': Version.version}) -+ % {'pkgname': 'Cython', 'pkgver': cython_version}) - - VERSION = open('VERSION').read().strip() - -@@ -145,8 +146,8 @@ +--- setup.py.orig 2015-07-05 14:52:30.439427615 +0800 ++++ setup.py 2015-07-05 14:53:35.680492890 +0800 +@@ -127,8 +127,8 @@ debug = '--debug' in sys.argv # Global variables -lib_dirs = [] -inc_dirs = ['c-blosc/hdf5'] +lib_dirs = ['%%LOCALBASE%%/lib'] +inc_dirs = ['c-blosc/hdf5','%%LOCALBASE%%/include'] optional_libs = [] data_files = [] # list of data files to add to packages (mainly for DLL's) -@@ -168,7 +169,7 @@ - dirs.append(flag[len(flag_key):]) - - if os.name == 'posix': -- prefixes = ('/usr/local', '/sw', '/opt', '/opt/local', '/usr', '/') -+ prefixes = ('/usr/local', '/sw', '/opt', '/opt/local', '/usr', '/','%%LOCALBASE%%') - - default_header_dirs = [] - add_from_path("CPATH", default_header_dirs)