Index: databases/innotop/Makefile
===================================================================
--- databases/innotop/Makefile	(revision 309526)
+++ databases/innotop/Makefile	(working copy)
@@ -16,10 +16,10 @@
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-DBD-mysql${MYSQL_VER}>=0:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER} \
+BUILD_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
 		p5-DBI>=1.46:${PORTSDIR}/databases/p5-DBI \
 		p5-Term-ReadKey>=2.10:${PORTSDIR}/devel/p5-Term-ReadKey
-RUN_DEPENDS=	p5-DBD-mysql${MYSQL_VER}>=0:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER} \
+RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
 		p5-DBI>=1.46:${PORTSDIR}/databases/p5-DBI \
 		p5-Term-ReadKey>=2.10:${PORTSDIR}/devel/p5-Term-ReadKey
 
Index: multimedia/zoneminder/Makefile
===================================================================
--- multimedia/zoneminder/Makefile	(revision 309526)
+++ multimedia/zoneminder/Makefile	(working copy)
@@ -25,7 +25,7 @@
 		avutil.1:${PORTSDIR}/multimedia/ffmpeg
 BUILD_DEPENDS=	${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php5-extensions \
 		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-mysql${MYSQL_VER}>=0:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER} \
+		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
 		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
Index: net-mgmt/netdot/Makefile
===================================================================
--- net-mgmt/netdot/Makefile	(revision 309526)
+++ net-mgmt/netdot/Makefile	(working copy)
@@ -20,7 +20,7 @@
 		p5-Apache-AuthCookie>=0:${PORTSDIR}/www/p5-Apache-AuthCookie \
 		p5-Apache2-SiteControl>=1.0:${PORTSDIR}/www/p5-Apache2-SiteControl \
 		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-DBD-mysql${MYSQL_VER}>=0:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER} \
+		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
 		p5-SQL-Translator>=0.07:${PORTSDIR}/databases/p5-SQL-Translator \
 		p5-Class-DBI>=3.0.17:${PORTSDIR}/databases/p5-Class-DBI \
 		p5-Class-DBI-AbstractSearch>=0:${PORTSDIR}/databases/p5-Class-DBI-AbstractSearch \
Index: ports-mgmt/tinderbox/Makefile
===================================================================
--- ports-mgmt/tinderbox/Makefile	(revision 309526)
+++ ports-mgmt/tinderbox/Makefile	(working copy)
@@ -6,7 +6,7 @@
 
 PORTNAME=	tinderbox
 PORTVERSION=	3.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://tinderbox.marcuscom.com/ \
 		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
@@ -66,7 +66,7 @@
 USE_PHP+=	mysql
 .endif
 USE_MYSQL=	yes
-RUN_DEPENDS+=	p5-DBD-mysql${MYSQL_VER}>=0:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER}
+RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 .endif
 
 .if defined(WITH_CVSUP)
Index: ports-mgmt/tinderbox-devel/Makefile
===================================================================
--- ports-mgmt/tinderbox-devel/Makefile	(revision 309526)
+++ ports-mgmt/tinderbox-devel/Makefile	(working copy)
@@ -68,7 +68,7 @@
 USE_PHP+=	mysql
 .endif
 USE_MYSQL=	yes
-RUN_DEPENDS+=	p5-DBD-mysql${MYSQL_VER}>=0:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER}
+RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 .endif
 
 .if !defined(WITHOUT_APACHE) && defined(WITH_WEBUI)
Index: sysutils/watchmen/Makefile
===================================================================
--- sysutils/watchmen/Makefile	(revision 309526)
+++ sysutils/watchmen/Makefile	(working copy)
@@ -7,6 +7,7 @@
 
 PORTNAME=	watchmen
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	GOOGLE_CODE
 
@@ -43,7 +44,7 @@
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
-RUN_DEPENDS+=	p5-DBD-mysql${MYSQL_VER}>=0:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER}
+RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
Index: www/MT/Makefile
===================================================================
--- www/MT/Makefile	(revision 309526)
+++ www/MT/Makefile	(working copy)
@@ -7,6 +7,7 @@
 
 PORTNAME=	MT
 PORTVERSION=	5.14
+PORTREVISION=	1
 CATEGORIES?=	www
 MASTER_SITES?=	http://www.movabletype.org/downloads/stable/
 DISTNAME?=	MTOS-${PORTVERSION}-en
@@ -42,7 +43,7 @@
 
 .if defined(WITH_MYSQL)
 DB_DIR?=	${BASEDIR}/var/db/mysql/blog
-RUN_DEPENDS+=	p5-DBD-mysql${MYSQL_VER}>=1:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER}
+RUN_DEPENDS+=	p5-DBD-mysql>=1:${PORTSDIR}/databases/p5-DBD-mysql
 USE_MYSQL=	yes
 .else
 DB_DIR?=	${PREFIX}/${CGIDIR}/db