From owner-svn-ports-all@freebsd.org Tue Jul 10 08:11:33 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A09B102EAF3; Tue, 10 Jul 2018 08:11:33 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DDAB8887D1; Tue, 10 Jul 2018 08:11:32 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A1BC921649; Tue, 10 Jul 2018 08:11:32 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6A8BWuo003080; Tue, 10 Jul 2018 08:11:32 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6A8BWZi003077; Tue, 10 Jul 2018 08:11:32 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201807100811.w6A8BWZi003077@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Tue, 10 Jul 2018 08:11:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474337 - in head/devel/py-qutip: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/devel/py-qutip: . files X-SVN-Commit-Revision: 474337 X-SVN-Commit-Repository: ports 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.27 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: Tue, 10 Jul 2018 08:11:33 -0000 Author: yuri Date: Tue Jul 10 08:11:31 2018 New Revision: 474337 URL: https://svnweb.freebsd.org/changeset/ports/474337 Log: devel/py-qutip: Add the FreeBSD compatibility patch; Add py-mayavi dependency Also update LICENSE Added: head/devel/py-qutip/files/ head/devel/py-qutip/files/patch-qutip_hardware__info.py (contents, props changed) Modified: head/devel/py-qutip/Makefile Modified: head/devel/py-qutip/Makefile ============================================================================== --- head/devel/py-qutip/Makefile Tue Jul 10 06:22:12 2018 (r474336) +++ head/devel/py-qutip/Makefile Tue Jul 10 08:11:31 2018 (r474337) @@ -2,6 +2,7 @@ PORTNAME= qutip DISTVERSION= 4.2.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -9,12 +10,13 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Quantum toolbox in python -LICENSE= BSD2CLAUSE +LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.15:science/py-scipy@${PY_FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.0:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mayavi>0:graphics/py-mayavi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.15:science/py-scipy@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} Added: head/devel/py-qutip/files/patch-qutip_hardware__info.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-qutip/files/patch-qutip_hardware__info.py Tue Jul 10 08:11:31 2018 (r474337) @@ -0,0 +1,28 @@ +Same as https://github.com/qutip/qutip/pull/895, but the PR patch doesn't merge with this version + +--- qutip/hardware_info.py.orig 2016-12-06 23:45:34 UTC ++++ qutip/hardware_info.py +@@ -80,6 +80,14 @@ def _linux_hardware_info(): + results.update({'os': 'Linux'}) + return results + ++def _freebsd_hardware_info(): ++ results = {} ++ results.update({'cpus': int(os.popen('sysctl -n hw.ncpu').readlines()[0])}) ++ results.update({'cpu_freq': int(os.popen('sysctl -n dev.cpu.0.freq').readlines()[0])}) ++ results.update({'memsize': int(os.popen('sysctl -n hw.realmem').readlines()[0]) / 1024}) ++ # add OS information ++ results.update({'os': 'FreeBSD'}) ++ return results + + def _win_hardware_info(): + try: +@@ -114,6 +122,8 @@ def hardware_info(): + out = _win_hardware_info() + elif sys.platform in ['linux', 'linux2']: + out = _linux_hardware_info() ++ elif sys.platform.startswith('freebsd'): ++ out = _freebsd_hardware_info() + else: + out = {} + except: