Skip to content

Commit

Permalink
databases/mariadb104-*: Sunset
Browse files Browse the repository at this point in the history
2023-06-30 databases/mariadb104-*: Use databases/mariadb106-*

- Sync mariadb versions in Mk/bsd.default-versions.mk

Approved by:	portmgr (blanket)
  • Loading branch information
5u623l20 committed Jun 30, 2023
1 parent 46db1ba commit 6ff0ba3
Show file tree
Hide file tree
Showing 41 changed files with 5 additions and 1,797 deletions.
2 changes: 2 additions & 0 deletions MOVED
Expand Up @@ -7698,3 +7698,5 @@ sysutils/mcollective-puppet-common||2023-06-30|Has expired: Depends on broken sy
sysutils/mcollective-nettest-common||2023-06-30|Has expired: Depends on broken sysutils/mcollective
sysutils/mnrpes||2023-06-30|Has expired: Depends on broken sysutils/mcollective
sysutils/mcollective||2023-06-30|Has expired: Broken with all supported Ruby versions
databases/mariadb104-server||2023-06-30|Has expired: Use databases/mariadb106-server
databases/mariadb104-client||2023-06-30|Has expired: Use databases/mariadb106-client
4 changes: 2 additions & 2 deletions Mk/Uses/mysql.mk
Expand Up @@ -67,7 +67,7 @@ DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//}
MYSQL57_LIBVER= 20
MYSQL57p_LIBVER= 20
MYSQL80_LIBVER= 21
. for v in 4 5 6 11
. for v in 5 6 11
MYSQL10${v}m_LIBVER= 3
. endfor

Expand Down Expand Up @@ -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//} >= 104
. if ${MYSQL_VER:C/m//} >= 105
_MYSQL_SHLIB= libmariadb
. endif
. elif (${MYSQL_VER:C/[0-9]*//} == "p")
Expand Down
2 changes: 1 addition & 1 deletion Mk/bsd.default-versions.mk
Expand Up @@ -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.4m, 10.5m, 5.7p, 5.7w
# Possible values: 5.7, 8.0, 10.5m, 10.6m, 10.11m, 5.7p, 5.7w
MYSQL_DEFAULT?= 8.0
# Possible values: ninja, samurai
NINJA_DEFAULT?= ninja
Expand Down
2 changes: 0 additions & 2 deletions databases/Makefile
Expand Up @@ -177,8 +177,6 @@
SUBDIR += mariadb-connector-odbc
SUBDIR += mariadb1011-client
SUBDIR += mariadb1011-server
SUBDIR += mariadb104-client
SUBDIR += mariadb104-server
SUBDIR += mariadb105-client
SUBDIR += mariadb105-server
SUBDIR += mariadb106-client
Expand Down
12 changes: 0 additions & 12 deletions databases/mariadb104-client/Makefile

This file was deleted.

173 changes: 0 additions & 173 deletions databases/mariadb104-client/pkg-plist

This file was deleted.

0 comments on commit 6ff0ba3

Please sign in to comment.