From nobody Mon Jan 30 13:19:13 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 4P580K5Lz4z3cdsV; Mon, 30 Jan 2023 13:19:13 +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 4P580K49Mhz4RqY; Mon, 30 Jan 2023 13:19:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675084753; 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=3ybFwyz0bp4xFEqsZd2uFbqGbGS7ITXblxHlXlb9qg0=; b=ldKwrLgZm7sz5koKPCWToflA3igV2C9K0KJA5JVdTDyyRPn/3IYHMvsPGsdtVrX9A6kLMH hO8OzxA9UGxePGmchZKgw5vhrh/Y/9un1pZcMH8LSC0hf8uEEtJE4TB3pTTF7d2b5/0b0G zjLx4OlIsGBjXewrNQ6RedKFU1GqrwFZzz3kuqA7v57419vMHNK6/gGestKwWW5o7kHoI6 HuO2ZZ3JgDAjibChJDWS3dy/RQnT7AtgYwF5WPUBp1OfCnMP4U9HEBeR6HSfSivx0/lftQ y832DikzBsMGJ86sATzyEu3X4sr+/lzW3rR2kK0Zzs2XzIHCy52WlWoUKdlmGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675084753; 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=3ybFwyz0bp4xFEqsZd2uFbqGbGS7ITXblxHlXlb9qg0=; b=x+zA+e+Klr02O5y+9+Hd0JXEExp8bqa8VwaIl3pjWHa7KpxZFT5qzqujkhSmjOLRwgkqmf iNIER5E8BOW9N1nsA+1RHLa3PYQPcd6UmjsBi3Q0WLmlTQrn8J1jy3C4/MoqG10nYZL9VH w/UqxBnRdrtPaTGOJEemfIzwzymSjIYVQohvM0mMnEK0Sy3IcrlM0ZelyoOwJ7KBQIXeQu ooTEVBd3jBTqhK2kQ9Hsmknlmmtn/QY+7uFfGawiY00fyDKs3+gH2gmESGTeyfeioSHrXh 1A5DPlCUqPw5R8qHbJBwCqf+yCCRGO7PJPdWHmdpyRlb6Z4qSPj0hdczdrbVyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675084753; a=rsa-sha256; cv=none; b=Woz8AMrwsPOaSsLCNrWUdvAG+nnao0/2TgJg+EB/cJEu2mI/YHOmrZqa9iCv0Von8Ca86i 2du1uAX7Tbb7uRtddN/RCIwp1mI0+Jk7AtyGVRCFz6TcDmijvU1vYxpp7bsZ9ax56XgrNN c5LB8uCCbCUmio5vg10Lfl78OaT+TGSKfHO8gJVWW2BWGLcsQN1J98zXCQ6lbN6oJ9Uil5 NfVLqjT6IUssvLvn8Cv+B2ZxArkp+Q5esrEbfEProZDT4ropUuCVb84ZUoaCp1tSL3AIPS zk8Q63XwA27DOPl1VvRnbdJioCB9CE1jtYWYyQiKCi6wOpvJKWqHqE+kLLh7fQ== 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 4P580K2kQ4z18lp; Mon, 30 Jan 2023 13:19:13 +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 30UDJDYH084329; Mon, 30 Jan 2023 13:19:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30UDJDT7084328; Mon, 30 Jan 2023 13:19:13 GMT (envelope-from git) Date: Mon, 30 Jan 2023 13:19:13 GMT Message-Id: <202301301319.30UDJDT7084328@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: 8ce5f8624bf3 - main - www/py-django40: 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: 8ce5f8624bf3ecd68b11b9108f4beae6a5f1653e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ce5f8624bf3ecd68b11b9108f4beae6a5f1653e commit 8ce5f8624bf3ecd68b11b9108f4beae6a5f1653e Author: Po-Chuan Hsieh AuthorDate: 2023-01-30 12:44:58 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-01-30 13:02:19 +0000 www/py-django40: Simplify CONFLICTS_INSTALL --- www/py-django40/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/www/py-django40/Makefile b/www/py-django40/Makefile index 761fedaf6775..4e923311e0cd 100644 --- a/www/py-django40/Makefile +++ b/www/py-django40/Makefile @@ -31,8 +31,7 @@ PORTDOCS= * SHEBANG_FILES= django/conf/project_template/manage.py-tpl -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django32 \ - ${PYTHON_PKGNAMEPREFIX}django41 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django[0-9][0-9] CPE_VENDOR= djangoproject