Date: Wed, 12 Jun 2013 07:56:24 +0000 (UTC) From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320671 - in head/databases: mysql55-client/files mysql55-server mysql55-server/files Message-ID: <201306120756.r5C7uOIa099589@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Wed Jun 12 07:56:24 2013 New Revision: 320671 URL: http://svnweb.freebsd.org/changeset/ports/320671 Log: Update to 5.5.32 release. Modified: head/databases/mysql55-client/files/patch-CMakeLists.txt head/databases/mysql55-server/Makefile head/databases/mysql55-server/distinfo head/databases/mysql55-server/files/patch-CMakeLists.txt Modified: head/databases/mysql55-client/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mysql55-client/files/patch-CMakeLists.txt Wed Jun 12 07:53:32 2013 (r320670) +++ head/databases/mysql55-client/files/patch-CMakeLists.txt Wed Jun 12 07:56:24 2013 (r320671) @@ -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() Modified: head/databases/mysql55-server/Makefile ============================================================================== --- head/databases/mysql55-server/Makefile Wed Jun 12 07:53:32 2013 (r320670) +++ head/databases/mysql55-server/Makefile Wed Jun 12 07:56:24 2013 (r320671) @@ -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 -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ + -DWITH_UNIT_TESTS=0 \ -DWITH_LIBEDIT=0 \ -DWITH_LIBWRAP=1 Modified: head/databases/mysql55-server/distinfo ============================================================================== --- head/databases/mysql55-server/distinfo Wed Jun 12 07:53:32 2013 (r320670) +++ head/databases/mysql55-server/distinfo Wed Jun 12 07:56:24 2013 (r320671) @@ -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 Modified: head/databases/mysql55-server/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mysql55-server/files/patch-CMakeLists.txt Wed Jun 12 07:53:32 2013 (r320670) +++ head/databases/mysql55-server/files/patch-CMakeLists.txt Wed Jun 12 07:56:24 2013 (r320671) @@ -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()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306120756.r5C7uOIa099589>