diff --git a/databases/mariadb-10.2/Portfile b/databases/mariadb-10.2/Portfile index 5e7890ced50..7b286f587e6 100644 --- a/databases/mariadb-10.2/Portfile +++ b/databases/mariadb-10.2/Portfile @@ -11,7 +11,7 @@ set version_branch [join [lrange [split ${version} .] 0 1] .] # Please set revision_client and revision_server to 0 if you bump # version; these can be changed independently for the 2 subports, but # can be changed at the same time if that's what's required. -set revision_client 1 +set revision_client 2 set revision_server 0 categories databases platforms darwin @@ -80,8 +80,13 @@ if {$subport eq $name} { move ${workpath}/${submodule_distname} ${worksrcpath}/libmariadb } + depends_build-append \ + port:pkgconfig port:bison depends_lib-append port:zlib port:tcp_wrappers port:ncurses port:judy \ - path:lib/libssl.dylib:openssl port:libxml2 + path:lib/libssl.dylib:openssl port:libxml2 port:unixodbc \ + port:pcre port:kerberos5 port:boost port:cracklib + # see https://mariadb.com/kb/en/innodb-page-compression/ + depends_lib-append port:bzip2 port:lzo2 port:lz4 port:lzma port:snappy depends_run-append port:mysql_select select.group mysql @@ -124,7 +129,6 @@ if {$subport eq $name} { -DDEFAULT_CHARSET:STRING=utf8 \ -DDEFAULT_COLLATION:STRING=utf8_general_ci \ -DWITH_EMBEDDED_SERVER:BOOL=ON \ - -DWITH_ZLIB:STRING=system \ -DWITH_UNIT_TESTS:BOOL=ON \ -DWITHOUT_CASSANDRA_STORAGE_ENGINE:BOOL=ON \ -DWITHOUT_MROONGA_STORAGE_ENGINE:BOOL=ON \ @@ -133,13 +137,29 @@ if {$subport eq $name} { -DENABLE_GCOV:BOOL=OFF \ -DENABLE_DTRACE:BOOL=OFF \ -DWITH_READLINE:BOOL=ON \ + -DWITH_VALGRIND:BOOL=OFF \ -DWITH_LIBWRAP:BOOL=ON \ - -DWITH_SSL:STRING=yes \ - -DWITH_SSL_PATH=${prefix} \ -DMYSQL_MAINTAINER_MODE:STRING=AUTO \ -DICONV_LIBRARIES=${prefix}/lib/libiconv.dylib \ -DICONV_INCLUDE_DIR:PATH=${prefix}/include \ - -DCONNECT_WITH_LIBXML2=ON + -DCONNECT_WITH_LIBXML2:BOOL=ON \ + -DPKG_CONFIG_EXECUTABLE:FILEPATH=${prefix}/bin/pkg-config \ + -DBISON_EXECUTABLE:FILEPATH=${prefix}/bin/bison \ + -DGIT_EXECUTABLE:FILEPATH= \ + -DUPDATE_SUBMODULES:BOOL=OFF \ + -DWITH_PCRE:STRING=system + +# -DWITH_ZLIB:STRING=system \ +# -DWITH_SSL:STRING=yes \ +# -DWITH_SSL_PATH=${prefix} \ + + + configure.args-append \ + -DWITH_INNODB_BZIP2:STRING=ON \ + -DWITH_INNODB_LZ4:STRING=ON \ + -DWITH_INNODB_LZMA:STRING=ON \ + -DWITH_INNODB_LZO:STRING=ON \ + -DWITH_INNODB_SNAPPY:STRING=ON post-destroot { # proc portdestroot::destroot_finish fails to find and compress our man pages