diff --git a/lang/php71/Makefile b/lang/php71/Makefile
index 24b2f9626384..dc4f60d9d1a9 100644
--- a/lang/php71/Makefile
+++ b/lang/php71/Makefile
@@ -34,8 +34,8 @@ USE_GNOME=	libxml2
 # PR230207 Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-z,notext
 
-OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD MYSQL LINKTHR ZTS
-OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQL LINKTHR DTRACE
+OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD MYSQLND LINKTHR ZTS
+OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQLND LINKTHR DTRACE
 OPTIONS_EXCLUDE_DragonFly=	DTRACE
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
@@ -54,7 +54,7 @@ FPM_DESC=	Build FPM version
 EMBED_DESC=	Build embedded library
 PHPDBG_DESC=	Interactive PHP debugger
 MAILHEAD_DESC=	Enable mail header patch
-MYSQL_DESC=	Build with MySQL Native Driver
+MYSQLND_DESC=	Build with MySQL Native Driver
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
@@ -71,7 +71,7 @@ PATCHFILES+=	php-7.1.x-mail-header.patch:mail
 PATCH_SITES+=	http://choon.net/opensource/php/:mail
 .endif
 
-.if ${PORT_OPTIONS:MMYSQL}
+.if ${PORT_OPTIONS:MMYSQLND}
 CONFIGURE_ARGS+=--enable-mysqlnd
 .endif
 
diff --git a/lang/php71/pkg-plist b/lang/php71/pkg-plist
index f21d898e47e9..a4e82b80f7db 100644
--- a/lang/php71/pkg-plist
+++ b/lang/php71/pkg-plist
@@ -92,33 +92,33 @@ include/php/ext/date/lib/timelib_config.h
 include/php/ext/date/lib/timelib_structs.h
 include/php/ext/date/php_date.h
 include/php/ext/libxml/php_libxml.h
-%%MYSQL%%include/php/ext/mysqlnd/config-win.h
-%%MYSQL%%include/php/ext/mysqlnd/mysql_float_to_double.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_alloc.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_auth.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_block_alloc.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_charset.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_commands.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_connection.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_debug.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_ext_plugin.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_plugin.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_portability.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_priv.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_ps.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_read_buffer.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_result.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_result_meta.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_reverse_api.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_statistics.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_structs.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_vio.h
-%%MYSQL%%include/php/ext/mysqlnd/php_mysqlnd.h
+%%MYSQLND%%include/php/ext/mysqlnd/config-win.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysql_float_to_double.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_alloc.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_auth.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_block_alloc.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_charset.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_commands.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_connection.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_debug.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_ext_plugin.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_plugin.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_portability.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_priv.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_ps.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_read_buffer.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_result.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_result_meta.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_reverse_api.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_statistics.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_structs.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_vio.h
+%%MYSQLND%%include/php/ext/mysqlnd/php_mysqlnd.h
 include/php/ext/pcre/php_pcre.h
 include/php/ext/spl/php_spl.h
 include/php/ext/spl/spl_array.h
diff --git a/lang/php72/Makefile b/lang/php72/Makefile
index 6bc93e298b8d..bf235ce58728 100644
--- a/lang/php72/Makefile
+++ b/lang/php72/Makefile
@@ -35,8 +35,8 @@ USE_GNOME=	libxml2
 # PR230207 Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-z,notext
 
-OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MYSQL LINKTHR ZTS
-OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQL LINKTHR DTRACE
+OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MYSQLND LINKTHR ZTS
+OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQLND LINKTHR DTRACE
 OPTIONS_EXCLUDE_DragonFly=	DTRACE
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
@@ -54,7 +54,7 @@ CGI_DESC=	Build CGI version
 FPM_DESC=	Build FPM version
 EMBED_DESC=	Build embedded library
 PHPDBG_DESC=	Interactive PHP debugger
-MYSQL_DESC=	Build with MySQL Native Driver
+MYSQLND_DESC=	Build with MySQL Native Driver
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
@@ -64,7 +64,7 @@ DESTDIRNAME=	INSTALL_ROOT
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MMYSQL}
+.if ${PORT_OPTIONS:MMYSQLND}
 CONFIGURE_ARGS+=--enable-mysqlnd
 .endif
 
diff --git a/lang/php72/pkg-plist b/lang/php72/pkg-plist
index 73678fe52912..56e7063334e1 100644
--- a/lang/php72/pkg-plist
+++ b/lang/php72/pkg-plist
@@ -92,33 +92,33 @@ include/php/ext/date/lib/timelib.h
 include/php/ext/date/lib/timelib_config.h
 include/php/ext/date/php_date.h
 include/php/ext/libxml/php_libxml.h
-%%MYSQL%%include/php/ext/mysqlnd/config-win.h
-%%MYSQL%%include/php/ext/mysqlnd/mysql_float_to_double.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_alloc.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_auth.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_block_alloc.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_charset.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_commands.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_connection.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_debug.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_ext_plugin.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_plugin.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_portability.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_priv.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_ps.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_read_buffer.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_result.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_result_meta.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_reverse_api.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_statistics.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_structs.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_vio.h
-%%MYSQL%%include/php/ext/mysqlnd/php_mysqlnd.h
+%%MYSQLND%%include/php/ext/mysqlnd/config-win.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysql_float_to_double.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_alloc.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_auth.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_block_alloc.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_charset.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_commands.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_connection.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_debug.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_ext_plugin.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_plugin.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_portability.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_priv.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_ps.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_read_buffer.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_result.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_result_meta.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_reverse_api.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_statistics.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_structs.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_vio.h
+%%MYSQLND%%include/php/ext/mysqlnd/php_mysqlnd.h
 include/php/ext/pcre/php_pcre.h
 include/php/ext/spl/php_spl.h
 include/php/ext/spl/spl_array.h
diff --git a/lang/php73/Makefile b/lang/php73/Makefile
index 2eefaf122c95..0bb03f2b5367 100644
--- a/lang/php73/Makefile
+++ b/lang/php73/Makefile
@@ -35,8 +35,8 @@ USE_GNOME=	libxml2
 # PR230207 Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-z,notext
 
-OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MYSQL LINKTHR ZTS
-OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQL LINKTHR DTRACE
+OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MYSQLND LINKTHR ZTS
+OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQLND LINKTHR DTRACE
 OPTIONS_EXCLUDE_DragonFly=	DTRACE
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
@@ -54,7 +54,7 @@ CGI_DESC=	Build CGI version
 FPM_DESC=	Build FPM version
 EMBED_DESC=	Build embedded library
 PHPDBG_DESC=	Interactive PHP debugger
-MYSQL_DESC=	Build with MySQL Native Driver
+MYSQLND_DESC=	Build with MySQL Native Driver
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
@@ -64,7 +64,7 @@ DESTDIRNAME=	INSTALL_ROOT
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MMYSQL}
+.if ${PORT_OPTIONS:MMYSQLND}
 CONFIGURE_ARGS+=--enable-mysqlnd
 .endif
 
diff --git a/lang/php73/pkg-plist b/lang/php73/pkg-plist
index b52bb051c47c..ec9944af89e7 100644
--- a/lang/php73/pkg-plist
+++ b/lang/php73/pkg-plist
@@ -96,33 +96,33 @@ include/php/ext/date/lib/timelib.h
 include/php/ext/date/lib/timelib_config.h
 include/php/ext/date/php_date.h
 include/php/ext/libxml/php_libxml.h
-%%MYSQL%%include/php/ext/mysqlnd/config-win.h
-%%MYSQL%%include/php/ext/mysqlnd/mysql_float_to_double.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_alloc.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_auth.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_block_alloc.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_charset.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_commands.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_connection.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_debug.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_ext_plugin.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_plugin.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_portability.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_priv.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_ps.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_read_buffer.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_result.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_result_meta.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_reverse_api.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_statistics.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_structs.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
-%%MYSQL%%include/php/ext/mysqlnd/mysqlnd_vio.h
-%%MYSQL%%include/php/ext/mysqlnd/php_mysqlnd.h
+%%MYSQLND%%include/php/ext/mysqlnd/config-win.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysql_float_to_double.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_alloc.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_auth.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_block_alloc.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_charset.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_commands.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_connection.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_debug.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_ext_plugin.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_plugin.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_portability.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_priv.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_ps.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_read_buffer.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_result.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_result_meta.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_reverse_api.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_statistics.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_structs.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
+%%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_vio.h
+%%MYSQLND%%include/php/ext/mysqlnd/php_mysqlnd.h
 include/php/ext/pcre/php_pcre.h
 include/php/ext/spl/php_spl.h
 include/php/ext/spl/spl_array.h