From owner-svn-ports-head@FreeBSD.ORG  Sat Jun 22 20:00:57 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id F0FDFCA;
 Sat, 22 Jun 2013 20:00:56 +0000 (UTC) (envelope-from rea@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E36A61BB9;
 Sat, 22 Jun 2013 20:00:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5MK0uVw053525;
 Sat, 22 Jun 2013 20:00:56 GMT (envelope-from rea@svn.freebsd.org)
Received: (from rea@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5MK0u99053524;
 Sat, 22 Jun 2013 20:00:56 GMT (envelope-from rea@svn.freebsd.org)
Message-Id: <201306222000.r5MK0u99053524@svn.freebsd.org>
From: Eygene Ryabinkin <rea@FreeBSD.org>
Date: Sat, 22 Jun 2013 20:00:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r321586 - head/mail/exim
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Jun 2013 20:00:57 -0000

Author: rea
Date: Sat Jun 22 20:00:56 2013
New Revision: 321586
URL: http://svnweb.freebsd.org/changeset/ports/321586

Log:
  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:		ports/179719
  QA page:	http://codelabs.ru/fbsd/ports/qa/mail/exim/4.80.1_2-p1

Modified:
  head/mail/exim/Makefile

Modified: head/mail/exim/Makefile
==============================================================================
--- head/mail/exim/Makefile	Sat Jun 22 19:59:57 2013	(r321585)
+++ head/mail/exim/Makefile	Sat Jun 22 20:00:56 2013	(r321586)
@@ -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,'