Attachment 138899 Details for Bug 185012 – maria.txt

maria.txt

maria.txt (text/plain; x-unix-mode=0644), 5.18 KB, created by Mark Felder on 2014-02-12 02:28:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Felder

Created: 2014-02-12 02:28:17 UTC

Size: 5.18 KB

patch

obsolete

>Index: mariadb55-server/Makefile
>===================================================================
>--- mariadb55-server/Makefile	(revision 343403)
>+++ mariadb55-server/Makefile	(working copy)
>@@ -1,8 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME?=	mariadb
>-PORTVERSION=	5.5.33a
>-PORTREVISION?=	2
>+PORTVERSION=	5.5.35
>+PORTREVISION?=	0
> CATEGORIES=	databases ipv6
> MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
> 		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
>Index: mariadb55-server/distinfo
>===================================================================
>--- mariadb55-server/distinfo	(revision 343403)
>+++ mariadb55-server/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (mariadb-5.5.33a.tar.gz) = adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b
>-SIZE (mariadb-5.5.33a.tar.gz) = 45226492
>+SHA256 (mariadb-5.5.35.tar.gz) = b47391e5da8ea1a09585411b2a892e2070d097bec6102b0f13640176a1746a4e
>+SIZE (mariadb-5.5.35.tar.gz) = 45723697
>Index: mariadb55-server/files/patch-cmake_os_FreeBSD.cmake
>===================================================================
>--- mariadb55-server/files/patch-cmake_os_FreeBSD.cmake	(revision 343403)
>+++ mariadb55-server/files/patch-cmake_os_FreeBSD.cmake	(working copy)
>@@ -1,16 +0,0 @@
>---- cmake/os/FreeBSD.cmake.orig	2013-09-27 00:09:44.000000000 +0300
>-+++ cmake/os/FreeBSD.cmake	2013-09-27 00:09:57.000000000 +0300
>-@@ -24,9 +24,10 @@
>- # ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
>- 
>- # Find libexecinfo (library that contains backtrace_symbols etc)
>--INCLUDE_DIRECTORIES(/usr/local/include)
>--SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )
>--SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")
>-+SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and header")
>-+INCLUDE_DIRECTORIES(${EXECINFO_ROOT}/include)
>-+SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${EXECINFO_ROOT}/include)
>-+SET(ENV{LIB} "$ENV{LIB}:${EXECINFO_ROOT}/lib")
>- FIND_LIBRARY(EXECINFO NAMES execinfo)
>- IF(EXECINFO)
>-  SET(LIBEXECINFO ${EXECINFO})
>Index: mariadb55-server/files/patch-libmysql_CMakeLists.txt
>===================================================================
>--- mariadb55-server/files/patch-libmysql_CMakeLists.txt	(revision 343403)
>+++ mariadb55-server/files/patch-libmysql_CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- libmysql/CMakeLists.txt.orig	2013-03-15 22:24:20.000000000 +0200
>-+++ libmysql/CMakeLists.txt	2013-03-15 22:24:34.000000000 +0200
>-@@ -329,13 +329,14 @@
>+--- libmysql/CMakeLists.txt.orig	2014-02-11 20:20:18.571491184 -0600
>++++ libmysql/CMakeLists.txt	2014-02-11 20:23:27.474449535 -0600
>+@@ -329,7 +329,7 @@
>  
>  # Merge several convenience libraries into one big mysqlclient
>  # and link them together into shared library.
>@@ -8,8 +8,9 @@
> +MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
>  
>  # Visual Studio users need debug  static library for debug projects
>- IF(MSVC)
>-  INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
>+ INSTALL_DEBUG_SYMBOLS(clientlib)
>+@@ -338,6 +338,7 @@
>+  INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
>  ENDIF()
>  
> +IF(FALSE)
>@@ -16,7 +17,7 @@
>  IF(UNIX)
>    MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
>      SET(DOT_VERSION ".${VERSION}")
>-@@ -350,9 +351,11 @@
>+@@ -352,9 +353,11 @@
>    ENDMACRO()
>    INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
>  ENDIF()
>@@ -29,7 +30,7 @@
>    IF(UNIX)
>      # libtool compatability
>      IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
>-@@ -399,3 +402,4 @@
>+@@ -401,3 +404,4 @@
>      ENDFOREACH()
>    ENDIF()
>  ENDIF()
>Index: mariadb55-client/Makefile
>===================================================================
>--- mariadb55-client/Makefile	(revision 343403)
>+++ mariadb55-client/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mariadb
>-PORTREVISION=	1
>+PORTREVISION=	0
> PKGNAMESUFFIX=	55-client
> 
> COMMENT=	Multithreaded SQL database (client)
>Index: mariadb55-client/files/patch-cmake_os_FreeBSD.cmake
>===================================================================
>--- mariadb55-client/files/patch-cmake_os_FreeBSD.cmake	(revision 343403)
>+++ mariadb55-client/files/patch-cmake_os_FreeBSD.cmake	(working copy)
>@@ -1,16 +0,0 @@
>---- cmake/os/FreeBSD.cmake.orig	2013-09-27 00:09:44.000000000 +0300
>-+++ cmake/os/FreeBSD.cmake	2013-09-27 00:09:57.000000000 +0300
>-@@ -24,9 +24,10 @@
>- # ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
>- 
>- # Find libexecinfo (library that contains backtrace_symbols etc)
>--INCLUDE_DIRECTORIES(/usr/local/include)
>--SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )
>--SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")
>-+SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and header")
>-+INCLUDE_DIRECTORIES(${EXECINFO_ROOT}/include)
>-+SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${EXECINFO_ROOT}/include)
>-+SET(ENV{LIB} "$ENV{LIB}:${EXECINFO_ROOT}/lib")
>- FIND_LIBRARY(EXECINFO NAMES execinfo)
>- IF(EXECINFO)
>-  SET(LIBEXECINFO ${EXECINFO})

Actions: View

Attachments on bug 185012: 138898 | 138899 | 138900