git: 3999eb79ff86 - main - devel/eric6: Fix CONFLICTS_INSTALL
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 25 Nov 2021 22:37:16 UTC
The branch main has been updated by se:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3999eb79ff868f653cc6863cca02a2faa2117721
commit 3999eb79ff868f653cc6863cca02a2faa2117721
Author: Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2021-11-25 22:31:42 +0000
Commit: Stefan Eßer <se@FreeBSD.org>
CommitDate: 2021-11-25 22:36:59 +0000
devel/eric6: Fix CONFLICTS_INSTALL
The automatically generated values did not match any package due to an
additional ${FLAVOR} added to the pattern. The version wildcard was
superfluous and and has been removed as well.
Approved by: portmgr (blanket)
---
devel/eric6/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/devel/eric6/Makefile b/devel/eric6/Makefile
index 004b40a7416e..7f975775b5c1 100644
--- a/devel/eric6/Makefile
+++ b/devel/eric6/Makefile
@@ -32,7 +32,7 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
-CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:C/^/${PORTNAME}${PKGNAMESUFFIX}-/:C/$/-[0-9]*/}
+CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:C/^/${PORTNAME}-qt5-/}
USES+= desktop-file-utils python:3.5+ pyqt:5 shebangfix
USE_PYTHON= flavors