Date: Sat, 13 Jul 2013 15:19:32 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322935 - in head/databases: percona55-client/files percona55-server percona55-server/files Message-ID: <201307131519.r6DFJWRe068763@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Sat Jul 13 15:19:32 2013 New Revision: 322935 URL: http://svnweb.freebsd.org/changeset/ports/322935 Log: Update to 5.5.32.31.0 Modified: head/databases/percona55-client/files/patch-CMakeLists.txt head/databases/percona55-server/Makefile head/databases/percona55-server/distinfo head/databases/percona55-server/files/patch-CMakeLists.txt Modified: head/databases/percona55-client/files/patch-CMakeLists.txt ============================================================================== --- head/databases/percona55-client/files/patch-CMakeLists.txt Sat Jul 13 14:28:58 2013 (r322934) +++ head/databases/percona55-client/files/patch-CMakeLists.txt Sat Jul 13 15:19:32 2013 (r322935) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2013-01-22 18:02:26.000000000 +0100 -+++ CMakeLists.txt 2013-01-24 22:23:00.448414543 +0100 -@@ -315,31 +315,11 @@ +--- 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() ADD_SUBDIRECTORY(extra) @@ -37,7 +37,18 @@ INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/tags.cmake) -@@ -383,11 +363,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} -@@ -413,3 +393,4 @@ +@@ -404,3 +386,4 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() Modified: head/databases/percona55-server/Makefile ============================================================================== --- head/databases/percona55-server/Makefile Sat Jul 13 14:28:58 2013 (r322934) +++ head/databases/percona55-server/Makefile Sat Jul 13 15:19:32 2013 (r322935) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= percona -PORTVERSION= 5.5.31.30.3 -DISTNAME= Percona-Server-5.5.31-rel30.3 +PORTVERSION= 5.5.32.31.0 +DISTNAME= Percona-Server-5.5.32-rel31.0 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/${DISTNAME:S/rel//}/source/ @@ -40,7 +40,8 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_LIBEDIT=0 \ -DWITH_LIBWRAP=1 \ - -DHAVE_PAM=0 + -DHAVE_PAM=0 \ + -DWITH_UNIT_TESTS=0 .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. Modified: head/databases/percona55-server/distinfo ============================================================================== --- head/databases/percona55-server/distinfo Sat Jul 13 14:28:58 2013 (r322934) +++ head/databases/percona55-server/distinfo Sat Jul 13 15:19:32 2013 (r322935) @@ -1,2 +1,2 @@ -SHA256 (Percona-Server-5.5.31-rel30.3.tar.gz) = 808fea7fa2a10e61a3767819f4f9275afc8e5a66a7567b7b6d9e3bde2b79fce3 -SIZE (Percona-Server-5.5.31-rel30.3.tar.gz) = 22589930 +SHA256 (Percona-Server-5.5.32-rel31.0.tar.gz) = e34676cea5ceb398258408e31e8527724845f83bbbf1f22308f5069304118e8f +SIZE (Percona-Server-5.5.32-rel31.0.tar.gz) = 22526210 Modified: head/databases/percona55-server/files/patch-CMakeLists.txt ============================================================================== --- head/databases/percona55-server/files/patch-CMakeLists.txt Sat Jul 13 14:28:58 2013 (r322934) +++ head/databases/percona55-server/files/patch-CMakeLists.txt Sat Jul 13 15:19:32 2013 (r322935) @@ -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?201307131519.r6DFJWRe068763>