Index: head/databases/mariadb100-client/files/patch-extra_CMakeLists.txt =================================================================== --- head/databases/mariadb100-client/files/patch-extra_CMakeLists.txt (revision 378180) +++ head/databases/mariadb100-client/files/patch-extra_CMakeLists.txt (revision 378181) @@ -1,25 +1,33 @@ ---- 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) +IF(FALSE) 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() + Index: head/databases/mariadb100-server/Makefile =================================================================== --- head/databases/mariadb100-server/Makefile (revision 378180) +++ head/databases/mariadb100-server/Makefile (revision 378181) @@ -1,145 +1,147 @@ # $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}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ http://gd.tuwien.ac.at/db/${SITESDIR}/ \ http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ http://mirror.layerjet.com/${SITESDIR}/ \ http://mirror.switch.ch/mirror/${SITESDIR}/ 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 BROKEN_armv6= Does not compile on arm OPTIONS_DEFINE= FASTMTX OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL= BUNDLED_SSL OPENSSL WITHOUT_SSL OPTIONS_DEFAULT+= OPENSSL NO_OPTIONS_SORT= yes BUNDLED_SSL_DESC= SSL/TLS support via (bundled) CyaSSL FASTMTX_DESC= Replace mutexes with spinlocks WITHOUT_SSL_DESC= No SSL/TLS support CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR= \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR= \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_UNIT_TESTS=0 \ -DWITH_LIBEDIT=0 \ -DWITH_LIBWRAP=1 \ -DEXECINFO_ROOT=${LOCALBASE} \ -DCOMPILATION_COMMENT="FreeBSD Ports" .ifdef USE_MYSQL .error You have USE_MYSQL variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif DATADIR= ${PREFIX}/share/mysql .if !defined(CLIENT_ONLY) # MySQL-Server options USE_MYSQL= yes OPTIONS_DEFINE+= INNODB MAXKEY MROONGA OQGRAPH OPTIONS_DEFAULT+= MAXKEY OPTIONS_SUB= yes INNODB_DESC= Build InnoDB engine next to XtraDB MAXKEY_DESC= Change max key length from 1000 to 4000 MROONGA_DESC= Mroonga Full Text Search engine (gcc) 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 .if defined(CLIENT_ONLY) # MySQL-Client part USES+= readline .else # MySQL-Server part CONFLICTS_INSTALL= mysql*-server-* \ mariadb[0-9][0-9]-server-* \ percona*-server-* USE_MYSQL= yes WANT_MYSQL_VER= 100m USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 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: # Remove programs to avoid conflict with mariadb100-client # These are "client" components, so there should be a switch that # prevents them from being installed but it's unknown right now ${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \ ${STAGEDIR}${PREFIX}/bin/mysql_config \ ${STAGEDIR}${PREFIX}/bin/mysql_find_rows \ ${STAGEDIR}${PREFIX}/bin/mysqlaccess .endif .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012 CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else CMAKE_ARGS+= -DWITH_JEMALLOC="no" .endif # Server segfaults on i386 when built with clang >= 3.4 .if ${ARCH} == 'i386' && ${OSVERSION} >= 1001000 USE_GCC= yes .endif post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake ${MV} ${WRKSRC}/storage/tokudb ${WRKSRC}/skip-tokudb .endif .include Index: head/databases/mariadb100-server/distinfo =================================================================== --- head/databases/mariadb100-server/distinfo (revision 378180) +++ head/databases/mariadb100-server/distinfo (revision 378181) @@ -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