From owner-svn-ports-branches@freebsd.org Tue May 3 10:39:45 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 550EEB2B71B; Tue, 3 May 2016 10:39:45 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 263381B63; Tue, 3 May 2016 10:39:45 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u43Adiid092621; Tue, 3 May 2016 10:39:44 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u43Adif9092620; Tue, 3 May 2016 10:39:44 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201605031039.u43Adif9092620@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Tue, 3 May 2016 10:39:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414524 - branches/2016Q2/databases/mariadb55-server X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 May 2016 10:39:45 -0000 Author: junovitch Date: Tue May 3 10:39:44 2016 New Revision: 414524 URL: https://svnweb.freebsd.org/changeset/ports/414524 Log: databases/mariadb55-server: revert portion of last commmit - Fix INDEX; mysql USES is not supported in quarterly and it should have been excluded when r414483 was merged. Pointy hat to: junovitch Approved by: ports-secteam (with hat) Modified: branches/2016Q2/databases/mariadb55-server/Makefile Modified: branches/2016Q2/databases/mariadb55-server/Makefile ============================================================================== --- branches/2016Q2/databases/mariadb55-server/Makefile Tue May 3 10:11:30 2016 (r414523) +++ branches/2016Q2/databases/mariadb55-server/Makefile Tue May 3 10:39:44 2016 (r414524) @@ -59,7 +59,8 @@ BROKEN_armv6= Does not compile on arm .if !defined(CLIENT_ONLY) # MySQL-Server part -USES+= mysql:55m +USE_MYSQL= yes +WANT_MYSQL_VER= 55m CONFLICTS_INSTALL= mariadb5[0-46-9]-server-* \ mariadb1*-server-* \