From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jan 10 03:30:12 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6F24C1065670 for ; Mon, 10 Jan 2011 03:30:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 473648FC16 for ; Mon, 10 Jan 2011 03:30:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p0A3UC3n072127 for ; Mon, 10 Jan 2011 03:30:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p0A3UBkN072126; Mon, 10 Jan 2011 03:30:11 GMT (envelope-from gnats) Resent-Date: Mon, 10 Jan 2011 03:30:11 GMT Resent-Message-Id: <201101100330.p0A3UBkN072126@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, Sunpoet Po-Chuan Hsieh Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1852A106564A; Mon, 10 Jan 2011 03:28:45 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by mx1.freebsd.org (Postfix) with ESMTP id BF3C48FC0A; Mon, 10 Jan 2011 03:28:44 +0000 (UTC) Received: by gxk8 with SMTP id 8so7933059gxk.13 for ; Sun, 09 Jan 2011 19:28:44 -0800 (PST) Received: by 10.236.108.52 with SMTP id p40mr13543652yhg.41.1294630123619; Sun, 09 Jan 2011 19:28:43 -0800 (PST) Received: from sunpoet.net (sunpoet.net [220.133.12.240]) by mx.google.com with ESMTPS id m49sm1751759yha.2.2011.01.09.19.28.41 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 09 Jan 2011 19:28:42 -0800 (PST) Received: by sunpoet.net (Postfix, from userid 1000) id AACDA2AEC4D1; Mon, 10 Jan 2011 11:28:57 +0800 (CST) Message-Id: <20110110032857.AACDA2AEC4D1@sunpoet.net> Date: Mon, 10 Jan 2011 11:28:57 +0800 (CST) From: Sunpoet Po-Chuan Hsieh Sender: Sunpoet Hsieh To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Alex Dupre Subject: ports/153833: [PATCH] Mk/bsd.database.mk: add mariadb as MYSQL_VER=52 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Sunpoet Po-Chuan Hsieh List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jan 2011 03:30:12 -0000 >Number: 153833 >Category: ports >Synopsis: [PATCH] Mk/bsd.database.mk: add mariadb as MYSQL_VER=52 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jan 10 03:30:11 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 8.2-PRERELEASE amd64 >Organization: The FreeBSD Project >Environment: System: FreeBSD bonjour.sunpoet.net 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #0: Tue Dec 28 19:05:46 CST 2010 sunpoet@bonjour.sunpoet.net:/usr/obj/usr/src/sys/bonjour amd64 >Description: Request a -exp run for adding databases/mariadb as MYSQL_VER=52. MySQL maintainer (ale@FreeBSD.org) is cc'd. >How-To-Repeat: >Fix: --- bsd.database.mk.patch begins here --- Index: bsd.database.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.database.mk,v retrieving revision 1.51 diff -u -r1.51 bsd.database.mk --- bsd.database.mk 30 Dec 2010 20:07:04 -0000 1.51 +++ bsd.database.mk 10 Jan 2011 02:34:50 -0000 @@ -111,6 +111,7 @@ MYSQL41_LIBVER= 14 MYSQL50_LIBVER= 15 MYSQL51_LIBVER= 16 +MYSQL52_LIBVER= 16 MYSQL55_LIBVER= 16 # Setting/finding MySQL version we want. @@ -139,6 +140,14 @@ .endif .endif +.if (${MYSQL_VER} == "52") +_MYSQL_CLIENT= databases/mariadb +_MYSQL_SERVER= databases/mariadb +.else +_MYSQL_CLIENT= databases/mysql${MYSQL_VER}-client +_MYSQL_SERVER= databases/mysql${MYSQL_VER}-server +.endif + .if (${USE_MYSQL} == "embedded") IGNORE_WITH_MYSQL= 323 40 41 .endif @@ -153,12 +162,12 @@ . endfor .endif # IGNORE_WITH_MYSQL .if (${USE_MYSQL} == "server" || ${USE_MYSQL} == "embedded") -RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server +RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/${_MYSQL_SERVER} .if (${USE_MYSQL} == "embedded") -BUILD_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server +BUILD_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/${_MYSQL_SERVER} .endif .else -LIB_DEPENDS+= mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client +LIB_DEPENDS+= mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/${_MYSQL_CLIENT} .endif .else IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER} --- bsd.database.mk.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: