svn commit: r448008 - in head/mail/exim: . files

[Vsevolod Stakhov]

Author: vsevolod
Date: Tue Aug 15 20:42:40 2017
New Revision: 448008
URL: https://svnweb.freebsd.org/changeset/ports/448008

Log:
  - Fix finding of mariadb headers [1]
  - Fix build with custom mysql library
  
  PR:		221533 [1]
  Submitted by:	vvd at unislabs.com [1]

Added:
  head/mail/exim/files/patch-src-lookups-mysql.c   (contents, props changed)
Modified:
  head/mail/exim/Makefile

Modified: head/mail/exim/Makefile
==============================================================================
--- head/mail/exim/Makefile	Tue Aug 15 19:33:57 2017	(r448007)
+++ head/mail/exim/Makefile	Tue Aug 15 20:42:40 2017	(r448008)
@@ -325,7 +325,7 @@ SEDLIST+=	-e 's,XX_LMDB_LIBS_XX,${LMDB_LIBS:S/,/\\,/g}
 		-e 's,XX_LMDB_INCLUDES_XX,${LMDB_INCLUDES:S/,/\\,/g},'
 
 .if ${PORT_OPTIONS:MMYSQL}
-SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib/mysql -lmysqlclient,' \
+SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib/mysql -l${_MYSQL_SHLIB:S/lib//},' \
 		-e 's,XX_MYSQL_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include/mysql,' \
 		-e 's,^\# (LOOKUP_MYSQL=),\1,'
 .else

Added: head/mail/exim/files/patch-src-lookups-mysql.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/exim/files/patch-src-lookups-mysql.c	Tue Aug 15 20:42:40 2017	(r448008)
@@ -0,0 +1,10 @@
+--- src/lookups/mysql.c.orig	2017-03-05 00:21:35.000000000 +0300
++++ src/lookups/mysql.c	2017-08-15 01:12:26.508519000 +0300
+@@ -13,6 +13,7 @@
+ #include "lf_functions.h"
+ 
+ #include <mysql.h>       /* The system header */
++#include <mysql_version.h>
+ 
+ 
+ /* Structure and anchor for caching connections. */