--- cmake/install_layout.cmake.orig	2020-12-10 13:01:55.000000000 +1000
+++ cmake/install_layout.cmake	2021-12-07 12:58:31.429576000 +1000
@@ -89,7 +89,7 @@
 ENDIF()
 
 SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
-CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), WIN (as in zip installer), STANDALONE, RPM, DEB, SVR4, FREEBSD, GLIBC, OSX, SLES")
+    CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), WIN (as in zip installer), STANDALONE, RPM, DEB, SVR4, BSDSUNIX, FREEBSD, GLIBC, OSX, SLES")
 
 IF(UNIX)
   IF(INSTALL_LAYOUT MATCHES "RPM" OR
@@ -108,7 +108,7 @@
     SET(CMAKE_INSTALL_PREFIX ${default_prefix}
       CACHE PATH "install prefix" FORCE)
   ENDIF()
-  SET(VALID_INSTALL_LAYOUTS "RPM" "DEB" "SVR4" "FREEBSD" "GLIBC" "OSX" "TARGZ" "SLES" "STANDALONE")
+  SET(VALID_INSTALL_LAYOUTS "RPM" "DEB" "SVR4" "BSDSUNIX" "FREEBSD" "GLIBC" "OSX" "TARGZ" "SLES" "STANDALONE")
   LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
   IF(ind EQUAL -1)
     MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
@@ -210,6 +210,34 @@
 SET(INSTALL_PLUGINTESTDIR_WIN    ${plugin_tests})
 SET(INSTALL_SECURE_FILE_PRIVDIR_WIN ${secure_file_priv_path})
 SET(INSTALL_SECURE_FILE_PRIV_EMBEDDEDDIR_WIN ${secure_file_priv_embedded_path})
+
+#
+# BSDSUNIX layout
+#
+SET(INSTALL_BINDIR_BSDSUNIX           "bin")
+SET(INSTALL_SBINDIR_BSDSUNIX          "bin")
+SET(INSTALL_SCRIPTDIR_BSDSUNIX        "scripts")
+#
+SET(INSTALL_LIBDIR_BSDSUNIX           "lib")
+SET(INSTALL_PLUGINDIR_BSDSUNIX        "lib/plugin")
+#
+SET(INSTALL_INCLUDEDIR_BSDSUNIX       "include")
+#
+SET(INSTALL_DOCDIR_BSDSUNIX           "docs")
+SET(INSTALL_DOCREADMEDIR_BSDSUNIX     ".")
+SET(INSTALL_MANDIR_BSDSUNIX           "man")
+SET(INSTALL_INFODIR_BSDSUNIX          "docs")
+#
+SET(INSTALL_SHAREDIR_BSDSUNIX         "share")
+SET(INSTALL_MYSQLSHAREDIR_BSDSUNIX    "share")
+SET(INSTALL_MYSQLTESTDIR_BSDSUNIX     "mysql-test")
+SET(INSTALL_SUPPORTFILESDIR_BSDSUNIX  "support-files")
+#
+SET(INSTALL_MYSQLDATADIR_BSDSUNIX     "data")
+SET(INSTALL_MYSQLKEYRINGDIR_BSDSUNIX  "keyring")
+SET(INSTALL_PLUGINTESTDIR_BSDSUNIX    ${plugin_tests})
+SET(INSTALL_SECURE_FILE_PRIVDIR_BSDSUNIX ${secure_file_priv_path})
+SET(INSTALL_SECURE_FILE_PRIV_EMBEDDEDDIR_BSDSUNIX ${secure_file_priv_embedded_path})
 
 #
 # FREEBSD layout