org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59OEkYcE041818; Fri, 24 Oct 2025 14:46:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OEkY36041815; Fri, 24 Oct 2025 14:46:34 GMT (envelope-from git) Date: Fri, 24 Oct 2025 14:46:34 GMT Message-Id: <202510241446.59OEkY36041815@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 4ec5872f705c - main - graphics/py-sorl-thumbnail: Register conflicts List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ec5872f705c9321f987cd6aabbae1e477e21d05 Auto-Submitted: auto-generated The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ec5872f705c9321f987cd6aabbae1e477e21d05 commit 4ec5872f705c9321f987cd6aabbae1e477e21d05 Author: Kai Knoblich AuthorDate: 2025-10-24 14:46:26 +0000 Commit: Kai Knoblich CommitDate: 2025-10-24 14:46:26 +0000 graphics/py-sorl-thumbnail: Register conflicts * In 36c338883557 a new port graphics/py-dj52-django-sorl-thumbnail was added, thus add CONFLICTS_INSTALL accordingly. Approved by: portmgr (blanket) --- graphics/py-sorl-thumbnail/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/graphics/py-sorl-thumbnail/Makefile b/graphics/py-sorl-thumbnail/Makefile index cad52c7ea394..f959fa203be9 100644 --- a/graphics/py-sorl-thumbnail/Makefile +++ b/graphics/py-sorl-thumbnail/Makefile @@ -20,6 +20,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django42>=4.2:www/py-django42@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}*${PORTNAME} + NO_ARCH= yes PORTDOCS= *