Index: branches/2020Q1/sysutils/iocage/Makefile
===================================================================
--- branches/2020Q1/sysutils/iocage/Makefile	(revision 526587)
+++ branches/2020Q1/sysutils/iocage/Makefile	(revision 526588)
@@ -1,53 +1,53 @@
 # $FreeBSD$
 
 PORTNAME=	iocage
 PORTVERSION=	1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	FreeBSD jail manager written in Python3
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=4.10.0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coloredlogs>0:devel/py-coloredlogs@${PY_FLAVOR} \
 		ca_root_nss>0:security/ca_root_nss \
 		${PYTHON_PKGNAMEPREFIX}texttable>=0.8.7:textproc/py-texttable@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:devel/py-libzfs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}GitPython>0:devel/py-gitpython@${PY_FLAVOR} \
 		merge:devel/rcs57
 
 USES=		python:3.6+
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
 
 CONFLICTS=	py27-iocage-[0-9]*
 NO_ARCH=	yes
 
 PLIST_FILES=	${PYTHON_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/PKG-INFO \
 		${PYTHON_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/SOURCES.txt \
 		${PYTHON_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/dependency_links.txt \
 		${PYTHON_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/entry_points.txt \
 		${PYTHON_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/requires.txt \
 		${PYTHON_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/top_level.txt
 
 OPTIONS_DEFAULT=	GIT
 OPTIONS_RADIO=	GIT_PACKAGE
 OPTIONS_RADIO_GIT_PACKAGE=	GIT GIT_LITE
 
 GIT_DESC=	depend on devel/git
 GIT_LITE_DESC=	depend on devel/git-lite (bare minimum git experience)
 
 GIT_RUN_DEPENDS=git:devel/git
 GIT_LITE_RUN_DEPENDS=git:devel/git-lite
 
 .include <bsd.port.mk>
Index: branches/2020Q1/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py
===================================================================
--- branches/2020Q1/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py	(nonexistent)
+++ branches/2020Q1/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py	(revision 526588)
@@ -0,0 +1,27 @@
+See https://github.com/iocage/iocage/commit/b47dc2c47ff125d644720b03f598a9caf4e08192
+--- iocage_lib/ioc_fetch.py.orig	2019-09-26 07:23:24 UTC
++++ iocage_lib/ioc_fetch.py
+@@ -964,19 +964,16 @@ class IOCFetch(iocage_lib.ioc_json.IOCZF
+ 
+                     if not cli:
+                         for jail, path in jails.items():
+-                            _json = iocage_lib.ioc_json.IOCJson(path)
++                            _json = iocage_lib.ioc_json.IOCJson(path, cli=False)
+                             props = _json.json_get_value('all')
+ 
+                             if props['basejail'] and self.release.rsplit(
+                                 '-', 1
+                             )[0] in props['release']:
+-                                props['release'] = new_release
+-                                _json.json_write(props)
++                                _json.json_set_value(f'release={new_release}')
+                     else:
+-                        _json = iocage_lib.ioc_json.IOCJson(jails[uuid])
+-                        props = _json.json_get_value('all')
+-                        props['release'] = new_release
+-                        _json.json_write(props)
++                        _json = iocage_lib.ioc_json.IOCJson(jails[uuid], cli=False)
++                        _json.json_set_value(f'release={new_release}')
+ 
+             if self.verify:
+                 # tmp only exists if they verify SSL certs

Property changes on: branches/2020Q1/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q1
===================================================================
--- branches/2020Q1	(revision 526587)
+++ branches/2020Q1	(revision 526588)

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