--- bsd.port.mk.orig	Tue Nov 16 21:26:15 2004
+++ bsd.port.mk	Tue Nov 16 21:44:26 2004
@@ -1548,15 +1548,31 @@
 MYSQL50_LIBVER=		14
 
 # Setting/finding MySQL version we want.
+.if exists(${LOCALBASE}/bin/mysql)
+_MYSQL_VER!=	${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib \([0-9]\)\.\([0-9]*\).*/\1\2/'
+.endif
+
 .if defined(WANT_MYSQL_VER)
+.    if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${WANT_MYSQL_VER}
+BROKEN=		The port wants mysql${WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client.
+.   endif
 MYSQL_VER=	${WANT_MYSQL_VER}
 .elif defined(WITH_MYSQL_VER)
 MYSQL_VER=	${WITH_MYSQL_VER}
-.elif exists(${LOCALBASE}/bin/mysql)
-MYSQL_VER!=	${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib \([0-9]\)\.\([0-9]*\).*/\1\2/'
 .else
+.   if defined(_MYSQL_VER)
+MYSQL_VER=	${_MYSQL_VER}
+.   else
 MYSQL_VER=	${DEFAULT_MYSQL_VER}
+.   endif
 .endif # WANT_MYSQL_VER
+
+.if defined(_MYSQL_VER)
+.    if ${_MYSQL_VER} != ${MYSQL_VER}
+BROKEN=	MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client
+.    endif
+.endif
+
 
 # And now we are checking if we can use it
 .if exists(${PORTSDIR}/databases/mysql${MYSQL_VER}-client)