svn commit: r321586 - head/mail/exim

[Eygene Ryabinkin]

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,'