From owner-dev-commits-ports-all@freebsd.org Wed Sep 22 02:46:40 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9D8D26A9C1D; Wed, 22 Sep 2021 02:46:40 +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 4HDjNw4292z3LwS; Wed, 22 Sep 2021 02:46:40 +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 6A332777F; Wed, 22 Sep 2021 02:46:40 +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 18M2keHa086686; Wed, 22 Sep 2021 02:46:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18M2ke4F086685; Wed, 22 Sep 2021 02:46:40 GMT (envelope-from git) Date: Wed, 22 Sep 2021 02:46:40 GMT Message-Id: <202109220246.18M2ke4F086685@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Wen Heping Subject: git: a040d4eba15f - main - www/py-django31: Update CONFLICTS_INSTALL MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a040d4eba15fa014443286835e3529681581cbde Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Sep 2021 02:46:40 -0000 The branch main has been updated by wen: URL: https://cgit.FreeBSD.org/ports/commit/?id=a040d4eba15fa014443286835e3529681581cbde commit a040d4eba15fa014443286835e3529681581cbde Author: Wen Heping AuthorDate: 2021-09-22 02:45:27 +0000 Commit: Wen Heping CommitDate: 2021-09-22 02:45:27 +0000 www/py-django31: Update CONFLICTS_INSTALL --- www/py-django31/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/py-django31/Makefile b/www/py-django31/Makefile index 091fad08976e..eba65453949a 100644 --- a/www/py-django31/Makefile +++ b/www/py-django31/Makefile @@ -36,8 +36,8 @@ PORTDOCS= * SHEBANG_FILES= django/bin/django-admin.py \ django/conf/project_template/manage.py-tpl -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django22 \ - ${PYTHON_PKGNAMEPREFIX}django30 ${PYTHON_PKGNAMEPREFIX}django32 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django22 \ + ${PYTHON_PKGNAMEPREFIX}django32 CPE_VENDOR= djangoproject