diff options
| -rw-r--r-- | databases/mariadb100-client/files/patch-extra_CMakeLists.txt | 18 | ||||
| -rw-r--r-- | databases/mariadb100-server/Makefile | 12 | ||||
| -rw-r--r-- | databases/mariadb100-server/distinfo | 4 |
3 files changed, 22 insertions, 12 deletions
diff --git a/databases/mariadb100-client/files/patch-extra_CMakeLists.txt b/databases/mariadb100-client/files/patch-extra_CMakeLists.txt index f08649d6ed04..3f34a7d1dba1 100644 --- a/databases/mariadb100-client/files/patch-extra_CMakeLists.txt +++ b/databases/mariadb100-client/files/patch-extra_CMakeLists.txt @@ -1,5 +1,5 @@ ---- extra/CMakeLists.txt.orig 2012-12-17 03:38:29.000000000 +0200 -+++ extra/CMakeLists.txt 2012-12-17 03:40:12.000000000 +0200 +--- extra/CMakeLists.txt.orig 2015-01-25 16:21:40.000000000 +0100 ++++ extra/CMakeLists.txt 2015-01-29 20:20:56.846047266 +0100 @@ -54,6 +54,7 @@ DEPENDS ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) @@ -8,18 +8,26 @@ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) TARGET_LINK_LIBRARIES(my_print_defaults mysys) -@@ -74,11 +75,14 @@ +@@ -74,9 +75,12 @@ MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) TARGET_LINK_LIBRARIES(replace mysys) +ENDIF() IF(UNIX) +IF(FALSE) - MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) TARGET_LINK_LIBRARIES(mysql_waitpid mysys) +@@ -97,7 +101,9 @@ + ../storage/innobase/page/page0zip.cc + ) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) + TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) + ADD_DEPENDENCIES(innochecksum GenError) ++ENDIF() + diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile index dd72cc629565..5490eebedb46 100644 --- a/databases/mariadb100-server/Makefile +++ b/databases/mariadb100-server/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.0.15 +PORTVERSION= 10.0.16 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -16,11 +16,13 @@ PKGNAMESUFFIX?= 100-server MAINTAINER= spil.oss@gmail.com COMMENT?= Multithreaded SQL database (server) +LICENSE= GPLv2 + SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb100-client -USES= bison:build cmake execinfo gmake shebangfix +USES= bison:build cmake execinfo gmake shebangfix cpe SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source @@ -77,7 +79,7 @@ OQGRAPH_DESC= Open Query Graph Computation engine (gcc) .endif BUNDLED_SSL_CMAKE_ON= -DWITH_SSL=bundled -FASTMX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 +FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 OPENSSL_CMAKE_ON= -DWITH_SSL=yes OPENSSL_USE= OPENSSL=yes WITHOUT_SSL_CMAKE_ON= -DWITH_SSL=no @@ -104,9 +106,9 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ INNODB_CMAKE_OFF= -DWITHOUT_INNOBASE=1 MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my_compare.h MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1 -MROONGA_USE= GCC=yes +MROONGA_USE= GCC?=yes OQGRAPH_CMAKE_OFF= -DWITHOUT_OQGRAPH=1 -OQGRAPH_USE= GCC=yes +OQGRAPH_USE= GCC?=yes OQGRAPH_LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs post-install: diff --git a/databases/mariadb100-server/distinfo b/databases/mariadb100-server/distinfo index 3b7a74627e02..0013cb91d61a 100644 --- a/databases/mariadb100-server/distinfo +++ b/databases/mariadb100-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (mariadb-10.0.15.tar.gz) = 9154cb68504d469b1bac636b85e30b2b2da2586092476d6ad2f9d6bc462909d8 -SIZE (mariadb-10.0.15.tar.gz) = 55531927 +SHA256 (mariadb-10.0.16.tar.gz) = 44134a5f3e174e3e8443c1d07916af57f3ffadd4c8846338d41850fedfefcde4 +SIZE (mariadb-10.0.16.tar.gz) = 55656968 |