Switch from mysql322-{client,server} to mysql323-{client,server}.

mysql323-client installs libmysqlclient.so.10 (instead of libmysqlclient.so.6). mysql323-{client,server} are production quality, now (according to MySQL AB at least).
author: Dirk Froemberg <dirk@FreeBSD.org> 2001-01-21 15:40:47 +0000
committer: Dirk Froemberg <dirk@FreeBSD.org> 2001-01-21 15:40:47 +0000
commit: 88d74bc517cd2019a6a3180248d65ae1be1c8884 (patch)
tree: 5c3c57e5e136497f16b8193ac33dfbf40b5e2e7e
parent: The directory of freetype's header files was changed (diff)
96 files changed, 90 insertions, 151 deletions
diff --git a/chinese/chinput2/Makefile b/chinese/chinput2/Makefile
index 65194371e2a3..15e30c1dbef0 100644
--- a/chinese/chinput2/Makefile
+++ b/chinese/chinput2/Makefile
@@ -14,8 +14,8 @@ DISTNAME=	zh-chinput2-1.0
 
 MAINTAINER=	phj@cn.FreeBSD.org
 
-BUILD_DEPENDS=	mysql:${PORTSDIR}/databases/mysql322-client
-RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql322-client
+BUILD_DEPENDS=	mysql:${PORTSDIR}/databases/mysql323-client
+RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql323-client
 
 USE_XLIB=	yes
 
diff --git a/databases/dbf2mysql/Makefile b/databases/dbf2mysql/Makefile
index 812d1b78a826..1dc0ddaa38b9 100644
--- a/databases/dbf2mysql/Makefile
+++ b/databases/dbf2mysql/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jedgar@FreeBSD.org
 
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 NO_WRKSUBDIR=	yes
 
diff --git a/databases/dbmetrix/Makefile b/databases/dbmetrix/Makefile
index 5979c1a9fbcc..625d255f5730 100644
--- a/databases/dbmetrix/Makefile
+++ b/databases/dbmetrix/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.tamos.net/pub/dbMetrix/ \
 
 MAINTAINER=	joseph@randomnetworks.com
 
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
diff --git a/databases/gmysql/Makefile b/databases/gmysql/Makefile
index 29912d07154d..3deea5397743 100644
--- a/databases/gmysql/Makefile
+++ b/databases/gmysql/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.loth.demon.co.uk/gmysql/ \
 
 MAINTAINER=	dirk@FreeBSD.org
 
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index fa44b584dfb3..42a435416f38 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -24,7 +24,7 @@ USE_GTK=	yes
 .if defined(WITH_MYSQL) || (exists(${LOCALBASE}/lib/mysql/libmysqlclient.a) \
      && !defined(WITHOUT_MYSQL))
 HAVE_MYSQL=	yes
-LIB_DEPENDS+=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 .endif
 .if defined(WITH_PGSQL) || (exists(${LOCALBASE}/lib/libpq.a) \
      && !defined(WITHOUT_PGSQL))
diff --git a/databases/myodbc/Makefile b/databases/myodbc/Makefile
index 392e2ce3ddc1..408cd3aa770f 100644
--- a/databases/myodbc/Makefile
+++ b/databases/myodbc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/M
 MAINTAINER=	ebakke@trolltech.com
 
 LIB_DEPENDS=	iodbc.2:${PORTSDIR}/databases/libiodbc \
-		mysqlclient.6:${PORTSDIR}/databases/mysql323-client
+		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-mysql-libs=${PREFIX}/lib/mysql \
diff --git a/databases/mysql++/Makefile b/databases/mysql++/Makefile
index 7f81d517c606..981a1f924722 100644
--- a/databases/mysql++/Makefile
+++ b/databases/mysql++/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://gd.tuwien.ac.at/db/mysql/mysql++/ \
 
 MAINTAINER=	mico@bsd.hu
 
-LIB_DEPENDS=	mysqlclient:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient:${PORTSDIR}/databases/mysql323-client
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -D_FIX_FOR_BSD_ "
diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile
index 7f81d517c606..981a1f924722 100644
--- a/databases/mysql++1/Makefile
+++ b/databases/mysql++1/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://gd.tuwien.ac.at/db/mysql/mysql++/ \
 
 MAINTAINER=	mico@bsd.hu
 
-LIB_DEPENDS=	mysqlclient:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient:${PORTSDIR}/databases/mysql323-client
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -D_FIX_FOR_BSD_ "
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
index 392e2ce3ddc1..408cd3aa770f 100644
--- a/databases/mysql-connector-odbc/Makefile
+++ b/databases/mysql-connector-odbc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/M
 MAINTAINER=	ebakke@trolltech.com
 
 LIB_DEPENDS=	iodbc.2:${PORTSDIR}/databases/libiodbc \
-		mysqlclient.6:${PORTSDIR}/databases/mysql323-client
+		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-mysql-libs=${PREFIX}/lib/mysql \
diff --git a/databases/mysql-navigator/Makefile b/databases/mysql-navigator/Makefile
index cae81513a53a..909860d34443 100644
--- a/databases/mysql-navigator/Makefile
+++ b/databases/mysql-navigator/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	mysql_navigator_ver_${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
diff --git a/databases/mysql322-server/Makefile b/databases/mysql322-server/Makefile
index 120ad3567da2..969add077b7a 100644
--- a/databases/mysql322-server/Makefile
+++ b/databases/mysql322-server/Makefile
@@ -17,6 +17,8 @@ DISTNAME=	mysql-${PORTVERSION}
 
 MAINTAINER=	dirk@FreeBSD.org
 
+FORBIDDEN=	'Use mysql323-{client,server} instead.'
+
 SLAVEDIRS=	databases/mysql322-client
 MASTERPORTNAME=	mysql-server
 DB_DIR?=	/var/db/mysql
diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile
index 5d9cff333a25..d1eb0f2903db 100644
--- a/databases/mysql323-client/Makefile
+++ b/databases/mysql323-client/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../mysql323-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 22de3aeb9226..64d3f4b00898 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.31
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \
 		http://www.mysql.net/Downloads/MySQL-3.23/ \
diff --git a/databases/mysql323-server/files/patch-ag b/databases/mysql323-server/files/patch-ag
index 08a7f3e6bb01..80d804d05274 100644
--- a/databases/mysql323-server/files/patch-ag
+++ b/databases/mysql323-server/files/patch-ag
@@ -1,14 +1,5 @@
 --- configure.orig	Sat Dec 16 22:49:12 2000
 +++ configure	Mon Dec 18 12:21:11 2000
-@@ -1070,7 +1070,7 @@
- PROTOCOL_VERSION=10
- DOT_FRM_VERSION=6
- # See the libtool docs for information on how to do shared lib versions.
--SHARED_LIB_VERSION=10:0:0
-+SHARED_LIB_VERSION=6:0:0
- 
- # Set all version vars based on $VERSION. How do we do this more elegant ?
- # Remember that regexps needs to quote [ and ] since this is run through m4
 @@ -2950,7 +2950,7 @@
    ;;
  esac
diff --git a/databases/mysql323-server/pkg-plist.client b/databases/mysql323-server/pkg-plist.client
index b2864e34adcd..0b08a7066a5a 100644
--- a/databases/mysql323-server/pkg-plist.client
+++ b/databases/mysql323-server/pkg-plist.client
@@ -27,6 +27,6 @@ include/mysql/sslopt-usage.h
 include/mysql/sslopt-vars.h
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.6
+lib/mysql/libmysqlclient.so.10
 @dirrm include/mysql
 @dirrm lib/mysql
diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile
index 5d9cff333a25..d1eb0f2903db 100644
--- a/databases/mysql40-client/Makefile
+++ b/databases/mysql40-client/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../mysql323-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 22de3aeb9226..64d3f4b00898 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.31
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \
 		http://www.mysql.net/Downloads/MySQL-3.23/ \
diff --git a/databases/mysql40-server/files/patch-configure b/databases/mysql40-server/files/patch-configure
index 08a7f3e6bb01..80d804d05274 100644
--- a/databases/mysql40-server/files/patch-configure
+++ b/databases/mysql40-server/files/patch-configure
@@ -1,14 +1,5 @@
 --- configure.orig	Sat Dec 16 22:49:12 2000
 +++ configure	Mon Dec 18 12:21:11 2000
-@@ -1070,7 +1070,7 @@
- PROTOCOL_VERSION=10
- DOT_FRM_VERSION=6
- # See the libtool docs for information on how to do shared lib versions.
--SHARED_LIB_VERSION=10:0:0
-+SHARED_LIB_VERSION=6:0:0
- 
- # Set all version vars based on $VERSION. How do we do this more elegant ?
- # Remember that regexps needs to quote [ and ] since this is run through m4
 @@ -2950,7 +2950,7 @@
    ;;
  esac
diff --git a/databases/mysql40-server/pkg-plist.client b/databases/mysql40-server/pkg-plist.client
index b2864e34adcd..0b08a7066a5a 100644
--- a/databases/mysql40-server/pkg-plist.client
+++ b/databases/mysql40-server/pkg-plist.client
@@ -27,6 +27,6 @@ include/mysql/sslopt-usage.h
 include/mysql/sslopt-vars.h
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.6
+lib/mysql/libmysqlclient.so.10
 @dirrm include/mysql
 @dirrm lib/mysql
diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile
index 5d9cff333a25..d1eb0f2903db 100644
--- a/databases/mysql41-client/Makefile
+++ b/databases/mysql41-client/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../mysql323-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 22de3aeb9226..64d3f4b00898 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.31
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \
 		http://www.mysql.net/Downloads/MySQL-3.23/ \
diff --git a/databases/mysql41-server/files/patch-configure b/databases/mysql41-server/files/patch-configure
index 08a7f3e6bb01..80d804d05274 100644
--- a/databases/mysql41-server/files/patch-configure
+++ b/databases/mysql41-server/files/patch-configure
@@ -1,14 +1,5 @@
 --- configure.orig	Sat Dec 16 22:49:12 2000
 +++ configure	Mon Dec 18 12:21:11 2000
-@@ -1070,7 +1070,7 @@
- PROTOCOL_VERSION=10
- DOT_FRM_VERSION=6
- # See the libtool docs for information on how to do shared lib versions.
--SHARED_LIB_VERSION=10:0:0
-+SHARED_LIB_VERSION=6:0:0
- 
- # Set all version vars based on $VERSION. How do we do this more elegant ?
- # Remember that regexps needs to quote [ and ] since this is run through m4
 @@ -2950,7 +2950,7 @@
    ;;
  esac
diff --git a/databases/mysql41-server/pkg-plist.client b/databases/mysql41-server/pkg-plist.client
index b2864e34adcd..0b08a7066a5a 100644
--- a/databases/mysql41-server/pkg-plist.client
+++ b/databases/mysql41-server/pkg-plist.client
@@ -27,6 +27,6 @@ include/mysql/sslopt-usage.h
 include/mysql/sslopt-vars.h
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.6
+lib/mysql/libmysqlclient.so.10
 @dirrm include/mysql
 @dirrm lib/mysql
diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile
index 5d9cff333a25..d1eb0f2903db 100644
--- a/databases/mysql50-client/Makefile
+++ b/databases/mysql50-client/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../mysql323-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 22de3aeb9226..64d3f4b00898 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.31
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \
 		http://www.mysql.net/Downloads/MySQL-3.23/ \
diff --git a/databases/mysql50-server/files/patch-configure b/databases/mysql50-server/files/patch-configure
index 08a7f3e6bb01..80d804d05274 100644
--- a/databases/mysql50-server/files/patch-configure
+++ b/databases/mysql50-server/files/patch-configure
@@ -1,14 +1,5 @@
 --- configure.orig	Sat Dec 16 22:49:12 2000
 +++ configure	Mon Dec 18 12:21:11 2000
-@@ -1070,7 +1070,7 @@
- PROTOCOL_VERSION=10
- DOT_FRM_VERSION=6
- # See the libtool docs for information on how to do shared lib versions.
--SHARED_LIB_VERSION=10:0:0
-+SHARED_LIB_VERSION=6:0:0
- 
- # Set all version vars based on $VERSION. How do we do this more elegant ?
- # Remember that regexps needs to quote [ and ] since this is run through m4
 @@ -2950,7 +2950,7 @@
    ;;
  esac
diff --git a/databases/mysql50-server/pkg-plist.client b/databases/mysql50-server/pkg-plist.client
index b2864e34adcd..0b08a7066a5a 100644
--- a/databases/mysql50-server/pkg-plist.client
+++ b/databases/mysql50-server/pkg-plist.client
@@ -27,6 +27,6 @@ include/mysql/sslopt-usage.h
 include/mysql/sslopt-vars.h
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.6
+lib/mysql/libmysqlclient.so.10
 @dirrm include/mysql
 @dirrm lib/mysql
diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index 5d9cff333a25..d1eb0f2903db 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../mysql323-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 22de3aeb9226..64d3f4b00898 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.31
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \
 		http://www.mysql.net/Downloads/MySQL-3.23/ \
diff --git a/databases/mysql51-server/files/patch-configure b/databases/mysql51-server/files/patch-configure
index 08a7f3e6bb01..80d804d05274 100644
--- a/databases/mysql51-server/files/patch-configure
+++ b/databases/mysql51-server/files/patch-configure
@@ -1,14 +1,5 @@
 --- configure.orig	Sat Dec 16 22:49:12 2000
 +++ configure	Mon Dec 18 12:21:11 2000
-@@ -1070,7 +1070,7 @@
- PROTOCOL_VERSION=10
- DOT_FRM_VERSION=6
- # See the libtool docs for information on how to do shared lib versions.
--SHARED_LIB_VERSION=10:0:0
-+SHARED_LIB_VERSION=6:0:0
- 
- # Set all version vars based on $VERSION. How do we do this more elegant ?
- # Remember that regexps needs to quote [ and ] since this is run through m4
 @@ -2950,7 +2950,7 @@
    ;;
  esac
diff --git a/databases/mysql51-server/pkg-plist.client b/databases/mysql51-server/pkg-plist.client
index b2864e34adcd..0b08a7066a5a 100644
--- a/databases/mysql51-server/pkg-plist.client
+++ b/databases/mysql51-server/pkg-plist.client
@@ -27,6 +27,6 @@ include/mysql/sslopt-usage.h
 include/mysql/sslopt-vars.h
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.6
+lib/mysql/libmysqlclient.so.10
 @dirrm include/mysql
 @dirrm lib/mysql
diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile
index 5d9cff333a25..d1eb0f2903db 100644
--- a/databases/mysql54-client/Makefile
+++ b/databases/mysql54-client/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../mysql323-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 22de3aeb9226..64d3f4b00898 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.31
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \
 		http://www.mysql.net/Downloads/MySQL-3.23/ \
diff --git a/databases/mysql54-server/files/patch-configure b/databases/mysql54-server/files/patch-configure
index 08a7f3e6bb01..80d804d05274 100644
--- a/databases/mysql54-server/files/patch-configure
+++ b/databases/mysql54-server/files/patch-configure
@@ -1,14 +1,5 @@
 --- configure.orig	Sat Dec 16 22:49:12 2000
 +++ configure	Mon Dec 18 12:21:11 2000
-@@ -1070,7 +1070,7 @@
- PROTOCOL_VERSION=10
- DOT_FRM_VERSION=6
- # See the libtool docs for information on how to do shared lib versions.
--SHARED_LIB_VERSION=10:0:0
-+SHARED_LIB_VERSION=6:0:0
- 
- # Set all version vars based on $VERSION. How do we do this more elegant ?
- # Remember that regexps needs to quote [ and ] since this is run through m4
 @@ -2950,7 +2950,7 @@
    ;;
  esac
diff --git a/databases/mysql54-server/pkg-plist.client b/databases/mysql54-server/pkg-plist.client
index b2864e34adcd..0b08a7066a5a 100644
--- a/databases/mysql54-server/pkg-plist.client
+++ b/databases/mysql54-server/pkg-plist.client
@@ -27,6 +27,6 @@ include/mysql/sslopt-usage.h
 include/mysql/sslopt-vars.h
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.6
+lib/mysql/libmysqlclient.so.10
 @dirrm include/mysql
 @dirrm lib/mysql
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index 5d9cff333a25..d1eb0f2903db 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../mysql323-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 22de3aeb9226..64d3f4b00898 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.31
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \
 		http://www.mysql.net/Downloads/MySQL-3.23/ \
diff --git a/databases/mysql55-server/files/patch-configure b/databases/mysql55-server/files/patch-configure
index 08a7f3e6bb01..80d804d05274 100644
--- a/databases/mysql55-server/files/patch-configure
+++ b/databases/mysql55-server/files/patch-configure
@@ -1,14 +1,5 @@
 --- configure.orig	Sat Dec 16 22:49:12 2000
 +++ configure	Mon Dec 18 12:21:11 2000
-@@ -1070,7 +1070,7 @@
- PROTOCOL_VERSION=10
- DOT_FRM_VERSION=6
- # See the libtool docs for information on how to do shared lib versions.
--SHARED_LIB_VERSION=10:0:0
-+SHARED_LIB_VERSION=6:0:0
- 
- # Set all version vars based on $VERSION. How do we do this more elegant ?
- # Remember that regexps needs to quote [ and ] since this is run through m4
 @@ -2950,7 +2950,7 @@
    ;;
  esac
diff --git a/databases/mysql55-server/pkg-plist.client b/databases/mysql55-server/pkg-plist.client
index b2864e34adcd..0b08a7066a5a 100644
--- a/databases/mysql55-server/pkg-plist.client
+++ b/databases/mysql55-server/pkg-plist.client
@@ -27,6 +27,6 @@ include/mysql/sslopt-usage.h
 include/mysql/sslopt-vars.h
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.6
+lib/mysql/libmysqlclient.so.10
 @dirrm include/mysql
 @dirrm lib/mysql
diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile
index 5d9cff333a25..d1eb0f2903db 100644
--- a/databases/mysql60-client/Makefile
+++ b/databases/mysql60-client/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../mysql323-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 22de3aeb9226..64d3f4b00898 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.31
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \
 		http://www.mysql.net/Downloads/MySQL-3.23/ \
diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure
index 08a7f3e6bb01..80d804d05274 100644
--- a/databases/mysql60-server/files/patch-configure
+++ b/databases/mysql60-server/files/patch-configure
@@ -1,14 +1,5 @@
 --- configure.orig	Sat Dec 16 22:49:12 2000
 +++ configure	Mon Dec 18 12:21:11 2000
-@@ -1070,7 +1070,7 @@
- PROTOCOL_VERSION=10
- DOT_FRM_VERSION=6
- # See the libtool docs for information on how to do shared lib versions.
--SHARED_LIB_VERSION=10:0:0
-+SHARED_LIB_VERSION=6:0:0
- 
- # Set all version vars based on $VERSION. How do we do this more elegant ?
- # Remember that regexps needs to quote [ and ] since this is run through m4
 @@ -2950,7 +2950,7 @@
    ;;
  esac
diff --git a/databases/mysql60-server/pkg-plist.client b/databases/mysql60-server/pkg-plist.client
index b2864e34adcd..0b08a7066a5a 100644
--- a/databases/mysql60-server/pkg-plist.client
+++ b/databases/mysql60-server/pkg-plist.client
@@ -27,6 +27,6 @@ include/mysql/sslopt-usage.h
 include/mysql/sslopt-vars.h
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.6
+lib/mysql/libmysqlclient.so.10
 @dirrm include/mysql
 @dirrm lib/mysql
diff --git a/databases/mysqltcl/Makefile b/databases/mysqltcl/Makefile
index 22676ba3352d..16c7127b50d4 100644
--- a/databases/mysqltcl/Makefile
+++ b/databases/mysqltcl/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.mysql.com/Downloads/Contrib/
 
 MAINTAINER=	mi@aldan.algebra.com
 
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client \
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client \
 		${TCL_NODOT}:${PORTSDIR}/lang/${TCL_NODOT}
 
 TCL_VERSION?=	tcl8.3
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index df888c6cb891..1be4a86d59fc 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	jedgar@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 RUN_DEPENDS=	${BUILD_DEPENDS}
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 CONFIGURE_ARGS=	PREFIX=${PREFIX} CC="${CC}" CCFLAGS="${CFLAGS}" \
 		--noprompt --mysql-install --nomsql-install
diff --git a/databases/p5-Mysql/Makefile b/databases/p5-Mysql/Makefile
index df888c6cb891..1be4a86d59fc 100644
--- a/databases/p5-Mysql/Makefile
+++ b/databases/p5-Mysql/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	jedgar@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 RUN_DEPENDS=	${BUILD_DEPENDS}
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 CONFIGURE_ARGS=	PREFIX=${PREFIX} CC="${CC}" CCFLAGS="${CFLAGS}" \
 		--noprompt --mysql-install --nomsql-install
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index 5d9cff333a25..d1eb0f2903db 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../mysql323-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 22de3aeb9226..64d3f4b00898 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	3.23.31
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.wipol.uni-bonn.de/MySQL/Downloads/MySQL-3.23/ \
 		http://www.mysql.net/Downloads/MySQL-3.23/ \
diff --git a/databases/percona55-server/files/patch-configure b/databases/percona55-server/files/patch-configure
index 08a7f3e6bb01..80d804d05274 100644
--- a/databases/percona55-server/files/patch-configure
+++ b/databases/percona55-server/files/patch-configure
@@ -1,14 +1,5 @@
 --- configure.orig	Sat Dec 16 22:49:12 2000
 +++ configure	Mon Dec 18 12:21:11 2000
-@@ -1070,7 +1070,7 @@
- PROTOCOL_VERSION=10
- DOT_FRM_VERSION=6
- # See the libtool docs for information on how to do shared lib versions.
--SHARED_LIB_VERSION=10:0:0
-+SHARED_LIB_VERSION=6:0:0
- 
- # Set all version vars based on $VERSION. How do we do this more elegant ?
- # Remember that regexps needs to quote [ and ] since this is run through m4
 @@ -2950,7 +2950,7 @@
    ;;
  esac
diff --git a/databases/percona55-server/pkg-plist.client b/databases/percona55-server/pkg-plist.client
index b2864e34adcd..0b08a7066a5a 100644
--- a/databases/percona55-server/pkg-plist.client
+++ b/databases/percona55-server/pkg-plist.client
@@ -27,6 +27,6 @@ include/mysql/sslopt-usage.h
 include/mysql/sslopt-vars.h
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.6
+lib/mysql/libmysqlclient.so.10
 @dirrm include/mysql
 @dirrm lib/mysql
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index ac1bb585388e..f2e1f895c54e 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	phpMyAdmin_${PORTVERSION}
 
 MAINTAINER=	nbm@FreeBSD.org
 
-RUN_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql322-client
+RUN_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client
 .if defined(WITH_PHP4)
 RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
 .else
diff --git a/databases/phpmyadmin211/Makefile b/databases/phpmyadmin211/Makefile
index ac1bb585388e..f2e1f895c54e 100644
--- a/databases/phpmyadmin211/Makefile
+++ b/databases/phpmyadmin211/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	phpMyAdmin_${PORTVERSION}
 
 MAINTAINER=	nbm@FreeBSD.org
 
-RUN_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql322-client
+RUN_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client
 .if defined(WITH_PHP4)
 RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
 .else
diff --git a/databases/py-MySQL/Makefile b/databases/py-MySQL/Makefile
index 126376e6439c..bd3957a46c59 100644
--- a/databases/py-MySQL/Makefile
+++ b/databases/py-MySQL/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	MySQLmodule-${PORTVERSION}
 
 MAINTAINER=	dr@domix.de
 
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 USE_PYTHON=	yes
 ALL_TARGET=	MySQLmodule.so
diff --git a/databases/py-MySQLdb-devel/Makefile b/databases/py-MySQLdb-devel/Makefile
index 0a5cf20462c4..dd829e520dd3 100644
--- a/databases/py-MySQLdb-devel/Makefile
+++ b/databases/py-MySQLdb-devel/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	MySQL-python-${PORTVERSION}
 MAINTAINER=	sobomax@FreeBSD.org
 
 BUILD_DEPENDS=	${PYDISTUTILS}
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 USE_PYTHON=	yes
 SETUP_CMD=	cd ${WRKSRC} && ${PYTHON_CMD} setup.py
diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index 0a5cf20462c4..dd829e520dd3 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	MySQL-python-${PORTVERSION}
 MAINTAINER=	sobomax@FreeBSD.org
 
 BUILD_DEPENDS=	${PYDISTUTILS}
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 USE_PYTHON=	yes
 SETUP_CMD=	cd ${WRKSRC} && ${PYTHON_CMD} setup.py
diff --git a/databases/ruby-mysql/Makefile b/databases/ruby-mysql/Makefile
index 05cd5865f9b6..93899c76db9b 100644
--- a/databases/ruby-mysql/Makefile
+++ b/databases/ruby-mysql/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
diff --git a/databases/tcl-Mysql/Makefile b/databases/tcl-Mysql/Makefile
index 83c4dcf0f633..b45d6d6c5d2e 100644
--- a/databases/tcl-Mysql/Makefile
+++ b/databases/tcl-Mysql/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	mi@aldan.algebra.com
 
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 RUN_DEPENDS=	${TCL_VERSION:S/tcl/tclsh/}:${PORTSDIR}/lang/${TCL_NODOT}
 
 TCL_VERSION?=	tcl8.3	# Only this needs changing to switch TCL-version
diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile
index 1f421a541512..8bcafb69f9c4 100644
--- a/databases/xmysql/Makefile
+++ b/databases/xmysql/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://web.wt.net/~dblhack/ \
 MAINTAINER=	dirk@FreeBSD.org
 
 LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms \
-		mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index 48d272ff7edb..128bf6690362 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.mysql.com/Downloads/Contrib/ \
 MAINTAINER=	dirk@FreeBSD.org
 
 LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms \
-		mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index 255e484002fd..a2ce7f485de1 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -44,7 +44,7 @@ CONFIGURE_ENV+=	CFLAGS="-I/usr/local/include -g" LDFLAGS=-L/usr/local/lib
 
 .if defined(WITH_MYSQL)
 MODULES:=$(MODULES):mod_sqlpw:mod_mysql
-LIB_DEPENDS+=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ENV+=	CFLAGS="-I${PREFIX}/include/mysql" LDFLAGS="-L${PREFIX}/lib/mysql"
 .endif
 
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 255e484002fd..a2ce7f485de1 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -44,7 +44,7 @@ CONFIGURE_ENV+=	CFLAGS="-I/usr/local/include -g" LDFLAGS=-L/usr/local/lib
 
 .if defined(WITH_MYSQL)
 MODULES:=$(MODULES):mod_sqlpw:mod_mysql
-LIB_DEPENDS+=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ENV+=	CFLAGS="-I${PREFIX}/include/mysql" LDFLAGS="-L${PREFIX}/lib/mysql"
 .endif
 
diff --git a/lang/php/scripts/configure.php b/lang/php/scripts/configure.php
index 19c965440383..ab323d606df4 100644
--- a/lang/php/scripts/configure.php
+++ b/lang/php/scripts/configure.php
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/lang/php/scripts/Attic/configure.php,v 1.2 2001-01-09 09:40:22 roam Exp $
+# $FreeBSD: /tmp/pcvs/ports/lang/php/scripts/Attic/configure.php,v 1.3 2001-01-21 15:40:39 dirk Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -100,7 +100,7 @@ while [ "$1" ]; do
 			echo "CONFIGURE_ARGS+=--with-imap=\${PREFIX}"
 			;;
 		\"MySQL\")
-			echo "LIB_DEPENDS+=	mysqlclient.6:\${PORTSDIR}/databases/mysql322-client"
+			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
 			echo "CONFIGURE_ARGS+=--with-mysql=\${PREFIX}"
 			;;
 		\"PostgreSQL\")
diff --git a/lang/pike/scripts/configure.pike b/lang/pike/scripts/configure.pike
index 1145e3be67d8..07ace70ee980 100644
--- a/lang/pike/scripts/configure.pike
+++ b/lang/pike/scripts/configure.pike
@@ -72,7 +72,7 @@ while [ "$1" ]; do
 			zlib=1
 			;;
 		\"MySQL\")
-			echo "LIB_DEPENDS+=	mysqlclient.6:\${PORTSDIR}/databases/mysql322-client" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			echo "CONFIGURE_ARGS+=	--with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			MySQL=1
 			;;
diff --git a/lang/pike70/scripts/configure.pike b/lang/pike70/scripts/configure.pike
index 1145e3be67d8..07ace70ee980 100644
--- a/lang/pike70/scripts/configure.pike
+++ b/lang/pike70/scripts/configure.pike
@@ -72,7 +72,7 @@ while [ "$1" ]; do
 			zlib=1
 			;;
 		\"MySQL\")
-			echo "LIB_DEPENDS+=	mysqlclient.6:\${PORTSDIR}/databases/mysql322-client" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			echo "CONFIGURE_ARGS+=	--with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			MySQL=1
 			;;
diff --git a/lang/pike72/scripts/configure.pike b/lang/pike72/scripts/configure.pike
index 1145e3be67d8..07ace70ee980 100644
--- a/lang/pike72/scripts/configure.pike
+++ b/lang/pike72/scripts/configure.pike
@@ -72,7 +72,7 @@ while [ "$1" ]; do
 			zlib=1
 			;;
 		\"MySQL\")
-			echo "LIB_DEPENDS+=	mysqlclient.6:\${PORTSDIR}/databases/mysql322-client" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			echo "CONFIGURE_ARGS+=	--with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			MySQL=1
 			;;
diff --git a/lang/pike73/scripts/configure.pike b/lang/pike73/scripts/configure.pike
index 1145e3be67d8..07ace70ee980 100644
--- a/lang/pike73/scripts/configure.pike
+++ b/lang/pike73/scripts/configure.pike
@@ -72,7 +72,7 @@ while [ "$1" ]; do
 			zlib=1
 			;;
 		\"MySQL\")
-			echo "LIB_DEPENDS+=	mysqlclient.6:\${PORTSDIR}/databases/mysql322-client" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			echo "CONFIGURE_ARGS+=	--with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			MySQL=1
 			;;
diff --git a/lang/pike74/scripts/configure.pike b/lang/pike74/scripts/configure.pike
index 1145e3be67d8..07ace70ee980 100644
--- a/lang/pike74/scripts/configure.pike
+++ b/lang/pike74/scripts/configure.pike
@@ -72,7 +72,7 @@ while [ "$1" ]; do
 			zlib=1
 			;;
 		\"MySQL\")
-			echo "LIB_DEPENDS+=	mysqlclient.6:\${PORTSDIR}/databases/mysql322-client" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			echo "CONFIGURE_ARGS+=	--with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			MySQL=1
 			;;
diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
index 50c09800ce65..f9c72338d02a 100644
--- a/mail/exim-devel/Makefile
+++ b/mail/exim-devel/Makefile
@@ -85,7 +85,7 @@ SEDLIST+=	-e 's,XX_LDAP_[^ ]*_XX,,' \
 .endif
 
 .if defined(WITH_MYSQL)
-LIB_DEPENDS+=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
 		-e 's,XX_MYSQL_INCLUDE_XX,-I${PREFIX}/include/mysql,' \
 		-e 's,^\# LOOKUP_MYSQL,LOOKUP_MYSQL,'
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index 50c09800ce65..f9c72338d02a 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -85,7 +85,7 @@ SEDLIST+=	-e 's,XX_LDAP_[^ ]*_XX,,' \
 .endif
 
 .if defined(WITH_MYSQL)
-LIB_DEPENDS+=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
 		-e 's,XX_MYSQL_INCLUDE_XX,-I${PREFIX}/include/mysql,' \
 		-e 's,^\# LOOKUP_MYSQL,LOOKUP_MYSQL,'
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 50c09800ce65..f9c72338d02a 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -85,7 +85,7 @@ SEDLIST+=	-e 's,XX_LDAP_[^ ]*_XX,,' \
 .endif
 
 .if defined(WITH_MYSQL)
-LIB_DEPENDS+=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
 		-e 's,XX_MYSQL_INCLUDE_XX,-I${PREFIX}/include/mysql,' \
 		-e 's,^\# LOOKUP_MYSQL,LOOKUP_MYSQL,'
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index 0a5dec5d95ba..2956ba379832 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -36,7 +36,7 @@ RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 # If WITH_MYSQL is defined, build with MySQL extensions
 .if defined(WITH_MYSQL)
 ALL_TARGET=	it ${LANGUAGE} mysql
-LIB_DEPENDS+=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 .else
 ALL_TARGET=	it ${LANGUAGE}
 .endif
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 603148e5f867..ab0fbecf58f3 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -62,7 +62,7 @@ MAKEFILEFLAGS+=	CC="${CC}"
 MAKEFILEFLAGS+=	OPT="${CFLAGS}"
 
 .if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
+BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 .endif
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index ea932df52658..5ee8e7b0beca 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -57,7 +57,7 @@ BIN2=	postalias postcat postconf postdrop postfix \
 	postkick postlock postlog postmap postsuper sendmail
 
 .if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
+BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 .endif
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index ea932df52658..5ee8e7b0beca 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -57,7 +57,7 @@ BIN2=	postalias postcat postconf postdrop postfix \
 	postkick postlock postlog postmap postsuper sendmail
 
 .if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
+BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 .endif
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index ea932df52658..5ee8e7b0beca 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -57,7 +57,7 @@ BIN2=	postalias postcat postconf postdrop postfix \
 	postkick postlock postlog postmap postsuper sendmail
 
 .if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
+BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 .endif
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index ea932df52658..5ee8e7b0beca 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -57,7 +57,7 @@ BIN2=	postalias postcat postconf postdrop postfix \
 	postkick postlock postlog postmap postsuper sendmail
 
 .if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
+BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 .endif
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index ea932df52658..5ee8e7b0beca 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -57,7 +57,7 @@ BIN2=	postalias postcat postconf postdrop postfix \
 	postkick postlock postlog postmap postsuper sendmail
 
 .if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
+BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 .endif
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index ea932df52658..5ee8e7b0beca 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -57,7 +57,7 @@ BIN2=	postalias postcat postconf postdrop postfix \
 	postkick postlock postlog postmap postsuper sendmail
 
 .if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
+BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 .endif
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index ea932df52658..5ee8e7b0beca 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -57,7 +57,7 @@ BIN2=	postalias postcat postconf postdrop postfix \
 	postkick postlock postlog postmap postsuper sendmail
 
 .if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
+BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 .endif
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index ea932df52658..5ee8e7b0beca 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -57,7 +57,7 @@ BIN2=	postalias postcat postconf postdrop postfix \
 	postkick postlock postlog postmap postsuper sendmail
 
 .if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
+BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 .endif
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index ea932df52658..5ee8e7b0beca 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -57,7 +57,7 @@ BIN2=	postalias postcat postconf postdrop postfix \
 	postkick postlock postlog postmap postsuper sendmail
 
 .if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
+BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 .endif
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index ea932df52658..5ee8e7b0beca 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -57,7 +57,7 @@ BIN2=	postalias postcat postconf postdrop postfix \
 	postkick postlock postlog postmap postsuper sendmail
 
 .if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
+BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 .endif
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index ea932df52658..5ee8e7b0beca 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -57,7 +57,7 @@ BIN2=	postalias postcat postconf postdrop postfix \
 	postkick postlock postlog postmap postsuper sendmail
 
 .if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
+BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql323-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 .endif
diff --git a/mail/teapop-devel/Makefile b/mail/teapop-devel/Makefile
index 9fb31f983e98..cfa920c26eff 100644
--- a/mail/teapop-devel/Makefile
+++ b/mail/teapop-devel/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql7
 .endif
 
 .if defined(WITH_MYSQL)
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 .endif
 
 GNU_CONFIGURE=	yes
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index 9fb31f983e98..cfa920c26eff 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql7
 .endif
 
 .if defined(WITH_MYSQL)
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 .endif
 
 GNU_CONFIGURE=	yes
diff --git a/misc/achievo/Makefile b/misc/achievo/Makefile
index 6a9c83963bba..1def10ee8ba3 100644
--- a/misc/achievo/Makefile
+++ b/misc/achievo/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-stable-${PORTVERSION}
 MAINTAINER=	nbm@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/www/mod_php3 \
-	${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql322-client
+	${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 NO_BUILD=	YES
diff --git a/security/acid/Makefile b/security/acid/Makefile
index 1224cc7074f5..fa5d854499e3 100644
--- a/security/acid/Makefile
+++ b/security/acid/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	foxfair@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 \
 		${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/www/mod_php3 \
-		${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql322-server \
+		${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql323-server \
 		${LOCALBASE}/bin/snort:${PORTSDIR}/security/snort
 
 post-configure:
diff --git a/security/cyrus-sasl/scripts/configure.sasl b/security/cyrus-sasl/scripts/configure.sasl
index 76337a140d0e..9d8349e0723c 100644
--- a/security/cyrus-sasl/scripts/configure.sasl
+++ b/security/cyrus-sasl/scripts/configure.sasl
@@ -77,7 +77,7 @@ while [ "$1" ]; do
 			echo "CONFIGURE_ARGS+=--with-dblib=berkeley"
 			;;
 		\"MySQL\")
-			echo "LIB_DEPENDS+=	mysqlclient.6:\${PORTSDIR}/databases/mysql322-client"
+			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
 			echo "CONFIGURE_ARGS+=--with-mysql=\${PREFIX}"
 			;;
 		\"OpenLDAP\")
diff --git a/security/cyrus-sasl2/scripts/configure.sasl b/security/cyrus-sasl2/scripts/configure.sasl
index 76337a140d0e..9d8349e0723c 100644
--- a/security/cyrus-sasl2/scripts/configure.sasl
+++ b/security/cyrus-sasl2/scripts/configure.sasl
@@ -77,7 +77,7 @@ while [ "$1" ]; do
 			echo "CONFIGURE_ARGS+=--with-dblib=berkeley"
 			;;
 		\"MySQL\")
-			echo "LIB_DEPENDS+=	mysqlclient.6:\${PORTSDIR}/databases/mysql322-client"
+			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
 			echo "CONFIGURE_ARGS+=--with-mysql=\${PREFIX}"
 			;;
 		\"OpenLDAP\")
diff --git a/security/pam-mysql/Makefile b/security/pam-mysql/Makefile
index 4ea31410813d..e749fd065167 100644
--- a/security/pam-mysql/Makefile
+++ b/security/pam-mysql/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://download.sourceforge.net/pam-mysql/ \
 
 MAINTAINER=	anders@fix.no
 
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 USE_GMAKE=	yes
 
diff --git a/security/snort/Makefile b/security/snort/Makefile
index 25d3443c1609..d152d983f688 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -24,7 +24,7 @@ LDFLAGS+=	"-L${LOCALBASE}/lib"
 .endif
 
 .if defined(WITH_MYSQL)
-LIB_DEPENDS+=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=--with-mysql-includes=${LOCALBASE}/include/mysql \
 		--with-mysql-libraries=${LOCALBASE}/lib/mysql
 .endif
diff --git a/www/mod_auth_mysql/Makefile b/www/mod_auth_mysql/Makefile
index da093ca2d87e..39820aaebbc8 100644
--- a/www/mod_auth_mysql/Makefile
+++ b/www/mod_auth_mysql/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://bourbon.netvision.net.il/mysql/mod_auth_mysql/ \
 MAINTAINER=	jeh@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT}
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 RUN_DEPENDS=	${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/www/${AP_PORT}
 
 .include <bsd.port.pre.mk>
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index db7df8f41e6f..3171c5b4f952 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -91,7 +91,7 @@ while [ "$1" ]; do
 			echo "CONFIGURE_ARGS+=--with-imap=\${PREFIX}"
 			;;
 		\"MySQL\")
-			echo "LIB_DEPENDS+=	mysqlclient.6:\${PORTSDIR}/databases/mysql322-client"
+			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
 			echo "CONFIGURE_ARGS+=--with-mysql=\${PREFIX}"
 			;;
 		\"PostgreSQL\")
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index 228f6949c72b..1ba51a13fd18 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -95,7 +95,7 @@ while [ "$1" ]; do
 			echo "CONFIGURE_ARGS+=--with-imap=\${PREFIX}"
 			;;
 		\"MySQL\")
-			echo "LIB_DEPENDS+=	mysqlclient.6:\${PORTSDIR}/databases/mysql322-client"
+			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
 			echo "CONFIGURE_ARGS+=--with-mysql=\${PREFIX}"
 			;;
 		\"PostgreSQL\")
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 228f6949c72b..1ba51a13fd18 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -95,7 +95,7 @@ while [ "$1" ]; do
 			echo "CONFIGURE_ARGS+=--with-imap=\${PREFIX}"
 			;;
 		\"MySQL\")
-			echo "LIB_DEPENDS+=	mysqlclient.6:\${PORTSDIR}/databases/mysql322-client"
+			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
 			echo "CONFIGURE_ARGS+=--with-mysql=\${PREFIX}"
 			;;
 		\"PostgreSQL\")
diff --git a/www/udmsearch/Makefile b/www/udmsearch/Makefile
index 9422c02cefe9..f8ff463ab6a2 100644
--- a/www/udmsearch/Makefile
+++ b/www/udmsearch/Makefile
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=	--with-msql=${LOCALBASE}
 .else
 # default to mysql
 
-LIB_DEPENDS=		mysqlclient.6:${PORTSDIR}/databases/mysql322-client
+LIB_DEPENDS=		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 
 .if !defined(WITH_MYSQL)
author	Dirk Froemberg <dirk@FreeBSD.org>	2001-01-21 15:40:47 +0000
committer	Dirk Froemberg <dirk@FreeBSD.org>	2001-01-21 15:40:47 +0000
commit	88d74bc517cd2019a6a3180248d65ae1be1c8884 (patch)
tree	5c3c57e5e136497f16b8193ac33dfbf40b5e2e7e
parent	The directory of freetype's header files was changed (diff)