aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorale <ale@FreeBSD.org>2011-02-25 21:43:55 +0800
committerale <ale@FreeBSD.org>2011-02-25 21:43:55 +0800
commit6e0a4f4518fe0a03b4db279f009ec4ec37e6d79a (patch)
tree53a466d6fb36a4d036fbdfaf153b132cdceb7228
parentb3fbd586013bcdca77c61a3ffe2e9854a4f1767c (diff)
downloadfreebsd-ports-gnome-6e0a4f4518fe0a03b4db279f009ec4ec37e6d79a.tar.gz
freebsd-ports-gnome-6e0a4f4518fe0a03b4db279f009ec4ec37e6d79a.tar.zst
freebsd-ports-gnome-6e0a4f4518fe0a03b4db279f009ec4ec37e6d79a.zip
Switch default MySQL version from 5.1 to 5.5.
PR: ports/153814 Submitted by: ale Approved by: portmgr (-exp run by pav)
-rw-r--r--Mk/bsd.database.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk
index 4fc409551c20..7e825ad08581 100644
--- a/Mk/bsd.database.mk
+++ b/Mk/bsd.database.mk
@@ -20,10 +20,10 @@ Database_Include_MAINTAINER= ports@FreeBSD.org
# If no version is given (by the maintainer via the port or
# by the user via defined variable), try to find the
# currently installed version. Fall back to default if
-# necessary (MySQL-5.1 = 51).
+# necessary (MySQL-5.5 = 55).
# DEFAULT_MYSQL_VER
# - MySQL default version. Can be overridden within a port.
-# Default: 51.
+# Default: 55.
# WANT_MYSQL_VER
# - Maintainer can set an arbitrary version of MySQL to always
# build this port with (overrides WITH_MYSQL_VER).
@@ -104,7 +104,7 @@ Database_Include_MAINTAINER= ports@FreeBSD.org
# - Detected Firebird version.
.if defined(USE_MYSQL)
-DEFAULT_MYSQL_VER?= 51
+DEFAULT_MYSQL_VER?= 55
# MySQL client version currently supported.
MYSQL323_LIBVER= 10
MYSQL40_LIBVER= 12
@@ -164,7 +164,7 @@ IGNORE= cannot install: does not work with MySQL version ${MYSQL_VER} (MySQL ${
.if (${USE_MYSQL} == "server" || ${USE_MYSQL} == "embedded")
RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/${_MYSQL_SERVER}
.if (${USE_MYSQL} == "embedded")
-BUILD_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/${_MYSQL_SERVER}
+BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqld.a:${PORTSDIR}/${_MYSQL_SERVER}
.endif
.else
LIB_DEPENDS+= mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/${_MYSQL_CLIENT}