From owner-svn-ports-all@FreeBSD.ORG Fri Jan 11 17:33:53 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 86147E87 for ; Fri, 11 Jan 2013 17:33:53 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: from mail-ob0-f178.google.com (mail-ob0-f178.google.com [209.85.214.178]) by mx1.freebsd.org (Postfix) with ESMTP id 4A8E1855 for ; Fri, 11 Jan 2013 17:33:53 +0000 (UTC) Received: by mail-ob0-f178.google.com with SMTP id eh20so1941264obb.23 for ; Fri, 11 Jan 2013 09:33:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-originating-ip:in-reply-to:references:date :message-id:subject:from:to:cc:content-type:x-gm-message-state; bh=CosnrnQz4jANAbWUglVxYSZpXmDilYjYUuJ06p4tQXY=; b=JOSGKPHePloJO+fwWjzRMhr6cHj8X1t1xlL904g0Obd97NfCRLAP7Ul49nsIivjMmv svwE5UQhtba1JKkLeSbImqjM97mcCWCI/47u1JiKphen+7wILfmd+JbeitcG4x/9ZTKB 76twY5Rguv2hGvTymAfY48pesWG6+UZbXmFV1vNq14KCRJranFoGKRJyaQV7cVSYE0++ Sm2srzyu37uz+3r3CtOt3/bOgDin6DA8CpQh06cMgFYlmNV+MPtQeXSXmNuCOd56pL0C HHwTw7twHs2jTqgvcJcxUHUj9yz3GDzZMAxmwXoWR1/p8iaOfvxZJ+GL3/NnnpdwnfUU Ag+g== MIME-Version: 1.0 Received: by 10.60.32.19 with SMTP id e19mr46678755oei.60.1357925627240; Fri, 11 Jan 2013 09:33:47 -0800 (PST) Received: by 10.60.161.13 with HTTP; Fri, 11 Jan 2013 09:33:47 -0800 (PST) X-Originating-IP: [68.101.40.130] In-Reply-To: <201301102342.r0ANgspC076357@svn.freebsd.org> References: <201301102342.r0ANgspC076357@svn.freebsd.org> Date: Fri, 11 Jan 2013 17:33:47 +0000 Message-ID: Subject: Re: svn commit: r310210 - in head: Mk databases/mariadb-server From: "Philip M. Gollucci" To: Florian Smeets X-Gm-Message-State: ALoCoQmYVpQ60LqqWp7trl2iG8WfPSeAJWAyQFzx6cRG+p+xCOJXFwY0lnpzSt+L0/LVXFQcrXTU Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2013 17:33:53 -0000 Woot! On Thu, Jan 10, 2013 at 11:42 PM, Florian Smeets 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 > 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@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.