diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2013-03-16 00:35:47 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2013-03-16 00:35:47 +0000 |
| commit | 8e6b0b4fddf45f9198f69dc8ef8f0a160f295f35 (patch) | |
| tree | da0768880454908dd64a5b9de57ef3275cecea9b /databases | |
| parent | - Use VPOPMAIL_DIR as install target since that is (diff) | |
Update to 5.5.30
PR: ports/177009
Submitted by: Alexandr Kovalenko <never@nevermind.kiev.ua> (maintainer)
Notes
Notes:
svn path=/head/; revision=314329
Diffstat (limited to 'databases')
4 files changed, 11 insertions, 21 deletions
diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile index 8bb74f1c5de2..a2d9061a8e95 100644 --- a/databases/mariadb55-server/Makefile +++ b/databases/mariadb55-server/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 5.5.29 -PORTREVISION?= 1 +PORTVERSION= 5.5.30 +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/ \ diff --git a/databases/mariadb55-server/distinfo b/databases/mariadb55-server/distinfo index a6254c8b9b60..4e1086cbc821 100644 --- a/databases/mariadb55-server/distinfo +++ b/databases/mariadb55-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (mariadb-5.5.29.tar.gz) = b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74 -SIZE (mariadb-5.5.29.tar.gz) = 27935253 +SHA256 (mariadb-5.5.30.tar.gz) = 64dba5f1819f1d4ebf7ed31d74e4106c981a24b88259995deba3734fb7c4635f +SIZE (mariadb-5.5.30.tar.gz) = 27875216 diff --git a/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt b/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt index 7f11bedc9e43..18eef8acc03d 100644 --- a/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt @@ -1,6 +1,6 @@ ---- libmysql/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100 -+++ libmysql/CMakeLists.txt 2010-12-23 22:01:37.000000000 +0100 -@@ -153,13 +153,14 @@ +--- 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 @@ # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. @@ -16,20 +16,20 @@ IF(UNIX) MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) SET(DOT_VERSION ".${VERSION}") -@@ -174,9 +175,11 @@ +@@ -350,9 +351,11 @@ ENDMACRO() INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) ENDIF() +ENDIF() IF(NOT DISABLE_SHARED) -- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries) -+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries NOINSTALL) +- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries) ++ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries NOINSTALL) +IF(FALSE) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -223,3 +226,4 @@ +@@ -399,3 +402,4 @@ ENDFOREACH() ENDIF() ENDIF() diff --git a/databases/mariadb55-server/files/patch-storage_oqgraph_CMakeLists.txt b/databases/mariadb55-server/files/patch-storage_oqgraph_CMakeLists.txt deleted file mode 100644 index 32912a676f3f..000000000000 --- a/databases/mariadb55-server/files/patch-storage_oqgraph_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- storage/oqgraph/CMakeLists.txt.orig 2013-01-29 16:12:49.000000000 +0200 -+++ storage/oqgraph/CMakeLists.txt 2013-02-24 20:21:58.000000000 +0200 -@@ -3,6 +3,7 @@ - RETURN() - ENDIF() - INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS}) -+SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${Boost_INCLUDE_DIRS}) - - IF(MSVC) - # lp:756966 OQGRAPH on Win64 does not compile |