Update to 5.5.5-m3 release:

- fix include layout [1]
- drop obsolete WITH_NDB knob

PR:		ports/146276 [1]
Submitted by:	pgollucci

4 files changed, 36 insertions, 19 deletions

diff --git a/databases/percona55-server/files/patch-configure b/databases/percona55-server/files/patch-configure
index ea51ece41d79..a733462f4c36 100644
--- a/databases/percona55-server/files/patch-configure
+++ b/databases/percona55-server/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	2010-04-18 11:13:22.000000000 +0200
-+++ configure	2010-04-18 11:17:01.000000000 +0200
+--- configure.orig	2010-07-06 20:37:18.000000000 +0200
++++ configure	2010-07-16 10:11:24.000000000 +0200
 @@ -3,8 +3,9 @@
  # of perl script that calls cmake.
  
@@ -9,6 +9,6 @@
 +#cmake -P cmake/check_minimal_version.cmake >/dev/null 2>&1 || HAVE_CMAKE=no
 +#perl --version >/dev/null 2>&1 || HAVE_CMAKE=no
 +HAVE_CMAKE=no
+ scriptdir=`dirname $0`
  if test "$HAVE_CMAKE" = "no"
  then
-   sh ./configure.am "$@"
diff --git a/databases/percona55-server/files/patch-configure.am b/databases/percona55-server/files/patch-configure.am
index ba1bd22648e6..39eae0a9c0b2 100644
--- a/databases/percona55-server/files/patch-configure.am
+++ b/databases/percona55-server/files/patch-configure.am
@@ -1,6 +1,24 @@
---- configure.am.orig	2010-04-13 16:22:46.000000000 +0200
-+++ configure.am	2010-04-13 16:23:40.000000000 +0200
-@@ -25756,8 +25756,8 @@
+--- configure.am.orig	2010-07-06 20:37:18.000000000 +0200
++++ configure.am	2010-07-16 11:11:48.000000000 +0200
+@@ -990,6 +990,8 @@
+ MYSQL_BASE_VERSION
+ MYSQL_NO_DASH_VERSION
+ MYSQL_U_SCORE_VERSION
++ndbcluster_includes
++NDB_SCI_LIBS
+ TEST_NDBCLUSTER
+ MAKEINDEX
+ PDFLATEX
+@@ -12684,6 +12686,8 @@
+ NDB_VERSION_MINOR=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f2`
+ NDB_VERSION_BUILD=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f3`
+ NDB_VERSION_STATUS=`echo $VERSION | sed 's/^[-.0-9]*//'`
++ndbcluster_includes=""
++NDB_SCI_LIBS=""
+ TEST_NDBCLUSTER=""
+ 
+ 
+@@ -25849,8 +25853,8 @@
  # Some system specific hacks
  #
  
diff --git a/databases/percona55-server/files/patch-include_Makefile.in b/databases/percona55-server/files/patch-include_Makefile.in
index ef2c4dea31ec..206952b66c3c 100644
--- a/databases/percona55-server/files/patch-include_Makefile.in
+++ b/databases/percona55-server/files/patch-include_Makefile.in
@@ -1,11 +1,11 @@
---- include/Makefile.in.orig	2009-07-23 14:45:21.000000000 +0200
-+++ include/Makefile.in	2009-07-23 14:45:34.000000000 +0200
-@@ -712,8 +712,6 @@
+--- include/Makefile.in.orig	2010-07-16 10:14:39.000000000 +0200
++++ include/Makefile.in	2010-07-16 10:14:51.000000000 +0200
+@@ -708,8 +708,6 @@
  @HAVE_DTRACE_TRUE@probes_mysql_dtrace.h: $(DTRACEPROVIDER)
  @HAVE_DTRACE_TRUE@	$(DTRACE) $(DTRACEFLAGS) -h -s $(DTRACEPROVIDER) -o $@
  
 -probes_mysql_nodtrace.h: $(DTRACEPROVIDER)
 -	@PERL@ $(top_srcdir)/scripts/dheadgen.pl -f $(DTRACEPROVIDER) > $@
- 
- # Don't update the files from bitkeeper
- %::SCCS/s.%
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/databases/percona55-server/files/patch-scripts::Makefile.in b/databases/percona55-server/files/patch-scripts::Makefile.in
index 7881ee6f48dc..a8fb0cbf469a 100644
--- a/databases/percona55-server/files/patch-scripts::Makefile.in
+++ b/databases/percona55-server/files/patch-scripts::Makefile.in
@@ -1,13 +1,12 @@
---- scripts/Makefile.in.orig	Tue May  8 11:42:25 2007
-+++ scripts/Makefile.in	Thu May 17 09:30:48 2007
-@@ -399,21 +399,7 @@
+--- scripts/Makefile.in.orig	2010-07-06 20:37:13.000000000 +0200
++++ scripts/Makefile.in	2010-07-16 10:19:28.000000000 +0200
+@@ -390,20 +390,7 @@
  BUILT_SOURCES = mysql_fix_privilege_tables.sql \
  		mysql_fix_privilege_tables_sql.c
  
 -bin_SCRIPTS = @server_scripts@ \
 -			msql2mysql \
 -			mysql_config \
--			mysql_fix_privilege_tables \
 -			mysql_fix_extensions \
 -			mysql_setpermission \
 -			mysql_secure_installation \
@@ -22,10 +21,10 @@
 +bin_SCRIPTS =
  
  noinst_SCRIPTS = make_binary_distribution \
- 			make_sharedlib_distribution
-@@ -445,11 +431,7 @@
+ 			make_sharedlib_distribution \
+@@ -439,11 +426,7 @@
  			mysql_system_tables_fix.sql \
- 			CMakeLists.txt
+ 			CMakeLists.txt 
  
 -dist_pkgdata_DATA = fill_help_tables.sql \
 -			mysql_fix_privilege_tables.sql \