mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

- fix databases/mariadb-{server,client} by adding MYSQL_VER 53m. This was

Browse Source 
broken by r309955. [1]
- remove MYSQL_VER 53, database/mariadb-* where the only ports to use it.
- sort

PR:		ports/175180
Submitted by:	Geoffroy Desvernay <dgeo@centrale-marseille.fr>
		Jeff Wheelhouse
This commit is contained in:
Florian Smeets 2013-01-10 23:42:53 +00:00
parent f6f3ae5b30
commit 112154f299
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=310210
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Mk/bsd.database.mk
View File

@ -108,10 +108,10 @@ DEFAULT_MYSQL_VER?= 55
MYSQL41_LIBVER= 14
MYSQL50_LIBVER= 15
MYSQL51_LIBVER= 16
MYSQL53_LIBVER= 16
MYSQL53m_LIBVER= 16
MYSQL55_LIBVER= 18
MYSQL55p_LIBVER= 18
MYSQL55m_LIBVER= 18
MYSQL55p_LIBVER= 18
MYSQL56p_LIBVER= 18
# Setting/finding MySQL version we want.
@ -150,15 +150,15 @@ IGNORE= cannot install: MySQL versions mismatch: mysql${_MYSQL_VER}-client is i
.endif
.endif
.if (${MYSQL_VER} == "53")
.if (${MYSQL_VER} == "53m")
_MYSQL_CLIENT= databases/mariadb-client
_MYSQL_SERVER= databases/mariadb-server
.elif (${MYSQL_VER} == "55p")
_MYSQL_CLIENT= databases/percona55-client
_MYSQL_SERVER= databases/percona55-server
.elif (${MYSQL_VER} == "55m")
_MYSQL_CLIENT= databases/mariadb55-client
_MYSQL_SERVER= databases/mariadb55-server
.elif (${MYSQL_VER} == "55p")
_MYSQL_CLIENT= databases/percona55-client
_MYSQL_SERVER= databases/percona55-server
.elif (${MYSQL_VER} == "56p")
_MYSQL_CLIENT= databases/percona56-client
_MYSQL_SERVER= databases/percona56-server

4
databases/mariadb-server/Makefile
View File

@ -28,7 +28,7 @@ GNU_CONFIGURE= yes
.if !defined(MARIADB_CLIENT_SLAVE)
USE_MYSQL= yes
WANT_MYSQL_VER= 53
WANT_MYSQL_VER= 53m
.endif
.if !defined(MARIADB_SCRIPTS_SLAVE)
@ -42,7 +42,7 @@ GROUPS= mysql
OPTIONS_DEFINE+= STATIC SSL OPENSSL
OPTIONS_DEFAULT+= SSL
STATIC_DESC= Build statically linked executables (not on 9.x)
STATIC_DESC= Statically link executables (not on 9.x)
SSL_DESC= Activate SSL support
OPENSSL_DESC= Use OpenSSL instead of bundled yassl