ports/56117: The Exim port only supports MySQL version 3.23

[Pat Lashley]

>Number:         56117
>Category:       ports
>Synopsis:       The Exim port only supports MySQL version 3.23
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 28 21:30:00 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Pat Lashley
>Release:        FreeBSD 4.7-RC i386
>Organization:
Henry Davis Consulting
>Environment:
System: FreeBSD knight.volant.org 4.7-RC FreeBSD 4.7-RC #0: Thu Oct 10 16:02:40 PDT 2002 root at knight.volant.org:/d2/usr.obj/usr/src/sys/KNIGHT i386

>Description:
	The mail/exim port has a WITH_MYSQL toggle to request that Exim
	be built with MySql support.  When defined, it adds a dependancy
	on databases/mysql323-client.  But Exim seems to build and run
	fine with later versions of the MySQL client; and later versions
	may be required for compatability with other packages.
>How-To-Repeat:
>Fix:
	The following patch modifies the Makefile to use the new MYSQL
	variables from bsd.ports.mk.

	NOTE that there is one side-effect of this patch - it changes
	the default mysql version dependancy (if no version of MySQL
	is already installed) to 4.0 (the default in bsd.ports.mk).
	If this is not desired, see the *MYSQL* variable documentation
	in the comments in bsd.ports.mk

--- Makefile.~8~        Sun Aug 24 23:57:39 2003
+++ Makefile    Thu Aug 28 20:25:01 2003
@@ -58,8 +58,12 @@
 # Define WITH_TCP_WRAPPERS, WITH_MYSQL, and WITH_PGSQL to link against
 # libwrap, liblibmysqlclient and libpq respectively.  Define
 # WITH_SASLAUTHD to enable use of the Cyrus SASL authentication daemon.
+# Define WITH_MYSQL_VER to specify a particular version of MySQL to
+# use.  Valid values are currently 323, 40, 41.  Defining WITH_MYSQL_VER
+# implies WITH_MYSQL.
 #WITH_TCP_WRAPPERS=    yes
 #WITH_MYSQL=           yes
+#WITH_MYSQL_VER?=      40
 #WITH_PGSQL=           yes
 #WITH_SASLAUTHD=       yes
  
@@ -232,8 +236,14 @@
 SEDLIST+=      -e 's,XX_DB_LIBS_XX,${DB_LIBS},' \
                -e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES},'
  
+.if defined(WITH_MYSQL_VER)
+WITH_MYSQL=    YES
+.if ${WITH_MYSQL_VER} == 3
+WANT_MYSQL_VER=        323
+.endif
+.endif
 .if defined(WITH_MYSQL)
-LIB_DEPENDS+=  mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+USE_MYSQL=     YES
 SEDLIST+=      -e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE}/lib/mysql -lmysqlclient,' \
                -e 's,XX_MYSQL_INCLUDE_XX,-I${LOCALBASE}/include/mysql,' \
                -e 's,^\# LOOKUP_MYSQL=,LOOKUP_MYSQL=,'
>Release-Note:
>Audit-Trail:
>Unformatted: