diff options
| -rw-r--r-- | Mk/Uses/mysql.mk | 4 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 | ||||
| -rw-r--r-- | databases/ateam_mysql57_ldap_auth/Makefile | 2 | ||||
| -rw-r--r-- | databases/mroonga/Makefile | 2 | ||||
| -rw-r--r-- | databases/mysql-connector-odbc-80/Makefile | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk index 58dd085288ef..7605397f8003 100644 --- a/Mk/Uses/mysql.mk +++ b/Mk/Uses/mysql.mk @@ -67,7 +67,7 @@ DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//} MYSQL57_LIBVER= 20 MYSQL57p_LIBVER= 20 MYSQL80_LIBVER= 21 -. for v in 3 4 5 6 11 +. for v in 4 5 6 11 MYSQL10${v}m_LIBVER= 3 . endfor @@ -129,7 +129,7 @@ _MYSQL_SHLIB= libmysqlclient . if (${MYSQL_VER:C/[0-9]*//} == "m") _MYSQL_SERVER_FLAVOUR= mariadb _MYSQL_CLIENT_FLAVOUR= mariadb -. if ${MYSQL_VER:C/m//} >= 103 +. if ${MYSQL_VER:C/m//} >= 104 _MYSQL_SHLIB= libmariadb . endif . elif (${MYSQL_VER:C/[0-9]*//} == "p") diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index a0c30b3c1fbd..4da7724fbdf1 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -93,7 +93,7 @@ LUAJIT_DEFAULT?= luajit-devel . endif # Possible values: 5.10, 5.20, 6.8 MONO_DEFAULT?= 5.10 -# Possible values: 5.7, 8.0, 10.3m, 10.4m, 10.5m, 5.7p, 5.7w +# Possible values: 5.7, 8.0, 10.4m, 10.5m, 5.7p, 5.7w MYSQL_DEFAULT?= 8.0 # Possible values: ninja, samurai NINJA_DEFAULT?= ninja diff --git a/databases/ateam_mysql57_ldap_auth/Makefile b/databases/ateam_mysql57_ldap_auth/Makefile index cbb898070007..97c739df0ed3 100644 --- a/databases/ateam_mysql57_ldap_auth/Makefile +++ b/databases/ateam_mysql57_ldap_auth/Makefile @@ -10,7 +10,7 @@ WWW= https://github.com/ateamsystems/ateam_mysql_ldap_auth LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -IGNORE_WITH_MYSQL= 80 103m +IGNORE_WITH_MYSQL= 80 LIB_DEPENDS= libconfig.so:devel/libconfig diff --git a/databases/mroonga/Makefile b/databases/mroonga/Makefile index 692a5b572231..548e8e57c3b9 100644 --- a/databases/mroonga/Makefile +++ b/databases/mroonga/Makefile @@ -14,7 +14,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${_MYSQL_SERVER}:configure LIB_DEPENDS= libgroonga.so:textproc/groonga USES= compiler:c11 libtool mysql pkgconfig shebangfix -IGNORE_WITH_MYSQL= 103m 57p 57w +IGNORE_WITH_MYSQL= 57p 57w SHEBANG_FILES= data/rpm/post.sh data/rpm/preun.sh diff --git a/databases/mysql-connector-odbc-80/Makefile b/databases/mysql-connector-odbc-80/Makefile index 41b5da967b80..59346d1f33fc 100644 --- a/databases/mysql-connector-odbc-80/Makefile +++ b/databases/mysql-connector-odbc-80/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libodbc.so:databases/unixODBC \ libzstd.so:archivers/zstd USES= cmake compiler:c++11-lang localbase:ldflags mysql:80 ssl -IGNORE_WITH_MYSQL= 57 103m 57p 57w +IGNORE_WITH_MYSQL= 57 57p 57w USE_LDCONFIG= yes CMAKE_ARGS= -DWITH_UNIXODBC=1 -DDISABLE_GUI=1 |