Date: Mon, 10 Jan 2011 11:28:57 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Alex Dupre <ale@FreeBSD.org> Subject: ports/153833: [PATCH] Mk/bsd.database.mk: add mariadb as MYSQL_VER=52 Message-ID: <20110110032857.AACDA2AEC4D1@sunpoet.net> Resent-Message-ID: <201101100330.p0A3UBkN072126@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110110032857.AACDA2AEC4D1>