Index: head/net/cloud-init/Makefile
===================================================================
--- head/net/cloud-init/Makefile	(revision 476023)
+++ head/net/cloud-init/Makefile	(revision 476024)
@@ -1,49 +1,48 @@
 # $FreeBSD$
 
 PORTNAME=	cloud-init
-PORTVERSION=	0.7.6
-PORTREVISION=	1
+PORTVERSION=	18.3
 CATEGORIES=	net python
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Init scripts for use on cloud images
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	dmidecode>0:sysutils/dmidecode \
 		sudo>0:security/sudo \
-		gpart>0:sysutils/gpart \
 		${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${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}oauth>0:net/py-oauth@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR}
 
 ETCDIR=		${PREFIX}/etc/cloud
 
 USES=		python:2.7 shebangfix
 SHEBANG_FILES=	tools/validate-yaml.py tools/read-dependencies \
-		tools/read-version tools/hacking.py
+		tools/read-version
 USE_PYTHON=	autoplist distutils
 
 PYDISTUTILS_INSTALLARGS+=	"--init-system=sysvinit_freebsd"
 
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	currently depends on dmidecode which is x86-only
 
 post-patch:
 	@${RM} ${WRKSRC}/sysvinit/freebsd/cloudinit.orig
 
 post-build:
-	@cd ${WRKSRC} && ${MV} config/cloud.cfg-freebsd config/cloud.cfg
+	@cd ${WRKSRC} && ${MV} sysvinit/freebsd/cloudconfig config/cloud.cfg
 
 .include <bsd.port.mk>
Index: head/net/cloud-init/distinfo
===================================================================
--- head/net/cloud-init/distinfo	(revision 476023)
+++ head/net/cloud-init/distinfo	(revision 476024)
@@ -1,2 +1,3 @@
-SHA256 (cloud-init-0.7.6.tar.gz) = 9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db2f3ed7
-SIZE (cloud-init-0.7.6.tar.gz) = 515670
+TIMESTAMP = 1533065272
+SHA256 (cloud-init-18.3.tar.gz) = ba93bffc6bd5ba6117e4f3c59a677d7af3e1621b7482aec4c6ceab9b7b223228
+SIZE (cloud-init-18.3.tar.gz) = 915723
Index: head/net/cloud-init/files/patch-cloudinit_netinfo.py
===================================================================
--- head/net/cloud-init/files/patch-cloudinit_netinfo.py	(nonexistent)
+++ head/net/cloud-init/files/patch-cloudinit_netinfo.py	(revision 476024)
@@ -0,0 +1,16 @@
+--- cloudinit/netinfo.py.orig	2018-07-31 21:06:07 UTC
++++ cloudinit/netinfo.py
+@@ -138,9 +138,10 @@ def _netdev_info_ifconfig(ifconfig_data)
+             elif toks[i].startswith("scope:"):
+                 devs[curdev]['ipv6'][-1]['scope6'] = toks[i].lstrip("scope:")
+             elif toks[i] == "scopeid":
+-                res = re.match(r'.*<(\S+)>', toks[i + 1])
+-                if res:
+-                    devs[curdev]['ipv6'][-1]['scope6'] = res.group(1)
++                if toks[i + 1] == "0x1":
++                    devs[curdev]['ipv6']['scope6'] = "Global"
++                elif toks[i + 1] == "0x2":
++                    devs[curdev]['ipv6']['scope6'] = "Link"
+     return devs
+ 
+ 

Property changes on: head/net/cloud-init/files/patch-cloudinit_netinfo.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: head/net/cloud-init/pkg-plist
===================================================================
--- head/net/cloud-init/pkg-plist	(nonexistent)
+++ head/net/cloud-init/pkg-plist	(revision 476024)
@@ -0,0 +1,4 @@
+@comment @dir /etc/bash_completion.d
+@comment @dir /%%ETCDIR%%/cloud.cfg.d
+@comment @dir /%%ETCDIR%%/templates
+@comment @dir /%%ETCDIR%%

Property changes on: head/net/cloud-init/pkg-plist
___________________________________________________________________
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