svn commit: r372136 - in head: Mk databases databases/mariadb100-client databases/mariadb100-client/files databases/mariadb100-server databases/mariadb100-server/files
John Marino
marino at FreeBSD.org
Tue Nov 4 08:22:02 UTC 2014
Author: marino
Date: Tue Nov 4 08:21:55 2014
New Revision: 372136
URL: https://svnweb.freebsd.org/changeset/ports/372136
QAT: https://qat.redports.org/buildarchive/r372136/
Log:
Add new ports databases/mariadb100-server and -client (version 10.0)
PR: 193539
Submitted by: spil.oss (gmail)
MariaDB is a database server that offers drop-in replacement functionality
for MySQL. MariaDB is built by some of the original authors of MySQL, with
assistance from the broader community of Free and open source software
developers. In addition to the core functionality of MySQL, MariaDB offers
a rich set of feature enhancements including alternate storage engines,
server optimizations, and patches.
Added:
head/databases/mariadb100-client/
head/databases/mariadb100-client/Makefile (contents, props changed)
head/databases/mariadb100-client/files/
head/databases/mariadb100-client/files/patch-CMakeLists.txt (contents, props changed)
head/databases/mariadb100-client/files/patch-client_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-client/files/patch-cmake__jemalloc.cmake (contents, props changed)
head/databases/mariadb100-client/files/patch-extra_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-client/files/patch-extra_yassl_taocrypt_src_integer.cpp (contents, props changed)
head/databases/mariadb100-client/files/patch-include_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-client/files/patch-include_my_compare.h (contents, props changed)
head/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-client/files/patch-man_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-client/files/patch-mysys_my_default.c (contents, props changed)
head/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-client/files/patch-scripts_mysql_config.sh (contents, props changed)
head/databases/mariadb100-client/files/patch-sql_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-client/files/pkg-message.in (contents, props changed)
head/databases/mariadb100-client/pkg-plist (contents, props changed)
head/databases/mariadb100-server/
head/databases/mariadb100-server/Makefile (contents, props changed)
head/databases/mariadb100-server/distinfo (contents, props changed)
head/databases/mariadb100-server/files/
head/databases/mariadb100-server/files/extra-patch-include_my_compare.h (contents, props changed)
head/databases/mariadb100-server/files/mysql-server.in (contents, props changed)
head/databases/mariadb100-server/files/patch-CMakeLists.txt (contents, props changed)
head/databases/mariadb100-server/files/patch-client_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-server/files/patch-cmake__jemalloc.cmake (contents, props changed)
head/databases/mariadb100-server/files/patch-extra_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp (contents, props changed)
head/databases/mariadb100-server/files/patch-include_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-server/files/patch-man_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-server/files/patch-mysys_my_default.c (contents, props changed)
head/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-server/files/patch-scripts_mysql_config.sh (contents, props changed)
head/databases/mariadb100-server/files/patch-scripts_mysqld_safe.sh (contents, props changed)
head/databases/mariadb100-server/files/patch-sql_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-server/files/patch-sql_sql_trigger.cc (contents, props changed)
head/databases/mariadb100-server/files/patch-sql_sql_view.cc (contents, props changed)
head/databases/mariadb100-server/files/patch-sql_sys_vars.cc (contents, props changed)
head/databases/mariadb100-server/files/patch-storage_connect_array.cpp (contents, props changed)
head/databases/mariadb100-server/files/patch-storage_connect_filamap.cpp (contents, props changed)
head/databases/mariadb100-server/files/patch-storage_connect_filamap.h (contents, props changed)
head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake (contents, props changed)
head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc (contents, props changed)
head/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt (contents, props changed)
head/databases/mariadb100-server/files/pkg-message.in (contents, props changed)
head/databases/mariadb100-server/pkg-descr (contents, props changed)
head/databases/mariadb100-server/pkg-plist (contents, props changed)
Modified:
head/Mk/bsd.database.mk
head/databases/Makefile
Modified: head/Mk/bsd.database.mk
==============================================================================
--- head/Mk/bsd.database.mk Tue Nov 4 07:42:32 2014 (r372135)
+++ head/Mk/bsd.database.mk Tue Nov 4 08:21:55 2014 (r372136)
@@ -129,10 +129,11 @@ MYSQL55m_LIBVER= 18
MYSQL55p_LIBVER= 18
MYSQL56_LIBVER= 18
MYSQL56p_LIBVER= 18
+MYSQL100m_LIBVER= 18
# Setting/finding MySQL version we want.
.if exists(${LOCALBASE}/bin/mysql)
-_MYSQL!= ${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib \([0-9]\)\.\([0-9]*\).*/\1\2/'
+_MYSQL!= ${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/'
_PERCONA!= ${LOCALBASE}/bin/mysql --version | ${GREP} Percona | wc -l
_MARIADB!= ${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB | wc -l
@@ -172,6 +173,9 @@ _MYSQL_SERVER= databases/mariadb-server
.elif (${MYSQL_VER} == "55m")
_MYSQL_CLIENT= databases/mariadb55-client
_MYSQL_SERVER= databases/mariadb55-server
+.elif (${MYSQL_VER} == "100m")
+_MYSQL_CLIENT= databases/mariadb100-client
+_MYSQL_SERVER= databases/mariadb100-server
.elif (${MYSQL_VER} == "55p")
_MYSQL_CLIENT= databases/percona55-client
_MYSQL_SERVER= databases/percona55-server
Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile Tue Nov 4 07:42:32 2014 (r372135)
+++ head/databases/Makefile Tue Nov 4 08:21:55 2014 (r372136)
@@ -163,6 +163,8 @@
SUBDIR += mariadb-client
SUBDIR += mariadb-scripts
SUBDIR += mariadb-server
+ SUBDIR += mariadb100-client
+ SUBDIR += mariadb100-server
SUBDIR += mariadb55-client
SUBDIR += mariadb55-server
SUBDIR += mdbtools
Added: head/databases/mariadb100-client/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/Makefile Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,28 @@
+# $FreeBSD$
+
+PORTNAME= mariadb
+PKGNAMESUFFIX= 100-client
+
+COMMENT= Multithreaded SQL database (client)
+
+MASTERDIR= ${.CURDIR}/../mariadb100-server
+
+FILESDIR= ${.CURDIR}/files
+PATCHDIR= ${.CURDIR}/files
+PLIST= ${.CURDIR}/pkg-plist
+
+CONFLICTS_INSTALL= mysql[0-9][0-9]-client-* \
+ mariadb[0-46-9][0-9]-client-* \
+ mariadb5.[0-46-9]-client-* \
+ percona[0-9][0-9]-client-*
+
+CMAKE_ARGS+= -DWITHOUT_SERVER=1
+
+USE_LDCONFIG= ${PREFIX}/lib/mysql
+
+CLIENT_ONLY= yes
+
+post-install:
+ ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
+
+.include "${MASTERDIR}/Makefile"
Added: head/databases/mariadb100-client/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/files/patch-CMakeLists.txt Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,55 @@
+--- CMakeLists.txt.orig 2014-09-25 00:29:47.000000000 +0200
++++ CMakeLists.txt 2014-09-27 09:57:32.000000000 +0200
+@@ -430,28 +430,8 @@
+ ADD_SUBDIRECTORY(extra)
+ ADD_SUBDIRECTORY(libservices)
+ ADD_SUBDIRECTORY(scripts)
+-ADD_SUBDIRECTORY(sql/share)
+ ADD_SUBDIRECTORY(support-files)
+
+-IF(NOT WITHOUT_SERVER)
+- ADD_SUBDIRECTORY(tests)
+- ADD_SUBDIRECTORY(sql)
+- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
+- IF(WITH_EMBEDDED_SERVER)
+- ADD_SUBDIRECTORY(libmysqld)
+- ADD_SUBDIRECTORY(libmysqld/examples)
+- ENDIF(WITH_EMBEDDED_SERVER)
+-
+- ADD_SUBDIRECTORY(mysql-test)
+- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
+- ADD_SUBDIRECTORY(sql-bench)
+-
+- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
+- ADD_SUBDIRECTORY(internal)
+- ENDIF()
+- ADD_SUBDIRECTORY(packaging/rpm-oel)
+-ENDIF()
+-
+ IF(UNIX)
+ ADD_SUBDIRECTORY(man)
+ ENDIF()
+@@ -463,7 +443,6 @@
+ ADD_SUBDIRECTORY(win/upgrade_wizard)
+ ADD_SUBDIRECTORY(win/packaging)
+ ENDIF()
+-ADD_SUBDIRECTORY(packaging/solaris)
+
+ IF(NOT CMAKE_CROSSCOMPILING)
+ SET(EXPORTED comp_err comp_sql factorial)
+@@ -506,6 +485,7 @@
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ )
+
++IF(FALSE)
+ INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT
+ COMPONENT Readme)
+
+@@ -516,6 +496,7 @@
+ IF(UNIX)
+ INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
+ ENDIF()
++ENDIF()
+
+ INCLUDE(CPack)
+
Added: head/databases/mariadb100-client/files/patch-client_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/files/patch-client_CMakeLists.txt Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,57 @@
+--- client/CMakeLists.txt.orig 2014-08-09 00:13:48.000000000 +0200
++++ client/CMakeLists.txt 2014-09-05 22:40:26.210338712 +0200
+@@ -38,11 +38,12 @@
+ SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
+ ENDIF(UNIX)
+
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
+ SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+ TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre pcreposix)
+ SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
+-
++ENDIF()
+
+ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
+ TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
+@@ -53,21 +54,25 @@
+ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
+ TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
+
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
+ TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
+ ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
++ENDIF()
+
+ MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
+ TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
+
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
+ TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
++ENDIF()
+
+ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
+ TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
+
+ MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
+-TARGET_LINK_LIBRARIES(mysqladmin mysqlclient)
++tARGET_LINK_LIBRARIES(mysqladmin mysqlclient)
+
+ MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
+ SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
+@@ -79,10 +84,12 @@
+ ENDIF(WIN32)
+
+ # async_example is just a code example, do not install it.
++IF(FALSE)
+ ADD_EXECUTABLE(async_example async_example.c)
+ TARGET_LINK_LIBRARIES(async_example mysqlclient)
++ENDIF()
+
+-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
++SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap
+ PROPERTIES HAS_CXX TRUE)
+
+ ADD_DEFINITIONS(-DHAVE_DLOPEN)
Added: head/databases/mariadb100-client/files/patch-cmake__jemalloc.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/files/patch-cmake__jemalloc.cmake Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,18 @@
+--- cmake/jemalloc.cmake.orig 2014-09-25 00:29:47.000000000 +0200
++++ cmake/jemalloc.cmake 2014-09-27 10:05:48.000000000 +0200
+@@ -24,12 +24,12 @@
+ SET(what system)
+ ENDIF()
+
+- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC)
++ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
+ SET(CMAKE_REQUIRED_LIBRARIES)
+
+ IF (HAVE_JEMALLOC)
+- SET(LIBJEMALLOC ${libname})
+- SET(MALLOC_LIBRARY "${what} jemalloc")
++ SET(LIBJEMALLOC c)
++ SET(MALLOC_LIBRARY "system jemalloc")
+ ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
+ MESSAGE(FATAL_ERROR "${libname} is not found")
+ ENDIF()
Added: head/databases/mariadb100-client/files/patch-extra_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/files/patch-extra_CMakeLists.txt Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,25 @@
+--- extra/CMakeLists.txt.orig 2012-12-17 03:38:29.000000000 +0200
++++ extra/CMakeLists.txt 2012-12-17 03:40:12.000000000 +0200
+@@ -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 @@
+
+ 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)
Added: head/databases/mariadb100-client/files/patch-extra_yassl_taocrypt_src_integer.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/files/patch-extra_yassl_taocrypt_src_integer.cpp Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,11 @@
+--- extra/yassl/taocrypt/src/integer.cpp.orig 2014-04-15 14:02:39.000000000 +0300
++++ extra/yassl/taocrypt/src/integer.cpp 2014-05-16 17:00:15.000000000 +0300
+@@ -75,7 +75,7 @@
+ CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
+ size_type n, const void *)
+ {
+- if (n > this->max_size())
++ if (n > AlignedAllocator<T>::max_size())
+ return 0;
+ if (n == 0)
+ return 0;
Added: head/databases/mariadb100-client/files/patch-include_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/files/patch-include_CMakeLists.txt Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,22 @@
+--- include/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
++++ include/CMakeLists.txt 2012-12-23 00:48:29.000000000 +0200
+@@ -58,13 +58,18 @@
+ FOREACH(f ${HEADERS_GEN_CONFIGURE})
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ ENDFOREACH(f)
+-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")
++INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development
++ FILES_MATCHING PATTERN "*.h"
++ PATTERN "psi_abi*" EXCLUDE
++)
+
+ STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
+ STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
+
++IF(FALSE)
+ INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
+ FILES_MATCHING PATTERN "*.h"
+ PATTERN CMakeFiles EXCLUDE
+ PATTERN mysql EXCLUDE
+ REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
++ENDIF()
Added: head/databases/mariadb100-client/files/patch-include_my_compare.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/files/patch-include_my_compare.h Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,11 @@
+--- include/my_compare.h.orig 2012-12-17 03:52:37.000000000 +0200
++++ include/my_compare.h 2012-12-17 03:53:40.000000000 +0200
+@@ -40,7 +40,7 @@
+ But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
+ */
+
+-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */
++#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */
+ #define HA_MAX_KEY_SEG 32 /* Max segments for key */
+
+ #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)
Added: head/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,11 @@
+--- libmysql/CMakeLists.txt.orig 2014-09-24 22:29:47 UTC
++++ libmysql/CMakeLists.txt
+@@ -437,6 +437,8 @@ IF(NOT DISABLE_SHARED)
+ # libtool compatability
+ IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
+ SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
++ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "DragonFly")
++ SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
+ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
+ SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0")
+ ELSE()
Added: head/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,9 @@
+--- libservices/CMakeLists.txt.orig 2014-08-09 00:13:47.000000000 +0200
++++ libservices/CMakeLists.txt 2014-09-05 22:29:05.110415834 +0200
+@@ -29,4 +29,6 @@
+ logger_service.c)
+
+ ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
++IF(FALSE)
+ INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
++ENDIF()
Added: head/databases/mariadb100-client/files/patch-man_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/files/patch-man_CMakeLists.txt Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,16 @@
+--- man/CMakeLists.txt.orig 2012-12-22 21:30:12.000000000 +0200
++++ man/CMakeLists.txt 2012-12-22 21:30:54.000000000 +0200
+@@ -30,9 +30,13 @@
+ SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
+ mysqltest_embedded.1 mysql_client_test_embedded.1)
+
++IF(FALSE)
+ INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
+ INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
++ENDIF()
+ INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
+ INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
++IF(FALSE)
+ INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
++ENDIF()
+
Added: head/databases/mariadb100-client/files/patch-mysys_my_default.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/files/patch-mysys_my_default.c Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,61 @@
+--- mysys/my_default.c.orig 2014-08-09 00:13:39.000000000 +0200
++++ mysys/my_default.c 2014-09-05 19:56:48.006019959 +0200
+@@ -90,7 +90,7 @@
+
+ /* Which directories are searched for options (and in which order) */
+
+-#define MAX_DEFAULT_DIRS 6
++#define MAX_DEFAULT_DIRS 7
+ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
+ static const char **default_directories = NULL;
+
+@@ -785,7 +785,7 @@
+ {
+ MY_STAT stat_info;
+ if (!my_stat(name,&stat_info,MYF(0)))
+- return 1;
++ return 0;
+ /*
+ Ignore world-writable regular files.
+ This is mainly done to protect us to not read a file created by
+@@ -803,6 +803,14 @@
+ if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
+ return 1; /* Ignore wrong files */
+
++ if (strstr(name, "/etc") == name)
++ {
++ fprintf(stderr,
++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
++ name,name);
++ goto err;
++ }
++
+ while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
+ {
+ line++;
+@@ -1067,7 +1075,8 @@
+ if (name[0] == FN_HOMELIB) /* Add . to filenames in home */
+ *end++= '.';
+ strxmov(end, conf_file, *ext, " ", NullS);
+- fputs(name, stdout);
++ if (strstr(name, "/etc") != name)
++ fputs(name, stdout);
+ }
+ }
+ }
+@@ -1223,13 +1232,10 @@
+
+ #else
+
+-#if defined(DEFAULT_SYSCONFDIR)
+- if (DEFAULT_SYSCONFDIR[0])
+- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
+-#else
+ errors += add_directory(alloc, "/etc/", dirs);
+ errors += add_directory(alloc, "/etc/mysql/", dirs);
+-#endif /* DEFAULT_SYSCONFDIR */
++ errors += add_directory(alloc, "/usr/local/etc/", dirs);
++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
+
+ #endif
+
Added: head/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,11 @@
+--- pcre/CMakeLists.txt.orig 2014-08-09 00:13:36.000000000 +0200
++++ pcre/CMakeLists.txt 2014-09-05 20:08:49.090972949 +0200
+@@ -513,6 +513,8 @@
+ MESSAGE(STATUS "")
+ ENDIF(PCRE_SHOW_REPORT)
+
++IF(FALSE)
+ INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)
++ENDIF()
+
+ # end CMakeLists.txt
Added: head/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,78 @@
+--- scripts/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200
++++ scripts/CMakeLists.txt 2014-09-05 22:33:01.060378167 +0200
+@@ -72,6 +72,7 @@
+ )
+ ENDIF()
+
++IF(FALSE)
+ INSTALL(FILES
+ ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
+ ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
+@@ -81,6 +82,7 @@
+ ${FIX_PRIVILEGES_SQL}
+ DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
+ )
++ENDIF()
+
+ # TCMalloc hacks
+ IF(MALLOC_LIB)
+@@ -140,6 +142,7 @@
+ SET(HOSTNAME "hostname")
+ SET(MYSQLD_USER "mysql")
+
++IF(FALSE)
+ # Required for mysqlbug until autotools are deprecated, once done remove these
+ # and expand default cmake variables
+ SET(CC ${CMAKE_C_COMPILER})
+@@ -180,6 +183,7 @@
+ DESTINATION ${INSTALL_BINDIR}
+ COMPONENT Server
+ )
++ENDIF()
+
+ ENDIF(UNIX)
+
+@@ -204,6 +208,7 @@
+ SET(localstatedir ${MYSQL_DATADIR})
+ ENDIF()
+
++IF()
+ IF(UNIX)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
+ ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
+@@ -219,6 +224,7 @@
+ COMPONENT Server
+ )
+ ENDIF()
++ENDIF()
+
+ SET(prefix "${CMAKE_INSTALL_PREFIX}")
+ IF(INSTALL_SYSCONFDIR)
+@@ -281,6 +287,8 @@
+ STRING(REGEX REPLACE "^lib" "" lib "${lib}")
+ SET(${var} "${${var}}-l${lib} " )
+ ENDIF()
++ ELSEIF(lib STREQUAL "-pthread")
++ SET(${var} "${${var}}-pthread " )
+ ELSE()
+ SET(${var} "${${var}}-l${lib} " )
+ ENDIF()
+@@ -339,18 +347,8 @@
+ SET(BIN_SCRIPTS
+ msql2mysql
+ mysql_config
+- mysql_fix_extensions
+- mysql_setpermission
+- mysql_secure_installation
+- mysql_zap
+ mysqlaccess
+- mysql_convert_table_format
+ mysql_find_rows
+- mytop
+- mysqlhotcopy
+- mysqldumpslow
+- mysqld_multi
+- mysqld_safe
+ )
+ FOREACH(file ${BIN_SCRIPTS})
+ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
Added: head/databases/mariadb100-client/files/patch-scripts_mysql_config.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/files/patch-scripts_mysql_config.sh Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,14 @@
+--- scripts/mysql_config.sh.orig 2014-04-15 14:02:39.000000000 +0300
++++ scripts/mysql_config.sh 2014-05-16 19:08:41.000000000 +0300
+@@ -108,8 +108,11 @@
+ # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
+ libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
+ libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
++libs="$libs -L%%LOCALBASE%%/lib "
+ libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
++libs_r="$libs_r -L%%LOCALBASE%%/lib "
+ embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
++embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
+
+ if [ -r "$pkglibdir/libmygcc.a" ]; then
+ # When linking against the static library with a different version of GCC
Added: head/databases/mariadb100-client/files/patch-sql_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/files/patch-sql_CMakeLists.txt Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,14 @@
+--- sql/CMakeLists.txt.orig 2014-09-05 22:49:59.808332000 +0200
++++ sql/CMakeLists.txt 2014-09-05 22:50:18.768326206 +0200
+@@ -226,9 +226,9 @@
+ )
+
+ # Gen_lex_hash
+-IF(NOT CMAKE_CROSSCOMPILING)
++
+ ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+-ENDIF()
++
+
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h
Added: head/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,48 @@
+--- support-files/CMakeLists.txt.orig 2014-06-13 13:36:52.080474738 +0300
++++ support-files/CMakeLists.txt 2014-06-13 13:50:59.537282325 +0300
+@@ -41,15 +41,18 @@
+ SET(inst_location ${INSTALL_SUPPORTFILESDIR})
+ ENDIF()
+
++IF(FALSE)
+ FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh
+ ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
+ DESTINATION ${inst_location} COMPONENT IniFiles)
+ ENDFOREACH()
++ENDIF()
+
+ IF(UNIX)
+ SET(prefix ${CMAKE_INSTALL_PREFIX})
++ IF(FALSE)
+ FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
+ ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
+@@ -67,8 +70,10 @@
+ INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
+ INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
+ ENDIF()
++ ENDIF()
+
+ INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
++ IF(FALSE)
+ CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
+ CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
+
+@@ -92,6 +97,7 @@
+ DESTINATION ${inst_location} COMPONENT SupportFiles
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
+ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
++
+
+ IF (INSTALL_SYSCONFDIR)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d
+@@ -101,6 +107,7 @@
+ RENAME mysql COMPONENT SupportFiles
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
+ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
++ ENDIF()
+
+ INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}
+ COMPONENT Common)
Added: head/databases/mariadb100-client/files/pkg-message.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/files/pkg-message.in Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,7 @@
+************************************************************************
+
+MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
+my.cnf. Please move existing my.cnf files from those paths to
+%%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
+
+************************************************************************
Added: head/databases/mariadb100-client/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-client/pkg-plist Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,104 @@
+bin/msql2mysql
+bin/mysql
+bin/mysql_config
+bin/mysql_find_rows
+bin/mysql_waitpid
+bin/mysqlaccess
+bin/mysqladmin
+bin/mysqlbinlog
+bin/mysqlcheck
+bin/mysqldump
+bin/mysqlimport
+bin/mysqlshow
+bin/mysqlslap
+include/mysql/auth_dialog_client.h
+include/mysql/big_endian.h
+include/mysql/byte_order_generic.h
+include/mysql/byte_order_generic_x86.h
+include/mysql/byte_order_generic_x86_64.h
+include/mysql/client_plugin.h
+include/mysql/decimal.h
+include/mysql/errmsg.h
+include/mysql/handler_ername.h
+include/mysql/handler_state.h
+include/mysql/keycache.h
+include/mysql/little_endian.h
+include/mysql/m_ctype.h
+include/mysql/m_string.h
+include/mysql/ma_dyncol.h
+include/mysql/my_alloc.h
+include/mysql/my_attribute.h
+include/mysql/my_byteorder.h
+include/mysql/my_compiler.h
+include/mysql/my_config.h
+include/mysql/my_dbug.h
+include/mysql/my_decimal_limits.h
+include/mysql/my_dir.h
+include/mysql/my_getopt.h
+include/mysql/my_global.h
+include/mysql/my_list.h
+include/mysql/my_net.h
+include/mysql/my_pthread.h
+include/mysql/my_sys.h
+include/mysql/my_valgrind.h
+include/mysql/my_xml.h
+include/mysql/mysql.h
+include/mysql/mysql_com.h
+include/mysql/mysql_com_server.h
+include/mysql/mysql_embed.h
+include/mysql/mysql_time.h
+include/mysql/mysql_version.h
+include/mysql/mysqld_ername.h
+include/mysql/mysqld_error.h
+include/mysql/plugin.h
+include/mysql/plugin_audit.h
+include/mysql/plugin_auth.h
+include/mysql/plugin_auth_common.h
+include/mysql/plugin_ftparser.h
+include/mysql/psi/mysql_file.h
+include/mysql/psi/mysql_idle.h
+include/mysql/psi/mysql_socket.h
+include/mysql/psi/mysql_stage.h
+include/mysql/psi/mysql_statement.h
+include/mysql/psi/mysql_table.h
+include/mysql/psi/mysql_thread.h
+include/mysql/psi/psi.h
+include/mysql/service_debug_sync.h
+include/mysql/service_kill_statement.h
+include/mysql/service_logger.h
+include/mysql/service_my_plugin_log.h
+include/mysql/service_my_snprintf.h
+include/mysql/service_progress_report.h
+include/mysql/service_sha1.h
+include/mysql/service_thd_alloc.h
+include/mysql/service_thd_autoinc.h
+include/mysql/service_thd_error_context.h
+include/mysql/service_thd_timezone.h
+include/mysql/service_thd_wait.h
+include/mysql/services.h
+include/mysql/sql_common.h
+include/mysql/sql_state.h
+include/mysql/sslopt-case.h
+include/mysql/sslopt-longopts.h
+include/mysql/sslopt-vars.h
+include/mysql/typelib.h
+lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.18
+lib/mysql/libmysqlclient_r.a
+lib/mysql/libmysqlclient_r.so
+lib/mysql/libmysqlclient_r.so.18
+man/man1/msql2mysql.1.gz
+man/man1/mysql.1.gz
+man/man1/mysql_config.1.gz
+man/man1/mysql_find_rows.1.gz
+man/man1/mysql_plugin.1.gz
+man/man1/mysql_waitpid.1.gz
+man/man1/mysqlaccess.1.gz
+man/man1/mysqladmin.1.gz
+man/man1/mysqlbinlog.1.gz
+man/man1/mysqlcheck.1.gz
+man/man1/mysqldump.1.gz
+man/man1/mysqlimport.1.gz
+man/man1/mysqlshow.1.gz
+man/man1/mysqlslap.1.gz
Added: head/databases/mariadb100-server/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-server/Makefile Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,157 @@
+# $FreeBSD$
+
+PORTNAME?= mariadb
+PORTVERSION= 10.0.14
+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 at gmail.com
+COMMENT?= Multithreaded SQL database (server)
+
+SUB_FILES= pkg-message
+PKGMESSAGE= ${WRKDIR}/pkg-message
+
+SLAVEDIRS= databases/mariadb100-client
+USES= bison:build cmake execinfo gmake shebangfix
+SHEBANG_FILES= scripts/*.sh
+SITESDIR= mariadb/mariadb-${PORTVERSION}/source
+
+BROKEN_arm= Does not compile on arm
+
+OPTIONS_DEFINE= SSL OPENSSL PORTSSL FASTMTX
+OPTIONS_DEFAULT= SSL
+NO_OPTIONS_SORT= yes
+
+FASTMTX_DESC= Replace mutexes with spinlocks
+OPENSSL_DESC= Use OpenSSL instead of bundled yassl
+PORTSSL_DESC= Use OpenSSL from port (requires OPENSSL to be set)
+
+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
+
+# MySQL-Server options
+.if !defined(CLIENT_ONLY)
+USE_MYSQL= yes
+OPTIONS_DEFINE+= OQGRAPH MAXKEY
+OPTIONS_DEFAULT+= MAXKEY
+
+OQGRAPH_DESC= Open Query Graph Computation engine
+MAXKEY_DESC= Change max key length from 1000 to 4000
+.endif
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012
+CMAKE_ARGS+= -DWITH_JEMALLOC="system"
+.else
+CMAKE_ARGS+= -DWITH_JEMALLOC="no"
+.endif
+
+.if ${PORT_OPTIONS:MSSL}
+. if exists(${LOCALBASE}/include/openssl/opensslv.h)
+. if !${PORT_OPTIONS:MOPENSSL} || !${PORT_OPTIONS:MPORTSSL}
+IGNORE= security/openssl package is installed. To build this either select the OPENSSL and PORTSSL options or deinstall openssl
+. endif
+. endif
+. if ${PORT_OPTIONS:MOPENSSL}
+USE_OPENSSL= yes
+. if !${PORT_OPTIONS:MPORTSSL}
+WITH_OPENSSL_BASE= yes
+. else
+WITH_OPENSSL_PORT= yes
+. endif
+CMAKE_ARGS+= -DWITH_SSL=yes
+. else
+CMAKE_ARGS+= -DWITH_SSL=bundled
+. endif
+.else
+CMAKE_FLAGS+= -DWITH_SSL=no
+.endif
+
+.if ${PORT_OPTIONS:MFASTMTX}
+CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1
+.endif
+
+# MySQL-Client part
+.if defined(CLIENT_ONLY)
+USES+= readline
+.else
+# MySQL-Server part
+
+CONFLICTS_INSTALL= mysql[0-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona[0-9][0-9]-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
+
+. if empty(PORT_OPTIONS:MOQGRAPH)
+CMAKE_ARGS+= -DWITHOUT_OQGRAPH=1
+PLIST_SUB+= OQGRAPH="@comment "
+. else
+USE_GCC?= yes
+CMAKE_ARGS+= -DWITH_OQGRAPH_STORAGE_ENGINE=1
+PLIST_SUB+= OQGRAPH=""
+LIB_DEPENDS+= libboost_system.so:${PORTSDIR}/devel/boost-libs
+. endif
+. if ${PORT_OPTIONS:MMAXKEY}
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my_compare.h
+. endif
+
+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
+
+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 <bsd.port.mk>
Added: head/databases/mariadb100-server/distinfo
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-server/distinfo Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,2 @@
+SHA256 (mariadb-10.0.14.tar.gz) = ac0eca4ebb278aa304236bf6dbd5e8c9cf285431333f1379051c231c08e2e31d
+SIZE (mariadb-10.0.14.tar.gz) = 51156364
Added: head/databases/mariadb100-server/files/extra-patch-include_my_compare.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-server/files/extra-patch-include_my_compare.h Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,11 @@
+--- include/my_compare.h.orig 2012-11-28 17:49:43.000000000 +0200
++++ include/my_compare.h 2012-12-23 02:45:51.000000000 +0200
+@@ -40,7 +40,7 @@
+ But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
+ */
+
+-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */
++#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */
+ #define HA_MAX_KEY_SEG 32 /* Max segments for key */
+
+ #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)
Added: head/databases/mariadb100-server/files/mysql-server.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-server/files/mysql-server.in Tue Nov 4 08:21:55 2014 (r372136)
@@ -0,0 +1,139 @@
+#!/bin/sh
+
+# $FreeBSD: head/databases/mariadb55-server/files/mysql-server.in 361647 2014-07-12 22:42:33Z rakuco $
+#
+# PROVIDE: mysql
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf to enable mysql:
+# mysql_(instance_)?enable (bool): Set to "NO" by default.
+# Set it to "YES" to enable MySQL.
+# mysql_(instance_)?limits (bool): Set to "NO" by default.
+# Set it to yes to run `limits -e -U mysql`
+# just before mysql starts.
+# mysql_(instance_)?dbdir (str): Default to "/var/db/mysql"
+# Base database directory.
+# mysql_(instance_)?args (str): Custom additional arguments to be passed
+# to mysqld_safe (default empty).
+# mysql_(instance_)?pidfile (str): Custum PID file path and name.
+# Default to "${mysql_dbdir}/${hostname}.pid".
+# mysql_(instance_)?user (str): User to run mysqld as
+# Default to "mysql" created by the port
+# mysql_(instance_)?optfile (str): Server-specific option file.
+# Default to "${mysql_dbdir}/my.cnf".
+# mysql_instances (str): Set to "" by default.
+# If defined, list of instances to enable
+
+. /etc/rc.subr
+
+name="mysql"
+rcvar=mysql_enable
+
+load_rc_config $name
+
+: ${mysql_enable="NO"}
+: ${mysql_limits="NO"}
+: ${mysql_user="mysql"}
+: ${mysql_limits_args="-e -U $mysql_user"}
+: ${mysql_dbdir="/var/db/mysql"}
+: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
+
+command="/usr/sbin/daemon"
+procname="%%PREFIX%%/libexec/mysqld"
+start_precmd="${name}_prestart"
+start_postcmd="${name}_poststart"
+
+if [ -n "$2" ]; then
+ instance="$2"
+ load_rc_config ${name}_${instance}
+ case "$mysql_instances" in
+ "$2 "*|*" $2 "*|*" $2"|"$2")
+ eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
+ eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}"
+ eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
+ eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
+ eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
+ eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}"
+ eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}"
+ ;;
+ *)
+ err 1 "$2 not found in mysql_instances" ;;
+ esac
+else
+ if [ -n "${mysql_instances}" -a -n "$1" ]; then
+ for instance in ${mysql_instances}; do
+ eval _enable="\${mysql_${instance}_enable}"
+ case "${_enable:-${mysql_enable}}" in
+ [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
+ continue
+ ;;
+ [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+ ;;
+ *)
+ if [ -z "$_enable" ]; then
+ _var=mysql_enable
+ else
+ _var=mysql_${instance}_enable
+ fi
+ warn "Bad value" \
+ "'${_enable:-${mysql_enable}}'" \
+ "for ${_var}. " \
+ "Instance ${instance} skipped."
+ continue
+ ;;
+ esac
+ echo "===> mysql instance: ${instance}"
+ if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
+ success="${instance} ${success}"
+ else
+ failed="${instance} (${retcode}) ${failed}"
+ fi
+ done
+ exit 0
+ else
+ mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
+ fi
+fi
+
+pidfile=$mysql_pidfile
+mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
+mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
+command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
+
+mysql_create_auth_tables()
+{
+ eval $mysql_install_db $mysql_install_db_args
+ [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir}
+}
+
+mysql_prestart()
+{
+ local dir
+ for dir in /etc /etc/mysql; do
+ if [ -f "${dir}/my.cnf" ]; then
+ echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}"
+ return 1
+ fi
+ done
+ if [ ! -d "${mysql_dbdir}/mysql/." ]; then
+ mysql_create_auth_tables || return 1
+ fi
+ if checkyesno mysql_limits; then
+ eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null
+ else
+ return 0
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list