diff --git a/net/samba420/Makefile b/net/samba422/Makefile
similarity index 100%
rename from net/samba420/Makefile
rename to net/samba422/Makefile
diff --git a/net/samba420/distinfo b/net/samba422/distinfo
similarity index 100%
rename from net/samba420/distinfo
rename to net/samba422/distinfo
diff --git a/net/samba420/files/0001-Compact-and-simplify-modules-build-and-config-genera.patch b/net/samba422/files/0001-Compact-and-simplify-modules-build-and-config-genera.patch
similarity index 100%
rename from net/samba420/files/0001-Compact-and-simplify-modules-build-and-config-genera.patch
rename to net/samba422/files/0001-Compact-and-simplify-modules-build-and-config-genera.patch
diff --git a/net/samba420/files/0002-Adjust-abi_gen.sh-script-to-run-under-FreeBSD-with-i.patch b/net/samba422/files/0002-Adjust-abi_gen.sh-script-to-run-under-FreeBSD-with-i.patch
similarity index 100%
rename from net/samba420/files/0002-Adjust-abi_gen.sh-script-to-run-under-FreeBSD-with-i.patch
rename to net/samba422/files/0002-Adjust-abi_gen.sh-script-to-run-under-FreeBSD-with-i.patch
diff --git a/net/samba420/files/0003-Mask-CLang-prototype-warnings-in-kadm5-admin.h.patch b/net/samba422/files/0003-Mask-CLang-prototype-warnings-in-kadm5-admin.h.patch
similarity index 100%
rename from net/samba420/files/0003-Mask-CLang-prototype-warnings-in-kadm5-admin.h.patch
rename to net/samba422/files/0003-Mask-CLang-prototype-warnings-in-kadm5-admin.h.patch
diff --git a/net/samba420/files/0004-On-FreeBSD-date-1-has-different-semantics-than-on-Li.patch b/net/samba422/files/0004-On-FreeBSD-date-1-has-different-semantics-than-on-Li.patch
similarity index 100%
rename from net/samba420/files/0004-On-FreeBSD-date-1-has-different-semantics-than-on-Li.patch
rename to net/samba422/files/0004-On-FreeBSD-date-1-has-different-semantics-than-on-Li.patch
diff --git a/net/samba420/files/0005-Include-jemalloc-jemalloc.h-if-ENABLE_JEMALLOC-is-se.patch b/net/samba422/files/0005-Include-jemalloc-jemalloc.h-if-ENABLE_JEMALLOC-is-se.patch
similarity index 100%
rename from net/samba420/files/0005-Include-jemalloc-jemalloc.h-if-ENABLE_JEMALLOC-is-se.patch
rename to net/samba422/files/0005-Include-jemalloc-jemalloc.h-if-ENABLE_JEMALLOC-is-se.patch
diff --git a/net/samba420/files/0006-Install-nss_-modules-into-PAMMODULESDIR-path.patch b/net/samba422/files/0006-Install-nss_-modules-into-PAMMODULESDIR-path.patch
similarity index 100%
rename from net/samba420/files/0006-Install-nss_-modules-into-PAMMODULESDIR-path.patch
rename to net/samba422/files/0006-Install-nss_-modules-into-PAMMODULESDIR-path.patch
diff --git a/net/samba420/files/0007-Use-macro-value-as-a-default-backlog-size-for-the-li.patch b/net/samba422/files/0007-Use-macro-value-as-a-default-backlog-size-for-the-li.patch
similarity index 100%
rename from net/samba420/files/0007-Use-macro-value-as-a-default-backlog-size-for-the-li.patch
rename to net/samba422/files/0007-Use-macro-value-as-a-default-backlog-size-for-the-li.patch
diff --git a/net/samba420/files/0008-Brute-force-work-around-usage-of-Linux-specific-m-fl.patch b/net/samba422/files/0008-Brute-force-work-around-usage-of-Linux-specific-m-fl.patch
similarity index 100%
rename from net/samba420/files/0008-Brute-force-work-around-usage-of-Linux-specific-m-fl.patch
rename to net/samba422/files/0008-Brute-force-work-around-usage-of-Linux-specific-m-fl.patch
diff --git a/net/samba420/files/0009-Make-sure-that-config-checks-fail-if-the-warning-is-.patch b/net/samba422/files/0009-Make-sure-that-config-checks-fail-if-the-warning-is-.patch
similarity index 100%
rename from net/samba420/files/0009-Make-sure-that-config-checks-fail-if-the-warning-is-.patch
rename to net/samba422/files/0009-Make-sure-that-config-checks-fail-if-the-warning-is-.patch
diff --git a/net/samba420/files/0010-Add-option-with-pkgconfigdir-to-specify-alternative-.patch b/net/samba422/files/0010-Add-option-with-pkgconfigdir-to-specify-alternative-.patch
similarity index 100%
rename from net/samba420/files/0010-Add-option-with-pkgconfigdir-to-specify-alternative-.patch
rename to net/samba422/files/0010-Add-option-with-pkgconfigdir-to-specify-alternative-.patch
diff --git a/net/samba420/files/0011-Use-provided-by-port-location-of-the-XML-catalog.patch b/net/samba422/files/0011-Use-provided-by-port-location-of-the-XML-catalog.patch
similarity index 100%
rename from net/samba420/files/0011-Use-provided-by-port-location-of-the-XML-catalog.patch
rename to net/samba422/files/0011-Use-provided-by-port-location-of-the-XML-catalog.patch
diff --git a/net/samba420/files/0012-Create-shared-libraries-according-to-the-FreeBSD-spe.patch b/net/samba422/files/0012-Create-shared-libraries-according-to-the-FreeBSD-spe.patch
similarity index 100%
rename from net/samba420/files/0012-Create-shared-libraries-according-to-the-FreeBSD-spe.patch
rename to net/samba422/files/0012-Create-shared-libraries-according-to-the-FreeBSD-spe.patch
diff --git a/net/samba420/files/0013-Pass-additional-msg-parameter-to-CHECK_LIB-so-it-can.patch b/net/samba422/files/0013-Pass-additional-msg-parameter-to-CHECK_LIB-so-it-can.patch
similarity index 100%
rename from net/samba420/files/0013-Pass-additional-msg-parameter-to-CHECK_LIB-so-it-can.patch
rename to net/samba422/files/0013-Pass-additional-msg-parameter-to-CHECK_LIB-so-it-can.patch
diff --git a/net/samba420/files/0014-Add-option-to-disable-CTDB-tests-failing-on-FreeBSD-.patch b/net/samba422/files/0014-Add-option-to-disable-CTDB-tests-failing-on-FreeBSD-.patch
similarity index 100%
rename from net/samba420/files/0014-Add-option-to-disable-CTDB-tests-failing-on-FreeBSD-.patch
rename to net/samba422/files/0014-Add-option-to-disable-CTDB-tests-failing-on-FreeBSD-.patch
diff --git a/net/samba420/files/0015-Add-extra-debug-class-to-trck-down-DB-locking-code.patch b/net/samba422/files/0015-Add-extra-debug-class-to-trck-down-DB-locking-code.patch
similarity index 100%
rename from net/samba420/files/0015-Add-extra-debug-class-to-trck-down-DB-locking-code.patch
rename to net/samba422/files/0015-Add-extra-debug-class-to-trck-down-DB-locking-code.patch
diff --git a/net/samba420/files/0016-Make-ldb_schema_attribute_compare-a-stable-comparisi.patch b/net/samba422/files/0016-Make-ldb_schema_attribute_compare-a-stable-comparisi.patch
similarity index 100%
rename from net/samba420/files/0016-Make-ldb_schema_attribute_compare-a-stable-comparisi.patch
rename to net/samba422/files/0016-Make-ldb_schema_attribute_compare-a-stable-comparisi.patch
diff --git a/net/samba420/files/0017-Use-arc4random-when-available-to-generate-random-tal.patch b/net/samba422/files/0017-Use-arc4random-when-available-to-generate-random-tal.patch
similarity index 100%
rename from net/samba420/files/0017-Use-arc4random-when-available-to-generate-random-tal.patch
rename to net/samba422/files/0017-Use-arc4random-when-available-to-generate-random-tal.patch
diff --git a/net/samba420/files/0018-Add-configuration-option-that-allows-to-choose-alter.patch b/net/samba422/files/0018-Add-configuration-option-that-allows-to-choose-alter.patch
similarity index 100%
rename from net/samba420/files/0018-Add-configuration-option-that-allows-to-choose-alter.patch
rename to net/samba422/files/0018-Add-configuration-option-that-allows-to-choose-alter.patch
diff --git a/net/samba420/files/0019-From-923bc7a1afeb0b920e60e14846987ae1d2d7dca4-Mon-Se.patch b/net/samba422/files/0019-From-923bc7a1afeb0b920e60e14846987ae1d2d7dca4-Mon-Se.patch
similarity index 100%
rename from net/samba420/files/0019-From-923bc7a1afeb0b920e60e14846987ae1d2d7dca4-Mon-Se.patch
rename to net/samba422/files/0019-From-923bc7a1afeb0b920e60e14846987ae1d2d7dca4-Mon-Se.patch
diff --git a/net/samba420/files/0020-FreeBSD-12-between-r336017-and-r342928-wrongfuly-ret.patch b/net/samba422/files/0020-FreeBSD-12-between-r336017-and-r342928-wrongfuly-ret.patch
similarity index 100%
rename from net/samba420/files/0020-FreeBSD-12-between-r336017-and-r342928-wrongfuly-ret.patch
rename to net/samba422/files/0020-FreeBSD-12-between-r336017-and-r342928-wrongfuly-ret.patch
diff --git a/net/samba420/files/0021-Fix-casting-warnings-in-the-nfs_quota-debug-message.patch b/net/samba422/files/0021-Fix-casting-warnings-in-the-nfs_quota-debug-message.patch
similarity index 100%
rename from net/samba420/files/0021-Fix-casting-warnings-in-the-nfs_quota-debug-message.patch
rename to net/samba422/files/0021-Fix-casting-warnings-in-the-nfs_quota-debug-message.patch
diff --git a/net/samba420/files/0022-Clean-up-UTMP-handling-code-and-add-FreeBSD-support..patch b/net/samba422/files/0022-Clean-up-UTMP-handling-code-and-add-FreeBSD-support..patch
similarity index 100%
rename from net/samba420/files/0022-Clean-up-UTMP-handling-code-and-add-FreeBSD-support..patch
rename to net/samba422/files/0022-Clean-up-UTMP-handling-code-and-add-FreeBSD-support..patch
diff --git a/net/samba420/files/0023-Add-cmd_get_quota-test-function-into-vfstest-to-test.patch b/net/samba422/files/0023-Add-cmd_get_quota-test-function-into-vfstest-to-test.patch
similarity index 100%
rename from net/samba420/files/0023-Add-cmd_get_quota-test-function-into-vfstest-to-test.patch
rename to net/samba422/files/0023-Add-cmd_get_quota-test-function-into-vfstest-to-test.patch
diff --git a/net/samba420/files/0024-Cherry-pick-ZFS-provisioning-code-by-iXsystems-Inc.patch b/net/samba422/files/0024-Cherry-pick-ZFS-provisioning-code-by-iXsystems-Inc.patch
similarity index 100%
rename from net/samba420/files/0024-Cherry-pick-ZFS-provisioning-code-by-iXsystems-Inc.patch
rename to net/samba422/files/0024-Cherry-pick-ZFS-provisioning-code-by-iXsystems-Inc.patch
diff --git a/net/samba420/files/0025-From-d9b748869a8f4018ebee302aae8246bf29f60309-Mon-Se.patch b/net/samba422/files/0025-From-d9b748869a8f4018ebee302aae8246bf29f60309-Mon-Se.patch
similarity index 100%
rename from net/samba420/files/0025-From-d9b748869a8f4018ebee302aae8246bf29f60309-Mon-Se.patch
rename to net/samba422/files/0025-From-d9b748869a8f4018ebee302aae8246bf29f60309-Mon-Se.patch
diff --git a/net/samba420/files/0026-vfs-add-a-compatibility-option-to-the-vfs_streams_xa.patch b/net/samba422/files/0026-vfs-add-a-compatibility-option-to-the-vfs_streams_xa.patch
similarity index 100%
rename from net/samba420/files/0026-vfs-add-a-compatibility-option-to-the-vfs_streams_xa.patch
rename to net/samba422/files/0026-vfs-add-a-compatibility-option-to-the-vfs_streams_xa.patch
diff --git a/net/samba420/files/0027-Add-VFS-module-vfs_freebsd-that-implements-FreeBSD-s.patch b/net/samba422/files/0027-Add-VFS-module-vfs_freebsd-that-implements-FreeBSD-s.patch
similarity index 100%
rename from net/samba420/files/0027-Add-VFS-module-vfs_freebsd-that-implements-FreeBSD-s.patch
rename to net/samba422/files/0027-Add-VFS-module-vfs_freebsd-that-implements-FreeBSD-s.patch
diff --git a/net/samba420/files/0028-Fix-rl_completion_func_t.patch b/net/samba422/files/0028-Fix-rl_completion_func_t.patch
similarity index 100%
rename from net/samba420/files/0028-Fix-rl_completion_func_t.patch
rename to net/samba422/files/0028-Fix-rl_completion_func_t.patch
diff --git a/net/samba420/files/0028-s3-lib-system-add-FreeBSD-proc_fd_pattern.patch b/net/samba422/files/0028-s3-lib-system-add-FreeBSD-proc_fd_pattern.patch
similarity index 100%
rename from net/samba420/files/0028-s3-lib-system-add-FreeBSD-proc_fd_pattern.patch
rename to net/samba422/files/0028-s3-lib-system-add-FreeBSD-proc_fd_pattern.patch
diff --git a/net/samba420/files/0099-s3-modules-zfsacl-fix-get-set-ACL-on-FreeBSD-13.patch b/net/samba422/files/0099-s3-modules-zfsacl-fix-get-set-ACL-on-FreeBSD-13.patch
similarity index 100%
rename from net/samba420/files/0099-s3-modules-zfsacl-fix-get-set-ACL-on-FreeBSD-13.patch
rename to net/samba422/files/0099-s3-modules-zfsacl-fix-get-set-ACL-on-FreeBSD-13.patch
diff --git a/net/samba420/files/0100-Fix-pathref-handling-for-FreeBSD-13plus_samba42x.patch b/net/samba422/files/0100-Fix-pathref-handling-for-FreeBSD-13plus_samba42x.patch
similarity index 100%
rename from net/samba420/files/0100-Fix-pathref-handling-for-FreeBSD-13plus_samba42x.patch
rename to net/samba422/files/0100-Fix-pathref-handling-for-FreeBSD-13plus_samba42x.patch
diff --git a/net/samba420/files/0102-FreeBSD-vfs_freebsd-fix-sys_proc_fd_path-args.patch b/net/samba422/files/0102-FreeBSD-vfs_freebsd-fix-sys_proc_fd_path-args.patch
similarity index 100%
rename from net/samba420/files/0102-FreeBSD-vfs_freebsd-fix-sys_proc_fd_path-args.patch
rename to net/samba422/files/0102-FreeBSD-vfs_freebsd-fix-sys_proc_fd_path-args.patch
diff --git a/net/samba420/files/README.FreeBSD.in b/net/samba422/files/README.FreeBSD.in
similarity index 100%
rename from net/samba420/files/README.FreeBSD.in
rename to net/samba422/files/README.FreeBSD.in
diff --git a/net/samba420/files/patch-examples_pdb_wscript__build b/net/samba422/files/patch-examples_pdb_wscript__build
similarity index 100%
rename from net/samba420/files/patch-examples_pdb_wscript__build
rename to net/samba422/files/patch-examples_pdb_wscript__build
diff --git a/net/samba420/files/patch-lib_ldb_wscript b/net/samba422/files/patch-lib_ldb_wscript
similarity index 100%
rename from net/samba420/files/patch-lib_ldb_wscript
rename to net/samba422/files/patch-lib_ldb_wscript
diff --git a/net/samba420/files/patch-lib_talloc_wscript b/net/samba422/files/patch-lib_talloc_wscript
similarity index 100%
rename from net/samba420/files/patch-lib_talloc_wscript
rename to net/samba422/files/patch-lib_talloc_wscript
diff --git a/net/samba420/files/patch-lib_util_wscript__build b/net/samba422/files/patch-lib_util_wscript__build
similarity index 100%
rename from net/samba420/files/patch-lib_util_wscript__build
rename to net/samba422/files/patch-lib_util_wscript__build
diff --git a/net/samba420/files/patch-python_samba_tdb__util.py b/net/samba422/files/patch-python_samba_tdb__util.py
similarity index 100%
rename from net/samba420/files/patch-python_samba_tdb__util.py
rename to net/samba422/files/patch-python_samba_tdb__util.py
diff --git a/net/samba420/files/patch-source3_lib_util.c b/net/samba422/files/patch-source3_lib_util.c
similarity index 100%
rename from net/samba420/files/patch-source3_lib_util.c
rename to net/samba422/files/patch-source3_lib_util.c
diff --git a/net/samba420/files/patch-source3_librpc_crypto_gse.c b/net/samba422/files/patch-source3_librpc_crypto_gse.c
similarity index 100%
rename from net/samba420/files/patch-source3_librpc_crypto_gse.c
rename to net/samba422/files/patch-source3_librpc_crypto_gse.c
diff --git a/net/samba420/files/patch-source3_modules_vfs__virusfilter__utils.c b/net/samba422/files/patch-source3_modules_vfs__virusfilter__utils.c
similarity index 100%
rename from net/samba420/files/patch-source3_modules_vfs__virusfilter__utils.c
rename to net/samba422/files/patch-source3_modules_vfs__virusfilter__utils.c
diff --git a/net/samba420/files/patch-source3_registry_tests_test__regfio.c b/net/samba422/files/patch-source3_registry_tests_test__regfio.c
similarity index 100%
rename from net/samba420/files/patch-source3_registry_tests_test__regfio.c
rename to net/samba422/files/patch-source3_registry_tests_test__regfio.c
diff --git a/net/samba420/files/patch-source3_winbindd_wscript__build b/net/samba422/files/patch-source3_winbindd_wscript__build
similarity index 100%
rename from net/samba420/files/patch-source3_winbindd_wscript__build
rename to net/samba422/files/patch-source3_winbindd_wscript__build
diff --git a/net/samba420/files/patch-source3_wscript__build b/net/samba422/files/patch-source3_wscript__build
similarity index 100%
rename from net/samba420/files/patch-source3_wscript__build
rename to net/samba422/files/patch-source3_wscript__build
diff --git a/net/samba420/files/pkg-message.in b/net/samba422/files/pkg-message.in
similarity index 100%
rename from net/samba420/files/pkg-message.in
rename to net/samba422/files/pkg-message.in
diff --git a/net/samba420/files/samba_server.in b/net/samba422/files/samba_server.in
similarity index 100%
rename from net/samba420/files/samba_server.in
rename to net/samba422/files/samba_server.in
diff --git a/net/samba420/pkg-descr b/net/samba422/pkg-descr
similarity index 100%
rename from net/samba420/pkg-descr
rename to net/samba422/pkg-descr
diff --git a/net/samba420/pkg-plist b/net/samba422/pkg-plist
similarity index 100%
rename from net/samba420/pkg-plist
rename to net/samba422/pkg-plist
diff --git a/net/samba420/pkg-plist.ad_dc b/net/samba422/pkg-plist.ad_dc
similarity index 100%
rename from net/samba420/pkg-plist.ad_dc
rename to net/samba422/pkg-plist.ad_dc
diff --git a/net/samba420/pkg-plist.cluster b/net/samba422/pkg-plist.cluster
similarity index 100%
rename from net/samba420/pkg-plist.cluster
rename to net/samba422/pkg-plist.cluster
diff --git a/net/samba420/pkg-plist.python b/net/samba422/pkg-plist.python
similarity index 100%
rename from net/samba420/pkg-plist.python
rename to net/samba422/pkg-plist.python