Index: branches/2018Q2/devel/py-canonicaljson/Makefile
===================================================================
--- branches/2018Q2/devel/py-canonicaljson/Makefile	(revision 471858)
+++ branches/2018Q2/devel/py-canonicaljson/Makefile	(revision 471859)
@@ -1,33 +1,28 @@
 # Created by: Brendan Molloy <brendan+freebsd@bbqsrc.net>
 # $FreeBSD$
 
 PORTNAME=	canonicaljson
-PORTVERSION=	1.0.0
-DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTVERSION=	1.1.4
 CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	brendan+freebsd@bbqsrc.net
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Canonical JSON
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}frozendict>=0.4:devel/py-frozendict@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=3.6.5:devel/py-simplejson@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}frozendict>=1.0:devel/py-frozendict@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=3.6.5:devel/py-simplejson@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
 
 USES=		python
-USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
-
-GH_ACCOUNT=	matrix-org
-GH_PROJECT=	python-canonicaljson
-
 NO_ARCH=	yes
 
 do-test:
 	@(cd ${WRKSRC} && ${PYTHON_CMD} -m pytest)
 
 .include <bsd.port.mk>
Index: branches/2018Q2/devel/py-canonicaljson/distinfo
===================================================================
--- branches/2018Q2/devel/py-canonicaljson/distinfo	(revision 471858)
+++ branches/2018Q2/devel/py-canonicaljson/distinfo	(revision 471859)
@@ -1,2 +1,3 @@
-SHA256 (matrix-org-python-canonicaljson-v1.0.0_GH0.tar.gz) = 99da302069a91eb2305a5a0a8965738f7345baf6f6ba7266d3cc77e1d5fe827a
-SIZE (matrix-org-python-canonicaljson-v1.0.0_GH0.tar.gz) = 6103
+TIMESTAMP = 1528219967
+SHA256 (canonicaljson-1.1.4.tar.gz) = 45bce530ff5fd0ca93703f71bfb66de740a894a3b5dd6122398c6d8f18539725
+SIZE (canonicaljson-1.1.4.tar.gz) = 9355
Index: branches/2018Q2/devel/py-canonicaljson/pkg-descr
===================================================================
--- branches/2018Q2/devel/py-canonicaljson/pkg-descr	(revision 471858)
+++ branches/2018Q2/devel/py-canonicaljson/pkg-descr	(revision 471859)
@@ -1,5 +1,5 @@
-A JSON library for Python that provides features such as sorted keys, no
-insignificant whitespace, minimal escaping where necessary and supports
-frozendict immutable dictionaries.
+Canonical JSON is a JSON library for Python that provides features such as
+sorted keys, no insignificant whitespace, minimal escaping where necessary and
+supports frozendict immutable dictionaries.
 
 WWW: https://github.com/matrix-org/python-canonicaljson
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 471858)
+++ branches/2018Q2	(revision 471859)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r467535,471795