Switch from mysql322 to mysql322-client and mysql322-server.

11 files changed, 20 insertions, 20 deletions

diff --git a/databases/Makefile b/databases/Makefile
index d42f4f06de2a..39596d6799da 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.37 1999/06/22 00:43:56 billf Exp $
+# $Id: Makefile,v 1.38 1999/06/22 10:05:57 asami Exp $
 #
     SUBDIR += cdb
     SUBDIR += db
@@ -11,8 +11,8 @@
     SUBDIR += interbase4
     SUBDIR += msql
     SUBDIR += mysql321
-    SUBDIR += mysql322
-#    SUBDIR += mysql322-client
+    SUBDIR += mysql322-client
+    SUBDIR += mysql322-server
     SUBDIR += mysqltutor
     SUBDIR += p5-DBD-Pg
     SUBDIR += p5-DBI
diff --git a/databases/gmysql/Makefile b/databases/gmysql/Makefile
index 928a2adcd852..c06b4431ea66 100644
--- a/databases/gmysql/Makefile
+++ b/databases/gmysql/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sun Nov 15 22:07:12 CET 1998
 # Whom:			Dirk Froemberg <ibex@physik.TU-Berlin.DE>
 #
-# $Id: Makefile,v 1.11 1999/04/22 07:42:49 mharo Exp $
+# $Id: Makefile,v 1.12 1999/05/29 03:55:32 steve Exp $
 #
 
 DISTNAME=	gmysql-0.3.2
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.loth.demon.co.uk/gmysql/ \
 MAINTAINER=	dirk@FreeBSD.ORG
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		mysqlclient.6:${PORTSDIR}/databases/mysql322
+		mysqlclient.6:${PORTSDIR}/databases/mysql322-client
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index ed63532a606d..9691288fa7b3 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -3,7 +3,7 @@
 # Date created:				September 29th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.17 1999/01/21 17:54:48 vanilla Exp $
+# $Id: Makefile,v 1.18 1999/02/12 11:57:57 dirk Exp $
 #
 
 DISTNAME=	Msql-Mysql-modules-1.2016
@@ -16,7 +16,7 @@ MAINTAINER=	vanilla@FreeBSD.ORG
 
 BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable \
 		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/DBI.pm:${PORTSDIR}/databases/p5-DBI
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322
+LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
 
 CONFIGURE_ARGS=	PREFIX=${PREFIX}
 CONFIGURE_ENV=	MYSQL_HOME=${PREFIX} IN_MYSQL_DISTRIBUTION=1
diff --git a/databases/p5-Mysql/Makefile b/databases/p5-Mysql/Makefile
index ed63532a606d..9691288fa7b3 100644
--- a/databases/p5-Mysql/Makefile
+++ b/databases/p5-Mysql/Makefile
@@ -3,7 +3,7 @@
 # Date created:				September 29th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.17 1999/01/21 17:54:48 vanilla Exp $
+# $Id: Makefile,v 1.18 1999/02/12 11:57:57 dirk Exp $
 #
 
 DISTNAME=	Msql-Mysql-modules-1.2016
@@ -16,7 +16,7 @@ MAINTAINER=	vanilla@FreeBSD.ORG
 
 BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable \
 		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/DBI.pm:${PORTSDIR}/databases/p5-DBI
-LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322
+LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
 
 CONFIGURE_ARGS=	PREFIX=${PREFIX}
 CONFIGURE_ENV=	MYSQL_HOME=${PREFIX} IN_MYSQL_DISTRIBUTION=1
diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile
index 8365e6c468ca..7b984846a616 100644
--- a/databases/xmysql/Makefile
+++ b/databases/xmysql/Makefile
@@ -3,7 +3,7 @@
 # Date created:			Tue Sep  2 15:46:09 CEST 1997
 # Whom:				Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.18 1999/02/12 11:57:57 dirk Exp $
+# $Id: Makefile,v 1.19 1999/06/08 22:15:04 steve Exp $
 #
 
 DISTNAME=	xmysql-1.9
@@ -16,7 +16,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		xforms.0:${PORTSDIR}/x11-toolkits/xforms \
-		mysqlclient.6:${PORTSDIR}/databases/mysql322
+		mysqlclient.6:${PORTSDIR}/databases/mysql322-client
 
 USE_X_PREFIX=	yes
 
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index ad70d74bb3eb..339a951a7f02 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -3,10 +3,10 @@
 # Date created:			Di   2 Sep 1997 16:29:27 CEST
 # Whom:				Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.18 1999/02/12 11:57:57 dirk Exp $
+# $Id: Makefile,v 1.19 1999/06/08 22:15:07 steve Exp $
 #
 
-DISTNAME=	xmysqladmin-0.4.4
+DISTNAME=	xmysqladmin-1.0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.tcx.se/Contrib/ \
 		http://www.buoy.com/mysql/Contrib/ \
@@ -17,7 +17,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		xforms.0:${PORTSDIR}/x11-toolkits/xforms \
-		mysqlclient.6:${PORTSDIR}/databases/mysql322
+		mysqlclient.6:${PORTSDIR}/databases/mysql322-client
 
 WRKSRC=		${WRKDIR}/xmysqladmin
 USE_X_PREFIX=	yes
diff --git a/databases/xmysqladmin/distinfo b/databases/xmysqladmin/distinfo
index 0595e6e3699e..e354ae1cfc83 100644
--- a/databases/xmysqladmin/distinfo
+++ b/databases/xmysqladmin/distinfo
@@ -1 +1 @@
-MD5 (xmysqladmin-0.4.4.tar.gz) = ae04bff6543899487810bfaf30c7d635
+MD5 (xmysqladmin-1.0.tar.gz) = d02b7e52d034f2f41b6f43ced3cb8e21
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index 184c8c62ff2e..ee8992c14475 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -3,7 +3,7 @@
 # Date created:		28 November 1998
 # Whom:			Neil Blakey-Milner <nbm@rucus.ru.ac.za>
 #
-# $Id: Makefile,v 1.3 1999/03/31 15:34:31 steve Exp $
+# $Id: Makefile,v 1.4 1999/06/07 13:30:28 billf Exp $
 
 DISTNAME=	ezmlm-idx-${IDX_VERSION}
 CATEGORIES=	mail
@@ -26,7 +26,7 @@ RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 # If USE_MYSQL is defined, build with MySQL extensions
 .if defined(USE_MYSQL)
 ALL_TARGET=	it ${LANGUAGE} mysql
-LIB_DEPENDS+=	mysqlclient.6:${PORTSDIR}/databases/mysql322
+LIB_DEPENDS+=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
 .else
 ALL_TARGET=	it ${LANGUAGE}
 .endif
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index 858fcc560a8d..cb72ca09333c 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -79,7 +79,7 @@ while [ "$1" ]; do
 			echo "PHP3_CONF_ARGS+=	--with-imap=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			;;
 		\"MySQL\")
-			echo "LIB_DEPENDS+=		mysqlclient.6:\${PORTSDIR}/databases/mysql322" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "LIB_DEPENDS+=		mysqlclient.6:\${PORTSDIR}/databases/mysql322-client" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			echo "PHP3_CONF_ARGS+=	--with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			;;
 		\"PostgreSQL\")
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index 858fcc560a8d..cb72ca09333c 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -79,7 +79,7 @@ while [ "$1" ]; do
 			echo "PHP3_CONF_ARGS+=	--with-imap=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			;;
 		\"MySQL\")
-			echo "LIB_DEPENDS+=		mysqlclient.6:\${PORTSDIR}/databases/mysql322" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "LIB_DEPENDS+=		mysqlclient.6:\${PORTSDIR}/databases/mysql322-client" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			echo "PHP3_CONF_ARGS+=	--with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			;;
 		\"PostgreSQL\")
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 858fcc560a8d..cb72ca09333c 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -79,7 +79,7 @@ while [ "$1" ]; do
 			echo "PHP3_CONF_ARGS+=	--with-imap=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			;;
 		\"MySQL\")
-			echo "LIB_DEPENDS+=		mysqlclient.6:\${PORTSDIR}/databases/mysql322" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			echo "LIB_DEPENDS+=		mysqlclient.6:\${PORTSDIR}/databases/mysql322-client" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			echo "PHP3_CONF_ARGS+=	--with-mysql=\${PREFIX}" >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			;;
 		\"PostgreSQL\")