Index: Makefile
===================================================================
--- Makefile	(revision 553614)
+++ Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	cloud-init
 PORTVERSION=	20.3
+PORTREVISION=	1
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -22,7 +23,6 @@
 		${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}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} \
Index: files/patch-cloudinit_config_cc__resizefs.py
===================================================================
--- files/patch-cloudinit_config_cc__resizefs.py	(nonexistent)
+++ files/patch-cloudinit_config_cc__resizefs.py	(working copy)
@@ -0,0 +1,11 @@
+--- cloudinit/config/cc_resizefs.py.orig	2020-10-29 12:41:28 UTC
++++ cloudinit/config/cc_resizefs.py
+@@ -110,7 +110,7 @@ def _can_skip_resize_ufs(mount_point, devpth):
+     for line in dumpfs_res.splitlines():
+         if not line.startswith('#'):
+             newfs_cmd = shlex.split(line)
+-            opt_value = 'O:Ua:s:b:d:e:f:g:h:i:jk:m:o:L:'
++            opt_value = 'O:Ua:s:b:d:e:f:g:h:i:jk:l:m:o:t:L:'
+             optlist, _args = getopt.getopt(newfs_cmd[1:], opt_value)
+             for o, a in optlist:
+                 if o == "-s":

Property changes on: files/patch-cloudinit_config_cc__resizefs.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: files/patch-cloudinit_util.py
===================================================================
--- files/patch-cloudinit_util.py	(nonexistent)
+++ files/patch-cloudinit_util.py	(working copy)
@@ -0,0 +1,16 @@
+--- cloudinit/util.py.orig	2020-10-29 12:40:41 UTC
++++ cloudinit/util.py
+@@ -1652,10 +1652,12 @@ def mount_cb(device, callback, data=None, mtype=None,
+             mtypes = ["auto"]
+     elif platsys.endswith("bsd"):
+         if mtypes is None:
+-            mtypes = ['ufs', 'cd9660', 'vfat']
++            mtypes = ['ufs', 'cd9660', 'msdos']
+         for index, mtype in enumerate(mtypes):
+             if mtype == "iso9660":
+                 mtypes[index] = "cd9660"
++            if mtype in ["vfat", "msdosfs", "msdos"]:
++                mtypes[index] = "msdos"
+     else:
+         # we cannot do a smart "auto", so just call 'mount' once with no -t
+         mtypes = ['']

Property changes on: files/patch-cloudinit_util.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