Index: head/net/cloud-init/Makefile
===================================================================
--- head/net/cloud-init/Makefile	(revision 568751)
+++ head/net/cloud-init/Makefile	(revision 568752)
@@ -1,50 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	cloud-init
 DISTVERSION=	20.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	andrey@bsdnir.info
 COMMENT=	Init scripts for use on cloud images
 
 LICENSE=	APACHE20 GPLv3
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-Apache2.0
 LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE-GPLv3
 
 RUN_DEPENDS=	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}pyserial>0:comms/py-pyserial@${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:3.6+ 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"
 
 NO_ARCH=	yes
 
 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
+	${REINPLACE_CMD} -e 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g' ${WRKSRC}/setup.py
+	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/cloudinit/settings.py
 
 post-build:
 	@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/files/patch-cloudinit_settings.py
===================================================================
--- head/net/cloud-init/files/patch-cloudinit_settings.py	(nonexistent)
+++ head/net/cloud-init/files/patch-cloudinit_settings.py	(revision 568752)
@@ -0,0 +1,20 @@
+--- cloudinit/settings.py.orig	2021-03-17 15:43:42 UTC
++++ cloudinit/settings.py
+@@ -12,7 +12,7 @@
+ CFG_ENV_NAME = "CLOUD_CFG"
+ 
+ # This is expected to be a yaml formatted file
+-CLOUD_CONFIG = '/etc/cloud/cloud.cfg'
++CLOUD_CONFIG = '%%PREFIX%%/etc/cloud/cloud.cfg'
+ 
+ RUN_CLOUD_CONFIG = '/run/cloud-init/cloud.cfg'
+ 
+@@ -50,7 +50,7 @@ CFG_BUILTIN = {
+     'system_info': {
+         'paths': {
+             'cloud_dir': '/var/lib/cloud',
+-            'templates_dir': '/etc/cloud/templates/',
++            'templates_dir': '%%PREFIX%%/etc/cloud/templates/',
+         },
+         'distro': 'ubuntu',
+         'network': {'renderers': None},

Property changes on: head/net/cloud-init/files/patch-cloudinit_settings.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/files/patch-setup.py
===================================================================
--- head/net/cloud-init/files/patch-setup.py	(nonexistent)
+++ head/net/cloud-init/files/patch-setup.py	(revision 568752)
@@ -0,0 +1,11 @@
+--- setup.py.orig	2021-03-17 15:40:30 UTC
++++ setup.py
+@@ -153,7 +153,7 @@ INITSYS_TYPES = sorted([f.partition(".")[0] for f in I
+ # Install everything in the right location and take care of Linux (default) and
+ # FreeBSD systems.
+ USR = "usr"
+-ETC = "etc"
++ETC = "%%PREFIX%%/etc"
+ USR_LIB_EXEC = "usr/lib"
+ LIB = "lib"
+ if os.uname()[0] == 'FreeBSD':

Property changes on: head/net/cloud-init/files/patch-setup.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