From nobody Thu Nov 25 22:37:16 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 92EC918B8F71; Thu, 25 Nov 2021 22:37:18 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J0Xn921KJz3KXB; Thu, 25 Nov 2021 22:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CC79A258AE; Thu, 25 Nov 2021 22:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1APMbGNc037004; Thu, 25 Nov 2021 22:37:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1APMbG2c037003; Thu, 25 Nov 2021 22:37:16 GMT (envelope-from git) Date: Thu, 25 Nov 2021 22:37:16 GMT Message-Id: <202111252237.1APMbG2c037003@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 3999eb79ff86 - main - devel/eric6: Fix CONFLICTS_INSTALL List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3999eb79ff868f653cc6863cca02a2faa2117721 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637879837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s4Mo1DjrBkpnEv+0iaq2dciJIwQ445BqWgHPeTM1kzE=; b=Hw0QRRwh9wQVz7fbrnJ9c/Phh2Vdkhyxe+XbSVHL/A33IGlegkMiYT/nID8MsZzNVr0d7U 636C1gn2v9HcgoepSVBOm39vtJy0lYRhJI8PJaE015mUtWvzoi65t8fRFfumMY/uhxVLwZ rXoDBzJaDzoDKKJ/uHbF1Bivp/5m54i4pir7J/HLS8E2ZnA686oPuJtWiMhGAmyrGC6Ndc JjLwm8KwsiZsilN4TExQ7EPB6IUFMOPQ3MpCjbZXUKQa1emeHvORXVqXoom6dTfVzU+liF RLaX1yqyKrI5ELkYVXPqG6S352DlJrX283Yh0nZWyInbU0w4uWh54o5TRLbBOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637879837; a=rsa-sha256; cv=none; b=sdlOmmo9+MkX8TKLQUQtiP+WS6XI+Kg64ywsu4t+UFgcxeDmOKrziOhcX5oPWHGOmvHHZT v9jXWRieEDpUhUHVoxEUDCYwBLPn29wHAaJi3/X/21hbb1IzNhtq5C6WS0CWFBPXm0Twto uFnwt8LhLHQdWzB+H+a6hfs8p/5dMwrlnoFXhe/A0OTPDMUDqKIizfk2bSypqJJBFSzlRj HAEh2LVzwq8SCTYQ37Zxuy4YsYOZluu7R6ZjO+XTOKqacimvxxqAJHGN8qr4sx6Dqt+Rbw 1t6N1tAztQHcNUjsQFRTUiGZetWw9Q3b5qU7p0/jxqz+xGqYntHjI5EFzTZOPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=3999eb79ff868f653cc6863cca02a2faa2117721 commit 3999eb79ff868f653cc6863cca02a2faa2117721 Author: Stefan Eßer AuthorDate: 2021-11-25 22:31:42 +0000 Commit: Stefan Eßer 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