As announced, remove MySQL 6.0 (dead development branch) and update CONFLICTS.

42 files changed, 27 insertions, 1163 deletions

diff --git a/databases/Makefile b/databases/Makefile
index eb7828956f2..f27c165d024 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -214,9 +214,6 @@
     SUBDIR += mysql55-client
     SUBDIR += mysql55-scripts
     SUBDIR += mysql55-server
-    SUBDIR += mysql60-client
-    SUBDIR += mysql60-scripts
-    SUBDIR += mysql60-server
     SUBDIR += mysql_last_value
     SUBDIR += mysqlard
     SUBDIR += mysqlbackup
@@ -304,7 +301,6 @@
     SUBDIR += p5-DBD-mysql50
     SUBDIR += p5-DBD-mysql51
     SUBDIR += p5-DBD-mysql55
-    SUBDIR += p5-DBD-mysql60
     SUBDIR += p5-DBI
     SUBDIR += p5-DBI-Shell
     SUBDIR += p5-DBICx-Deploy
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 29b6b0946ee..865ff23e55f 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -77,7 +77,7 @@ WANT_MYSQL_VER=	323
 
 LATEST_LINK=	mysql323-server
 
-CONFLICTS=	mysql-server-4.* mysql-server-5.* mysql-server-6.*
+CONFLICTS=	mysql-server-[45].*
 
 USE_RC_SUBR=	mysql-server.sh
 
@@ -137,7 +137,7 @@ post-install:
 .if defined(CLIENT_ONLY)
 LATEST_LINK=	mysql323-client
 
-CONFLICTS=	mysql-client-4.* mysql-client-5.* mysql-client-6.*
+CONFLICTS=	mysql-client-[45].*
 
 MAN1=		mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1
 
@@ -163,7 +163,7 @@ RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 LATEST_LINK=	mysql323-scripts
 
-CONFLICTS=	mysql-scripts-4.* mysql-scripts-5.* mysql-scripts-6.*
+CONFLICTS=	mysql-scripts-[45].*
 
 MAN1=		mysql_zap.1 mysqlaccess.1 mysqld_multi.1
 
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index b53a2b34fb3..e135e0c5ba1 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -86,7 +86,7 @@ WANT_MYSQL_VER=	40
 
 LATEST_LINK=	mysql40-server
 
-CONFLICTS=	mysql-server-3.* mysql-server-4.[1-9].* mysql-server-5.* mysql-server-6.*
+CONFLICTS=	mysql-server-[35].* mysql-server-4.[1-9].*
 
 USE_RC_SUBR=	mysql-server.sh
 
@@ -132,7 +132,7 @@ post-install:
 .if defined(CLIENT_ONLY)
 LATEST_LINK=	mysql40-client
 
-CONFLICTS=	mysql-client-3.* mysql-client-4.[1-9].* mysql-client-5.* mysql-client-6.*
+CONFLICTS=	mysql-client-[35].* mysql-client-4.[1-9].*
 
 MAN1=		mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1
 
@@ -161,7 +161,7 @@ RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 LATEST_LINK=	mysql40-scripts
 
-CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.[1-9].* mysql-scripts-5.* mysql-scripts-6.*
+CONFLICTS=	mysql-scripts-[35].* mysql-scripts-4.[1-9].*
 
 MAN1=		mysql_zap.1 mysqlaccess.1 mysqld_multi.1 mysql_fix_privilege_tables.1
 
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index c14854c6986..2f083d75b78 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -91,7 +91,7 @@ WANT_MYSQL_VER=	41
 
 LATEST_LINK=	mysql41-server
 
-CONFLICTS=	mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.* mysql-server-6.*
+CONFLICTS=	mysql-server-[35].* mysql-server-4.[02-9].*
 
 USE_RC_SUBR=	mysql-server.sh
 
@@ -151,7 +151,7 @@ post-install:
 .if defined(CLIENT_ONLY)
 LATEST_LINK=	mysql41-client
 
-CONFLICTS=	mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.* mysql-client-6.*
+CONFLICTS=	mysql-client-[35].* mysql-client-4.[02-9].*
 
 MAN1=		mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
 		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
@@ -184,7 +184,7 @@ RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 LATEST_LINK=	mysql41-scripts
 
-CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.[02-9].* mysql-scripts-5.* mysql-scripts-6.*
+CONFLICTS=	mysql-scripts-[35].* mysql-scripts-4.[02-9].*
 
 MAN1=		msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \
 		mysqld_multi.1 mysql_fix_privilege_tables.1
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index b5e5120aac6..4f9c227c2cf 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -101,7 +101,7 @@ WANT_MYSQL_VER=	50
 
 LATEST_LINK=	mysql50-server
 
-CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.[1-9].* mysql-server-6.*
+CONFLICTS=	mysql-server-[34].* mysql-server-5.[1-9].*
 
 USE_RC_SUBR=	mysql-server.sh
 
@@ -186,7 +186,7 @@ post-install:
 .if defined(CLIENT_ONLY)
 LATEST_LINK=	mysql50-client
 
-CONFLICTS=	mysql-client-3.* mysql-client-4.* mysql-client-5.[1-9].* mysql-client-6.*
+CONFLICTS=	mysql-client-[34].* mysql-client-5.[1-9].*
 
 MAN1=		mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \
 		mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \
@@ -218,7 +218,7 @@ RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 LATEST_LINK=	mysql50-scripts
 
-CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.[1-9].* mysql-scripts-6.*
+CONFLICTS=	mysql-scripts-[34].* mysql-scripts-5.[1-9].*
 
 MAN1=		msql2mysql.1 mysql_convert_table_format.1 mysql_explain_log.1 mysql_find_rows.1 \
 		mysql_fix_extensions.1 mysql_secure_installation.1 \
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index fef4fe9387c..fd3b869e616 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -96,7 +96,7 @@ WANT_MYSQL_VER=	51
 
 LATEST_LINK=	mysql51-server
 
-CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.[02-9].* mysql-server-6.*
+CONFLICTS=	mysql-server-[34].* mysql-server-5.[02-9].*
 
 USE_RC_SUBR=	mysql-server.sh
 
@@ -169,7 +169,7 @@ post-install:
 .if defined(CLIENT_ONLY)
 LATEST_LINK=	mysql51-client
 
-CONFLICTS=	mysql-client-3.* mysql-client-4.* mysql-client-5.[02-9].* mysql-client-6.*
+CONFLICTS=	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 \
@@ -202,7 +202,7 @@ RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 LATEST_LINK=	mysql51-scripts
 
-CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.[02-9].* mysql-scripts-6.*
+CONFLICTS=	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 \
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 81f28377271..60689ae4167 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -97,7 +97,7 @@ WANT_MYSQL_VER=	55
 
 LATEST_LINK=	mysql55-server
 
-CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.[0-46-9].* mysql-server-6.*
+CONFLICTS=	mysql-server-[34].* mysql-server-5.[0-46-9].*
 
 USE_RC_SUBR=	mysql-server.sh
 
@@ -170,7 +170,7 @@ post-install:
 .if defined(CLIENT_ONLY)
 LATEST_LINK=	mysql55-client
 
-CONFLICTS=	mysql-client-3.* mysql-client-4.* mysql-client-5.[0-46-9].* mysql-client-6.*
+CONFLICTS=	mysql-client-[34].* mysql-client-5.[0-46-9].*
 
 MAN1=		mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \
 		mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \
@@ -203,7 +203,7 @@ RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 LATEST_LINK=	mysql55-scripts
 
-CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.[0-46-9].* mysql-scripts-6.*
+CONFLICTS=	mysql-scripts-[34].* mysql-scripts-5.[0-46-9].*
 
 MAN1=		msql2mysql.1 mysql_convert_table_format.1 mysql_find_rows.1 \
 		mysql_fix_extensions.1 mysql_secure_installation.1 \
diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile
deleted file mode 100644
index cd01ebfdad6..00000000000
--- a/databases/mysql60-client/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	MySQL-client
-# Date created:				28 Jan 2006
-# Whom:					Alex Dupre <ale@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mysql
-PKGNAMESUFFIX=	-client
-
-COMMENT=	Multithreaded SQL database (client)
-
-MASTERDIR=	${.CURDIR}/../mysql60-server
-
-PKGINSTALL=	mustnotexist
-PKGMESSAGE=	mustnotexist
-PLIST=		${PKGDIR}/pkg-plist.client
-
-CLIENT_ONLY=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql60-scripts/Makefile b/databases/mysql60-scripts/Makefile
deleted file mode 100644
index 08ae3a0c35d..00000000000
--- a/databases/mysql60-scripts/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for:    MySQL-scripts
-# Date created:         28 Jan 2006
-# Whom:                 Alex Dupre <ale@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mysql
-PKGNAMESUFFIX=	-scripts
-
-COMMENT=	Multithreaded SQL database (scripts)
-
-MASTERDIR=	${.CURDIR}/../mysql60-server
-
-PKGINSTALL=	mustnotexist
-PKGMESSAGE=	mustnotexist
-PLIST=		${PKGDIR}/pkg-plist.scripts
-
-SCRIPTS_ONLY=	yes
-USE_PERL5=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
deleted file mode 100644
index bb351cf4abc..00000000000
--- a/databases/mysql60-server/Makefile
+++ /dev/null
@@ -1,232 +0,0 @@
-# New ports collection makefile for:	MySQL-server
-# Date created:				28 Jan 2006
-# Whom:					Alex Dupre <ale@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME?=	mysql
-PORTVERSION=	6.0.11
-PORTREVISION?=	0
-CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	MySQL-6.0
-PKGNAMESUFFIX?=	-server
-DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
-
-MAINTAINER=	ale@FreeBSD.org
-COMMENT?=	Multithreaded SQL database (server)
-
-DEPRECATED=	The MySQL 6.0 development branch is deprecated and will be removed soon. \
-		Please consider using MySQL 5.5 instead.
-EXPIRATION_DATE=2010-01-10
-
-SLAVEDIRS=	databases/mysql60-client databases/mysql60-scripts
-USE_AUTOTOOLS=	libtool:22
-USE_GMAKE=	yes
-
-CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--infodir=${PREFIX}/info \
-		--mandir=${PREFIX}/man \
-		--with-zlib-dir=/usr \
-		--without-debug \
-		--without-readline \
-		--without-libedit \
-		--with-libwrap \
-		--with-low-memory \
-		--with-comment='FreeBSD port: ${PKGNAME}' \
-		--enable-thread-safe-client
-
-.ifdef USE_MYSQL
-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
-.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
-CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
-.endif
-.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
-CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
-.endif
-.if defined(WITH_OPENSSL)
-CONFIGURE_ARGS+=--with-ssl=bundled
-.endif
-.if defined(WITH_FAST_MUTEXES)
-CONFIGURE_ARGS+=--with-fast-mutexes
-.endif
-.if defined(WITH_THREAD_POOL)
-CONFIGURE_ARGS+=--with-libevent
-.endif
-.if defined(BUILD_STATIC)
-CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
-.endif
-.if defined(WITH_NDB)
-CONFIGURE_ARGS+=--with-plugins=max
-.else
-CONFIGURE_ARGS+=--with-plugins=max-no-ndb
-.endif
-.if defined(WITH_COLLATION) && ${WITH_COLLATION} != ""
-CONFIGURE_ARGS+=--with-collation=${WITH_COLLATION}
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler
-.endif
-.if defined(WITH_LINUXTHREADS)
-CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
-CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
-CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE
-CFLAGS+=	-I${LOCALBASE}/include/pthread/linuxthreads
-LIB_DEPENDS+=	lthread:${PORTSDIR}/devel/linuxthreads
-CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++'
-.else
-CONFIGURE_ARGS+=--with-named-thread-libs=${PTHREAD_LIBS}
-CFLAGS+=	${PTHREAD_CFLAGS}
-.endif
-
-.if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-O3 -fno-omit-frame-pointer
-CFLAGS+=	-fno-gcse
-.endif
-CXXFLAGS+=	${CFLAGS} -felide-constructors -fno-rtti
-CXXFLAGS+=	-fno-exceptions
-
-# MySQL-Server part
-.if !defined(CLIENT_ONLY) && !defined(SCRIPTS_ONLY)
-USE_MYSQL=	yes
-WANT_MYSQL_VER=	60
-
-LATEST_LINK=	mysql60-server
-
-CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.*
-
-USE_RC_SUBR=	mysql-server.sh
-
-.if defined(WITH_NDB)
-PLIST_SUB+=	NDB=""
-.else
-PLIST_SUB+=	NDB="@comment "
-.endif
-
-MAN1=		innochecksum.1 myisamchk.1 myisamlog.1 myisampack.1 \
-		my_print_defaults.1 myisam_ftdump.1 mysql_client_test_embedded.1 \
-		mysql_install_db.1 mysql_tzinfo_to_sql.1 \
-		mysql_waitpid.1 mysqld_safe.1 mysqltest_embedded.1 mysql.server.1 \
-		perror.1 replace.1 resolve_stack_dump.1 resolveip.1
-
-INFO=		mysql
-
-CONFIGURE_ARGS+=--with-embedded-server
-
-CFLAGS+=	-fPIC
-
-pre-fetch:
-	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} ""
-	@${ECHO} "	WITH_CHARSET=charset	Define the primary built-in charset (latin1)."
-	@${ECHO} "	WITH_XCHARSET=list	Define other built-in charsets (may be 'all')."
-	@${ECHO} "	WITH_COLLATION=collate	Define default collation (latin1_swedish_ci)."
-	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections."
-	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
-	@${ECHO} "	WITH_PROC_SCOPE_PTH=yes	Use process scope threads"
-	@${ECHO} "				(try it if you use libpthread)."
-	@${ECHO} "	WITH_THREAD_POOL=yes	Use libevent to have connection pooling."
-	@${ECHO} "	WITH_FAST_MUTEXES=yes	Replace mutexes with spinlocks."
-	@${ECHO} "	BUILD_OPTIMIZED=yes	Enable compiler optimizations"
-	@${ECHO} "				(use it if you need speed)."
-	@${ECHO} "	BUILD_STATIC=yes	Build a static version of mysqld."
-	@${ECHO} "				(use it if you need even more speed)."
-	@${ECHO} "	WITH_NDB=yes		Enable support for NDB Cluster."
-	@${ECHO} ""
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ sql-common @sql_server_dirs@ libmysql storage scripts @sql_server@ @man_dirs@ @libmysqld_dirs@ support-files|g" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql mysql_system_tables.sql mysql_system_tables_data.sql|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
-	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/extra/Makefile.in
-	@${REINPLACE_CMD} -e "s|install-data-am: install-includeHEADERS|install-data-am:|g" ${WRKSRC}/extra/libevent/Makefile.in
-	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
-	@${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLTLIBRARIES|install-exec-am:|g" ${WRKSRC}/libmysql/Makefile.in
-	@${REINPLACE_CMD} -e "s|PROGRAMS = \$$(noinst_PROGRAMS)|PROGRAMS =|g" ${WRKSRC}/storage/archive/Makefile.in
-	@${REINPLACE_CMD} -e "/^AM_CXXFLAGS/s|=.*|+= \$$(NDB_CXXFLAGS)|" `${FIND} ${WRKSRC}/storage/ndb -name Makefile.in`
-.if defined(WITH_PROC_SCOPE_PTH)
-	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc
-.endif
-
-post-install:
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${CAT} ${PKGMESSAGE}
-.endif
-
-.else
-# MySQL-Client part
-.if defined(CLIENT_ONLY)
-LATEST_LINK=	mysql60-client
-
-CONFLICTS=	mysql-client-3.* mysql-client-4.* mysql-client-5.*
-
-MAN1=		mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \
-		mysqlbackup.1 mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \
-		mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mysqltest.1
-
-USE_LDCONFIG=	${PREFIX}/lib/mysql
-
-CONFIGURE_ARGS+=--without-server
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include sql-common scripts strings regex mysys dbug extra libmysql libmysql_r client @man_dirs@|g" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLTLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/Makefile.in ${WRKSRC}/mysys/Makefile.in ${WRKSRC}/dbug/Makefile.in
-	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysqlbug|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
-	@${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/
-
-.else
-# MySQL-Scripts part
-USE_MYSQL=	yes
-WANT_MYSQL_VER=	60
-
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql60
-.if ${PERL_LEVEL} <= 500800
-RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.endif
-
-LATEST_LINK=	mysql60-scripts
-
-CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.*
-
-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 \
-		mysqldumpslow.1 mysqlhotcopy.1 mysqld_multi.1
-
-SCRIPTS=	msql2mysql mysql_fix_extensions mysql_setpermission \
-		mysql_secure_installation mysql_zap mysqlaccess \
-		mysql_convert_table_format mysql_find_rows mysqlhotcopy \
-		mysqldumpslow mysqld_multi
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = scripts @man_dirs@|g" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = ${SCRIPTS}|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|install-exec-am install-data-am|install-exec-am|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
-.endif
-.endif
-# Common part
-post-extract:
-	@${CP} /usr/include/tcpd.h ${WRKSRC}/include/my_tcpd.h
-
-.if defined(WITH_OPENSSL) && defined(BUILD_STATIC)
-pre-configure:
-	@${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL."
-	@${FALSE}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
deleted file mode 100644
index c083be6105f..00000000000
--- a/databases/mysql60-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (mysql-6.0.11-alpha.tar.gz) = 516b0695b97102508811f2c4d6e8e683
-SHA256 (mysql-6.0.11-alpha.tar.gz) = 94164a295b7f020edd7b95ae236e196b69e3c27e782a864ec2c6f5f9cec1ecac
-SIZE (mysql-6.0.11-alpha.tar.gz) = 37677862
diff --git a/databases/mysql60-server/files/mysql-server.sh.in b/databases/mysql60-server/files/mysql-server.sh.in
deleted file mode 100644
index 2896a9effe5..00000000000
--- a/databases/mysql60-server/files/mysql-server.sh.in
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable MySQL.
-# mysql_limits (bool):	Set to "NO" by default.
-#			Set it to yes to run `limits -e -U mysql`
-#			just before mysql starts.
-# mysql_dbdir (str):	Default to "/var/db/mysql"
-#			Base database directory.
-# mysql_args (str):	Custom additional arguments to be passed
-#			to mysqld_safe (default empty).
-#
-
-. %%RC_SUBR%%
-
-name="mysql"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-: ${mysql_limits="NO"}
-: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_args=""}
-
-mysql_user="mysql"
-mysql_limits_args="-e -U ${mysql_user}"
-pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
-command="%%PREFIX%%/bin/mysqld_safe"
-command_args="--defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} > /dev/null 2>&1 &"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--ldata=${mysql_dbdir}"
-
-mysql_create_auth_tables()
-{
-	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
-        [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
-		mysql_create_auth_tables || return 1
-	fi
-	if checkyesno mysql_limits; then
-		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
-	else
-		return 0
-	fi
-}
-
-mysql_poststart()
-{
-	local timeout=15
-	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
-		timeout=$(( timeout - 1 ))
-		sleep 1
-	done
-	return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mysql60-server/files/patch-Docs::Makefile.in b/databases/mysql60-server/files/patch-Docs::Makefile.in
deleted file mode 100644
index 51888b7712c..00000000000
--- a/databases/mysql60-server/files/patch-Docs::Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- Docs/Makefile.in.orig	2008-01-29 22:43:40.000000000 +0100
-+++ Docs/Makefile.in	2008-02-14 08:21:57.000000000 +0100
-@@ -368,7 +368,7 @@
- yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
- zlib_dir = @zlib_dir@
- EXTRA_DIST = mysql.info INSTALL-BINARY @extra_docs@
--all: all-am
-+all:
- 
- .SUFFIXES:
- $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-@@ -453,7 +453,7 @@
- install-data: install-data-am
- uninstall: uninstall-am
- 
--install-am: all-am
-+install-am:
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- 
- installcheck: installcheck-am
diff --git a/databases/mysql60-server/files/patch-Makefile.in b/databases/mysql60-server/files/patch-Makefile.in
deleted file mode 100644
index 79d4eb1b41c..00000000000
--- a/databases/mysql60-server/files/patch-Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.in.orig	2008-06-12 15:27:07.000000000 +0200
-+++ Makefile.in	2008-07-25 08:10:32.000000000 +0200
-@@ -419,14 +419,7 @@
- EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
- 			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
- 
--SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
--			@readline_topdir@ sql-common scripts \
--			@pstack_dir@ \
--			@sql_union_dirs@ unittest storage plugin \
--			@sql_server@ @man_dirs@ tests \
--			netware @libmysqld_dirs@ \
--			mysql-test support-files sql-bench \
--			win
-+SUBDIRS =
- 
- DIST_SUBDIRS = . include Docs zlib \
- 			cmd-line-utils sql-common scripts \
diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure
deleted file mode 100644
index c20f7783159..00000000000
--- a/databases/mysql60-server/files/patch-configure
+++ /dev/null
@@ -1,38 +0,0 @@
---- configure.orig	2009-01-02 16:59:54.000000000 +0100
-+++ configure	2009-01-18 10:14:57.000000000 +0100
-@@ -21832,8 +21832,6 @@
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
- # Prevent multiple expansion
- 
-@@ -27046,13 +27044,14 @@
-         { $as_echo "$as_me:$LINENO: result: using bundled zlib" >&5
- $as_echo "using bundled zlib" >&6; }
-         ;;
--      "")
-+      *)
-         ZLIB_INCLUDES=""
-         ZLIB_LIBS="-lz"
- 
- save_CPPFLAGS="$CPPFLAGS"
- save_LIBS="$LIBS"
- CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS"
-+LIBS="$ZLIB_LIBS $LIBS"
- if test X"$with_server" = Xno
- then
-   zlibsym=zlibVersion
-@@ -29214,8 +29213,8 @@
- # Some system specific hacks
- #
- 
--MAX_C_OPTIMIZE="-O3"
--MAX_CXX_OPTIMIZE="-O3"
-+MAX_C_OPTIMIZE=""
-+MAX_CXX_OPTIMIZE=""
- 
- case $SYSTEM_TYPE in
-   *solaris2.7*)
diff --git a/databases/mysql60-server/files/patch-extra_yassl_Makefile.in b/databases/mysql60-server/files/patch-extra_yassl_Makefile.in
deleted file mode 100644
index 647752da23a..00000000000
--- a/databases/mysql60-server/files/patch-extra_yassl_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- extra/yassl/Makefile.in.orig	2008-08-12 17:34:32.000000000 +0200
-+++ extra/yassl/Makefile.in	2008-08-27 12:27:58.000000000 +0200
-@@ -387,7 +387,7 @@
- yassl_libs = @yassl_libs@
- yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
- zlib_dir = @zlib_dir@
--SUBDIRS = taocrypt src testsuite
-+SUBDIRS = taocrypt src
- EXTRA_DIST = CMakeLists.txt
- all: all-recursive
- 
diff --git a/databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in b/databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in
deleted file mode 100644
index 8ee80d82e84..00000000000
--- a/databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- extra/yassl/taocrypt/Makefile.in.orig	2008-08-12 17:34:32.000000000 +0200
-+++ extra/yassl/taocrypt/Makefile.in	2008-08-27 12:33:51.000000000 +0200
-@@ -387,7 +387,7 @@
- yassl_libs = @yassl_libs@
- yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
- zlib_dir = @zlib_dir@
--SUBDIRS = src test benchmark
-+SUBDIRS = src
- EXTRA_DIST = CMakeLists.txt $(wildcard mySTL/*.hpp)
- all: all-recursive
- 
diff --git a/databases/mysql60-server/files/patch-include_my_handler.h b/databases/mysql60-server/files/patch-include_my_handler.h
deleted file mode 100644
index 5f0356b5c67..00000000000
--- a/databases/mysql60-server/files/patch-include_my_handler.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_handler.h.orig	2009-02-16 23:09:40.000000000 +0100
-+++ include/my_handler.h	2009-02-16 23:09:55.000000000 +0100
-@@ -39,7 +39,7 @@
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
--#define HA_MAX_KEY_LENGTH           1332        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mysql60-server/files/patch-include_my_libwrap.h b/databases/mysql60-server/files/patch-include_my_libwrap.h
deleted file mode 100644
index a115f40fc8f..00000000000
--- a/databases/mysql60-server/files/patch-include_my_libwrap.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_libwrap.h.orig	Tue Nov  7 08:39:53 2006
-+++ include/my_libwrap.h	Tue Nov  7 08:40:17 2006
-@@ -15,7 +15,7 @@
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
- 
- #ifdef HAVE_LIBWRAP
--#include <tcpd.h>
-+#include <my_tcpd.h>
- #include <syslog.h>
- #ifdef NEED_SYS_SYSLOG_H
- #include <sys/syslog.h>
diff --git a/databases/mysql60-server/files/patch-include_my_tcpd.h b/databases/mysql60-server/files/patch-include_my_tcpd.h
deleted file mode 100644
index 38aad1aa57d..00000000000
--- a/databases/mysql60-server/files/patch-include_my_tcpd.h
+++ /dev/null
@@ -1,147 +0,0 @@
---- include/my_tcpd.h.orig	Sun Jan  9 13:33:51 2005
-+++ include/my_tcpd.h	Sun Jan  9 13:41:42 2005
-@@ -6,6 +6,25 @@
-   * $FreeBSD$
-   */
- 
-+#ifndef _TCPWRAPPERS_TCPD_H
-+#define _TCPWRAPPERS_TCPD_H
-+
-+/* someone else may have defined this */
-+#undef  __P
-+
-+/* use prototypes if we have an ANSI C compiler or are using C++ */
-+#if defined(__STDC__) || defined(__cplusplus)
-+#define __P(args)       args
-+#else
-+#define __P(args)       ()
-+#endif
-+
-+/* Need definitions of struct sockaddr_in and FILE. */
-+#include <netinet/in.h>
-+#include <stdio.h>
-+
-+__BEGIN_DECLS
-+
- /* Structure to describe one communications endpoint. */
- 
- #define STRING_LENGTH	128		/* hosts, users, processes */
-@@ -31,10 +50,10 @@
-     char    pid[10];			/* access via eval_pid(request) */
-     struct host_info client[1];		/* client endpoint info */
-     struct host_info server[1];		/* server endpoint info */
--    void  (*sink) ();			/* datagram sink function or 0 */
--    void  (*hostname) ();		/* address to printable hostname */
--    void  (*hostaddr) ();		/* address to printable address */
--    void  (*cleanup) ();		/* cleanup function or 0 */
-+    void  (*sink) __P((int));		/* datagram sink function or 0 */
-+    void  (*hostname) __P((struct host_info *)); /* address to printable hostname */
-+    void  (*hostaddr) __P((struct host_info *)); /* address to printable address */
-+    void  (*cleanup) __P((struct request_info *)); /* cleanup function or 0 */
-     struct netconfig *config;		/* netdir handle */
- };
- 
-@@ -67,20 +86,23 @@
- /* Global functions. */
- 
- #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
--extern void fromhost();			/* get/validate client host info */
-+extern void fromhost __P((struct request_info *));	/* get/validate client host info */
- #else
- #define fromhost sock_host		/* no TLI support needed */
- #endif
- 
--extern int hosts_access();		/* access control */
--extern void shell_cmd();		/* execute shell command */
--extern char *percent_x();		/* do %<char> expansion */
--extern void rfc931();			/* client name from RFC 931 daemon */
--extern void clean_exit();		/* clean up and exit */
--extern void refuse();			/* clean up and exit */
--extern char *xgets();			/* fgets() on steroids */
--extern char *split_at();		/* strchr() and split */
--extern unsigned long dot_quad_addr();	/* restricted inet_addr() */
-+extern void shell_cmd __P((char *));	/* execute shell command */
-+extern char *percent_x __P((char *, int, char *, struct request_info *)); /* do %<char> expansion */
-+#ifdef INET6
-+extern void rfc931 __P((struct sockaddr *, struct sockaddr *, char *)); /* client name from RFC 931 daemon */
-+#else
-+extern void rfc931 __P((struct sockaddr_in *, struct sockaddr_in *, char *)); /* client name from RFC 931 daemon */
-+#endif
-+extern void clean_exit __P((struct request_info *)); /* clean up and exit */
-+extern void refuse __P((struct request_info *));	/* clean up and exit */
-+extern char *xgets __P((char *, int, FILE *));	/* fgets() on steroids */
-+extern char *split_at __P((char *, int));	/* strchr() and split */
-+extern unsigned long dot_quad_addr __P((char *)); /* restricted inet_addr() */
- 
- /* Global variables. */
- 
-@@ -98,9 +120,14 @@
-   */
- 
- #ifdef __STDC__
-+extern int hosts_access(struct request_info *request);
-+extern int hosts_ctl(char *daemon, char *client_name, char *client_addr, 
-+                     char *client_user);
- extern struct request_info *request_init(struct request_info *,...);
- extern struct request_info *request_set(struct request_info *,...);
- #else
-+extern int hosts_access();
-+extern int hosts_ctl();
- extern struct request_info *request_init();	/* initialize request */
- extern struct request_info *request_set();	/* update request structure */
- #endif
-@@ -123,27 +150,27 @@
-   * host_info structures serve as caches for the lookup results.
-   */
- 
--extern char *eval_user();		/* client user */
--extern char *eval_hostname();		/* printable hostname */
--extern char *eval_hostaddr();		/* printable host address */
--extern char *eval_hostinfo();		/* host name or address */
--extern char *eval_client();		/* whatever is available */
--extern char *eval_server();		/* whatever is available */
-+extern char *eval_user __P((struct request_info *));	/* client user */
-+extern char *eval_hostname __P((struct host_info *));	/* printable hostname */
-+extern char *eval_hostaddr __P((struct host_info *));	/* printable host address */
-+extern char *eval_hostinfo __P((struct host_info *));	/* host name or address */
-+extern char *eval_client __P((struct request_info *));	/* whatever is available */
-+extern char *eval_server __P((struct request_info *));	/* whatever is available */
- #define eval_daemon(r)	((r)->daemon)	/* daemon process name */
- #define eval_pid(r)	((r)->pid)	/* process id */
- 
- /* Socket-specific methods, including DNS hostname lookups. */
- 
--extern void sock_host();		/* look up endpoint addresses */
--extern void sock_hostname();		/* translate address to hostname */
--extern void sock_hostaddr();		/* address to printable address */
-+extern void sock_host __P((struct request_info *));
-+extern void sock_hostname __P((struct host_info *));
-+extern void sock_hostaddr __P((struct host_info *));
- #define sock_methods(r) \
- 	{ (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
- 
- /* The System V Transport-Level Interface (TLI) interface. */
- 
- #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
--extern void tli_host();			/* look up endpoint addresses etc. */
-+extern void tli_host __P((struct request_info *));	/* look up endpoint addresses etc. */
- #endif
- 
-  /*
-@@ -184,7 +211,7 @@
-   * behavior.
-   */
- 
--extern void process_options();		/* execute options */
-+extern void process_options __P((char *, struct request_info *)); /* execute options */
- extern int dry_run;			/* verification flag */
- 
- /* Bug workarounds. */
-@@ -223,3 +250,7 @@
- #define strtok	my_strtok
- extern char *my_strtok();
- #endif
-+
-+__END_DECLS
-+
-+#endif /* tcpd.h */
diff --git a/databases/mysql60-server/files/patch-man::Makefile.in b/databases/mysql60-server/files/patch-man::Makefile.in
deleted file mode 100644
index 0b15e2d4ca0..00000000000
--- a/databases/mysql60-server/files/patch-man::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/Makefile.in.orig	Thu Oct 26 14:03:04 2006
-+++ man/Makefile.in	Tue Nov  7 08:19:50 2006
-@@ -363,8 +363,8 @@
- yassl_libs = @yassl_libs@
- yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
- zlib_dir = @zlib_dir@
--man1_MANS = @man1_files@
--man8_MANS = @man8_files@
-+man1_MANS =
-+man8_MANS =
- EXTRA_DIST = $(man1_MANS) $(man8_MANS)
- all: all-am
- 
diff --git a/databases/mysql60-server/files/patch-mysys_default.c b/databases/mysql60-server/files/patch-mysys_default.c
deleted file mode 100644
index 69b1463ce4a..00000000000
--- a/databases/mysql60-server/files/patch-mysys_default.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- mysys/default.c.orig	2009-05-11 14:50:54.000000000 +0200
-+++ mysys/default.c	2009-05-19 07:45:53.000000000 +0200
-@@ -679,7 +679,7 @@
-   {
-     MY_STAT stat_info;
-     if (!my_stat(name,&stat_info,MYF(0)))
--      return 1;
-+      return 0;
-     /*
-       Ignore world-writable regular files.
-       This is mainly done to protect us to not read a file created by
-@@ -1128,7 +1128,10 @@
- 
- #if defined(DEFAULT_SYSCONFDIR)
-   if (DEFAULT_SYSCONFDIR[0])
-+  {
-     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
-+  }
- #endif /* DEFAULT_SYSCONFDIR */
- 
- #endif
diff --git a/databases/mysql60-server/files/patch-scripts::Makefile.in b/databases/mysql60-server/files/patch-scripts::Makefile.in
deleted file mode 100644
index 173330ec2fa..00000000000
--- a/databases/mysql60-server/files/patch-scripts::Makefile.in
+++ /dev/null
@@ -1,37 +0,0 @@
---- scripts/Makefile.in.orig	2009-05-11 15:02:29.000000000 +0200
-+++ scripts/Makefile.in	2009-05-19 07:51:39.000000000 +0200
-@@ -424,20 +424,7 @@
- BUILT_SOURCES = mysql_fix_privilege_tables.sql \
- 		mysql_fix_privilege_tables_sql.c
- 
--bin_SCRIPTS = @server_scripts@ \
--			msql2mysql \
--			mysql_config \
--			mysql_fix_extensions \
--			mysql_setpermission \
--			mysql_secure_installation \
--			mysql_zap \
--			mysqlaccess \
--			mysqlbug \
--			mysql_convert_table_format \
--			mysql_find_rows \
--			mysqlhotcopy \
--			mysqldumpslow \
--			mysqld_multi
-+bin_SCRIPTS =
- 
- noinst_SCRIPTS = make_binary_distribution \
- 			make_sharedlib_distribution
-@@ -471,11 +458,7 @@
- 			mysql_system_tables_fix.sql \
- 			CMakeLists.txt
- 
--dist_pkgdata_DATA = fill_help_tables.sql \
--			mysql_fix_privilege_tables.sql \
--			mysql_system_tables.sql \
--			mysql_system_tables_data.sql \
--			mysql_test_data_timezone.sql
-+dist_pkgdata_DATA =
- 
- CLEANFILES = @server_scripts@ \
- 			make_binary_distribution \
diff --git a/databases/mysql60-server/files/patch-scripts_mysqld_safe.sh b/databases/mysql60-server/files/patch-scripts_mysqld_safe.sh
deleted file mode 100644
index 2a30469922f..00000000000
--- a/databases/mysql60-server/files/patch-scripts_mysqld_safe.sh
+++ /dev/null
@@ -1,24 +0,0 @@
---- scripts/mysqld_safe.sh.orig	2007-10-08 10:39:23.000000000 +0200
-+++ scripts/mysqld_safe.sh	2007-10-08 10:40:52.000000000 +0200
-@@ -242,10 +242,10 @@
- 
- if test -z "$MYSQL_HOME"
- then 
--  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
-+  if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
-   then
-     log_error "WARNING: Found two instances of my.cnf -
--$MY_BASEDIR_VERSION/my.cnf and
-+$MY_BASEDIR_VERSION/etc/my.cnf and
- $DATADIR/my.cnf
- IGNORING $DATADIR/my.cnf"
- 
-@@ -254,7 +254,7 @@
-   then
-     log_error "WARNING: Found $DATADIR/my.cnf
- The data directory is a deprecated location for my.cnf, please move it to
--$MY_BASEDIR_VERSION/my.cnf"
-+$MY_BASEDIR_VERSION/etc/my.cnf"
-     MYSQL_HOME=$DATADIR
-   else
-     MYSQL_HOME=$MY_BASEDIR_VERSION
diff --git a/databases/mysql60-server/files/patch-sql::mysqld.cc b/databases/mysql60-server/files/patch-sql::mysqld.cc
deleted file mode 100644
index 4feed825cb1..00000000000
--- a/databases/mysql60-server/files/patch-sql::mysqld.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- sql/mysqld.cc.orig	Sat Aug  6 03:39:41 2005
-+++ sql/mysqld.cc	Sun Aug 28 20:41:38 2005
-@@ -3177,7 +3177,7 @@
-   init_ssl();
- 
- #ifdef HAVE_LIBWRAP
--  libwrapName= my_progname+dirname_length(my_progname);
-+  libwrapName= (char *) my_progname+dirname_length(my_progname);
-   openlog(libwrapName, LOG_PID, LOG_AUTH);
- #endif
- 
diff --git a/databases/mysql60-server/files/patch-storage_maria_Makefile.in b/databases/mysql60-server/files/patch-storage_maria_Makefile.in
deleted file mode 100644
index cddfb294b23..00000000000
--- a/databases/mysql60-server/files/patch-storage_maria_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/maria/Makefile.in.orig	2008-08-27 14:50:26.000000000 +0200
-+++ storage/maria/Makefile.in	2008-08-27 14:50:44.000000000 +0200
-@@ -512,7 +512,7 @@
- LDADD = 
- 
- # "." is needed first because tests in unittest need libmaria
--SUBDIRS = . unittest
-+SUBDIRS = .
- EXTRA_DIST = ma_test_all.sh ma_test_all.res ma_test_big.sh \
- 			ma_ft_stem.c CMakeLists.txt plug.in ma_test_recovery
- 
diff --git a/databases/mysql60-server/files/patch-storage_ndb_src_kernel_Makefile.in b/databases/mysql60-server/files/patch-storage_ndb_src_kernel_Makefile.in
deleted file mode 100644
index ffbdc44702e..00000000000
--- a/databases/mysql60-server/files/patch-storage_ndb_src_kernel_Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- storage/ndb/src/kernel/Makefile.in.orig	2009-01-18 12:52:07.000000000 +0100
-+++ storage/ndb/src/kernel/Makefile.in	2009-01-18 12:52:20.000000000 +0100
-@@ -120,8 +120,7 @@
- 	$(top_builddir)/storage/ndb/src/common/util/libgeneral.la \
- 	$(top_builddir)/dbug/libdbuglt.la \
- 	$(top_builddir)/mysys/libmysyslt.la \
--	$(top_builddir)/strings/libmystringslt.la \
--	$(top_builddir)/zlib/libzlt.la
-+	$(top_builddir)/strings/libmystringslt.la
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -498,7 +497,7 @@
- 	$(top_builddir)/dbug/libdbuglt.la \
- 	$(top_builddir)/mysys/libmysyslt.la \
- 	$(top_builddir)/strings/libmystringslt.la \
--	$(top_builddir)/zlib/libzlt.la @NDB_SCI_LIBS@
-+	@NDB_SCI_LIBS@
- NDB_CXXFLAGS = @ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC) 
- NDB_AM_CXXFLAGS := $(AM_CXXFLAGS)
- AM_CXXFLAGS = $(NDB_AM_CXXFLAGS) $(NDB_CXXFLAGS)
diff --git a/databases/mysql60-server/files/patch-storage_ndb_src_ndbapi_Makefile.in b/databases/mysql60-server/files/patch-storage_ndb_src_ndbapi_Makefile.in
deleted file mode 100644
index 44dbc194c9a..00000000000
--- a/databases/mysql60-server/files/patch-storage_ndb_src_ndbapi_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- storage/ndb/src/ndbapi/Makefile.in.orig	2009-01-18 12:30:08.000000000 +0100
-+++ storage/ndb/src/ndbapi/Makefile.in	2009-01-18 12:30:38.000000000 +0100
-@@ -530,8 +530,7 @@
- ndberror_check_LDFLAGS = \
-          $(top_builddir)/dbug/libdbuglt.la \
-          $(top_builddir)/mysys/libmysyslt.la \
--         $(top_builddir)/strings/libmystringslt.la \
--         $(top_builddir)/zlib/libzlt.la
-+         $(top_builddir)/strings/libmystringslt.la
- 
- all: all-am
- 
diff --git a/databases/mysql60-server/files/patch-support-files_Makefile.in b/databases/mysql60-server/files/patch-support-files_Makefile.in
deleted file mode 100644
index 2d6ef213f89..00000000000
--- a/databases/mysql60-server/files/patch-support-files_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- support-files/Makefile.in.orig	Thu Apr 19 09:31:48 2007
-+++ support-files/Makefile.in	Thu Apr 19 09:33:03 2007
-@@ -419,7 +419,7 @@
- 
- pkgdata_SCRIPTS = mysql.server
- aclocaldir = $(datadir)/aclocal
--aclocal_DATA = mysql.m4
-+aclocal_DATA =
- noinst_DATA = mysql-@VERSION@.spec \
- 			MySQL-shared-compat.spec
- 
diff --git a/databases/mysql60-server/pkg-descr b/databases/mysql60-server/pkg-descr
deleted file mode 100644
index 4ddefbb7054..00000000000
--- a/databases/mysql60-server/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-MySQL is a very fast, multi-threaded, multi-user and robust SQL
-(Structured Query Language) database server.
-
-WWW: http://www.mysql.com/
-
-- Alex Dupre
-ale@FreeBSD.org
diff --git a/databases/mysql60-server/pkg-install b/databases/mysql60-server/pkg-install
deleted file mode 100644
index 586f846c503..00000000000
--- a/databases/mysql60-server/pkg-install
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/sbin
-
-case $2 in
-POST-INSTALL)
-	USER=mysql
-	GROUP=${USER}
-	UID=88
-	GID=${UID}
-
-	if pw group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if pw groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if pw user show "${USER}" 2>/dev/null; then
-		echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d /nonexistent -s /sbin/nologin -c "MySQL Daemon"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-	;;
-esac
diff --git a/databases/mysql60-server/pkg-message b/databases/mysql60-server/pkg-message
deleted file mode 100644
index 7e30302334e..00000000000
--- a/databases/mysql60-server/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-************************************************************************
-
-Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
-the first time you start the MySQL server after an upgrade from an
-earlier version.
-
-************************************************************************
diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
deleted file mode 100644
index 2bac3909e6e..00000000000
--- a/databases/mysql60-server/pkg-plist
+++ /dev/null
@@ -1,230 +0,0 @@
-@stopdaemon mysql-server
-bin/innochecksum
-bin/maria_chk
-bin/maria_dump_log
-bin/maria_ftdump
-bin/maria_non_trans_log
-bin/maria_pack
-bin/maria_read_log
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-bin/mysqltest_embedded
-bin/mysql_client_test_embedded
-bin/mysql_install_db
-bin/mysql_tzinfo_to_sql
-bin/mysql_waitpid
-bin/mysqld_safe
-%%NDB%%bin/ndb_config
-%%NDB%%bin/ndb_delete_all
-%%NDB%%bin/ndb_desc
-%%NDB%%bin/ndb_drop_index
-%%NDB%%bin/ndb_drop_table
-%%NDB%%bin/ndb_error_reporter
-%%NDB%%bin/ndb_mgm
-%%NDB%%bin/ndb_print_backup_file
-%%NDB%%bin/ndb_print_schema_file
-%%NDB%%bin/ndb_print_sys_file
-%%NDB%%bin/ndb_restore
-%%NDB%%bin/ndb_select_all
-%%NDB%%bin/ndb_select_count
-%%NDB%%bin/ndb_show_tables
-%%NDB%%bin/ndb_size.pl
-%%NDB%%bin/ndb_test_platform
-%%NDB%%bin/ndb_waiter
-%%NDB%%bin/ndbd_redo_log_reader
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
-%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi.h
-%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters.h
-%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters_debug.h
-%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_debug.h
-%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_error.h
-%%NDB%%include/mysql/storage/ndb/mgmapi/ndb_logevent.h
-%%NDB%%include/mysql/storage/ndb/mgmapi/ndbd_exit_codes.h
-%%NDB%%include/mysql/storage/ndb/ndb_constants.h
-%%NDB%%include/mysql/storage/ndb/ndb_init.h
-%%NDB%%include/mysql/storage/ndb/ndb_types.h
-%%NDB%%include/mysql/storage/ndb/ndb_version.h
-%%NDB%%include/mysql/storage/ndb/ndbapi/Ndb.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbApi.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbBlob.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbDictionary.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbError.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbEventOperation.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexOperation.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexScanOperation.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexStat.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbInterpretedCode.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbOperation.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbPool.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbRecAttr.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbReceiver.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbScanFilter.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbScanOperation.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/NdbTransaction.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/ndbapi_limits.h
-%%NDB%%include/mysql/storage/ndb/ndbapi/ndb_cluster_connection.hpp
-%%NDB%%include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h
-%%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h
-lib/mysql/libdbug.a
-lib/mysql/libdbug.la
-lib/mysql/libheap.a
-lib/mysql/libmaria.a
-lib/mysql/libmyisam.a
-lib/mysql/libmyisammrg.a
-lib/mysql/libmysqld.a
-lib/mysql/libmystrings.a
-lib/mysql/libmystrings.la
-lib/mysql/libmysys.a
-lib/mysql/libmysys.la
-%%NDB%%lib/mysql/libndbclient.a
-%%NDB%%lib/mysql/libndbclient.la
-%%NDB%%lib/mysql/libndbclient.so
-%%NDB%%lib/mysql/libndbclient.so.4
-lib/mysql/libvio.a
-lib/mysql/plugin/ha_example.a
-lib/mysql/plugin/ha_example.la
-lib/mysql/plugin/ha_example.so
-lib/mysql/plugin/ha_example.so.0
-libexec/mysqld
-%%NDB%%libexec/ndb_cpcd
-%%NDB%%libexec/ndb_mgmd
-%%NDB%%libexec/ndbd
-%%DATADIR%%/ChangeLog
-%%DATADIR%%/binary-configure
-%%DATADIR%%/charsets/Index.xml
-%%DATADIR%%/charsets/README
-%%DATADIR%%/charsets/armscii8.xml
-%%DATADIR%%/charsets/ascii.xml
-%%DATADIR%%/charsets/cp1250.xml
-%%DATADIR%%/charsets/cp1251.xml
-%%DATADIR%%/charsets/cp1256.xml
-%%DATADIR%%/charsets/cp1257.xml
-%%DATADIR%%/charsets/cp850.xml
-%%DATADIR%%/charsets/cp852.xml
-%%DATADIR%%/charsets/cp866.xml
-%%DATADIR%%/charsets/dec8.xml
-%%DATADIR%%/charsets/geostd8.xml
-%%DATADIR%%/charsets/greek.xml
-%%DATADIR%%/charsets/hebrew.xml
-%%DATADIR%%/charsets/hp8.xml
-%%DATADIR%%/charsets/keybcs2.xml
-%%DATADIR%%/charsets/koi8r.xml
-%%DATADIR%%/charsets/koi8u.xml
-%%DATADIR%%/charsets/latin1.xml
-%%DATADIR%%/charsets/latin2.xml
-%%DATADIR%%/charsets/latin5.xml
-%%DATADIR%%/charsets/latin7.xml
-%%DATADIR%%/charsets/macce.xml
-%%DATADIR%%/charsets/macroman.xml
-%%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/config.huge.ini
-%%DATADIR%%/config.medium.ini
-%%DATADIR%%/config.small.ini
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%DATADIR%%/fill_help_tables.sql
-%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
-%%DATADIR%%/greek/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.sys
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/ma_test_all
-%%DATADIR%%/ma_test_all.res
-%%DATADIR%%/ma_test_recovery
-%%DATADIR%%/mi_test_all
-%%DATADIR%%/mi_test_all.res
-%%DATADIR%%/my-huge.cnf
-%%DATADIR%%/my-innodb-heavy-4G.cnf
-%%DATADIR%%/my-large.cnf
-%%DATADIR%%/my-medium.cnf
-%%DATADIR%%/my-small.cnf
-%%DATADIR%%/mysql_system_tables.sql
-%%DATADIR%%/mysql_system_tables_data.sql
-%%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql.server
-%%DATADIR%%/mysqld_multi.server
-%%DATADIR%%/ndb-config-2-node.ini
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.sys
-%%NDB%%%%DATADIR%%/swig/globals.i
-%%NDB%%%%DATADIR%%/swig/mgmapi/ClusterState.i
-%%NDB%%%%DATADIR%%/swig/mgmapi/NdbLogEvent.i
-%%NDB%%%%DATADIR%%/swig/mgmapi/NdbLogEventManager.i
-%%NDB%%%%DATADIR%%/swig/mgmapi/NdbMgm.i
-%%NDB%%%%DATADIR%%/swig/mgmapi/NdbMgmFactory.i
-%%NDB%%%%DATADIR%%/swig/mgmapi/NdbMgmReply.i
-%%NDB%%%%DATADIR%%/swig/mgmapi/NodeState.i
-%%NDB%%%%DATADIR%%/swig/mgmapi/events.i
-%%NDB%%%%DATADIR%%/swig/mgmapi/listeners.i
-%%NDB%%%%DATADIR%%/swig/mgmapi/mgmglobals.i
-%%NDB%%%%DATADIR%%/swig/ndbapi/Ndb.i
-%%NDB%%%%DATADIR%%/swig/ndbapi/NdbBlob.i
-%%NDB%%%%DATADIR%%/swig/ndbapi/NdbClusterConnection.i
-%%NDB%%%%DATADIR%%/swig/ndbapi/NdbDictionary.i
-%%NDB%%%%DATADIR%%/swig/ndbapi/NdbError.i
-%%NDB%%%%DATADIR%%/swig/ndbapi/NdbEventOperation.i
-%%NDB%%%%DATADIR%%/swig/ndbapi/NdbFactory.i
-%%NDB%%%%DATADIR%%/swig/ndbapi/NdbIndexOperation.i
-%%NDB%%%%DATADIR%%/swig/ndbapi/NdbIndexScanOperation.i
-%%NDB%%%%DATADIR%%/swig/ndbapi/NdbOperation.i
-%%NDB%%%%DATADIR%%/swig/ndbapi/NdbRecAttr.i
-%%NDB%%%%DATADIR%%/swig/ndbapi/NdbScanFilter.i
-%%NDB%%%%DATADIR%%/swig/ndbapi/NdbScanOperation.i
-%%NDB%%%%DATADIR%%/swig/ndbapi/NdbTransaction.i
-%%NDB%%%%DATADIR%%/swig/ndbapi/ndbglobals.i
-%%DATADIR%%/ukrainian/errmsg.sys
-%%NDB%%@dirrm include/mysql/storage/ndb/mgmapi
-%%NDB%%@dirrm include/mysql/storage/ndb/ndbapi
-%%NDB%%@dirrm include/mysql/storage/ndb
-%%NDB%%@dirrm include/mysql/storage
-@dirrmtry include/mysql
-@dirrm lib/mysql/plugin
-@dirrmtry lib/mysql
-@dirrm %%DATADIR%%/charsets
-@dirrm %%DATADIR%%/czech
-@dirrm %%DATADIR%%/danish
-@dirrm %%DATADIR%%/dutch
-@dirrm %%DATADIR%%/english
-@dirrm %%DATADIR%%/estonian
-@dirrm %%DATADIR%%/french
-@dirrm %%DATADIR%%/german
-@dirrm %%DATADIR%%/greek
-@dirrm %%DATADIR%%/hungarian
-@dirrm %%DATADIR%%/italian
-@dirrm %%DATADIR%%/japanese
-@dirrm %%DATADIR%%/korean
-@dirrm %%DATADIR%%/norwegian
-@dirrm %%DATADIR%%/norwegian-ny
-@dirrm %%DATADIR%%/polish
-@dirrm %%DATADIR%%/portuguese
-@dirrm %%DATADIR%%/romanian
-@dirrm %%DATADIR%%/russian
-@dirrm %%DATADIR%%/serbian
-@dirrm %%DATADIR%%/slovak
-@dirrm %%DATADIR%%/spanish
-@dirrm %%DATADIR%%/swedish
-%%NDB%%@dirrm %%DATADIR%%/swig/mgmapi
-%%NDB%%@dirrm %%DATADIR%%/swig/ndbapi
-%%NDB%%@dirrm %%DATADIR%%/swig
-@dirrm %%DATADIR%%/ukrainian
-@dirrmtry %%DATADIR%%
diff --git a/databases/mysql60-server/pkg-plist.client b/databases/mysql60-server/pkg-plist.client
deleted file mode 100644
index 7e405e17604..00000000000
--- a/databases/mysql60-server/pkg-plist.client
+++ /dev/null
@@ -1,60 +0,0 @@
-bin/mysql
-bin/mysql_config
-bin/mysql_upgrade
-bin/mysqladmin
-bin/mysqlbackup
-bin/mysqlbinlog
-bin/mysqlbug
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-bin/mysqltest
-include/mysql/decimal.h
-include/mysql/errmsg.h
-include/mysql/keycache.h
-include/mysql/m_ctype.h
-include/mysql/m_string.h
-include/mysql/my_alloc.h
-include/mysql/my_attribute.h
-include/mysql/my_config.h
-include/mysql/my_dbug.h
-include/mysql/my_dir.h
-include/mysql/my_getopt.h
-include/mysql/my_global.h
-include/mysql/my_list.h
-include/mysql/my_net.h
-include/mysql/my_no_pthread.h
-include/mysql/my_pthread.h
-include/mysql/my_sys.h
-include/mysql/my_xml.h
-include/mysql/mysql.h
-include/mysql/mysql_com.h
-include/mysql/mysql_embed.h
-include/mysql/mysql_time.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_ername.h
-include/mysql/mysqld_error.h
-include/mysql/plugin.h
-include/mysql/plugin_audit.h
-include/mysql/plugin_ftparser.h
-include/mysql/sql_common.h
-include/mysql/sql_state.h
-include/mysql/sslopt-case.h
-include/mysql/sslopt-longopts.h
-include/mysql/sslopt-vars.h
-include/mysql/typelib.h
-lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.la
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.16
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.la
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.16
-share/aclocal/mysql.m4
-%%DATADIR%%/mysql_fix_privilege_tables.sql
-@dirrm include/mysql
-@dirrm lib/mysql
-@dirrm %%DATADIR%%
diff --git a/databases/mysql60-server/pkg-plist.scripts b/databases/mysql60-server/pkg-plist.scripts
deleted file mode 100644
index b0a603760ef..00000000000
--- a/databases/mysql60-server/pkg-plist.scripts
+++ /dev/null
@@ -1,11 +0,0 @@
-bin/msql2mysql
-bin/mysql_convert_table_format
-bin/mysql_find_rows
-bin/mysql_fix_extensions
-bin/mysql_secure_installation
-bin/mysql_setpermission
-bin/mysql_zap
-bin/mysqlaccess
-bin/mysqld_multi
-bin/mysqldumpslow
-bin/mysqlhotcopy
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index 0b51d4b39e6..e70f1feb206 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -18,7 +18,7 @@ COMMENT?=	MySQL driver for the Perl5 Database Interface (DBI)
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-CONFLICTS?=	p5-Mysql-modules-[0-9]* p5-DBD-mysql4[0-9]-[0-9]* p5-DBD-mysql5[0-9]-[0-9]* p5-DBD-mysql6[0-9]-[0-9]*
+CONFLICTS?=	p5-Mysql-modules-[0-9]* p5-DBD-mysql[45][0-9]-[0-9]*
 
 USE_MYSQL=	yes
 
diff --git a/databases/p5-DBD-mysql40/Makefile b/databases/p5-DBD-mysql40/Makefile
index 11dd5d73622..031f2f6cea6 100644
--- a/databases/p5-DBD-mysql40/Makefile
+++ b/databases/p5-DBD-mysql40/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	40
 
 COMMENT=	MySQL 4.0 driver for the Perl5 Database Interface (DBI)
 
-CONFLICTS=	p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[1-9]-[0-9]* p5-DBD-mysql5[0-9]-[0-9]* p5-DBD-mysql6[0-9]-[0-9]*
+CONFLICTS=	p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[1-9]-[0-9]* p5-DBD-mysql5[0-9]-[0-9]*
 
 WANT_MYSQL_VER=	40
 
diff --git a/databases/p5-DBD-mysql41/Makefile b/databases/p5-DBD-mysql41/Makefile
index 31d1b29bd72..70fde263fb7 100644
--- a/databases/p5-DBD-mysql41/Makefile
+++ b/databases/p5-DBD-mysql41/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	41
 
 COMMENT=	MySQL 4.1 driver for the Perl5 Database Interface (DBI)
 
-CONFLICTS=	p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[02-9]-[0-9]* p5-DBD-mysql5[0-9]-[0-9]* p5-DBD-mysql6[0-9]-[0-9]*
+CONFLICTS=	p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[02-9]-[0-9]* p5-DBD-mysql5[0-9]-[0-9]*
 
 WANT_MYSQL_VER=	41
 
diff --git a/databases/p5-DBD-mysql50/Makefile b/databases/p5-DBD-mysql50/Makefile
index 5e270907013..ba07f099218 100644
--- a/databases/p5-DBD-mysql50/Makefile
+++ b/databases/p5-DBD-mysql50/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	50
 
 COMMENT=	MySQL 5.0 driver for the Perl5 Database Interface (DBI)
 
-CONFLICTS=	p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[0-9]-[0-9]* p5-DBD-mysql5[1-9]-[0-9]* p5-DBD-mysql6[0-9]-[0-9]*
+CONFLICTS=	p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[0-9]-[0-9]* p5-DBD-mysql5[1-9]-[0-9]*
 
 WANT_MYSQL_VER=	50
 
diff --git a/databases/p5-DBD-mysql51/Makefile b/databases/p5-DBD-mysql51/Makefile
index 4a30d87ef46..e795efb3d7e 100644
--- a/databases/p5-DBD-mysql51/Makefile
+++ b/databases/p5-DBD-mysql51/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	51
 
 COMMENT=	MySQL 5.1 driver for the Perl5 Database Interface (DBI)
 
-CONFLICTS=	p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[0-9]-[0-9]* p5-DBD-mysql5[02-9]-[0-9]* p5-DBD-mysql6[0-9]-[0-9]*
+CONFLICTS=	p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[0-9]-[0-9]* p5-DBD-mysql5[02-9]-[0-9]*
 
 WANT_MYSQL_VER=	51
 
diff --git a/databases/p5-DBD-mysql55/Makefile b/databases/p5-DBD-mysql55/Makefile
index 2adda67bd00..d03680febb6 100644
--- a/databases/p5-DBD-mysql55/Makefile
+++ b/databases/p5-DBD-mysql55/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	55
 
 COMMENT=	MySQL 5.5 driver for the Perl5 Database Interface (DBI)
 
-CONFLICTS=	p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[0-9]-[0-9]* p5-DBD-mysql5[0-46-9]-[0-9]* p5-DBD-mysql6[0-9]-[0-9]*
+CONFLICTS=	p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[0-9]-[0-9]* p5-DBD-mysql5[0-46-9]-[0-9]*
 
 WANT_MYSQL_VER=	55
 
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 81f28377271..60689ae4167 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -97,7 +97,7 @@ WANT_MYSQL_VER=	55
 
 LATEST_LINK=	mysql55-server
 
-CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.[0-46-9].* mysql-server-6.*
+CONFLICTS=	mysql-server-[34].* mysql-server-5.[0-46-9].*
 
 USE_RC_SUBR=	mysql-server.sh
 
@@ -170,7 +170,7 @@ post-install:
 .if defined(CLIENT_ONLY)
 LATEST_LINK=	mysql55-client
 
-CONFLICTS=	mysql-client-3.* mysql-client-4.* mysql-client-5.[0-46-9].* mysql-client-6.*
+CONFLICTS=	mysql-client-[34].* mysql-client-5.[0-46-9].*
 
 MAN1=		mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \
 		mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \
@@ -203,7 +203,7 @@ RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 LATEST_LINK=	mysql55-scripts
 
-CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.[0-46-9].* mysql-scripts-6.*
+CONFLICTS=	mysql-scripts-[34].* mysql-scripts-5.[0-46-9].*
 
 MAN1=		msql2mysql.1 mysql_convert_table_format.1 mysql_find_rows.1 \
 		mysql_fix_extensions.1 mysql_secure_installation.1 \