Index: head/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake =================================================================== --- head/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake (nonexistent) +++ head/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake (revision 403905) @@ -0,0 +1,27 @@ +--- cmake/os/DragonFly.cmake.orig 2015-12-17 10:53:10 UTC ++++ cmake/os/DragonFly.cmake +@@ -0,0 +1,24 @@ ++INCLUDE(CheckCSourceRuns) ++ ++# We require at least GCC 4.4 or Clang 3.3. ++IF(NOT FORCE_UNSUPPORTED_COMPILER) ++ IF(CMAKE_COMPILER_IS_GNUCC) ++ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion ++ OUTPUT_VARIABLE GCC_VERSION) ++ IF(GCC_VERSION VERSION_LESS 4.4) ++ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") ++ ENDIF() ++ ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang") ++ CHECK_C_SOURCE_RUNS(" ++ int main() ++ { ++ return (__clang_major__ < 3) || ++ (__clang_major__ == 3 && __clang_minor__ < 3); ++ }" HAVE_SUPPORTED_CLANG_VERSION) ++ IF(NOT HAVE_SUPPORTED_CLANG_VERSION) ++ MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") ++ ENDIF() ++ ELSE() ++ MESSAGE(FATAL_ERROR "Unsupported compiler!") ++ ENDIF() ++ENDIF() Property changes on: head/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h =================================================================== --- head/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h (nonexistent) +++ head/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h (revision 403905) @@ -0,0 +1,11 @@ +--- cmd-line-utils/libedit/chartype.h.orig 2015-11-29 19:16:24 UTC ++++ cmd-line-utils/libedit/chartype.h +@@ -49,7 +49,7 @@ + TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */ + #if !defined(__NetBSD__) && !defined(__sun) \ + && !(defined(__APPLE__) && defined(__MACH__)) \ +- && !defined(__FreeBSD__) && !defined(_AIX) ++ && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__) + #ifndef __STDC_ISO_10646__ + /* In many places it is assumed that the first 127 code points are ASCII + * compatible, so ensure wchar_t indeed does ISO 10646 and not some other Property changes on: head/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c =================================================================== --- head/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c (nonexistent) +++ head/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c (revision 403905) @@ -0,0 +1,20 @@ +--- cmd-line-utils/libedit/vi.c.orig 2015-11-29 19:16:24 UTC ++++ cmd-line-utils/libedit/vi.c +@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att + * NB: posix implies that we should enter insert mode, however + * this is against historical precedent... + */ +-#if defined(__weak_reference) && !defined(__FreeBSD__) ++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) + __weakref_visible char *my_get_alias_text(const char *) + __weak_reference(get_alias_text); + #endif +@@ -928,7 +928,7 @@ protected el_action_t + vi_alias(EditLine *el __attribute__((__unused__)), + Int c __attribute__((__unused__))) + { +-#if defined(__weak_reference) && !defined(__FreeBSD__) ++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) + char alias_name[3]; + char *alias_text; + Property changes on: head/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt =================================================================== --- head/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt (nonexistent) +++ head/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt (revision 403905) @@ -0,0 +1,11 @@ +--- libmysql/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ libmysql/CMakeLists.txt +@@ -260,7 +260,7 @@ IF(NOT DISABLE_SHARED) + COMPONENT SharedLibraries) + IF(UNIX) + # libtool compatability +- IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) ++ IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly" OR APPLE) + SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") + ELSE() + SET(OS_SHARED_LIB_VERSION Property changes on: head/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysql57-server/Makefile =================================================================== --- head/databases/mysql57-server/Makefile (revision 403904) +++ head/databases/mysql57-server/Makefile (revision 403905) @@ -1,132 +1,126 @@ # Created by: "Mahdi Mokhtari " # $FreeBSD$ PORTNAME= mysql PORTVERSION= 5.7.10 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost PKGNAMESUFFIX?= 57-server DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:MySQL boost_1_59_0.tar.gz:boost MAINTAINER= mokhi64@gmail.com COMMENT= Multithreaded SQL database (server) LICENSE= GPLv2 SLAVEDIRS= databases/mysql57-client USES= cmake:outsource shebangfix 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 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_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DLOCAL_BOOST_DIR=${WRKSRC}/../boost_1_59_0 \ -DWITH_INNODB_EXTRA_DEBUG=0 SHEBANG_FILES= scripts/*.pl* scripts/*.sh .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif BUNDLED_SSL_CMAKE_ON= -DWITH_SSL=bundled OPENSSL_USE= OPENSSL=yes WITHOUT_SSL_CMAKE_ON= -DWITH_SSL=no # MySQL-Server part .if !defined(CLIENT_ONLY) USE_MYSQL= yes WANT_MYSQL_VER= 57 USES+= bison:build cpe perl5 USE_PERL5= run CONFLICTS_BUILD= boost-libs-1.55* CONFLICTS_INSTALL= mariadb[0-9]*-server-* \ mysql[0-46-9][0-689]-server-* \ percona[0-9]*-server-* USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin MMAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \ mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" OPTIONS_GROUP= STORAGE OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server) ARCHIVE_DESC= Compile "Archive Storage" statically in server BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server EXAMPLE_DESC= Compile "Example Storage" statically in server FEDERATED_DESC= Compile "Federated Storage" statically in server INNOBASE_DESC= Compile "InnoDB Storage" statically in server PARTITION_DESC= Compile "Partitioning support Storage" statically in server PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1 BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1 EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1 FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1 INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1 PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1 PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 .else USES+= readline .endif .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 CC= clang CXX= clang++ CPP= clang-cpp OPENSSL_CMAKE_ON= -DWITH_SSL=system .elif ${OSVERSION} >= 1000000 OPENSSL_CMAKE_ON= -DWITH_SSL=yes .endif USE_CLANG= 3.3+ post-extract: ${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h post-patch: @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt -.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/mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h =================================================================== --- head/databases/mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h (nonexistent) +++ head/databases/mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h (revision 403905) @@ -0,0 +1,11 @@ +--- cmd-line-utils/libedit/chartype.h.orig 2015-11-29 19:16:24 UTC ++++ cmd-line-utils/libedit/chartype.h +@@ -49,7 +49,7 @@ + TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */ + #if !defined(__NetBSD__) && !defined(__sun) \ + && !(defined(__APPLE__) && defined(__MACH__)) \ +- && !defined(__FreeBSD__) && !defined(_AIX) ++ && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__) + #ifndef __STDC_ISO_10646__ + /* In many places it is assumed that the first 127 code points are ASCII + * compatible, so ensure wchar_t indeed does ISO 10646 and not some other Property changes on: head/databases/mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysql57-server/files/patch-cmd-line-utils_libedit_vi.c =================================================================== --- head/databases/mysql57-server/files/patch-cmd-line-utils_libedit_vi.c (nonexistent) +++ head/databases/mysql57-server/files/patch-cmd-line-utils_libedit_vi.c (revision 403905) @@ -0,0 +1,20 @@ +--- cmd-line-utils/libedit/vi.c.orig 2015-11-29 19:16:24 UTC ++++ cmd-line-utils/libedit/vi.c +@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att + * NB: posix implies that we should enter insert mode, however + * this is against historical precedent... + */ +-#if defined(__weak_reference) && !defined(__FreeBSD__) ++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) + __weakref_visible char *my_get_alias_text(const char *) + __weak_reference(get_alias_text); + #endif +@@ -928,7 +928,7 @@ protected el_action_t + vi_alias(EditLine *el __attribute__((__unused__)), + Int c __attribute__((__unused__))) + { +-#if defined(__weak_reference) && !defined(__FreeBSD__) ++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) + char alias_name[3]; + char *alias_text; + Property changes on: head/databases/mysql57-server/files/patch-cmd-line-utils_libedit_vi.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysql57-server/files/patch-include_my__thread__os__id.h =================================================================== --- head/databases/mysql57-server/files/patch-include_my__thread__os__id.h (nonexistent) +++ head/databases/mysql57-server/files/patch-include_my__thread__os__id.h (revision 403905) @@ -0,0 +1,15 @@ +--- include/my_thread_os_id.h.orig 2015-11-29 19:16:24 UTC ++++ include/my_thread_os_id.h +@@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa + return pthread_getthreadid_np(); + #else + #ifdef HAVE_INTEGER_PTHREAD_SELF ++# ifdef __DragonFly__ ++ return syscall(SYS_lwp_gettid); ++# else + /* Unknown platform, fallback. */ + return pthread_self(); ++# endif + #else + /* Feature not available. */ + return 0; Property changes on: head/databases/mysql57-server/files/patch-include_my__thread__os__id.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h =================================================================== --- head/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h (nonexistent) +++ head/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h (revision 403905) @@ -0,0 +1,13 @@ +--- storage/innobase/include/srv0mon.h.orig 2015-11-29 19:16:24 UTC ++++ storage/innobase/include/srv0mon.h +@@ -34,6 +34,10 @@ Created 12/15/2009 Jimmy Yang + /* Required for FreeBSD so that INT64_MAX is defined. */ + #define __STDC_LIMIT_MACROS + #endif /* __STDC_LIMIT_MACROS */ ++#ifdef __DragonFly__ ++/* The hack above doen't work for dragonfly, stdint.h already imported */ ++#include ++#endif + + #include + Property changes on: head/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property