From owner-svn-ports-all@freebsd.org  Mon Jan  1 20:58:50 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
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 7A92DE8088A;
 Mon,  1 Jan 2018 20:58:50 +0000 (UTC)
 (envelope-from sunpoet@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 E59027D7BF;
 Mon,  1 Jan 2018 20:58:49 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w01Kwm0w044586;
 Mon, 1 Jan 2018 20:58:48 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w01KwmLV044585;
 Mon, 1 Jan 2018 20:58:48 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201801012058.w01KwmLV044585@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to
 sunpoet@FreeBSD.org using -f
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Mon, 1 Jan 2018 20:58:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r457802 - head/www/py-jsonfield
X-SVN-Group: ports-head
X-SVN-Commit-Author: sunpoet
X-SVN-Commit-Paths: head/www/py-jsonfield
X-SVN-Commit-Revision: 457802
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jan 2018 20:58:50 -0000

Author: sunpoet
Date: Mon Jan  1 20:58:47 2018
New Revision: 457802
URL: https://svnweb.freebsd.org/changeset/ports/457802

Log:
  Move to newer Django
  
  - Remove CONFLICTS_INSTALL
  - Bump PORTREVISION for dependency change
  
  PR:		224724
  Submitted by:	sunpoet (myself)
  Approved by:	rene (maintainer)

Modified:
  head/www/py-jsonfield/Makefile

Modified: head/www/py-jsonfield/Makefile
==============================================================================
--- head/www/py-jsonfield/Makefile	Mon Jan  1 20:58:43 2018	(r457801)
+++ head/www/py-jsonfield/Makefile	Mon Jan  1 20:58:47 2018	(r457802)
@@ -3,6 +3,7 @@
 
 PORTNAME=	jsonfield
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,9 +14,7 @@ COMMENT=	Reusable JSONField model for Django to store 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django110>=0:www/py-django110@${FLAVOR}
-
-CONFLICTS_INSTALL=py*-django-jsonfield
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist