From owner-dev-commits-ports-all@freebsd.org Wed Sep 22 02:42:45 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 51FB16A9BD7; Wed, 22 Sep 2021 02:42:45 +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 4HDjJP1qT8z3LDh; Wed, 22 Sep 2021 02:42:45 +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 199777A39; Wed, 22 Sep 2021 02:42:45 +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 18M2gicn086302; Wed, 22 Sep 2021 02:42:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18M2gi0Q086301; Wed, 22 Sep 2021 02:42:44 GMT (envelope-from git) Date: Wed, 22 Sep 2021 02:42:44 GMT Message-Id: <202109220242.18M2gi0Q086301@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: 418da1cad0ae - main - www/py-django22: Remove django111 from 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: 418da1cad0aeeb48cb9322cc98a6e9a1e99cf88b 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:42:45 -0000 The branch main has been updated by wen: URL: https://cgit.FreeBSD.org/ports/commit/?id=418da1cad0aeeb48cb9322cc98a6e9a1e99cf88b commit 418da1cad0aeeb48cb9322cc98a6e9a1e99cf88b Author: Wen Heping AuthorDate: 2021-09-22 02:39:30 +0000 Commit: Wen Heping CommitDate: 2021-09-22 02:39:30 +0000 www/py-django22: Remove django111 from CONFLICTS_INSTALL --- www/py-django22/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/py-django22/Makefile b/www/py-django22/Makefile index 2de00ad6c8bd..5d1d6faaa0d9 100644 --- a/www/py-django22/Makefile +++ b/www/py-django22/Makefile @@ -32,7 +32,7 @@ PORTDOCS= * SHEBANG_FILES= django/bin/django-admin.py \ django/conf/project_template/manage.py-tpl -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django30 \ +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django30 \ ${PYTHON_PKGNAMEPREFIX}django31 ${PYTHON_PKGNAMEPREFIX}django32 CPE_VENDOR= djangoproject