svn commit: r526027 - in head/www: . py-dj22-django-jsonfield2 py-dj22-jsonfield2

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Thu Feb 13 18:30:20 2020
New Revision: 526027
URL: https://svnweb.freebsd.org/changeset/ports/526027

Log:
  Move www/py-dj22-django-jsonfield2 to www/py-dj22-jsonfield2
  
  - Add CONFLICTS_INSTALL

Added:
  head/www/py-dj22-jsonfield2/
     - copied from r526026, head/www/py-dj22-django-jsonfield2/
Deleted:
  head/www/py-dj22-django-jsonfield2/
Modified:
  head/www/Makefile
  head/www/py-dj22-jsonfield2/Makefile

Modified: head/www/Makefile
==============================================================================
--- head/www/Makefile	Thu Feb 13 18:30:00 2020	(r526026)
+++ head/www/Makefile	Thu Feb 13 18:30:20 2020	(r526027)
@@ -1454,7 +1454,6 @@
     SUBDIR += py-dj22-django-formset-js-improved
     SUBDIR += py-dj22-django-jquery-js
     SUBDIR += py-dj22-django-js-asset
-    SUBDIR += py-dj22-django-jsonfield2
     SUBDIR += py-dj22-django-model-utils
     SUBDIR += py-dj22-django-mptt
     SUBDIR += py-dj22-django-prometheus
@@ -1468,6 +1467,7 @@
     SUBDIR += py-dj22-djangoql
     SUBDIR += py-dj22-djangorestframework
     SUBDIR += py-dj22-drf-yasg
+    SUBDIR += py-dj22-jsonfield2
     SUBDIR += py-dj22-swapper
     SUBDIR += py-django
     SUBDIR += py-django-allauth

Modified: head/www/py-dj22-jsonfield2/Makefile
==============================================================================
--- head/www/py-dj22-django-jsonfield2/Makefile	Thu Feb 13 18:30:00 2020	(r526026)
+++ head/www/py-dj22-jsonfield2/Makefile	Thu Feb 13 18:30:20 2020	(r526027)
@@ -4,7 +4,7 @@
 PORTNAME=	jsonfield2
 PORTVERSION=	3.1.0
 CATEGORIES=	www python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj22-django-
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj22-
 
 MAINTAINER=	sunpoet at FreeBSD.org
 COMMENT=	Reusable Django field to store validated JSON in your model
@@ -18,6 +18,8 @@ USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
+
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}jsonfield2
 
 GH_ACCOUNT=	rpkilby
 USE_GITHUB=	yes