From owner-svn-ports-all@FreeBSD.ORG Wed Oct 1 14:41:54 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 33C3B2A6; Wed, 1 Oct 2014 14:41:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 14BA692; Wed, 1 Oct 2014 14:41:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s91Efrcs026048; Wed, 1 Oct 2014 14:41:53 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s91Efri9026045; Wed, 1 Oct 2014 14:41:53 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201410011441.s91Efri9026045@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Wed, 1 Oct 2014 14:41:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369728 - in head/devel/py-tables: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Oct 2014 14:41:54 -0000 Author: wen Date: Wed Oct 1 14:41:52 2014 New Revision: 369728 URL: https://svnweb.freebsd.org/changeset/ports/369728 QAT: https://qat.redports.org/buildarchive/r369728/ Log: - Update to 3.1.1 - Fix build with cython-0.21 Modified: head/devel/py-tables/Makefile head/devel/py-tables/distinfo head/devel/py-tables/files/patch-setup.py Modified: head/devel/py-tables/Makefile ============================================================================== --- head/devel/py-tables/Makefile Wed Oct 1 13:58:11 2014 (r369727) +++ head/devel/py-tables/Makefile Wed Oct 1 14:41:52 2014 (r369728) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tables -PORTVERSION= 3.0.0 -PORTREVISION= 4 +PORTVERSION= 3.1.1 CATEGORIES= devel python MASTER_SITES= SF/py${PORTNAME:tl}/py${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -23,8 +22,8 @@ LIB_DEPENDS= libhdf5.so:${PORTSDIR}/scie libucl.so:${PORTSDIR}/archivers/ucl RUN_DEPENDS:= ${BUILD_DEPENDS} -USE_PYTHON= yes -USE_PYDISTUTILS= yes +USES= python +USE_PYTHON= distutils PLIST_FILES= bin/pt2to3 bin/ptdump bin/ptrepack Modified: head/devel/py-tables/distinfo ============================================================================== --- head/devel/py-tables/distinfo Wed Oct 1 13:58:11 2014 (r369727) +++ head/devel/py-tables/distinfo Wed Oct 1 14:41:52 2014 (r369728) @@ -1,4 +1,4 @@ -SHA256 (tables-3.0.0.tar.gz) = 53532a59c8f03c3c5ef3c73c04f5bfd8384d6a3d508683cb87fc17af4c71dfe1 -SIZE (tables-3.0.0.tar.gz) = 6191726 -SHA256 (pytablesmanual-3.0.0.pdf) = 623cf4d64884c0c34996ac8d4208dd899450a96ddd64d1267c733da0a59a6ed6 -SIZE (pytablesmanual-3.0.0.pdf) = 2515096 +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 Modified: head/devel/py-tables/files/patch-setup.py ============================================================================== --- head/devel/py-tables/files/patch-setup.py Wed Oct 1 13:58:11 2014 (r369727) +++ head/devel/py-tables/files/patch-setup.py Wed Oct 1 14:41:52 2014 (r369728) @@ -1,29 +1,57 @@ ---- setup.py.orig 2013-08-20 10:38:37.000000000 +0800 -+++ setup.py 2013-08-20 10:40:44.000000000 +0800 -@@ -133,8 +133,8 @@ +--- 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 @@ debug = '--debug' in sys.argv # Global variables -lib_dirs = [] --inc_dirs = ['blosc'] +-inc_dirs = ['c-blosc/hdf5'] +lib_dirs = ['%%LOCALBASE%%/lib'] -+inc_dirs = ['blosc','%%LOCALBASE%%/include'] ++inc_dirs = ['c-blosc/hdf5','%%LOCALBASE%%/include'] optional_libs = [] data_files = [] # list of data files to add to packages (mainly for DLL's) -@@ -160,13 +160,13 @@ - add_from_path("CPATH", default_header_dirs) - add_from_path("C_INCLUDE_PATH", default_header_dirs) - add_from_flags("CPPFLAGS", "-I", default_header_dirs) -- default_header_dirs.extend(['/usr/include', '/usr/local/include']) -+ default_header_dirs.extend(['/usr/include', '/usr/local/include','%%LOCALBASE%%/include']) - - default_library_dirs = [] - add_from_flags("LDFLAGS", "-L", default_library_dirs) - default_library_dirs.extend( - os.path.join(_tree, _arch) -- for _tree in ('/usr/local', '/sw', '/opt', '/opt/local', '/usr', '/') -+ for _tree in ('/usr/local', '/sw', '/opt', '/opt/local', '/usr', '/','%%LOCALBASE%%') - for _arch in ('lib64', 'lib')) - default_runtime_dirs = default_library_dirs +@@ -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)