cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 5.5.41-37.0

Browse Source 
MFH:		2015Q1
This commit is contained in:
Florian Smeets 2015-01-21 23:38:27 +00:00
parent c24084775b
commit c14bb80a68
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=377635
5 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
databases/percona55-client/files/patch-CMakeLists.txt
View File

@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2014-10-06 18:02:58.000000000 +0200
+++ CMakeLists.txt 2014-10-17 20:59:57.890024727 +0200
@@ -419,31 +419,12 @@
--- CMakeLists.txt.orig 2015-01-07 10:49:52.000000000 +0100
+++ CMakeLists.txt 2015-01-21 20:01:50.952601051 +0100
@@ -400,32 +400,11 @@
ENDIF()
ADD_SUBDIRECTORY(extra)
@ -28,8 +28,8 @@
- ADD_SUBDIRECTORY(internal)
- ENDIF()
- ADD_SUBDIRECTORY(packaging/rpm-oel)
- ADD_SUBDIRECTORY(packaging/rpm-sles)
-ENDIF()
+
+ADD_SUBDIRECTORY(client)
+ADD_SUBDIRECTORY(libservices)
+ADD_SUBDIRECTORY(support-files)
@ -38,7 +38,7 @@
INCLUDE(cmake/abi_check.cmake)
INCLUDE(cmake/tags.cmake)
@@ -479,19 +460,21 @@
@@ -461,19 +440,21 @@
ELSE()
SET(CPACK_GENERATOR "TGZ")
ENDIF()
@ -61,10 +61,11 @@
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
INSTALL(FILES COPYING LICENSE.mysql
DESTINATION ${INSTALL_DOCREADMEDIR}
@@ -518,5 +501,6 @@
@@ -499,6 +480,7 @@
PATTERN "sp-imp-spec.txt" EXCLUDE
)
ENDIF()
+ENDIF()
INCLUDE(CPack)

17
databases/percona55-client/files/patch-client_CMakeLists.txt
View File

@ -1,18 +1,23 @@
--- client/CMakeLists.txt.orig 2014-03-15 18:08:16.000000000 +0100
+++ client/CMakeLists.txt 2014-03-22 19:33:32.505508311 +0100
@@ -33,9 +33,11 @@
--- client/CMakeLists.txt.orig 2015-01-07 10:49:52.000000000 +0100
+++ client/CMakeLists.txt 2015-01-21 20:03:30.747577544 +0100
@@ -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,7 +43,7 @@
ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error")
ENDIF()
TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
-
+ENDIF()
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
@@ -47,15 +49,19 @@
TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient)
@@ -53,15 +54,19 @@
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
@ -32,7 +37,7 @@
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc
../sql/rpl_filter.cc ../sql/sql_list.cc)
@@ -73,7 +79,7 @@
@@ -79,7 +84,7 @@
MYSQL_ADD_EXECUTABLE(echo echo.c)
ENDIF(WIN32)

2
databases/percona55-server/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME?= percona
DISTVERSION= 5.5.40-36.1
DISTVERSION= 5.5.41-37.0
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${DISTVERSION}/source/tarball/

4
databases/percona55-server/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (percona-server-5.5.40-36.1.tar.gz) = 33b2a66c2a221ec4e02b38f065f5a8fbbe5fdcaaf00e0ae5f267d4e2b746ffb4
SIZE (percona-server-5.5.40-36.1.tar.gz) = 22710586
SHA256 (percona-server-5.5.41-37.0.tar.gz) = 4de65ccbdd6c266f18339c2ea5427a15d90a8ce1ce1c7574aa2e72f685a10833
SIZE (percona-server-5.5.41-37.0.tar.gz) = 22670445

11
databases/percona55-server/files/patch-client_CMakeLists.txt
View File

@ -1,6 +1,6 @@
--- client/CMakeLists.txt.orig 2014-03-15 18:08:16.000000000 +0100
+++ client/CMakeLists.txt 2014-03-22 21:03:06.194178397 +0100
@@ -27,17 +27,20 @@
--- client/CMakeLists.txt.orig 2015-01-07 10:49:52.000000000 +0100
+++ client/CMakeLists.txt 2015-01-21 20:06:10.493605146 +0100
@@ -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 perconaserverclient regex)
@ -21,7 +22,7 @@
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient)
@@ -46,17 +49,21 @@
@@ -52,17 +55,21 @@
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
@ -43,7 +44,7 @@
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc
../sql/rpl_filter.cc ../sql/sql_list.cc)
TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient)
@@ -67,13 +74,14 @@
@@ -73,13 +80,14 @@
MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqlslap perconaserverclient)