diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2010-07-16 10:24:46 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2010-07-16 10:24:46 +0000 |
| commit | 1f706238c57375a6f41cc362cc967ac2baafc2c8 (patch) | |
| tree | 7c7123f7bf0f8415ad2a8efb21b8de70b2db71ce /databases/mysql55-server/files/patch-configure | |
| parent | - Update to 2.2.4 (diff) | |
Update to 5.5.5-m3 release:
- fix include layout [1]
- drop obsolete WITH_NDB knob
PR: ports/146276 [1]
Submitted by: pgollucci
Notes
Notes:
svn path=/head/; revision=257849
Diffstat (limited to '')
| -rw-r--r-- | databases/mysql55-server/files/patch-configure | 6 | ||||
| -rw-r--r-- | databases/mysql55-server/files/patch-configure.am | 24 |
2 files changed, 24 insertions, 6 deletions
diff --git a/databases/mysql55-server/files/patch-configure b/databases/mysql55-server/files/patch-configure index ea51ece41d79..a733462f4c36 100644 --- a/databases/mysql55-server/files/patch-configure +++ b/databases/mysql55-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/mysql55-server/files/patch-configure.am b/databases/mysql55-server/files/patch-configure.am index ba1bd22648e6..39eae0a9c0b2 100644 --- a/databases/mysql55-server/files/patch-configure.am +++ b/databases/mysql55-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 # |