svn commit: r310210 - in head: Mk databases/mariadb-server

[Philip M. Gollucci]

Woot!


On Thu, Jan 10, 2013 at 11:42 PM, Florian Smeets <flo at freebsd.org> wrote:

> Author: flo
> Date: Thu Jan 10 23:42:53 2013
> New Revision: 310210
> URL: http://svnweb.freebsd.org/changeset/ports/310210
>
> Log:
>   - fix databases/mariadb-{server,client} by adding MYSQL_VER 53m. This was
>     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 at centrale-marseille.fr>
>                 Jeff Wheelhouse
>
> Modified:
>   head/Mk/bsd.database.mk
>   head/databases/mariadb-server/Makefile   (contents, props changed)
>
> Modified: head/Mk/bsd.database.mk
>
> ==============================================================================
> --- head/Mk/bsd.database.mk     Thu Jan 10 23:24:54 2013        (r310209)
> +++ head/Mk/bsd.database.mk     Thu Jan 10 23:42:53 2013        (r310210)
> @@ -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
>  .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
>
> Modified: head/databases/mariadb-server/Makefile
>
> ==============================================================================
> --- head/databases/mariadb-server/Makefile      Thu Jan 10 23:24:54 2013
>      (r310209)
> +++ head/databases/mariadb-server/Makefile      Thu Jan 10 23:42:53 2013
>      (r310210)
> @@ -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
>
>


-- 
---------------------------------------------------------------------------------------------
1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70  3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollucci at p6m7g8.com) c: 703.336.9354
Member,                           Apache Software Foundation
Committer,                        FreeBSD Foundation
Consultant,                       P6M7G8 Inc.
Director Operations,      Ridecharge Inc.

Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.