Index: mysql51-client/Makefile
===================================================================
--- mysql51-client/Makefile	(revision 329105)
+++ mysql51-client/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PKGNAMESUFFIX=	-client
+PKGNAMESUFFIX=	51-client
 
 COMMENT=	Multithreaded SQL database (client)
 
Index: mysql51-scripts/Makefile
===================================================================
--- mysql51-scripts/Makefile	(revision 329105)
+++ mysql51-scripts/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PKGNAMESUFFIX=	-scripts
+PKGNAMESUFFIX=	51-scripts
 
 COMMENT=	Multithreaded SQL database (scripts)
 
Index: mysql51-server/Makefile
===================================================================
--- mysql51-server/Makefile	(revision 329105)
+++ mysql51-server/Makefile	(working copy)
@@ -7,7 +7,7 @@
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
-PKGNAMESUFFIX?=	-server
+PKGNAMESUFFIX?=	51-server
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
@@ -88,10 +88,8 @@
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	51
 
-LATEST_LINK=	mysql51-server
+CONFLICTS_INSTALL=	mysql5.[02-9]-server-* mysql[0-46-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona[0-9][0-9]-server-*
 
-CONFLICTS_INSTALL=	mysql-server-[34].* mysql-server-5.[02-9].* mariadb-server-5.* percona-server-5.*
-
 USE_RC_SUBR=	mysql-server
 
 USERS=		mysql
@@ -163,10 +161,8 @@
 .else
 # MySQL-Client part
 .if defined(CLIENT_ONLY)
-LATEST_LINK=	mysql51-client
+CONFLICTS_INSTALL=	mysql5.[02-9]-client-* mysql[0-46-9][0-9]-client-*
 
-CONFLICTS_INSTALL=	mysql-client-[34].* mysql-client-5.[02-9].*
-
 MAN1=		mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \
 		mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \
 		mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mysqltest.1
@@ -193,10 +189,8 @@
 
 RUN_DEPENDS=	p5-DBD-mysql51>=0:${PORTSDIR}/databases/p5-DBD-mysql51
 
-LATEST_LINK=	mysql51-scripts
+CONFLICTS_INSTALL=	mysql[0-46-9][0-9]-scripts-* mysql5.[02-9]-scripts-*
 
-CONFLICTS_INSTALL=	mysql-scripts-[34].* mysql-scripts-5.[02-9].*
-
 MAN1=		msql2mysql.1 mysql_convert_table_format.1 mysql_find_rows.1 \
 		mysql_fix_extensions.1 mysql_secure_installation.1 \
 		mysql_setpermission.1 mysql_zap.1 mysqlaccess.1 \
Index: mysql55-client/Makefile
===================================================================
--- mysql55-client/Makefile	(revision 329105)
+++ mysql55-client/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PKGNAMESUFFIX=	-client
+PKGNAMESUFFIX=	55-client
 
 COMMENT=	Multithreaded SQL database (client)
 
@@ -12,10 +12,8 @@
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-LATEST_LINK=	mysql55-client
+CONFLICTS_INSTALL=	mysql5.[0-46-9]-client-* mysql[0-46-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona[0-9][0-9]-client-*
 
-CONFLICTS_INSTALL=	mysql-client-[34].* mysql-client-5.[0-46-9].* mariadb-client-5.* percona-client-5.*
-
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 
 USE_LDCONFIG=	${PREFIX}/lib/mysql
Index: mysql55-server/Makefile
===================================================================
--- mysql55-server/Makefile	(revision 329105)
+++ mysql55-server/Makefile	(working copy)
@@ -7,7 +7,7 @@
 CATEGORIES=	databases ipv6
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.5
-PKGNAMESUFFIX?=	-server
+PKGNAMESUFFIX?=	55-server
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
@@ -61,10 +61,8 @@
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	55
 
-LATEST_LINK=	mysql55-server
+CONFLICTS_INSTALL=	mysql5.[0-46-9]-server-* mysql[0-46-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona[0-9][0-9]-server-*
 
-CONFLICTS_INSTALL=	mysql-server-[34].* mysql-server-5.[0-46-9].* mariadb-server-5.* percona-server-5.*
-
 USE_RC_SUBR=	mysql-server
 
 USERS=		mysql
Index: mysql56-client/Makefile
===================================================================
--- mysql56-client/Makefile	(revision 329105)
+++ mysql56-client/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PKGNAMESUFFIX=	-client
+PKGNAMESUFFIX=	56-client
 
 COMMENT=	Multithreaded SQL database (client)
 
@@ -12,10 +12,8 @@
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-LATEST_LINK=	mysql56-client
+CONFLICTS_INSTALL=	mysql5.[0-57-9]-client-* mysql[0-46-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona[0-9][0-9]-client-*
 
-CONFLICTS_INSTALL=	mysql-client-[34].* mysql-client-5.[0-57-9].* mariadb-client-5.* percona-client-5.*
-
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 
 USE_LDCONFIG=	${PREFIX}/lib/mysql
Index: mysql56-server/Makefile
===================================================================
--- mysql56-server/Makefile	(revision 329105)
+++ mysql56-server/Makefile	(working copy)
@@ -7,7 +7,7 @@
 CATEGORIES=	databases ipv6
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.6
-PKGNAMESUFFIX?=	-server
+PKGNAMESUFFIX?=	56-server
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
@@ -45,10 +45,8 @@
 USES+=		perl5
 USE_PERL5=	run
 
-LATEST_LINK=	mysql56-server
+CONFLICTS_INSTALL=	mysql5.[0-57-9]-server-* mysql[0-46-9][0-9]-server-* percona[0-9][0-9]-server-* mariadb[0-9][0-9]-server-*
 
-CONFLICTS_INSTALL=	mysql-server-[34].* mysql-server-5.[0-57-9].* mariadb-server-5.* percona-server-5.*
-
 USE_RC_SUBR=	mysql-server
 
 USERS=		mysql
Index: mariadb-client/Makefile
===================================================================
--- mariadb-client/Makefile	(revision 329105)
+++ mariadb-client/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mariadb
-PKGNAMESUFFIX=	-client
+PKGNAMESUFFIX=	53-client
 
 UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
@@ -16,7 +16,7 @@
 OPTIONS_DEFAULT=	THREADSAFE
 THREADSAFE_DESC=	Build thread-safe client
 
-CONFLICTS=	mysql-client-[0-9]* mariadb-client-5.[0-24-9].* percona-client-5.*
+CONFLICTS=	mysql[0-9][0-9]-client-* mariadb5.[0-24-9]-client-* mariadb[0-46-9][0-9]-client-* percona[0-9][0-9]-client-*
 
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
Index: mariadb-scripts/Makefile
===================================================================
--- mariadb-scripts/Makefile	(revision 329105)
+++ mariadb-scripts/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mariadb
-PKGNAMESUFFIX=	-scripts
+PKGNAMESUFFIX=	53-scripts
 
 COMMENT=	Scripts for mariadb - drop-in replacement for MySQL
 
@@ -13,7 +13,7 @@
 MASTERDIR=	${.CURDIR}/../mariadb-server
 MARIADB_SCRIPTS_SLAVE=	yes
 
-CONFLICTS=	mysql-scripts-[0-9]* \
+CONFLICTS=	mysql[0-9][0-9]-scripts-* \
 		mytop-[0-9]*
 
 PATCHDIR=	${.CURDIR}/files
Index: mariadb-server/Makefile
===================================================================
--- mariadb-server/Makefile	(revision 329105)
+++ mariadb-server/Makefile	(working copy)
@@ -12,7 +12,7 @@
 		http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
 		http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
 		http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/
-PKGNAMESUFFIX?=	-server
+PKGNAMESUFFIX?=	53-server
 
 MAINTAINER=	dgeo@centrale-marseille.fr
 COMMENT=	Database server - drop-in replacement for MySQL
@@ -21,7 +21,7 @@
 
 UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
-CONFLICTS?=	mysql-server-[0-9]* percona-server-[0-9]* mariadb-server-5.[0-24-9].* mariadb-server-[0-46-9].*
+CONFLICTS?=	mysql[0-9][0-9]-server-* percona[0-9][0-9]-server-* mariadb5.[0-24-9]-server-* mariadb[0-46-9][0-9]-server-*
 
 GNU_CONFIGURE=	yes
 
Index: mariadb55-client/Makefile
===================================================================
--- mariadb55-client/Makefile	(revision 329105)
+++ mariadb55-client/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mariadb
-PKGNAMESUFFIX=	-client
+PKGNAMESUFFIX=	55-client
 
 COMMENT=	Multithreaded SQL database (client)
 
@@ -11,10 +11,8 @@
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-LATEST_LINK=	mariadb55-client
+CONFLICTS_INSTALL=	mysql[0-9][0-9]-client-* mariadb[0-46-9][0-9]-client-* mariadb5.[0-46-9]-client-* percona[0-9][0-9]-client-*
 
-CONFLICTS_INSTALL=	mysql-client-[345].* mariadb-client-5.3.* percona-client-5.*
-
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 
 USE_LDCONFIG=	${PREFIX}/lib/mysql
Index: mariadb55-server/Makefile
===================================================================
--- mariadb55-server/Makefile	(revision 329105)
+++ mariadb55-server/Makefile	(working copy)
@@ -13,7 +13,7 @@
 		http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
 		http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
 		http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/
-PKGNAMESUFFIX?=	-server
+PKGNAMESUFFIX?=	55-server
 
 MAINTAINER=	never@nevermind.kiev.ua
 COMMENT?=	Multithreaded SQL database (server)
@@ -103,10 +103,8 @@
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	55m
 
-LATEST_LINK=	mariadb55-server
+CONFLICTS_INSTALL=	mysql[0-9][0-9]-server-* mariadb[0-46-9][0-9]-server-* mariadb5.[0-46-9]-server-* percona[0-9][0-9]-server-*
 
-CONFLICTS_INSTALL=	mysql-server-[345].* mariadb-server-5.3.* percona-server-5.*
-
 USE_RC_SUBR=	mysql-server
 
 USERS=		mysql
Index: percona55-client/Makefile
===================================================================
--- percona55-client/Makefile	(revision 329105)
+++ percona55-client/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	percona
-PKGNAMESUFFIX=	-client
+PKGNAMESUFFIX=	55-client
 
 COMMENT=	Multithreaded SQL database (client)
 
@@ -11,10 +11,8 @@
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-LATEST_LINK=	percona55-client
+CONFLICTS_INSTALL=	mysql[0-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona5.[0-46-9]-client-* percona[0-46-9][0-9]-client-*
 
-CONFLICTS_INSTALL=	mysql-client-[345].* mariadb-client-5.* percona-client-5.[0-46-9].*
-
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 
 USE_LDCONFIG=	${PREFIX}/lib/mysql
Index: percona55-server/Makefile
===================================================================
--- percona55-server/Makefile	(revision 329105)
+++ percona55-server/Makefile	(working copy)
@@ -7,7 +7,7 @@
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.5/${DISTNAME:S/rel//}/source/
 MASTER_SITE_SUBDIR=	MySQL-5.5
-PKGNAMESUFFIX?=	-server
+PKGNAMESUFFIX?=	55-server
 
 MAINTAINER=	flo@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
@@ -61,10 +61,8 @@
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	55p
 
-LATEST_LINK=	percona55-server
+CONFLICTS_INSTALL=	mysql[0-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona5.[0-46-9]-server-* percona[0-46-9][0-9]-server-*
 
-CONFLICTS_INSTALL=	mysql-server-[345].* percona-server-5.[0-46-9].* mariadb-server-[0-9].*
-
 USE_RC_SUBR=	mysql-server
 
 USERS=		mysql
Index: percona56-client/Makefile
===================================================================
--- percona56-client/Makefile	(revision 329105)
+++ percona56-client/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	percona
-PKGNAMESUFFIX=	-client
+PKGNAMESUFFIX=	56-client
 
 COMMENT=	Multithreaded SQL database (client)
 
@@ -12,10 +12,8 @@
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-LATEST_LINK=	percona56-client
+CONFLICTS_INSTALL=	mysql[0-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona5.[0-57-9]-client-* percona[0-46-9][0-9]-client-*
 
-CONFLICTS_INSTALL=	mysql-client-[345].* mariadb-client-5.* percona-client-5.[0-57-9].*
-
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 
 USE_LDCONFIG=	${PREFIX}/lib/mysql
Index: percona56-server/Makefile
===================================================================
--- percona56-server/Makefile	(revision 329105)
+++ percona56-server/Makefile	(working copy)
@@ -6,7 +6,7 @@
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/
-PKGNAMESUFFIX?=	-server
+PKGNAMESUFFIX?=	56-server
 DISTNAME=	Percona-Server-5.6.13-rc60.6
 
 MAINTAINER=	flo@FreeBSD.org
@@ -60,10 +60,8 @@
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	56p
 
-LATEST_LINK=	percona56-server
+CONFLICTS_INSTALL=	mysql[0-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona5.[0-57-9]-server-* percona[0-46-9][0-9]-server-*
 
-CONFLICTS_INSTALL=	mysql-server-[345].* percona-server-5.[0-57-9].* mariadb-server-[0-9].*
-
 USE_RC_SUBR=	mysql-server
 
 USERS=		mysql