From 2f3fc35d237af2c16e245cb5bdba9c71436c3800 Mon Sep 17 00:00:00 2001
From: Alex Dupre <ale@FreeBSD.org>
Date: Fri, 21 Dec 2012 21:53:09 +0000
Subject: Update to 5.5.29 release.

---
 databases/mysql55-client/files/patch-CMakeLists.txt | 11 ++++++-----
 databases/mysql55-server/Makefile                   |  2 +-
 databases/mysql55-server/distinfo                   |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/databases/mysql55-client/files/patch-CMakeLists.txt b/databases/mysql55-client/files/patch-CMakeLists.txt
index fb72365c367f..3ecaa063edb0 100644
--- a/databases/mysql55-client/files/patch-CMakeLists.txt
+++ b/databases/mysql55-client/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2012-08-29 10:50:46.000000000 +0200
-+++ CMakeLists.txt	2012-10-12 15:29:18.000000000 +0200
-@@ -304,30 +304,11 @@
+--- CMakeLists.txt.orig	2012-12-10 07:16:24.000000000 +0100
++++ CMakeLists.txt	2012-12-21 22:33:41.000000000 +0100
+@@ -305,31 +305,11 @@
  ENDIF()
  
  ADD_SUBDIRECTORY(extra)
@@ -27,6 +27,7 @@
 -  IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
 -    ADD_SUBDIRECTORY(internal)
 -  ENDIF()
+-  ADD_SUBDIRECTORY(packaging/rpm-uln)
 -ENDIF()
 +ADD_SUBDIRECTORY(client)
 +ADD_SUBDIRECTORY(libservices)
@@ -36,7 +37,7 @@
  
  INCLUDE(cmake/abi_check.cmake)
  INCLUDE(cmake/tags.cmake)
-@@ -371,11 +352,11 @@
+@@ -373,11 +353,11 @@
  
  INCLUDE(CPack)
  IF(UNIX)
@@ -49,7 +50,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -401,3 +382,4 @@
+@@ -403,3 +383,4 @@
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index ed624de48004..34131b70adfc 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mysql
-PORTVERSION=	5.5.28
+PORTVERSION=	5.5.29
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	${MASTER_SITE_MYSQL}
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index 5c60f47725da..3d44ad05f7b3 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.5.28.tar.gz) = f9b2491f1ddd99842a8e75c21958368bebe59c47e84bec778baa915e255cc78f
-SIZE (mysql-5.5.28.tar.gz) = 24739429
+SHA256 (mysql-5.5.29.tar.gz) = 22b50c089038913b3468c7055fc288f7b5d973199ca37c563cd3a3292e812ae5
+SIZE (mysql-5.5.29.tar.gz) = 24870769
-- 
cgit v1.2.3