From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 10 14:10:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1D059649 for ; Thu, 10 Jan 2013 14:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 0108BF42 for ; Thu, 10 Jan 2013 14:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0AEA058030216 for ; Thu, 10 Jan 2013 14:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0AEA03X030212; Thu, 10 Jan 2013 14:10:00 GMT (envelope-from gnats) Resent-Date: Thu, 10 Jan 2013 14:10:00 GMT Resent-Message-Id: <201301101410.r0AEA03X030212@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Geoffroy Desvernay Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 342A949C for ; Thu, 10 Jan 2013 14:05:05 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 08393F18 for ; Thu, 10 Jan 2013 14:05:05 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r0AE541R006627 for ; Thu, 10 Jan 2013 14:05:04 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r0AE54TB006626; Thu, 10 Jan 2013 14:05:04 GMT (envelope-from nobody) Message-Id: <201301101405.r0AE54TB006626@red.freebsd.org> Date: Thu, 10 Jan 2013 14:05:04 GMT From: Geoffroy Desvernay To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/175180: Un-break databases/mariadb-* after ports/174660 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2013 14:10:01 -0000 >Number: 175180 >Category: ports >Synopsis: Un-break databases/mariadb-* after ports/174660 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jan 10 14:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Geoffroy Desvernay >Release: 9.1-RELEASE >Organization: Ecole Centrale de Marseille >Environment: FreeBSD dgeo.sysadm.ec-m.fr 9.1-RELEASE FreeBSD 9.1-RELEASE #0: Tue Dec 18 11:55:35 CET 2012 root@dgeo.sysadm.ec-m.fr:/usr/obj/usr/src/sys/DGEO amd64 >Description: changes in bsd.database.mk from ports/174660 made databases/mariadb-* break. This patch to bsd.database.mk and databases/mariadb-server should let it work again >How-To-Repeat: try to compile anything dependent on mariadb-client >Fix: patch attached (thanks to Jeff Wheelhouse) Patch attached with submission follows: --- Mk/bsd.database.mk- 2013-01-09 20:18:01.511346124 +0000 +++ Mk/bsd.database.mk 2013-01-09 20:18:39.700379158 +0000 @@ -109,6 +109,7 @@ MYSQL50_LIBVER= 15 MYSQL51_LIBVER= 16 MYSQL53_LIBVER= 16 +MYSQL53m_LIBVER= 16 MYSQL55_LIBVER= 18 MYSQL55p_LIBVER= 18 MYSQL55m_LIBVER= 18 @@ -153,6 +154,9 @@ .if (${MYSQL_VER} == "53") _MYSQL_CLIENT= databases/mariadb-client _MYSQL_SERVER= databases/mariadb-server +.elif (${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 --- databases/mariadb-server/Makefile- 2013-01-10 13:01:01.324427257 +0000 +++ databases/mariadb-server/Makefile 2013-01-10 13:01:17.510017470 +0000 @@ -28,7 +28,7 @@ .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 @@ 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 >Release-Note: >Audit-Trail: >Unformatted: