Index: head/databases/mariadb-connector-c/files/patch-libmariadb_ma__secure.c =================================================================== --- head/databases/mariadb-connector-c/files/patch-libmariadb_ma__secure.c (revision 446735) +++ head/databases/mariadb-connector-c/files/patch-libmariadb_ma__secure.c (nonexistent) @@ -1,16 +0,0 @@ ---- libmariadb/ma_secure.c.orig 2017-01-17 09:53:54 UTC -+++ libmariadb/ma_secure.c -@@ -149,11 +149,11 @@ int my_ssl_start(MYSQL *mysql) - pthread_mutex_lock(&LOCK_ssl_config); - if (!my_ssl_initialized) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) - if (ssl_crypto_init()) - goto end; - #endif --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL); - #else - SSL_library_init(); Property changes on: head/databases/mariadb-connector-c/files/patch-libmariadb_ma__secure.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mariadb-connector-c/Makefile =================================================================== --- head/databases/mariadb-connector-c/Makefile (revision 446735) +++ head/databases/mariadb-connector-c/Makefile (revision 446736) @@ -1,44 +1,40 @@ # $FreeBSD$ -PORTNAME= mariadb -PORTVERSION= 2.3.2 +PORTNAME= mariadb-connector-c +PORTVERSION= 3.0.2 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= connector-c -DISTNAME= ${PORTNAME}-${PKGNAMESUFFIX}-${PORTVERSION}-src +DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= brnrd@FreeBSD.org COMMENT= MariaDB database connector for C LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/COPYING.LIB BROKEN_armv6= fails to configure: CMake Error: Generator: execution of make failed BROKEN_powerpc64= fails to compile: my_stmt_codec.c: error: invalid use of void expression CONFLICTS_INSTALL= mariadb[0-9]*-client-* \ mariadb102-server-* \ mysql[0-9]*-client-* \ percona[0-9]*-client-* -USES= cmake compiler:c++11-lib ssl +USES= cmake compiler:c++11-lib iconv:translit ssl USE_LDCONFIG= ${PREFIX}/lib/mysql SITESDIR= mariadb/connector-c-${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/mysql +LIB_DEPENDS= libcurl.so:ftp/curl + CMAKE_ARGS+= -DCOMPILATION_COMMENT="FreeBSD Ports" \ -DWITH_EXTERNAL_ZLIB="YES" - -post-install: - ${RM} -r ${STAGEDIR}${PREFIX}/include/mariadb/CMakeFiles -. for f in CMakeLists.txt Makefile Makefile.am cmake_install.cmake - ${RM} ${STAGEDIR}${PREFIX}/include/mariadb/${f} -. endfor .include Index: head/databases/mariadb-connector-c/distinfo =================================================================== --- head/databases/mariadb-connector-c/distinfo (revision 446735) +++ head/databases/mariadb-connector-c/distinfo (revision 446736) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492184849 -SHA256 (mariadb-connector-c-2.3.2-src.tar.gz) = 4063c8655dc37608d4eade981e25b76f67f5d36e8426dc7f20d59e48ebba628a -SIZE (mariadb-connector-c-2.3.2-src.tar.gz) = 538172 +TIMESTAMP = 1501154860 +SHA256 (mariadb-connector-c-3.0.2-src.tar.gz) = 518d14b8d77838370767d73f9bf1674f46232e1a2a34d4195bd38f52a3033758 +SIZE (mariadb-connector-c-3.0.2-src.tar.gz) = 662569 Index: head/databases/mariadb-connector-c/pkg-plist =================================================================== --- head/databases/mariadb-connector-c/pkg-plist (revision 446735) +++ head/databases/mariadb-connector-c/pkg-plist (revision 446736) @@ -1,50 +1,23 @@ bin/mariadb_config -include/mariadb/config-win.h -include/mariadb/dbug.h include/mariadb/errmsg.h -include/mariadb/getopt.h -include/mariadb/hash.h -include/mariadb/m_ctype.h -include/mariadb/m_string.h -include/mariadb/ma_common.h -include/mariadb/ma_dyncol.h -include/mariadb/ma_secure.h -include/mariadb/my_alarm.h -include/mariadb/my_base.h -include/mariadb/my_config.h -include/mariadb/my_config.h.in -include/mariadb/my_context.h -include/mariadb/my_dir.h -include/mariadb/my_global.h -include/mariadb/my_list.h -include/mariadb/my_net.h -include/mariadb/my_no_pthread.h -include/mariadb/my_pthread.h -include/mariadb/my_stmt.h -include/mariadb/my_sys.h +include/mariadb/ma_list.h +include/mariadb/ma_pvio.h +include/mariadb/ma_tls.h +include/mariadb/mariadb/ma_io.h +include/mariadb/mariadb_com.h +include/mariadb/mariadb_ctype.h +include/mariadb/mariadb_dyncol.h +include/mariadb/mariadb_stmt.h +include/mariadb/mariadb_version.h include/mariadb/mysql.h include/mariadb/mysql/client_plugin.h include/mariadb/mysql/plugin_auth.h include/mariadb/mysql/plugin_auth_common.h -include/mariadb/mysql_async.h -include/mariadb/mysql_com.h -include/mariadb/mysql_io.h -include/mariadb/mysql_mm.h -include/mariadb/mysql_priv.h -include/mariadb/mysql_version.h -include/mariadb/mysql_version.h.in -include/mariadb/mysql_wireprotocol.h include/mariadb/mysqld_error.h -include/mariadb/mysys_err.h -include/mariadb/sha1.h -include/mariadb/thr_alarm.h -include/mariadb/violite.h lib/mariadb/libmariadb.so -lib/mariadb/libmariadb.so.2 +lib/mariadb/libmariadb.so.3 lib/mariadb/libmariadbclient.a -lib/mariadb/libmysqlclient.a -lib/mariadb/libmysqlclient.so -lib/mariadb/libmysqlclient_r.a -lib/mariadb/libmysqlclient_r.so -lib/plugin/dialog.so -lib/plugin/mysql_clear_password.so +lib/mariadb/plugin/auth_gssapi_client.so +lib/mariadb/plugin/dialog.so +lib/mariadb/plugin/mysql_clear_password.so +lib/mariadb/plugin/remote_io.so