From nobody Mon Jan 30 13:19:12 2023 X-Original-To: dev-commits-ports-main@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 4P580J3CzTz3cdxt; Mon, 30 Jan 2023 13:19:12 +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 4P580J2XSCz4RWm; Mon, 30 Jan 2023 13:19:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675084752; 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=0N/hWlBEq2b4/I4oSfdPt6Znu9VhjyB0yQQR4RYdeaQ=; b=TPZJKYvq7ZAXnbDCal13PnMgSwA8Hf7nmTulRmVoWzOBVli+H3pJ9gV/DwP5EgKtTF3CTg Ww8rNB/3hVpanISoqQxHwO6xvTcuieTp8cpLFZcLaSnJK+ISZ13KZ82S4oZvsCMnp7Coj5 XVvsjnnTM4NDbGCNKydKGrRUq4dW1Zey2247LGx9Np23P+wtxJ6fTu2C+2sxYBJYvMze/v 7KHPmfVhuZDn0r47DxLjP0IyMv/+69fd3eacXWoyn6EqcbyfTLnvFI7t1yyBeQB3InbTCN LjRDdvf1K1N2f/itcd2ypCNV9a4njDf8OIb31WtpVyxxVrNs9JpNLFq3d/Yelg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675084752; 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=0N/hWlBEq2b4/I4oSfdPt6Znu9VhjyB0yQQR4RYdeaQ=; b=jDCoRkV4jLl7ODEztfmLO7N/n3QL7AtszIDSbQrg2HcH1cNYmD+7WiyUJTyVS9zpHLE5Zr HdGUTs2e4y4OO+bl2teCB1/PXBlhSZzrfBO1rRnmdL2LpUc/2bMiYS+X2AfhOJezEkQGjx 1KqKJIy7LWpdBfQBT1fZVIoX6PiBvWXZwnoD8h//nKiaSYK63qaaWAr7P6hz9NL2LU3lsw 1JGikV8FW1poJf1HhlY0GqN/E+WIXugDXHdScN96/FgIC7gt+tnXzqZOSJlMlIYFaxE9Ze bMqo/7lqsLU6d4YETxV588MXWdMLqhHi83kFEo63PdrWqjzRfMybRofu4mXGIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675084752; a=rsa-sha256; cv=none; b=Cei5VXSHAyMH1zItur7Cr/WE8sVT6BfSHk3+lT1UkKFNXIIHakHqWIYlT6JRg8rQao9iXa btPCk9tLYrh+JZ9psTbh090ph3uSxTVio+yErbVn8YzsUov/UEHYABPo6hg28dXY0IL6tE KasN77oKqLo8AAEteM3NTRzui4MAG+RnUL9is6vHC+H696yIzvfU1chzhRG2iS8aZjS82K uwevY7A9GKeLBrVPnbZsFA2zquwVsh0yFF4FGITF5npq3Q91eD6PjcNznTEPN4EKaNoyA/ Z9NDnYtkDYtbHpKQN5jIp1h8JlPKfbUznnqxZNQhtf12DjKWBstz2CiRpD5u6g== 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 4P580J1dXyz18bd; Mon, 30 Jan 2023 13:19:12 +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 30UDJCId084303; Mon, 30 Jan 2023 13:19:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30UDJCVa084302; Mon, 30 Jan 2023 13:19:12 GMT (envelope-from git) Date: Mon, 30 Jan 2023 13:19:12 GMT Message-Id: <202301301319.30UDJCVa084302@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 4ca72e1c3a29 - main - www/py-django32: Simplify CONFLICTS_INSTALL 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ca72e1c3a299dba0650ce05ab75722fee283bf7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ca72e1c3a299dba0650ce05ab75722fee283bf7 commit 4ca72e1c3a299dba0650ce05ab75722fee283bf7 Author: Po-Chuan Hsieh AuthorDate: 2023-01-30 12:44:56 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-01-30 13:02:19 +0000 www/py-django32: Simplify CONFLICTS_INSTALL --- www/py-django32/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/www/py-django32/Makefile b/www/py-django32/Makefile index ecda0425e775..23dd135ef93f 100644 --- a/www/py-django32/Makefile +++ b/www/py-django32/Makefile @@ -32,8 +32,7 @@ PORTDOCS= * SHEBANG_FILES= django/bin/django-admin.py \ django/conf/project_template/manage.py-tpl -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django40 \ - ${PYTHON_PKGNAMEPREFIX}django41 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django[0-9][0-9] CPE_VENDOR= djangoproject