Update to 5.5.32 release.

4 files changed, 36 insertions, 13 deletions

diff --git a/databases/mysql55-client/files/patch-CMakeLists.txt b/databases/mysql55-client/files/patch-CMakeLists.txt
index 3ecaa063edb0..2fab8152273e 100644
--- a/databases/mysql55-client/files/patch-CMakeLists.txt
+++ b/databases/mysql55-client/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig	2012-12-10 07:16:24.000000000 +0100
-+++ CMakeLists.txt	2012-12-21 22:33:41.000000000 +0100
+--- CMakeLists.txt.orig	2013-05-16 17:47:15.000000000 +0200
++++ CMakeLists.txt	2013-06-12 09:22:45.000000000 +0200
 @@ -305,31 +305,11 @@
  ENDIF()
  
@@ -37,7 +37,18 @@
  
  INCLUDE(cmake/abi_check.cmake)
  INCLUDE(cmake/tags.cmake)
-@@ -373,11 +353,11 @@
+@@ -365,8 +345,10 @@
+ ELSE()
+   SET(CPACK_GENERATOR "TGZ")
+ ENDIF() 
++IF(FALSE)
+ ADD_SUBDIRECTORY(packaging/WiX)
+ ADD_SUBDIRECTORY(packaging/solaris)
++ENDIF() 
+ 
+ # Create a single package with "make package"
+ # (see http://public.kitware.com/Bug/view.php?id=11452)
+@@ -374,11 +356,11 @@
  
  INCLUDE(CPack)
  IF(UNIX)
@@ -50,7 +61,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -403,3 +383,4 @@
+@@ -404,3 +386,4 @@
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 82dfe9338ddf..24691f77ebdb 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mysql
-PORTVERSION=	5.5.31
+PORTVERSION=	5.5.32
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -37,6 +37,7 @@ CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_SHAREDIR="share" \
 		-DINSTALL_SQLBENCHDIR="share/mysql" \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
+		-DWITH_UNIT_TESTS=0 \
 		-DWITH_LIBEDIT=0 \
 		-DWITH_LIBWRAP=1
 
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index c80cd8e8bed7..a8b0bd2abbd4 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.5.31.tar.gz) = 9cdd650b47e3ea864ab40d4ab23fa4a9fdfabc7fd018bf5c9cce30722c0abcea
-SIZE (mysql-5.5.31.tar.gz) = 24608323
+SHA256 (mysql-5.5.32.tar.gz) = 20930c3d934937f3863073af0a54cb014a4c6469e5460a81e2ff75062755377e
+SIZE (mysql-5.5.32.tar.gz) = 24625029
diff --git a/databases/mysql55-server/files/patch-CMakeLists.txt b/databases/mysql55-server/files/patch-CMakeLists.txt
index c0a8713402cb..59e1a4126599 100644
--- a/databases/mysql55-server/files/patch-CMakeLists.txt
+++ b/databases/mysql55-server/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2010-12-03 18:58:24.000000000 +0100
-+++ CMakeLists.txt	2010-12-23 18:02:02.000000000 +0100
-@@ -293,7 +293,6 @@
+--- CMakeLists.txt.orig	2013-05-16 17:47:15.000000000 +0200
++++ CMakeLists.txt	2013-06-12 09:41:06.000000000 +0200
+@@ -306,7 +306,6 @@
  
  ADD_SUBDIRECTORY(extra)
  IF(NOT WITHOUT_SERVER)
@@ -8,7 +8,7 @@
    ADD_SUBDIRECTORY(client)
    ADD_SUBDIRECTORY(sql)
    ADD_SUBDIRECTORY(sql/share)
-@@ -301,14 +300,10 @@
+@@ -314,14 +313,10 @@
    OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
    IF(WITH_EMBEDDED_SERVER) 
     ADD_SUBDIRECTORY(libmysqld)
@@ -23,7 +23,18 @@
    IF(UNIX)
      ADD_SUBDIRECTORY(man)
    ENDIF()
-@@ -343,6 +338,7 @@
+@@ -365,8 +360,10 @@
+ ELSE()
+   SET(CPACK_GENERATOR "TGZ")
+ ENDIF() 
++IF(FALSE)
+ ADD_SUBDIRECTORY(packaging/WiX)
+ ADD_SUBDIRECTORY(packaging/solaris)
++ENDIF() 
+ 
+ # Create a single package with "make package"
+ # (see http://public.kitware.com/Bug/view.php?id=11452)
+@@ -379,6 +376,7 @@
  #
  # RPM installs documentation directly from the source tree
  #
@@ -31,7 +42,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -367,3 +363,4 @@
+@@ -404,3 +402,4 @@
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()