From owner-svn-ports-all@freebsd.org Fri Apr 7 07:55:11 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 53955D31FF6; Fri, 7 Apr 2017 07:55:11 +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 0B7FA81C; Fri, 7 Apr 2017 07:55:10 +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 v377tAa0027373; Fri, 7 Apr 2017 07:55:10 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v377t9UC027369; Fri, 7 Apr 2017 07:55:09 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201704070755.v377t9UC027369@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Fri, 7 Apr 2017 07:55:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437915 - in head/www: py-django110 py-django16 py-django18 py-django19 X-SVN-Group: ports-head 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.23 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: Fri, 07 Apr 2017 07:55:11 -0000 Author: wen Date: Fri Apr 7 07:55:09 2017 New Revision: 437915 URL: https://svnweb.freebsd.org/changeset/ports/437915 Log: - Adjust CONFLICTS_INSTALL after add py-django111 Modified: head/www/py-django110/Makefile head/www/py-django16/Makefile head/www/py-django18/Makefile head/www/py-django19/Makefile Modified: head/www/py-django110/Makefile ============================================================================== --- head/www/py-django110/Makefile Fri Apr 7 07:44:32 2017 (r437914) +++ head/www/py-django110/Makefile Fri Apr 7 07:55:09 2017 (r437915) @@ -21,7 +21,7 @@ NO_ARCH= yes USES= cpe python USE_PYTHON= autoplist distutils -CONFLICTS_INSTALL= py??-django-devel-* py??-django1[689]-* +CONFLICTS_INSTALL= py??-django-devel-* py??-django1[689]-* py??-django111-* CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django Modified: head/www/py-django16/Makefile ============================================================================== --- head/www/py-django16/Makefile Fri Apr 7 07:44:32 2017 (r437914) +++ head/www/py-django16/Makefile Fri Apr 7 07:55:09 2017 (r437915) @@ -23,7 +23,7 @@ EXPIRATION_DATE= 2015-10-01 USES= cpe python USE_PYTHON= autoplist distutils -CONFLICTS_INSTALL= py??-django-devel-* py??-django1[89]-* py??-django110-* +CONFLICTS_INSTALL= py??-django-devel-* py??-django1[89]-* py??-django11[01]-* CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django Modified: head/www/py-django18/Makefile ============================================================================== --- head/www/py-django18/Makefile Fri Apr 7 07:44:32 2017 (r437914) +++ head/www/py-django18/Makefile Fri Apr 7 07:55:09 2017 (r437915) @@ -21,7 +21,7 @@ NO_ARCH= yes USES= cpe python USE_PYTHON= autoplist distutils -CONFLICTS_INSTALL= py??-django-devel-* py??-django1[69]-* py??-django110-* +CONFLICTS_INSTALL= py??-django-devel-* py??-django1[69]-* py??-django11[01]-* CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django Modified: head/www/py-django19/Makefile ============================================================================== --- head/www/py-django19/Makefile Fri Apr 7 07:44:32 2017 (r437914) +++ head/www/py-django19/Makefile Fri Apr 7 07:55:09 2017 (r437915) @@ -21,7 +21,7 @@ NO_ARCH= yes USES= cpe python USE_PYTHON= autoplist distutils -CONFLICTS_INSTALL= py??-django-devel-* py??-django1[68]-* py??-django110-* +CONFLICTS_INSTALL= py??-django-devel-* py??-django1[68]-* py??-django11[01]-* CPE_VENDOR= djangoproject DOCSDIR= ${PREFIX}/share/doc/py-django