Remove references to mysql 323 and 40, most commonly of the form:

IGNORE_WITH_MYSQL=     323 40

8 files changed, 7 insertions, 12 deletions

diff --git a/databases/fireprofile/Makefile b/databases/fireprofile/Makefile
index 3852ffcab45e..751ee97de710 100644
--- a/databases/fireprofile/Makefile
+++ b/databases/fireprofile/Makefile
@@ -23,8 +23,6 @@ PLIST_FILES=	lib/libfireprofile.so.0 lib/libfireprofile.so
 
 USE_LDCONFIG=	yes
 USE_MYSQL=	yes
-DEFAULT_MYSQL_VER=	323
-WANT_MYSQL_VER=	323
 
 post-install:
 		$(LN) ${PREFIX}/lib/libfireprofile.so ${PREFIX}/lib/libfireprofile.so.0
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index d3107eb5bf66..2d6ed5669b84 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -24,8 +24,7 @@ USE_GNOME=	gtk12
 
 .if defined(WITH_MYSQL) || (exists(${LOCALBASE}/lib/mysql/libmysqlclient.a) \
 	&& !defined(WITHOUT_MYSQL))
-HAVE_MYSQL=	yes
-LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+USE_MYSQL=	yes
 .endif
 .if defined(WITH_PGSQL) || (exists(${LOCALBASE}/lib/libpq.a) \
 	&& !defined(WITHOUT_PGSQL))
@@ -34,7 +33,7 @@ USE_PGSQL=	yes
 .endif
 
 pre-patch:
-.if !defined(HAVE_MYSQL) && !defined(HAVE_PGSQL)
+.if !defined(USE_MYSQL) && !defined(HAVE_PGSQL)
 	@${ECHO} "You must specify which database to use, possible are:"
 	@${ECHO}
 	@${ECHO} "make WITH_MYSQL=yes (for MySQL support)"
@@ -44,7 +43,7 @@ pre-patch:
 .endif
 
 do-configure:
-.if defined(HAVE_MYSQL)
+.if defined(USE_MYSQL)
 	@${REINPLACE_CMD} -e "s/^#MYSQL/MYSQL/g" ${WRKSRC}/Makefile
 .endif
 .if defined(HAVE_PGSQL)
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
index f218eeb8ed6a..bb1962cbcd72 100644
--- a/databases/mysql-connector-odbc/Makefile
+++ b/databases/mysql-connector-odbc/Makefile
@@ -19,7 +19,7 @@ COMMENT=	ODBC driver for MySQL${MYSQL_VER} / ${DRIVER_MANAGER}
 
 USE_MYSQL=		yes
 DEFAULT_MYSQL_VER=	51
-IGNORE_WITH_MYSQL=	323 55
+IGNORE_WITH_MYSQL=	55
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool libltdl
diff --git a/databases/mysql-proxy/Makefile b/databases/mysql-proxy/Makefile
index 49163a0aa712..d3baeaa9f1f9 100644
--- a/databases/mysql-proxy/Makefile
+++ b/databases/mysql-proxy/Makefile
@@ -28,6 +28,6 @@ USE_LDCONFIG=	yes
 USE_LUA=	5.1+
 USE_MYSQL=	yes
 USE_RC_SUBR=	mysql-proxy
-IGNORE_WITH_MYSQL=	323 40 41
+IGNORE_WITH_MYSQL=	41
 
 .include <bsd.port.mk>
diff --git a/databases/mysql-udf/Makefile b/databases/mysql-udf/Makefile
index 116467f7bf47..d9a0bc2206c1 100644
--- a/databases/mysql-udf/Makefile
+++ b/databases/mysql-udf/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Set of user-defined functions for the MySQL server
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_MYSQL=	yes
-IGNORE_WITH_MYSQL_VER=	323
 
 MODULES=	colwidth confidence_higher confidence_lower correlation \
 		faculty geomean intercept kurtosis longest median noverm \
diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile
index 72960fd1e737..8522c5fca6b9 100644
--- a/databases/mysql-workbench51/Makefile
+++ b/databases/mysql-workbench51/Makefile
@@ -62,7 +62,7 @@ CONFIGURE_ENV=	GNOME2_DIR="${LOCALBASE}" LUA_LIBS="-llua"
 
 USE_MYSQL=	client
 DEFAULT_MYSQL_VER=	51
-IGNORE_WITH_MYSQL=	323 40 41 55
+IGNORE_WITH_MYSQL=	41 55
 
 .if defined(WITH_PYTHON)
 CONFIGURE_ARGS+=	--enable-python-modules
diff --git a/databases/p5-Mysql/Makefile b/databases/p5-Mysql/Makefile
index adf7c3f30dca..8968059d02d7 100644
--- a/databases/p5-Mysql/Makefile
+++ b/databases/p5-Mysql/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 CONFLICTS=	p5-DBD-mysql-* p5-DBD-mysql4[0-9]-* p5-DBD-mysql5[0-9]-*
 
 USE_MYSQL=	yes
-DEFAULT_MYSQL_VER=	323
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	PREFIX=${PREFIX} CC="${CC}" CCFLAGS="${CFLAGS}" \
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 026df305f4a2..74dd1a1d1649 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -18,7 +18,7 @@ LICENSE=	GPLv2
 
 USE_MYSQL=	compat
 IGNORE_WITH_PHP=	4
-IGNORE_WITH_MYSQL=	323 40 41
+IGNORE_WITH_MYSQL=	41
 USE_BZIP2=	yes
 NO_BUILD=	yes
 .if !defined(WITHOUT_PHP_DEPENDS)