Index: head/net/cloud-init/Makefile
===================================================================
--- head/net/cloud-init/Makefile	(revision 568665)
+++ head/net/cloud-init/Makefile	(revision 568666)
@@ -1,49 +1,50 @@
 # $FreeBSD$
 
 PORTNAME=	cloud-init
 DISTVERSION=	20.4.1
+PORTREVISION=	1
 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
 
 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_config_cc__salt__minion.py
===================================================================
--- head/net/cloud-init/files/patch-cloudinit_config_cc__salt__minion.py	(nonexistent)
+++ head/net/cloud-init/files/patch-cloudinit_config_cc__salt__minion.py	(revision 568666)
@@ -0,0 +1,21 @@
+--- cloudinit/config/cc_salt_minion.py.orig	2021-01-15 17:33:05 UTC
++++ cloudinit/config/cc_salt_minion.py
+@@ -46,7 +46,7 @@ specify them with ``pkg_name``, ``service_name`` and `
+ import os
+ 
+ from cloudinit import safeyaml, subp, util
+-from cloudinit.distros import rhel_util
++from cloudinit.distros import bsd_utils
+ 
+ 
+ # Note: see https://docs.saltstack.com/en/latest/topics/installation/
+@@ -125,8 +141,7 @@ def handle(name, cfg, cloud, log, _args):
+     # we need to have the salt minion service enabled in rc in order to be
+     # able to start the service. this does only apply on FreeBSD servers.
+     if cloud.distro.osfamily == 'freebsd':
+-        rhel_util.update_sysconfig_file(
+-            '/etc/rc.conf', {'salt_minion_enable': 'YES'})
++        bsd_utils.set_rc_config_value('salt_minion_enable', 'YES')
+ 
+     # restart salt-minion. 'service' will start even if not started. if it
+     # was started, it needs to be restarted for config change.

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