From owner-svn-ports-all@freebsd.org Tue Dec 3 00:06:25 2019 Return-Path: Delivered-To: svn-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 543091BCCE5; Tue, 3 Dec 2019 00:06:25 +0000 (UTC) (envelope-from wen@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47Rj291c9vz4Z82; Tue, 3 Dec 2019 00:06:25 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 166AD71E8; Tue, 3 Dec 2019 00:06:25 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB306OJA092701; Tue, 3 Dec 2019 00:06:24 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB306OxW092698; Tue, 3 Dec 2019 00:06:24 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201912030006.xB306OxW092698@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Tue, 3 Dec 2019 00:06:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518887 - in head/www: py-django111 py-django21 py-django22 X-SVN-Group: ports-head X-SVN-Commit-Author: wen X-SVN-Commit-Paths: in head/www: py-django111 py-django21 py-django22 X-SVN-Commit-Revision: 518887 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Dec 2019 00:06:25 -0000 Author: wen Date: Tue Dec 3 00:06:24 2019 New Revision: 518887 URL: https://svnweb.freebsd.org/changeset/ports/518887 Log: - Adjust CONFLICTS_INSTALL to welcome py-django30 Modified: head/www/py-django111/Makefile head/www/py-django21/Makefile head/www/py-django22/Makefile Modified: head/www/py-django111/Makefile ============================================================================== --- head/www/py-django111/Makefile Tue Dec 3 00:03:16 2019 (r518886) +++ head/www/py-django111/Makefile Tue Dec 3 00:06:24 2019 (r518887) @@ -27,7 +27,7 @@ USE_PYTHON= autoplist distutils SHEBANG_FILES= django/bin/django-admin.py \ django/conf/project_template/manage.py-tpl -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django2[0-2] +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django2[0-2] ${PYTHON_PKGNAMEPREFIX}django30 CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django Modified: head/www/py-django21/Makefile ============================================================================== --- head/www/py-django21/Makefile Tue Dec 3 00:03:16 2019 (r518886) +++ head/www/py-django21/Makefile Tue Dec 3 00:06:24 2019 (r518887) @@ -25,7 +25,8 @@ USE_PYTHON= autoplist distutils SHEBANG_FILES= django/bin/django-admin.py \ django/conf/project_template/manage.py-tpl -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django22 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django22 \ + ${PYTHON_PKGNAMEPREFIX}django30 CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django Modified: head/www/py-django22/Makefile ============================================================================== --- head/www/py-django22/Makefile Tue Dec 3 00:03:16 2019 (r518886) +++ head/www/py-django22/Makefile Tue Dec 3 00:06:24 2019 (r518887) @@ -27,7 +27,8 @@ USE_PYTHON= autoplist distutils SHEBANG_FILES= django/bin/django-admin.py \ django/conf/project_template/manage.py-tpl -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django21 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django21 \ + ${PYTHON_PKGNAMEPREFIX}django30 CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django