Index: head/net/cloud-init/pkg-plist
===================================================================
--- head/net/cloud-init/pkg-plist	(revision 476231)
+++ head/net/cloud-init/pkg-plist	(nonexistent)
@@ -1,4 +0,0 @@
-@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
___________________________________________________________________
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 476231)
+++ head/net/cloud-init/Makefile	(revision 476232)
@@ -1,48 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	cloud-init
 PORTVERSION=	18.3
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 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 \
 		${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}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
 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
+	${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
 
 .include <bsd.port.mk>
Index: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig
===================================================================
--- head/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig	(nonexistent)
+++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig	(revision 476232)
@@ -0,0 +1,10 @@
+--- 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
___________________________________________________________________
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/files/patch-sysvinit_freebsd_cloudfinal
===================================================================
--- head/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal	(nonexistent)
+++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal	(revision 476232)
@@ -0,0 +1,10 @@
+--- 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
___________________________________________________________________
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/files/patch-sysvinit_freebsd_cloudinit
===================================================================
--- head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit	(revision 476231)
+++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit	(revision 476232)
@@ -1,11 +1,19 @@
---- sysvinit/freebsd/cloudinit.orig	2018-01-01 11:58:33 UTC
+--- 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"
Index: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal
===================================================================
--- head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal	(nonexistent)
+++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal	(revision 476232)
@@ -0,0 +1,10 @@
+--- 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
___________________________________________________________________
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