From 188a16c05ec9c7e2c504e0f12a6bef12fd5b4133 Mon Sep 17 00:00:00 2001 From: Eygene Ryabinkin Date: Sat, 22 Jun 2013 11:26:38 +0400 Subject: [PATCH] mail/exim: fix handling of WITH_MYSQL_VER - fix introduction of bogus MYSQL_VER option that appeared after blind conversion to OPTIONSng in r320120; - drop support for WITH_MYSQL_VER="auto": this is an obsolete setting that currently has the same effect as not defining WITH_MYSQL_VER at all; - don't set WANT_MYSQL_VER based on WITH_MYSQL_VER: setting the latter is enough, since we don't insist on any particular MySQL version. PR: 179719 Signed-off-by: Eygene Ryabinkin --- mail/exim/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 9a6f295..cdf7490 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -286,14 +286,13 @@ SEDLIST+= -e 's,^(DBMLIB=),\# \1,' SEDLIST+= -e 's,XX_DB_LIBS_XX,${DB_LIBS:S/,/\\,/g},' \ -e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES:S/,/\\,/g},' -.if ${PORT_OPTIONS:MMYSQL_VER} && ${WITH_MYSQL_VER:L} != "auto" -WANT_MYSQL_VER= ${WITH_MYSQL_VER} -.else -.undef WITH_MYSQL_VER -.endif - .if ${PORT_OPTIONS:MMYSQL} +.if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER:L} == "auto" +IGNORE= WITH_MYSQL_VER set to "${WITH_MYSQL_VER}" is no longer supported. +IGNORE+= Just don't set WITH_MYSQL_VER if you want to use system-default version +.else USE_MYSQL= yes +.endif SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib/mysql -lmysqlclient,' \ -e 's,XX_MYSQL_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include/mysql,' \ -e 's,^\# (LOOKUP_MYSQL=),\1,' -- 1.8.1