Upgrade to 3.23.34a.

27 files changed, 99 insertions, 162 deletions

diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 8146b07371c2..b72953b4b118 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	3.23.33
+PORTVERSION=	3.23.34a
 CATEGORIES=	databases
 MASTER_SITES=	http://www.kernelnotes.de/MySQL/Downloads/%SUBDIR%/ \
 		http://www.mysql.net/Downloads/%SUBDIR%/ \
@@ -32,10 +32,7 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-libwrap \
 		--with-low-memory
 .if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler
-.endif
-.if ${MACHINE_ARCH} == "alpha"
-CONFIGURE_ARGS+=--without-berkeley-db
+CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
@@ -67,17 +64,10 @@ pre-fetch:
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
-MASTER_SITE_SUBDIR+=	db
-DISTFILES+=	db-${BDBVERSION}${EXTRACT_SUFX}
-
 RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql323-client
 
-BDBVERSION=	3.2.3h
 PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}
 
-pre-configure:
-	cd ${WRKSRC} && ${LN} -s ../db-${BDBVERSION}
-
 post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
diff --git a/databases/mysql323-server/distinfo b/databases/mysql323-server/distinfo
index bf3c96dea58d..b8e066ccbc70 100644
--- a/databases/mysql323-server/distinfo
+++ b/databases/mysql323-server/distinfo
@@ -1,2 +1 @@
-MD5 (mysql-3.23.33.tar.gz) = ca9294080873830138efef1b85e60a94
-MD5 (db-3.2.3h.tar.gz) = 7a4a88daa29268eebb57ff2ed58dff53
+MD5 (mysql-3.23.34a.tar.gz) = c949146084976c38b0a4a1ee8b2b275c
diff --git a/databases/mysql323-server/files/patch-af b/databases/mysql323-server/files/patch-af
index ad1f5ae20877..7cde1a7119d4 100644
--- a/databases/mysql323-server/files/patch-af
+++ b/databases/mysql323-server/files/patch-af
@@ -1,6 +1,6 @@
---- scripts/safe_mysqld.sh.orig	Thu Jan  4 03:03:55 2001
-+++ scripts/safe_mysqld.sh	Fri Jan  5 14:05:04 2001
-@@ -64,26 +64,9 @@
+--- scripts/safe_mysqld.sh.orig	Mon Mar 12 00:18:24 2001
++++ scripts/safe_mysqld.sh	Mon Mar 12 07:36:07 2001
+@@ -64,30 +64,9 @@
    done
  }
  
@@ -12,6 +12,10 @@
 -  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
 -  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -  DATADIR=$MY_BASEDIR_VERSION/data
+-  if test -z "defaults"
+-  then
+-    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
+-  fi
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
@@ -30,7 +34,7 @@
  
  MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
  MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
-@@ -220,34 +203,6 @@
+@@ -224,34 +203,6 @@
    if test ! -f $pid_file		# This is removed if normal shutdown
    then
      break
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 8146b07371c2..b72953b4b118 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	3.23.33
+PORTVERSION=	3.23.34a
 CATEGORIES=	databases
 MASTER_SITES=	http://www.kernelnotes.de/MySQL/Downloads/%SUBDIR%/ \
 		http://www.mysql.net/Downloads/%SUBDIR%/ \
@@ -32,10 +32,7 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-libwrap \
 		--with-low-memory
 .if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler
-.endif
-.if ${MACHINE_ARCH} == "alpha"
-CONFIGURE_ARGS+=--without-berkeley-db
+CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
@@ -67,17 +64,10 @@ pre-fetch:
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
-MASTER_SITE_SUBDIR+=	db
-DISTFILES+=	db-${BDBVERSION}${EXTRACT_SUFX}
-
 RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql323-client
 
-BDBVERSION=	3.2.3h
 PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}
 
-pre-configure:
-	cd ${WRKSRC} && ${LN} -s ../db-${BDBVERSION}
-
 post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
diff --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo
index bf3c96dea58d..b8e066ccbc70 100644
--- a/databases/mysql40-server/distinfo
+++ b/databases/mysql40-server/distinfo
@@ -1,2 +1 @@
-MD5 (mysql-3.23.33.tar.gz) = ca9294080873830138efef1b85e60a94
-MD5 (db-3.2.3h.tar.gz) = 7a4a88daa29268eebb57ff2ed58dff53
+MD5 (mysql-3.23.34a.tar.gz) = c949146084976c38b0a4a1ee8b2b275c
diff --git a/databases/mysql40-server/files/patch-af b/databases/mysql40-server/files/patch-af
index ad1f5ae20877..7cde1a7119d4 100644
--- a/databases/mysql40-server/files/patch-af
+++ b/databases/mysql40-server/files/patch-af
@@ -1,6 +1,6 @@
---- scripts/safe_mysqld.sh.orig	Thu Jan  4 03:03:55 2001
-+++ scripts/safe_mysqld.sh	Fri Jan  5 14:05:04 2001
-@@ -64,26 +64,9 @@
+--- scripts/safe_mysqld.sh.orig	Mon Mar 12 00:18:24 2001
++++ scripts/safe_mysqld.sh	Mon Mar 12 07:36:07 2001
+@@ -64,30 +64,9 @@
    done
  }
  
@@ -12,6 +12,10 @@
 -  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
 -  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -  DATADIR=$MY_BASEDIR_VERSION/data
+-  if test -z "defaults"
+-  then
+-    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
+-  fi
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
@@ -30,7 +34,7 @@
  
  MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
  MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
-@@ -220,34 +203,6 @@
+@@ -224,34 +203,6 @@
    if test ! -f $pid_file		# This is removed if normal shutdown
    then
      break
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 8146b07371c2..b72953b4b118 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	3.23.33
+PORTVERSION=	3.23.34a
 CATEGORIES=	databases
 MASTER_SITES=	http://www.kernelnotes.de/MySQL/Downloads/%SUBDIR%/ \
 		http://www.mysql.net/Downloads/%SUBDIR%/ \
@@ -32,10 +32,7 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-libwrap \
 		--with-low-memory
 .if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler
-.endif
-.if ${MACHINE_ARCH} == "alpha"
-CONFIGURE_ARGS+=--without-berkeley-db
+CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
@@ -67,17 +64,10 @@ pre-fetch:
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
-MASTER_SITE_SUBDIR+=	db
-DISTFILES+=	db-${BDBVERSION}${EXTRACT_SUFX}
-
 RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql323-client
 
-BDBVERSION=	3.2.3h
 PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}
 
-pre-configure:
-	cd ${WRKSRC} && ${LN} -s ../db-${BDBVERSION}
-
 post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo
index bf3c96dea58d..b8e066ccbc70 100644
--- a/databases/mysql41-server/distinfo
+++ b/databases/mysql41-server/distinfo
@@ -1,2 +1 @@
-MD5 (mysql-3.23.33.tar.gz) = ca9294080873830138efef1b85e60a94
-MD5 (db-3.2.3h.tar.gz) = 7a4a88daa29268eebb57ff2ed58dff53
+MD5 (mysql-3.23.34a.tar.gz) = c949146084976c38b0a4a1ee8b2b275c
diff --git a/databases/mysql41-server/files/patch-af b/databases/mysql41-server/files/patch-af
index ad1f5ae20877..7cde1a7119d4 100644
--- a/databases/mysql41-server/files/patch-af
+++ b/databases/mysql41-server/files/patch-af
@@ -1,6 +1,6 @@
---- scripts/safe_mysqld.sh.orig	Thu Jan  4 03:03:55 2001
-+++ scripts/safe_mysqld.sh	Fri Jan  5 14:05:04 2001
-@@ -64,26 +64,9 @@
+--- scripts/safe_mysqld.sh.orig	Mon Mar 12 00:18:24 2001
++++ scripts/safe_mysqld.sh	Mon Mar 12 07:36:07 2001
+@@ -64,30 +64,9 @@
    done
  }
  
@@ -12,6 +12,10 @@
 -  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
 -  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -  DATADIR=$MY_BASEDIR_VERSION/data
+-  if test -z "defaults"
+-  then
+-    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
+-  fi
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
@@ -30,7 +34,7 @@
  
  MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
  MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
-@@ -220,34 +203,6 @@
+@@ -224,34 +203,6 @@
    if test ! -f $pid_file		# This is removed if normal shutdown
    then
      break
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 8146b07371c2..b72953b4b118 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	3.23.33
+PORTVERSION=	3.23.34a
 CATEGORIES=	databases
 MASTER_SITES=	http://www.kernelnotes.de/MySQL/Downloads/%SUBDIR%/ \
 		http://www.mysql.net/Downloads/%SUBDIR%/ \
@@ -32,10 +32,7 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-libwrap \
 		--with-low-memory
 .if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler
-.endif
-.if ${MACHINE_ARCH} == "alpha"
-CONFIGURE_ARGS+=--without-berkeley-db
+CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
@@ -67,17 +64,10 @@ pre-fetch:
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
-MASTER_SITE_SUBDIR+=	db
-DISTFILES+=	db-${BDBVERSION}${EXTRACT_SUFX}
-
 RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql323-client
 
-BDBVERSION=	3.2.3h
 PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}
 
-pre-configure:
-	cd ${WRKSRC} && ${LN} -s ../db-${BDBVERSION}
-
 post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo
index bf3c96dea58d..b8e066ccbc70 100644
--- a/databases/mysql50-server/distinfo
+++ b/databases/mysql50-server/distinfo
@@ -1,2 +1 @@
-MD5 (mysql-3.23.33.tar.gz) = ca9294080873830138efef1b85e60a94
-MD5 (db-3.2.3h.tar.gz) = 7a4a88daa29268eebb57ff2ed58dff53
+MD5 (mysql-3.23.34a.tar.gz) = c949146084976c38b0a4a1ee8b2b275c
diff --git a/databases/mysql50-server/files/patch-af b/databases/mysql50-server/files/patch-af
index ad1f5ae20877..7cde1a7119d4 100644
--- a/databases/mysql50-server/files/patch-af
+++ b/databases/mysql50-server/files/patch-af
@@ -1,6 +1,6 @@
---- scripts/safe_mysqld.sh.orig	Thu Jan  4 03:03:55 2001
-+++ scripts/safe_mysqld.sh	Fri Jan  5 14:05:04 2001
-@@ -64,26 +64,9 @@
+--- scripts/safe_mysqld.sh.orig	Mon Mar 12 00:18:24 2001
++++ scripts/safe_mysqld.sh	Mon Mar 12 07:36:07 2001
+@@ -64,30 +64,9 @@
    done
  }
  
@@ -12,6 +12,10 @@
 -  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
 -  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -  DATADIR=$MY_BASEDIR_VERSION/data
+-  if test -z "defaults"
+-  then
+-    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
+-  fi
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
@@ -30,7 +34,7 @@
  
  MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
  MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
-@@ -220,34 +203,6 @@
+@@ -224,34 +203,6 @@
    if test ! -f $pid_file		# This is removed if normal shutdown
    then
      break
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 8146b07371c2..b72953b4b118 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	3.23.33
+PORTVERSION=	3.23.34a
 CATEGORIES=	databases
 MASTER_SITES=	http://www.kernelnotes.de/MySQL/Downloads/%SUBDIR%/ \
 		http://www.mysql.net/Downloads/%SUBDIR%/ \
@@ -32,10 +32,7 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-libwrap \
 		--with-low-memory
 .if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler
-.endif
-.if ${MACHINE_ARCH} == "alpha"
-CONFIGURE_ARGS+=--without-berkeley-db
+CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
@@ -67,17 +64,10 @@ pre-fetch:
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
-MASTER_SITE_SUBDIR+=	db
-DISTFILES+=	db-${BDBVERSION}${EXTRACT_SUFX}
-
 RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql323-client
 
-BDBVERSION=	3.2.3h
 PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}
 
-pre-configure:
-	cd ${WRKSRC} && ${LN} -s ../db-${BDBVERSION}
-
 post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index bf3c96dea58d..b8e066ccbc70 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,2 +1 @@
-MD5 (mysql-3.23.33.tar.gz) = ca9294080873830138efef1b85e60a94
-MD5 (db-3.2.3h.tar.gz) = 7a4a88daa29268eebb57ff2ed58dff53
+MD5 (mysql-3.23.34a.tar.gz) = c949146084976c38b0a4a1ee8b2b275c
diff --git a/databases/mysql51-server/files/patch-af b/databases/mysql51-server/files/patch-af
index ad1f5ae20877..7cde1a7119d4 100644
--- a/databases/mysql51-server/files/patch-af
+++ b/databases/mysql51-server/files/patch-af
@@ -1,6 +1,6 @@
---- scripts/safe_mysqld.sh.orig	Thu Jan  4 03:03:55 2001
-+++ scripts/safe_mysqld.sh	Fri Jan  5 14:05:04 2001
-@@ -64,26 +64,9 @@
+--- scripts/safe_mysqld.sh.orig	Mon Mar 12 00:18:24 2001
++++ scripts/safe_mysqld.sh	Mon Mar 12 07:36:07 2001
+@@ -64,30 +64,9 @@
    done
  }
  
@@ -12,6 +12,10 @@
 -  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
 -  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -  DATADIR=$MY_BASEDIR_VERSION/data
+-  if test -z "defaults"
+-  then
+-    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
+-  fi
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
@@ -30,7 +34,7 @@
  
  MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
  MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
-@@ -220,34 +203,6 @@
+@@ -224,34 +203,6 @@
    if test ! -f $pid_file		# This is removed if normal shutdown
    then
      break
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 8146b07371c2..b72953b4b118 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	3.23.33
+PORTVERSION=	3.23.34a
 CATEGORIES=	databases
 MASTER_SITES=	http://www.kernelnotes.de/MySQL/Downloads/%SUBDIR%/ \
 		http://www.mysql.net/Downloads/%SUBDIR%/ \
@@ -32,10 +32,7 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-libwrap \
 		--with-low-memory
 .if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler
-.endif
-.if ${MACHINE_ARCH} == "alpha"
-CONFIGURE_ARGS+=--without-berkeley-db
+CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
@@ -67,17 +64,10 @@ pre-fetch:
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
-MASTER_SITE_SUBDIR+=	db
-DISTFILES+=	db-${BDBVERSION}${EXTRACT_SUFX}
-
 RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql323-client
 
-BDBVERSION=	3.2.3h
 PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}
 
-pre-configure:
-	cd ${WRKSRC} && ${LN} -s ../db-${BDBVERSION}
-
 post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index bf3c96dea58d..b8e066ccbc70 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1,2 +1 @@
-MD5 (mysql-3.23.33.tar.gz) = ca9294080873830138efef1b85e60a94
-MD5 (db-3.2.3h.tar.gz) = 7a4a88daa29268eebb57ff2ed58dff53
+MD5 (mysql-3.23.34a.tar.gz) = c949146084976c38b0a4a1ee8b2b275c
diff --git a/databases/mysql54-server/files/patch-af b/databases/mysql54-server/files/patch-af
index ad1f5ae20877..7cde1a7119d4 100644
--- a/databases/mysql54-server/files/patch-af
+++ b/databases/mysql54-server/files/patch-af
@@ -1,6 +1,6 @@
---- scripts/safe_mysqld.sh.orig	Thu Jan  4 03:03:55 2001
-+++ scripts/safe_mysqld.sh	Fri Jan  5 14:05:04 2001
-@@ -64,26 +64,9 @@
+--- scripts/safe_mysqld.sh.orig	Mon Mar 12 00:18:24 2001
++++ scripts/safe_mysqld.sh	Mon Mar 12 07:36:07 2001
+@@ -64,30 +64,9 @@
    done
  }
  
@@ -12,6 +12,10 @@
 -  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
 -  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -  DATADIR=$MY_BASEDIR_VERSION/data
+-  if test -z "defaults"
+-  then
+-    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
+-  fi
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
@@ -30,7 +34,7 @@
  
  MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
  MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
-@@ -220,34 +203,6 @@
+@@ -224,34 +203,6 @@
    if test ! -f $pid_file		# This is removed if normal shutdown
    then
      break
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 8146b07371c2..b72953b4b118 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	3.23.33
+PORTVERSION=	3.23.34a
 CATEGORIES=	databases
 MASTER_SITES=	http://www.kernelnotes.de/MySQL/Downloads/%SUBDIR%/ \
 		http://www.mysql.net/Downloads/%SUBDIR%/ \
@@ -32,10 +32,7 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-libwrap \
 		--with-low-memory
 .if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler
-.endif
-.if ${MACHINE_ARCH} == "alpha"
-CONFIGURE_ARGS+=--without-berkeley-db
+CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
@@ -67,17 +64,10 @@ pre-fetch:
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
-MASTER_SITE_SUBDIR+=	db
-DISTFILES+=	db-${BDBVERSION}${EXTRACT_SUFX}
-
 RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql323-client
 
-BDBVERSION=	3.2.3h
 PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}
 
-pre-configure:
-	cd ${WRKSRC} && ${LN} -s ../db-${BDBVERSION}
-
 post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index bf3c96dea58d..b8e066ccbc70 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,2 +1 @@
-MD5 (mysql-3.23.33.tar.gz) = ca9294080873830138efef1b85e60a94
-MD5 (db-3.2.3h.tar.gz) = 7a4a88daa29268eebb57ff2ed58dff53
+MD5 (mysql-3.23.34a.tar.gz) = c949146084976c38b0a4a1ee8b2b275c
diff --git a/databases/mysql55-server/files/patch-af b/databases/mysql55-server/files/patch-af
index ad1f5ae20877..7cde1a7119d4 100644
--- a/databases/mysql55-server/files/patch-af
+++ b/databases/mysql55-server/files/patch-af
@@ -1,6 +1,6 @@
---- scripts/safe_mysqld.sh.orig	Thu Jan  4 03:03:55 2001
-+++ scripts/safe_mysqld.sh	Fri Jan  5 14:05:04 2001
-@@ -64,26 +64,9 @@
+--- scripts/safe_mysqld.sh.orig	Mon Mar 12 00:18:24 2001
++++ scripts/safe_mysqld.sh	Mon Mar 12 07:36:07 2001
+@@ -64,30 +64,9 @@
    done
  }
  
@@ -12,6 +12,10 @@
 -  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
 -  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -  DATADIR=$MY_BASEDIR_VERSION/data
+-  if test -z "defaults"
+-  then
+-    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
+-  fi
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
@@ -30,7 +34,7 @@
  
  MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
  MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
-@@ -220,34 +203,6 @@
+@@ -224,34 +203,6 @@
    if test ! -f $pid_file		# This is removed if normal shutdown
    then
      break
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 8146b07371c2..b72953b4b118 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	3.23.33
+PORTVERSION=	3.23.34a
 CATEGORIES=	databases
 MASTER_SITES=	http://www.kernelnotes.de/MySQL/Downloads/%SUBDIR%/ \
 		http://www.mysql.net/Downloads/%SUBDIR%/ \
@@ -32,10 +32,7 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-libwrap \
 		--with-low-memory
 .if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler
-.endif
-.if ${MACHINE_ARCH} == "alpha"
-CONFIGURE_ARGS+=--without-berkeley-db
+CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
@@ -67,17 +64,10 @@ pre-fetch:
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
-MASTER_SITE_SUBDIR+=	db
-DISTFILES+=	db-${BDBVERSION}${EXTRACT_SUFX}
-
 RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql323-client
 
-BDBVERSION=	3.2.3h
 PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}
 
-pre-configure:
-	cd ${WRKSRC} && ${LN} -s ../db-${BDBVERSION}
-
 post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index bf3c96dea58d..b8e066ccbc70 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1,2 +1 @@
-MD5 (mysql-3.23.33.tar.gz) = ca9294080873830138efef1b85e60a94
-MD5 (db-3.2.3h.tar.gz) = 7a4a88daa29268eebb57ff2ed58dff53
+MD5 (mysql-3.23.34a.tar.gz) = c949146084976c38b0a4a1ee8b2b275c
diff --git a/databases/mysql60-server/files/patch-af b/databases/mysql60-server/files/patch-af
index ad1f5ae20877..7cde1a7119d4 100644
--- a/databases/mysql60-server/files/patch-af
+++ b/databases/mysql60-server/files/patch-af
@@ -1,6 +1,6 @@
---- scripts/safe_mysqld.sh.orig	Thu Jan  4 03:03:55 2001
-+++ scripts/safe_mysqld.sh	Fri Jan  5 14:05:04 2001
-@@ -64,26 +64,9 @@
+--- scripts/safe_mysqld.sh.orig	Mon Mar 12 00:18:24 2001
++++ scripts/safe_mysqld.sh	Mon Mar 12 07:36:07 2001
+@@ -64,30 +64,9 @@
    done
  }
  
@@ -12,6 +12,10 @@
 -  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
 -  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -  DATADIR=$MY_BASEDIR_VERSION/data
+-  if test -z "defaults"
+-  then
+-    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
+-  fi
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
@@ -30,7 +34,7 @@
  
  MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
  MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
-@@ -220,34 +203,6 @@
+@@ -224,34 +203,6 @@
    if test ! -f $pid_file		# This is removed if normal shutdown
    then
      break
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 8146b07371c2..b72953b4b118 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	3.23.33
+PORTVERSION=	3.23.34a
 CATEGORIES=	databases
 MASTER_SITES=	http://www.kernelnotes.de/MySQL/Downloads/%SUBDIR%/ \
 		http://www.mysql.net/Downloads/%SUBDIR%/ \
@@ -32,10 +32,7 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-libwrap \
 		--with-low-memory
 .if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler
-.endif
-.if ${MACHINE_ARCH} == "alpha"
-CONFIGURE_ARGS+=--without-berkeley-db
+CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
@@ -67,17 +64,10 @@ pre-fetch:
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
-MASTER_SITE_SUBDIR+=	db
-DISTFILES+=	db-${BDBVERSION}${EXTRACT_SUFX}
-
 RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql323-client
 
-BDBVERSION=	3.2.3h
 PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}
 
-pre-configure:
-	cd ${WRKSRC} && ${LN} -s ../db-${BDBVERSION}
-
 post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo
index bf3c96dea58d..b8e066ccbc70 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@@ -1,2 +1 @@
-MD5 (mysql-3.23.33.tar.gz) = ca9294080873830138efef1b85e60a94
-MD5 (db-3.2.3h.tar.gz) = 7a4a88daa29268eebb57ff2ed58dff53
+MD5 (mysql-3.23.34a.tar.gz) = c949146084976c38b0a4a1ee8b2b275c
diff --git a/databases/percona55-server/files/patch-af b/databases/percona55-server/files/patch-af
index ad1f5ae20877..7cde1a7119d4 100644
--- a/databases/percona55-server/files/patch-af
+++ b/databases/percona55-server/files/patch-af
@@ -1,6 +1,6 @@
---- scripts/safe_mysqld.sh.orig	Thu Jan  4 03:03:55 2001
-+++ scripts/safe_mysqld.sh	Fri Jan  5 14:05:04 2001
-@@ -64,26 +64,9 @@
+--- scripts/safe_mysqld.sh.orig	Mon Mar 12 00:18:24 2001
++++ scripts/safe_mysqld.sh	Mon Mar 12 07:36:07 2001
+@@ -64,30 +64,9 @@
    done
  }
  
@@ -12,6 +12,10 @@
 -  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
 -  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -  DATADIR=$MY_BASEDIR_VERSION/data
+-  if test -z "defaults"
+-  then
+-    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
+-  fi
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
@@ -30,7 +34,7 @@
  
  MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
  MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
-@@ -220,34 +203,6 @@
+@@ -224,34 +203,6 @@
    if test ! -f $pid_file		# This is removed if normal shutdown
    then
      break