From bdd2d4af9630fdc1157d49bd193e8195c3240e9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20E=C3=9Fer?= Date: Sun, 6 Feb 2022 19:36:07 +0100 Subject: Update CONFLICTS definitions in categories a* to c* Update the CONFLICTS definitions of ports in the following categories: - accessibility - archivers - audio - benchmarks - biology - cad - chinese - comms - converters An attempt has been made to use generic conflicts patterns that do not have to be updated whenever a new version of a conflicting port is added to the ports system. There is a misunderstanding that the port being built/installed has to be omitted from the conflicts pattern. This is not true - the port being built is implicitly non-conflicting due to logic in bsd.port.mk. Approved by: portmgr (implicit) --- accessibility/orca/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'accessibility/orca/Makefile') diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile index 364aaa2b77b3..4274e97e9589 100644 --- a/accessibility/orca/Makefile +++ b/accessibility/orca/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ # conflict with py*-json-py because orca uses the json from python itself # and py*-json-py shadows this. -CONFLICTS= py*-json-py +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}orca # lib/python3.8/site-packages/orca/__init__.py PORTSCOUT= limitw:1,even NO_ARCH= yes -- cgit v1.2.3