From owner-svn-ports-head@freebsd.org Tue Feb 12 06:52:59 2019 Return-Path: Delivered-To: svn-ports-head@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 3879D14D8D83; Tue, 12 Feb 2019 06:52:59 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CB49574A65; Tue, 12 Feb 2019 06:52:58 +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 BAAF1C5F4; Tue, 12 Feb 2019 06:52:58 +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 x1C6qwsP027310; Tue, 12 Feb 2019 06:52:58 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1C6qv8s027303; Tue, 12 Feb 2019 06:52:57 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201902120652.x1C6qv8s027303@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Tue, 12 Feb 2019 06:52:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492761 - in head/science/py-pymol: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/science/py-pymol: . files X-SVN-Commit-Revision: 492761 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CB49574A65 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.995,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Feb 2019 06:52:59 -0000 Author: yuri Date: Tue Feb 12 06:52:57 2019 New Revision: 492761 URL: https://svnweb.freebsd.org/changeset/ports/492761 Log: science/py-pymol: Update 2.2.0 -> 2.3.0 Reported by: portscout Modified: head/science/py-pymol/Makefile head/science/py-pymol/distinfo head/science/py-pymol/files/patch-modules_pymol_Qt_____init____.py head/science/py-pymol/files/patch-setup.py head/science/py-pymol/pkg-plist Modified: head/science/py-pymol/Makefile ============================================================================== --- head/science/py-pymol/Makefile Tue Feb 12 06:50:53 2019 (r492760) +++ head/science/py-pymol/Makefile Tue Feb 12 06:52:57 2019 (r492761) @@ -3,8 +3,7 @@ PORTNAME= pymol DISTVERSIONPREFIX= v -DISTVERSION= 2.2.0 -PORTREVISION= 3 +DISTVERSION= 2.3.0 CATEGORIES= science biology python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,7 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= ${PYNUMPY} \ - ${LOCALBASE}/include/glm/glm.hpp:math/glm + ${LOCALBASE}/include/glm/glm.hpp:math/glm \ + ${LOCALBASE}/include/mmtf.hpp:science/mmtf LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ libmsgpackc.so:devel/msgpack @@ -25,7 +25,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py ${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw@${PY_FLAVOR} \ ${PYNUMPY} -USES= compiler:c++11-lang python:2.7 shebangfix tar:bz2 +USES= compiler:c++11-lang gl gnome python:2.7 shebangfix tar:bz2 USE_GITHUB= yes GH_ACCOUNT= schrodinger GH_PROJECT= ${PORTNAME}-open-source Modified: head/science/py-pymol/distinfo ============================================================================== --- head/science/py-pymol/distinfo Tue Feb 12 06:50:53 2019 (r492760) +++ head/science/py-pymol/distinfo Tue Feb 12 06:52:57 2019 (r492761) @@ -1,3 +1,3 @@ -TIMESTAMP = 1537213207 -SHA256 (schrodinger-pymol-open-source-v2.2.0_GH0.tar.gz) = 58d910103dc494c49c86bc8fd6cd94b1a030647f9d72f69fbd7d7ad25fb11233 -SIZE (schrodinger-pymol-open-source-v2.2.0_GH0.tar.gz) = 10514753 +TIMESTAMP = 1549950556 +SHA256 (schrodinger-pymol-open-source-v2.3.0_GH0.tar.gz) = 62aa21fafd1db805c876f89466e47513809f8198395e1f00a5f5cc40d6f40ed0 +SIZE (schrodinger-pymol-open-source-v2.3.0_GH0.tar.gz) = 10448674 Modified: head/science/py-pymol/files/patch-modules_pymol_Qt_____init____.py ============================================================================== --- head/science/py-pymol/files/patch-modules_pymol_Qt_____init____.py Tue Feb 12 06:50:53 2019 (r492760) +++ head/science/py-pymol/files/patch-modules_pymol_Qt_____init____.py Tue Feb 12 06:52:57 2019 (r492761) @@ -1,15 +1,15 @@ ---- modules/pymol/Qt/__init__.py.orig 2018-03-22 05:10:42 UTC +--- modules/pymol/Qt/__init__.py.orig 2019-02-11 14:08:10 UTC +++ modules/pymol/Qt/__init__.py -@@ -28,7 +28,7 @@ if not PYQT_NAME: +@@ -29,7 +29,7 @@ if not PYQT_NAME: if DEBUG: print('import PyQt5 failed') -if not PYQT_NAME: +if False: try: - __import__("sip").setapi("QString", 2) - from PyQt4 import QtGui, QtCore, QtOpenGL -@@ -37,7 +37,7 @@ if not PYQT_NAME: + from PySide2 import QtGui, QtCore, QtOpenGL, QtWidgets + PYQT_NAME = 'PySide2' +@@ -46,7 +46,7 @@ if not PYQT_NAME: if DEBUG: print('import PyQt4 failed') Modified: head/science/py-pymol/files/patch-setup.py ============================================================================== --- head/science/py-pymol/files/patch-setup.py Tue Feb 12 06:50:53 2019 (r492760) +++ head/science/py-pymol/files/patch-setup.py Tue Feb 12 06:52:57 2019 (r492761) @@ -1,19 +1,11 @@ ---- setup.py.orig 2018-07-24 16:14:37 UTC +--- setup.py.orig 2019-02-12 06:00:47 UTC +++ setup.py -@@ -54,6 +54,8 @@ try: - "keyword support.") +@@ -52,6 +52,8 @@ try: + "shared library; no: disable fast MMTF load support") parser.add_argument('--help-distutils', action="store_true", help="show help for distutils options and exit") + parser.add_argument('--single-version-externally-managed', action="store_true", + help="single-version-externally-managed") + parser.add_argument('--testing', action="store_true", + help="Build C-level tests") options, sys.argv[1:] = parser.parse_known_args(namespace=options) - except ImportError: - print("argparse not available") -@@ -278,7 +280,6 @@ ext_comp_args = [ - # optimizations - "-ffast-math", - "-funroll-loops", -- "-O3", - "-fcommon", - ] - ext_link_args = [] Modified: head/science/py-pymol/pkg-plist ============================================================================== --- head/science/py-pymol/pkg-plist Tue Feb 12 06:50:53 2019 (r492760) +++ head/science/py-pymol/pkg-plist Tue Feb 12 06:52:57 2019 (r492761) @@ -189,6 +189,7 @@ bin/pymol %%PYTHON_SITELIBDIR%%/pmg_qt/forms/askpartial.ui %%PYTHON_SITELIBDIR%%/pmg_qt/forms/colors.ui %%PYTHON_SITELIBDIR%%/pmg_qt/forms/fetch.ui +%%PYTHON_SITELIBDIR%%/pmg_qt/forms/load_aln.ui %%PYTHON_SITELIBDIR%%/pmg_qt/forms/load_mae.ui %%PYTHON_SITELIBDIR%%/pmg_qt/forms/load_map.ui %%PYTHON_SITELIBDIR%%/pmg_qt/forms/load_mtz.ui @@ -279,9 +280,6 @@ bin/pymol %%PYTHON_SITELIBDIR%%/pmg_tk/startup/apbs_tools.py %%PYTHON_SITELIBDIR%%/pmg_tk/startup/apbs_tools.pyc %%PYTHON_SITELIBDIR%%/pmg_tk/startup/apbs_tools.pyo -%%PYTHON_SITELIBDIR%%/pmg_tk/startup/remote_pdb_load.py -%%PYTHON_SITELIBDIR%%/pmg_tk/startup/remote_pdb_load.pyc -%%PYTHON_SITELIBDIR%%/pmg_tk/startup/remote_pdb_load.pyo %%PYTHON_SITELIBDIR%%/pmg_tk/volume.py %%PYTHON_SITELIBDIR%%/pmg_tk/volume.pyc %%PYTHON_SITELIBDIR%%/pmg_tk/volume.pyo @@ -682,6 +680,9 @@ bin/pymol %%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/startup/README.txt %%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/startup/lightingsettings_gui/__init__.py %%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/startup/lightingsettings_gui/main.py +%%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/test/double.png +%%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/test/single-right.png +%%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/test/single.png %%PYTHON_SITELIBDIR%%/pymol/pymol_path/data/tut/1hpv.pdb %%PYTHON_SITELIBDIR%%/pymol/pymol_path/examples/chempy/generate_amber.py %%PYTHON_SITELIBDIR%%/pymol/pymol_path/examples/chempy/generate_mmff.py @@ -974,6 +975,9 @@ bin/pymol %%PYTHON_SITELIBDIR%%/pymol/selector.py %%PYTHON_SITELIBDIR%%/pymol/selector.pyc %%PYTHON_SITELIBDIR%%/pymol/selector.pyo +%%PYTHON_SITELIBDIR%%/pymol/seqalign.py +%%PYTHON_SITELIBDIR%%/pymol/seqalign.pyc +%%PYTHON_SITELIBDIR%%/pymol/seqalign.pyo %%PYTHON_SITELIBDIR%%/pymol/setting.py %%PYTHON_SITELIBDIR%%/pymol/setting.pyc %%PYTHON_SITELIBDIR%%/pymol/setting.pyo