svn commit: r536079 - in head/science: py-chempy py-pymol
Yuri Victorovich
yuri at FreeBSD.org
Thu May 21 07:17:56 UTC 2020
Author: yuri
Date: Thu May 21 07:17:55 2020
New Revision: 536079
URL: https://svnweb.freebsd.org/changeset/ports/536079
Log:
Add CONFLICT between science/py-chempy and science/py-pymol
Modified:
head/science/py-chempy/Makefile
head/science/py-pymol/Makefile
Modified: head/science/py-chempy/Makefile
==============================================================================
--- head/science/py-chempy/Makefile Thu May 21 07:17:53 2020 (r536078)
+++ head/science/py-chempy/Makefile Thu May 21 07:17:55 2020 (r536079)
@@ -34,6 +34,8 @@ USES= python:3.5+
USE_PYTHON= distutils autoplist
NO_ARCH= yes
+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pymol # https://github.com/schrodinger/pymol-open-source/issues/100
+
OPTIONS_DEFINE= EXTRAS
OPTIONS_DEFAULT= EXTRAS
Modified: head/science/py-pymol/Makefile
==============================================================================
--- head/science/py-pymol/Makefile Thu May 21 07:17:53 2020 (r536078)
+++ head/science/py-pymol/Makefile Thu May 21 07:17:55 2020 (r536079)
@@ -35,6 +35,8 @@ USE_GNOME= libxml2
USE_PYTHON= distutils concurrent # autoplist is broken: https://github.com/schrodinger/pymol-open-source/issues/99
SHEBANG_FILES= test/show test/run test/cyg
+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}chempy # https://github.com/schrodinger/pymol-open-source/issues/100
+
OPTIONS_SINGLE= GUI
OPTIONS_SINGLE_GUI= QT5 TK
OPTIONS_DEFAULT= QT5
More information about the svn-ports-head
mailing list