Index: head/databases/mysql-connector-c/Makefile =================================================================== --- head/databases/mysql-connector-c/Makefile (revision 390159) +++ head/databases/mysql-connector-c/Makefile (revision 390160) @@ -1,35 +1,31 @@ # Created by: gahr # $FreeBSD$ PORTNAME= mysql-connector-c -PORTVERSION= 6.1.5 +PORTVERSION= 6.1.6 CATEGORIES= databases MASTER_SITES= MYSQL/Connector-C DISTNAME= ${PORTNAME}-${PORTVERSION}-src -MAINTAINER= ports@FreeBSD.org +MAINTAINER= bofh@FreeBSD.org COMMENT= MySQL database connector for C LICENSE= GPLv2 -BROKEN= Fails to configure - USE_MYSQL= 51+ USE_OPENSSL= yes WITH_OPENSSL_PORT=yes USES= cmake:outsource compiler:features CMAKE_ARGS+= -DWITH_SSL=system \ - -DOPENSSL_INCLUDE_DIR=${LOCALBASE}/include \ - -DOPENSSL_LIBRARY=${LOCALBASE}/lib/libssl.so \ - -DCRYPTO_LIBRARY=${LOCALBASE}/lib/libcrypto.so + -DOPENSSL_INCLUDE_DIR=${LOCALBASE}/include/openssl USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} PLIST_SUB+= PORTVERSION=${PORTVERSION} .include .if ${ARCH} == "i386" && ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 CFLAGS+= -march=i586 .endif .include Index: head/databases/mysql-connector-c/distinfo =================================================================== --- head/databases/mysql-connector-c/distinfo (revision 390159) +++ head/databases/mysql-connector-c/distinfo (revision 390160) @@ -1,2 +1,2 @@ -SHA256 (mysql-connector-c-6.1.5-src.tar.gz) = 278f2b40f3980079bc7ad247cb2bf08967ce56ef79da468ae26ff2e2a560be66 -SIZE (mysql-connector-c-6.1.5-src.tar.gz) = 3455028 +SHA256 (mysql-connector-c-6.1.6-src.tar.gz) = 2222433012c415871958b61bc4f3683e1ebe77e3389f698b267058c12533ea78 +SIZE (mysql-connector-c-6.1.6-src.tar.gz) = 3475044 Index: head/databases/mysql-connector-c/files/patch-cmake_install_layout.cmake =================================================================== --- head/databases/mysql-connector-c/files/patch-cmake_install_layout.cmake (revision 390159) +++ head/databases/mysql-connector-c/files/patch-cmake_install_layout.cmake (nonexistent) @@ -1,21 +0,0 @@ ---- cmake/install_layout.cmake.orig 2013-12-23 20:24:06.000000000 +0100 -+++ cmake/install_layout.cmake 2014-01-31 15:09:54.000000000 +0100 -@@ -112,14 +112,14 @@ - # - # STANDALONE layout - # --SET(INSTALL_BINDIR_STANDALONE "bin") -+SET(INSTALL_BINDIR_STANDALONE "bin/mysql-connector-c") - SET(INSTALL_SBINDIR_STANDALONE "bin") - SET(INSTALL_SCRIPTDIR_STANDALONE "scripts") - # --SET(INSTALL_LIBDIR_STANDALONE "lib") --SET(INSTALL_PLUGINDIR_STANDALONE "lib/plugin") -+SET(INSTALL_LIBDIR_STANDALONE "lib/mysql-connector-c") -+SET(INSTALL_PLUGINDIR_STANDALONE "lib/mysql-connector-cplugin") - # --SET(INSTALL_INCLUDEDIR_STANDALONE "include") -+SET(INSTALL_INCLUDEDIR_STANDALONE "include/mysql-connector-c") - # - SET(INSTALL_DOCDIR_STANDALONE "docs") - SET(INSTALL_DOCREADMEDIR_STANDALONE ".") Property changes on: head/databases/mysql-connector-c/files/patch-cmake_install_layout.cmake ___________________________________________________________________ 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/mysql-connector-c/files/patch-CMakeLists.txt =================================================================== --- head/databases/mysql-connector-c/files/patch-CMakeLists.txt (revision 390159) +++ head/databases/mysql-connector-c/files/patch-CMakeLists.txt (revision 390160) @@ -1,11 +1,11 @@ ---- CMakeLists.txt.orig 2014-01-31 15:10:13.000000000 +0100 -+++ CMakeLists.txt 2014-01-31 15:10:39.000000000 +0100 -@@ -535,7 +535,7 @@ +--- CMakeLists.txt.orig 2015-02-25 21:09:49 UTC ++++ CMakeLists.txt +@@ -541,7 +541,7 @@ ADD_SUBDIRECTORY(packaging/WiX) # # RPM installs documentation directly from the source tree # -IF(NOT INSTALL_LAYOUT MATCHES "RPM") +IF(NOT INSTALL_LAYOUT MATCHES "RPM" AND 0) INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme Index: head/databases/mysql-connector-c/files/patch-cmake_install__layout.cmake =================================================================== --- head/databases/mysql-connector-c/files/patch-cmake_install__layout.cmake (nonexistent) +++ head/databases/mysql-connector-c/files/patch-cmake_install__layout.cmake (revision 390160) @@ -0,0 +1,21 @@ +--- cmake/install_layout.cmake.orig 2015-02-25 21:09:49 UTC ++++ cmake/install_layout.cmake +@@ -112,14 +112,14 @@ FILE(GLOB plugin_tests + # + # STANDALONE layout + # +-SET(INSTALL_BINDIR_STANDALONE "bin") ++SET(INSTALL_BINDIR_STANDALONE "bin/mysql-connector-c") + SET(INSTALL_SBINDIR_STANDALONE "bin") + SET(INSTALL_SCRIPTDIR_STANDALONE "scripts") + # +-SET(INSTALL_LIBDIR_STANDALONE "lib") +-SET(INSTALL_PLUGINDIR_STANDALONE "lib/plugin") ++SET(INSTALL_LIBDIR_STANDALONE "lib/mysql-connector-c") ++SET(INSTALL_PLUGINDIR_STANDALONE "lib/mysql-connector-cplugin") + # +-SET(INSTALL_INCLUDEDIR_STANDALONE "include") ++SET(INSTALL_INCLUDEDIR_STANDALONE "include/mysql-connector-c") + # + SET(INSTALL_DOCDIR_STANDALONE "docs") + SET(INSTALL_DOCREADMEDIR_STANDALONE ".") Property changes on: head/databases/mysql-connector-c/files/patch-cmake_install__layout.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/mysql-connector-c/files/patch-cmake_ssl.cmake =================================================================== --- head/databases/mysql-connector-c/files/patch-cmake_ssl.cmake (nonexistent) +++ head/databases/mysql-connector-c/files/patch-cmake_ssl.cmake (revision 390160) @@ -0,0 +1,14 @@ +--- cmake/ssl.cmake.orig 2015-02-25 21:09:49 UTC ++++ cmake/ssl.cmake +@@ -164,9 +164,9 @@ MACRO (MYSQL_CHECK_SSL) + # Verify version number. Version information looks like: + # #define OPENSSL_VERSION_NUMBER 0x1000103fL + # Encoded as MNNFFPPS: major minor fix patch status +- FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" ++ FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/opensslv.h" + OPENSSL_VERSION_NUMBER +- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" ++ REGEX "^#[\t ]define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" + ) + STRING(REGEX REPLACE + "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" Property changes on: head/databases/mysql-connector-c/files/patch-cmake_ssl.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/mysql-connector-c/files/patch-vio_viossl.c =================================================================== --- head/databases/mysql-connector-c/files/patch-vio_viossl.c (nonexistent) +++ head/databases/mysql-connector-c/files/patch-vio_viossl.c (revision 390160) @@ -0,0 +1,13 @@ +--- vio/viossl.c.orig 2015-06-20 10:21:51 UTC ++++ vio/viossl.c +@@ -392,8 +392,10 @@ static int ssl_do(struct st_VioSSLFd *pt + SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout); + SSL_set_fd(ssl, sd); + #ifndef HAVE_YASSL ++#ifdef SSL_OP_NO_COMPRESSION + SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); + #endif ++#endif + + /* + Since yaSSL does not support non-blocking send operations, use Property changes on: head/databases/mysql-connector-c/files/patch-vio_viossl.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/mysql-connector-c/pkg-plist =================================================================== --- head/databases/mysql-connector-c/pkg-plist (revision 390159) +++ head/databases/mysql-connector-c/pkg-plist (revision 390160) @@ -1,67 +1,67 @@ bin/mysql-connector-c/my_print_defaults bin/mysql-connector-c/mysql_config bin/mysql-connector-c/perror include/mysql-connector-c/big_endian.h include/mysql-connector-c/byte_order_generic.h include/mysql-connector-c/byte_order_generic_x86.h include/mysql-connector-c/decimal.h include/mysql-connector-c/errmsg.h include/mysql-connector-c/keycache.h include/mysql-connector-c/little_endian.h include/mysql-connector-c/m_ctype.h include/mysql-connector-c/m_string.h include/mysql-connector-c/my_alloc.h include/mysql-connector-c/my_byteorder.h include/mysql-connector-c/my_compiler.h include/mysql-connector-c/my_config.h include/mysql-connector-c/my_dbug.h include/mysql-connector-c/my_dir.h include/mysql-connector-c/my_getopt.h include/mysql-connector-c/my_global.h include/mysql-connector-c/my_list.h -include/mysql-connector-c/my_net.h include/mysql-connector-c/my_pthread.h include/mysql-connector-c/my_sys.h include/mysql-connector-c/my_xml.h include/mysql-connector-c/mysql.h include/mysql-connector-c/mysql/client_authentication.h include/mysql-connector-c/mysql/client_plugin.h include/mysql-connector-c/mysql/client_plugin.h.pp include/mysql-connector-c/mysql/get_password.h include/mysql-connector-c/mysql/plugin_auth_common.h include/mysql-connector-c/mysql/plugin_trace.h include/mysql-connector-c/mysql/psi/mysql_file.h include/mysql-connector-c/mysql/psi/mysql_idle.h include/mysql-connector-c/mysql/psi/mysql_mdl.h include/mysql-connector-c/mysql/psi/mysql_memory.h include/mysql-connector-c/mysql/psi/mysql_ps.h include/mysql-connector-c/mysql/psi/mysql_socket.h include/mysql-connector-c/mysql/psi/mysql_sp.h include/mysql-connector-c/mysql/psi/mysql_stage.h include/mysql-connector-c/mysql/psi/mysql_statement.h include/mysql-connector-c/mysql/psi/mysql_table.h include/mysql-connector-c/mysql/psi/mysql_thread.h include/mysql-connector-c/mysql/psi/mysql_transaction.h include/mysql-connector-c/mysql/psi/psi.h include/mysql-connector-c/mysql/psi/psi_base.h include/mysql-connector-c/mysql/psi/psi_memory.h include/mysql-connector-c/mysql/service_mysql_alloc.h +include/mysql-connector-c/mysql/service_my_snprintf.h include/mysql-connector-c/mysql_com.h include/mysql-connector-c/mysql_com_server.h include/mysql-connector-c/mysql_embed.h include/mysql-connector-c/mysql_time.h include/mysql-connector-c/mysql_version.h include/mysql-connector-c/mysqld_ername.h include/mysql-connector-c/mysqld_error.h include/mysql-connector-c/sql_common.h include/mysql-connector-c/sql_state.h include/mysql-connector-c/sslopt-case.h include/mysql-connector-c/sslopt-longopts.h include/mysql-connector-c/sslopt-vars.h include/mysql-connector-c/typelib.h lib/mysql-connector-c/libmysqlclient.a lib/mysql-connector-c/libmysqlclient.so lib/mysql-connector-c/libmysqlclient.so.18 lib/mysql-connector-c/libmysqlclient_r.a lib/mysql-connector-c/libmysqlclient_r.so lib/mysql-connector-c/libmysqlclient_r.so.18