Update to 5.1.19 release.

15 files changed, 45 insertions, 85 deletions

diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 3a190fea847a..3ad2b92c534b 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.18
+PORTVERSION=	5.1.19
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -129,6 +129,7 @@ post-patch:
 	@${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-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
+	@${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
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index 872dfba5845e..462664a8a102 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.18-beta.tar.gz) = 50aace960b9489e5d57be4224755cdf4
-SHA256 (mysql-5.1.18-beta.tar.gz) = da5d8869211fbd0349c287615ec1371a1c38522e0ce3f8d67b61a08b1bdd3e4d
-SIZE (mysql-5.1.18-beta.tar.gz) = 25037302
+MD5 (mysql-5.1.19-beta.tar.gz) = 5e4280fb3cf1051d779f686d0cd45622
+SHA256 (mysql-5.1.19-beta.tar.gz) = 6e7b04471d2bab24901f1646cec218ef682038b62c56191a44c3b520b22eea62
+SIZE (mysql-5.1.19-beta.tar.gz) = 25129313
diff --git a/databases/mysql51-server/files/patch-configure b/databases/mysql51-server/files/patch-configure
index 681fa38d1099..abfacbb91222 100644
--- a/databases/mysql51-server/files/patch-configure
+++ b/databases/mysql51-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Oct 26 14:03:58 2006
-+++ configure	Tue Nov  7 17:13:30 2006
-@@ -20360,8 +20360,6 @@
+--- configure.orig	Sat May 26 12:22:14 2007
++++ configure	Fri Jun  1 07:53:46 2007
+@@ -20394,8 +20394,6 @@
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
@@ -9,7 +9,7 @@
  
  # Prevent multiple expansion
  
-@@ -26478,8 +26476,8 @@
+@@ -26935,8 +26933,8 @@
  # Some system specific hacks
  #
  
@@ -20,12 +20,3 @@
  
  case $SYSTEM_TYPE in
    *solaris2.7*)
-@@ -46147,7 +46145,7 @@
- 
-   MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster"
- 
--  CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
-+  # CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
-   if test "$have_ndb_debug" = "default"
-   then
-     have_ndb_debug=$with_debug
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 3a190fea847a..3ad2b92c534b 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.18
+PORTVERSION=	5.1.19
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -129,6 +129,7 @@ post-patch:
 	@${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-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
+	@${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
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index 872dfba5845e..462664a8a102 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.18-beta.tar.gz) = 50aace960b9489e5d57be4224755cdf4
-SHA256 (mysql-5.1.18-beta.tar.gz) = da5d8869211fbd0349c287615ec1371a1c38522e0ce3f8d67b61a08b1bdd3e4d
-SIZE (mysql-5.1.18-beta.tar.gz) = 25037302
+MD5 (mysql-5.1.19-beta.tar.gz) = 5e4280fb3cf1051d779f686d0cd45622
+SHA256 (mysql-5.1.19-beta.tar.gz) = 6e7b04471d2bab24901f1646cec218ef682038b62c56191a44c3b520b22eea62
+SIZE (mysql-5.1.19-beta.tar.gz) = 25129313
diff --git a/databases/mysql54-server/files/patch-configure b/databases/mysql54-server/files/patch-configure
index 681fa38d1099..abfacbb91222 100644
--- a/databases/mysql54-server/files/patch-configure
+++ b/databases/mysql54-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Oct 26 14:03:58 2006
-+++ configure	Tue Nov  7 17:13:30 2006
-@@ -20360,8 +20360,6 @@
+--- configure.orig	Sat May 26 12:22:14 2007
++++ configure	Fri Jun  1 07:53:46 2007
+@@ -20394,8 +20394,6 @@
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
@@ -9,7 +9,7 @@
  
  # Prevent multiple expansion
  
-@@ -26478,8 +26476,8 @@
+@@ -26935,8 +26933,8 @@
  # Some system specific hacks
  #
  
@@ -20,12 +20,3 @@
  
  case $SYSTEM_TYPE in
    *solaris2.7*)
-@@ -46147,7 +46145,7 @@
- 
-   MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster"
- 
--  CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
-+  # CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
-   if test "$have_ndb_debug" = "default"
-   then
-     have_ndb_debug=$with_debug
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 3a190fea847a..3ad2b92c534b 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.18
+PORTVERSION=	5.1.19
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -129,6 +129,7 @@ post-patch:
 	@${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-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
+	@${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
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index 872dfba5845e..462664a8a102 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.18-beta.tar.gz) = 50aace960b9489e5d57be4224755cdf4
-SHA256 (mysql-5.1.18-beta.tar.gz) = da5d8869211fbd0349c287615ec1371a1c38522e0ce3f8d67b61a08b1bdd3e4d
-SIZE (mysql-5.1.18-beta.tar.gz) = 25037302
+MD5 (mysql-5.1.19-beta.tar.gz) = 5e4280fb3cf1051d779f686d0cd45622
+SHA256 (mysql-5.1.19-beta.tar.gz) = 6e7b04471d2bab24901f1646cec218ef682038b62c56191a44c3b520b22eea62
+SIZE (mysql-5.1.19-beta.tar.gz) = 25129313
diff --git a/databases/mysql55-server/files/patch-configure b/databases/mysql55-server/files/patch-configure
index 681fa38d1099..abfacbb91222 100644
--- a/databases/mysql55-server/files/patch-configure
+++ b/databases/mysql55-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Oct 26 14:03:58 2006
-+++ configure	Tue Nov  7 17:13:30 2006
-@@ -20360,8 +20360,6 @@
+--- configure.orig	Sat May 26 12:22:14 2007
++++ configure	Fri Jun  1 07:53:46 2007
+@@ -20394,8 +20394,6 @@
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
@@ -9,7 +9,7 @@
  
  # Prevent multiple expansion
  
-@@ -26478,8 +26476,8 @@
+@@ -26935,8 +26933,8 @@
  # Some system specific hacks
  #
  
@@ -20,12 +20,3 @@
  
  case $SYSTEM_TYPE in
    *solaris2.7*)
-@@ -46147,7 +46145,7 @@
- 
-   MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster"
- 
--  CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
-+  # CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
-   if test "$have_ndb_debug" = "default"
-   then
-     have_ndb_debug=$with_debug
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 3a190fea847a..3ad2b92c534b 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.18
+PORTVERSION=	5.1.19
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -129,6 +129,7 @@ post-patch:
 	@${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-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
+	@${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
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index 872dfba5845e..462664a8a102 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.18-beta.tar.gz) = 50aace960b9489e5d57be4224755cdf4
-SHA256 (mysql-5.1.18-beta.tar.gz) = da5d8869211fbd0349c287615ec1371a1c38522e0ce3f8d67b61a08b1bdd3e4d
-SIZE (mysql-5.1.18-beta.tar.gz) = 25037302
+MD5 (mysql-5.1.19-beta.tar.gz) = 5e4280fb3cf1051d779f686d0cd45622
+SHA256 (mysql-5.1.19-beta.tar.gz) = 6e7b04471d2bab24901f1646cec218ef682038b62c56191a44c3b520b22eea62
+SIZE (mysql-5.1.19-beta.tar.gz) = 25129313
diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure
index 681fa38d1099..abfacbb91222 100644
--- a/databases/mysql60-server/files/patch-configure
+++ b/databases/mysql60-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Oct 26 14:03:58 2006
-+++ configure	Tue Nov  7 17:13:30 2006
-@@ -20360,8 +20360,6 @@
+--- configure.orig	Sat May 26 12:22:14 2007
++++ configure	Fri Jun  1 07:53:46 2007
+@@ -20394,8 +20394,6 @@
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
@@ -9,7 +9,7 @@
  
  # Prevent multiple expansion
  
-@@ -26478,8 +26476,8 @@
+@@ -26935,8 +26933,8 @@
  # Some system specific hacks
  #
  
@@ -20,12 +20,3 @@
  
  case $SYSTEM_TYPE in
    *solaris2.7*)
-@@ -46147,7 +46145,7 @@
- 
-   MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster"
- 
--  CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
-+  # CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
-   if test "$have_ndb_debug" = "default"
-   then
-     have_ndb_debug=$with_debug
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 3a190fea847a..3ad2b92c534b 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.18
+PORTVERSION=	5.1.19
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -129,6 +129,7 @@ post-patch:
 	@${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-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
+	@${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
diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo
index 872dfba5845e..462664a8a102 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.18-beta.tar.gz) = 50aace960b9489e5d57be4224755cdf4
-SHA256 (mysql-5.1.18-beta.tar.gz) = da5d8869211fbd0349c287615ec1371a1c38522e0ce3f8d67b61a08b1bdd3e4d
-SIZE (mysql-5.1.18-beta.tar.gz) = 25037302
+MD5 (mysql-5.1.19-beta.tar.gz) = 5e4280fb3cf1051d779f686d0cd45622
+SHA256 (mysql-5.1.19-beta.tar.gz) = 6e7b04471d2bab24901f1646cec218ef682038b62c56191a44c3b520b22eea62
+SIZE (mysql-5.1.19-beta.tar.gz) = 25129313
diff --git a/databases/percona55-server/files/patch-configure b/databases/percona55-server/files/patch-configure
index 681fa38d1099..abfacbb91222 100644
--- a/databases/percona55-server/files/patch-configure
+++ b/databases/percona55-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Oct 26 14:03:58 2006
-+++ configure	Tue Nov  7 17:13:30 2006
-@@ -20360,8 +20360,6 @@
+--- configure.orig	Sat May 26 12:22:14 2007
++++ configure	Fri Jun  1 07:53:46 2007
+@@ -20394,8 +20394,6 @@
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
@@ -9,7 +9,7 @@
  
  # Prevent multiple expansion
  
-@@ -26478,8 +26476,8 @@
+@@ -26935,8 +26933,8 @@
  # Some system specific hacks
  #
  
@@ -20,12 +20,3 @@
  
  case $SYSTEM_TYPE in
    *solaris2.7*)
-@@ -46147,7 +46145,7 @@
- 
-   MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster"
- 
--  CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
-+  # CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
-   if test "$have_ndb_debug" = "default"
-   then
-     have_ndb_debug=$with_debug