Index: branches/2020Q1/www/py-django-cacheops/Makefile
===================================================================
--- branches/2020Q1/www/py-django-cacheops/Makefile	(revision 521886)
+++ branches/2020Q1/www/py-django-cacheops/Makefile	(revision 521887)
@@ -1,27 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	django-cacheops
-PORTVERSION=	4.1
+PORTVERSION=	4.2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Slick ORM cache with automatic granular event-driven invalidation
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}redis>=2.9.1:databases/py-redis@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}funcy>=1.8:devel/py-funcy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}funcy>=1.8<2.0:devel/py-funcy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}dj22-django-cacheops
 
 NO_ARCH=		yes
 
 .include <bsd.port.mk>
Index: branches/2020Q1/www/py-django-cacheops/distinfo
===================================================================
--- branches/2020Q1/www/py-django-cacheops/distinfo	(revision 521886)
+++ branches/2020Q1/www/py-django-cacheops/distinfo	(revision 521887)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555579412
-SHA256 (django-cacheops-4.1.tar.gz) = 2a5cd01ad64f565d0ad18bf103c96988ccdf7d245601dedd8ef52f9ef63e0727
-SIZE (django-cacheops-4.1.tar.gz) = 53766
+TIMESTAMP = 1576102209
+SHA256 (django-cacheops-4.2.tar.gz) = 56ea95ad4eb1b61b6c014b7b23f3203ef8816611c9e8a097a7e99628810e9f16
+SIZE (django-cacheops-4.2.tar.gz) = 50240
Index: branches/2020Q1
===================================================================
--- branches/2020Q1	(revision 521886)
+++ branches/2020Q1	(revision 521887)

Property changes on: branches/2020Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r521750