Update to 5.5.41 release.

6 files changed, 31 insertions, 23 deletions

diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index eb8ed1c7012b..697de17baeca 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -20,7 +20,7 @@ CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 
-MAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
+MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
 		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
 		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
 
diff --git a/databases/mysql55-client/files/patch-CMakeLists.txt b/databases/mysql55-client/files/patch-CMakeLists.txt
index 3ac984d778f6..20747541d5a7 100644
--- a/databases/mysql55-client/files/patch-CMakeLists.txt
+++ b/databases/mysql55-client/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- 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 @@
+--- CMakeLists.txt.orig	2014-11-04 07:49:52.000000000 +0000
++++ CMakeLists.txt	2014-12-03 09:20:45.966491617 +0000
+@@ -387,32 +387,11 @@
  ENDIF()
  
  ADD_SUBDIRECTORY(extra)
@@ -28,6 +28,7 @@
 -    ADD_SUBDIRECTORY(internal)
 -  ENDIF()
 -  ADD_SUBDIRECTORY(packaging/rpm-oel)
+-  ADD_SUBDIRECTORY(packaging/rpm-sles)
 -ENDIF()
 +ADD_SUBDIRECTORY(client)
 +ADD_SUBDIRECTORY(libservices)
@@ -37,7 +38,7 @@
  
  INCLUDE(cmake/abi_check.cmake)
  INCLUDE(cmake/tags.cmake)
-@@ -365,8 +345,10 @@
+@@ -448,19 +427,21 @@
  ELSE()
    SET(CPACK_GENERATOR "TGZ")
  ENDIF() 
@@ -48,9 +49,8 @@
  
  # Create a single package with "make package"
  # (see http://public.kitware.com/Bug/view.php?id=11452)
-@@ -374,11 +356,11 @@
+ SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
  
- INCLUDE(CPack)
  IF(UNIX)
 -  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
  ENDIF()
@@ -61,8 +61,11 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -404,3 +386,4 @@
+@@ -486,6 +467,7 @@
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()
 +ENDIF()
+ 
+ INCLUDE(CPack)
+ 
diff --git a/databases/mysql55-client/files/patch-client_CMakeLists.txt b/databases/mysql55-client/files/patch-client_CMakeLists.txt
index 23a951a0e7ad..74f289fce78c 100644
--- a/databases/mysql55-client/files/patch-client_CMakeLists.txt
+++ b/databases/mysql55-client/files/patch-client_CMakeLists.txt
@@ -1,18 +1,22 @@
---- client/CMakeLists.txt.orig	2011-09-09 17:56:40.000000000 +0200
-+++ client/CMakeLists.txt	2011-10-07 11:08:18.000000000 +0200
-@@ -33,9 +33,11 @@
+--- client/CMakeLists.txt.orig	2014-11-04 07:49:50.000000000 +0000
++++ client/CMakeLists.txt	2014-12-03 09:22:09.860599069 +0000
+@@ -33,6 +33,7 @@
    TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
  ENDIF(UNIX)
  
 +IF(FALSE)
  MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
  SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+ # mysqltest has unused result errors, so we skip Werror
+@@ -42,6 +43,7 @@
+   ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error")
+ ENDIF()
  TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
 +ENDIF()
  
  
  MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
-@@ -47,15 +49,19 @@
+@@ -53,15 +55,19 @@
  MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
  TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
  
@@ -32,7 +36,7 @@
  
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
-@@ -72,7 +78,7 @@
+@@ -78,7 +84,7 @@
    MYSQL_ADD_EXECUTABLE(echo echo.c)
  ENDIF(WIN32)
  
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 7c373816b91f..6f91b9ac7fd0 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mysql
-PORTVERSION=	5.5.40
+PORTVERSION=	5.5.41
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -72,7 +72,7 @@ USE_RC_SUBR=	mysql-server
 USERS=		mysql
 GROUPS=		mysql
 
-MAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
+MMAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
 		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
 		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
 		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
@@ -83,6 +83,6 @@ CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
+	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index 526310297780..0613d577c10a 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.5.40.tar.gz) = 4d3721761a31c28866e8ee0fde47558a3e9047aaef3b89135ae8d45eebb74960
-SIZE (mysql-5.5.40.tar.gz) = 21727672
+SHA256 (mysql-5.5.41.tar.gz) = ec642fc5be5ea03b24a0c5189204675fb3794dee772314ace650623c1c994844
+SIZE (mysql-5.5.41.tar.gz) = 21768300
diff --git a/databases/mysql55-server/files/patch-client_CMakeLists.txt b/databases/mysql55-server/files/patch-client_CMakeLists.txt
index 2c5864188b98..fc496933828e 100644
--- a/databases/mysql55-server/files/patch-client_CMakeLists.txt
+++ b/databases/mysql55-server/files/patch-client_CMakeLists.txt
@@ -1,6 +1,6 @@
---- client/CMakeLists.txt.orig	2011-09-09 17:56:40.000000000 +0200
-+++ client/CMakeLists.txt	2011-10-07 11:06:21.000000000 +0200
-@@ -27,17 +27,20 @@
+--- client/CMakeLists.txt.orig	2014-11-04 07:49:50.000000000 +0000
++++ client/CMakeLists.txt	2014-12-03 09:23:56.610710083 +0000
+@@ -27,11 +27,13 @@
  
  ADD_DEFINITIONS(${READLINE_DEFINES})
  ADD_DEFINITIONS(${SSL_DEFINES})
@@ -14,6 +14,7 @@
  
  MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
  SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+@@ -44,6 +46,7 @@
  TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
  
  
@@ -21,7 +22,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
  TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
  
-@@ -46,17 +49,21 @@
+@@ -52,17 +55,21 @@
  
  MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
  TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
@@ -43,7 +44,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
  
-@@ -66,13 +73,14 @@
+@@ -72,13 +79,14 @@
  MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
  SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
  TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)