Index: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig
===================================================================
--- head/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig	(revision 529083)
+++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig	(nonexistent)
@@ -1,10 +0,0 @@
---- sysvinit/freebsd/cloudconfig.orig	2018-08-01 15:31:13 UTC
-+++ sysvinit/freebsd/cloudconfig
-@@ -22,4 +22,7 @@ cloudconfig_start()
- }
- 
- load_rc_config $name
-+
-+: ${cloudconfig_enable="NO"}
-+
- run_rc_command "$1"

Property changes on: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit
===================================================================
--- head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit	(revision 529083)
+++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit	(nonexistent)
@@ -1,19 +0,0 @@
---- sysvinit/freebsd/cloudinit.orig	2018-08-01 15:31:22 UTC
-+++ sysvinit/freebsd/cloudinit
-@@ -1,7 +1,7 @@
- #!/bin/sh
- 
- # PROVIDE: cloudinit
--# REQUIRE: FILESYSTEMS NETWORKING cloudinitlocal
-+# REQUIRE: FILESYSTEMS NETWORKING cloudinitlocal ldconfig
- # BEFORE:  cloudconfig cloudfinal
- 
- . /etc/rc.subr
-@@ -22,4 +22,7 @@ cloudinit_start()
- }
- 
- load_rc_config $name
-+
-+: ${cloudinit_enable="NO"}
-+
- run_rc_command "$1"

Property changes on: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal
===================================================================
--- head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal	(revision 529083)
+++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal	(nonexistent)
@@ -1,10 +0,0 @@
---- sysvinit/freebsd/cloudinitlocal.orig	2018-08-01 15:31:29 UTC
-+++ sysvinit/freebsd/cloudinitlocal
-@@ -22,4 +22,7 @@ cloudlocal_start()
- }
- 
- load_rc_config $name
-+
-+: ${cloudinitlocal_enable="NO"}
-+
- run_rc_command "$1"

Property changes on: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal
===================================================================
--- head/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal	(revision 529083)
+++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal	(nonexistent)
@@ -1,10 +0,0 @@
---- sysvinit/freebsd/cloudfinal.orig	2018-08-01 15:31:17 UTC
-+++ sysvinit/freebsd/cloudfinal
-@@ -22,4 +22,7 @@ cloudfinal_start()
- }
- 
- load_rc_config $name
-+
-+: ${cloudfinal_enable="NO"}
-+
- run_rc_command "$1"

Property changes on: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/cloud-init/Makefile
===================================================================
--- head/net/cloud-init/Makefile	(revision 529083)
+++ head/net/cloud-init/Makefile	(revision 529084)
@@ -1,50 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	cloud-init
-PORTVERSION=	19.2
+PORTVERSION=	20.1
 CATEGORIES=	net python
-MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	zi@FreeBSD.org
+MAINTAINER=	andrey@bsdnir.info
 COMMENT=	Init scripts for use on cloud images
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	currently depends on dmidecode which is x86-only
 
 RUN_DEPENDS=	dmidecode>0:sysutils/dmidecode \
 		sudo>0:security/sudo \
 		${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR}
 
 USES=		python shebangfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	canonical
 
 SHEBANG_FILES=	tools/validate-yaml.py tools/read-dependencies \
 		tools/read-version
 USE_PYTHON=	autoplist distutils
 ETCDIR=		${PREFIX}/etc/cloud
 
 PYDISTUTILS_INSTALLARGS+=	"--init-system=sysvinit_freebsd"
 
 post-patch:
 	${REINPLACE_CMD} -e 's|"etc"|"${STAGEDIR}${PREFIX}/etc"|g' ${WRKSRC}/setup.py
 	${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/cloudinit/settings.py
 	@${RM} ${WRKSRC}/sysvinit/freebsd/*.orig
 
 post-build:
 	(cd ${WRKSRC} && ${MV} sysvinit/freebsd/cloudconfig config/cloud.cfg)
 	@cd ${WRKSRC} && ${MV} config/cloud.cfg.d/05_logging.cfg config/cloud.cfg.d/05_logging.cfg.sample
 
 .include <bsd.port.mk>
Index: head/net/cloud-init/distinfo
===================================================================
--- head/net/cloud-init/distinfo	(revision 529083)
+++ head/net/cloud-init/distinfo	(revision 529084)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565726929
-SHA256 (cloud-init-19.2.tar.gz) = f5ead1b3c782c159669f8f8779c45d16a986c7405425d75f915ec55301d83a07
-SIZE (cloud-init-19.2.tar.gz) = 1028832
+TIMESTAMP = 1584089583
+SHA256 (canonical-cloud-init-20.1_GH0.tar.gz) = ce03bb179ed79bdfd37e80c3b11aae2e79776e28d88898f428c8f2ab6a8272b5
+SIZE (canonical-cloud-init-20.1_GH0.tar.gz) = 1098224
Index: head/net/cloud-init/pkg-descr
===================================================================
--- head/net/cloud-init/pkg-descr	(revision 529083)
+++ head/net/cloud-init/pkg-descr	(revision 529084)
@@ -1,3 +1,6 @@
-Package provides configuration and customization of cloud instance.
+Cloud-init is the industry standard multi-distribution method for cross-platform
+cloud instance initialization. It is supported across all major public cloud
+providers, provisioning systems for private cloud infrastructure, and bare-metal
+installations.
 
-WWW: https://launchpad.net/cloud-init
+WWW: https://cloud-init.io/