From owner-svn-ports-all@freebsd.org Sun Dec 10 13:48:52 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2B7EE8D312; Sun, 10 Dec 2017 13:48:52 +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 mx1.freebsd.org (Postfix) with ESMTPS id 7F68071FC9; Sun, 10 Dec 2017 13:48:52 +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 vBADmpBd048381; Sun, 10 Dec 2017 13:48:51 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBADmpZE048378; Sun, 10 Dec 2017 13:48:51 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201712101348.vBADmpZE048378@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Sun, 10 Dec 2017 13:48:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455898 - in head/www: py-django110 py-django111 py-django18 X-SVN-Group: ports-head X-SVN-Commit-Author: wen X-SVN-Commit-Paths: in head/www: py-django110 py-django111 py-django18 X-SVN-Commit-Revision: 455898 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.25 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: Sun, 10 Dec 2017 13:48:52 -0000 Author: wen Date: Sun Dec 10 13:48:51 2017 New Revision: 455898 URL: https://svnweb.freebsd.org/changeset/ports/455898 Log: - Adjust CONFLICTS_INSTALL Modified: head/www/py-django110/Makefile head/www/py-django111/Makefile head/www/py-django18/Makefile Modified: head/www/py-django110/Makefile ============================================================================== --- head/www/py-django110/Makefile Sun Dec 10 13:39:34 2017 (r455897) +++ head/www/py-django110/Makefile Sun Dec 10 13:48:51 2017 (r455898) @@ -25,7 +25,7 @@ USE_PYTHON= autoplist distutils SHEBANG_FILES= django/bin/django-admin.py \ django/conf/project_template/manage.py-tpl -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-devel ${PYTHON_PKGNAMEPREFIX}django1[689] ${PYTHON_PKGNAMEPREFIX}django111 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-devel ${PYTHON_PKGNAMEPREFIX}django18 ${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django20 CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django Modified: head/www/py-django111/Makefile ============================================================================== --- head/www/py-django111/Makefile Sun Dec 10 13:39:34 2017 (r455897) +++ head/www/py-django111/Makefile Sun Dec 10 13:48:51 2017 (r455898) @@ -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}django-devel ${PYTHON_PKGNAMEPREFIX}django1[689] ${PYTHON_PKGNAMEPREFIX}django110 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-devel ${PYTHON_PKGNAMEPREFIX}django18 ${PYTHON_PKGNAMEPREFIX}django110 ${PYTHON_PKGNAMEPREFIX}django20 CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django Modified: head/www/py-django18/Makefile ============================================================================== --- head/www/py-django18/Makefile Sun Dec 10 13:39:34 2017 (r455897) +++ head/www/py-django18/Makefile Sun Dec 10 13:48:51 2017 (r455898) @@ -26,7 +26,9 @@ USE_PYTHON= autoplist distutils SHEBANG_FILES= django/bin/django-admin.py \ django/conf/project_template/manage.py -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-devel ${PYTHON_PKGNAMEPREFIX}django1[69] ${PYTHON_PKGNAMEPREFIX}django110 +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-devel \ + ${PYTHON_PKGNAMEPREFIX}django11[01] \ + ${PYTHON_PKGNAMEPREFIX}django20 CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django