databases/mysql-connector-c: UNBREAK

- Update version 6.1.5=>6.1.6
- Fix patch files to reflect 'make makepatch'
- Take MAINTAINERSHIP

7 files changed, 39 insertions, 16 deletions

diff --git a/databases/mysql-connector-c/Makefile b/databases/mysql-connector-c/Makefile
index 83569ecf10d7..f35db227116e 100644
--- a/databases/mysql-connector-c/Makefile
+++ b/databases/mysql-connector-c/Makefile
@@ -2,26 +2,22 @@
 # $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}
diff --git a/databases/mysql-connector-c/distinfo b/databases/mysql-connector-c/distinfo
index a56de2344252..66c17ee203be 100644
--- a/databases/mysql-connector-c/distinfo
+++ b/databases/mysql-connector-c/distinfo
@@ -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
diff --git a/databases/mysql-connector-c/files/patch-CMakeLists.txt b/databases/mysql-connector-c/files/patch-CMakeLists.txt
index 3085b8c10489..30ad71fa38de 100644
--- a/databases/mysql-connector-c/files/patch-CMakeLists.txt
+++ b/databases/mysql-connector-c/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- 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
  #
diff --git a/databases/mysql-connector-c/files/patch-cmake_install_layout.cmake b/databases/mysql-connector-c/files/patch-cmake_install__layout.cmake
index 10d60d0cf938..890cb1100937 100644
--- a/databases/mysql-connector-c/files/patch-cmake_install_layout.cmake
+++ b/databases/mysql-connector-c/files/patch-cmake_install__layout.cmake
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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
  #
diff --git a/databases/mysql-connector-c/files/patch-cmake_ssl.cmake b/databases/mysql-connector-c/files/patch-cmake_ssl.cmake
new file mode 100644
index 000000000000..c240d3089cda
--- /dev/null
+++ b/databases/mysql-connector-c/files/patch-cmake_ssl.cmake
@@ -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"
diff --git a/databases/mysql-connector-c/files/patch-vio_viossl.c b/databases/mysql-connector-c/files/patch-vio_viossl.c
new file mode 100644
index 000000000000..3fd5e7740a69
--- /dev/null
+++ b/databases/mysql-connector-c/files/patch-vio_viossl.c
@@ -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
diff --git a/databases/mysql-connector-c/pkg-plist b/databases/mysql-connector-c/pkg-plist
index 5190f64eabcd..e54d11cfbfc3 100644
--- a/databases/mysql-connector-c/pkg-plist
+++ b/databases/mysql-connector-c/pkg-plist
@@ -19,7 +19,6 @@ 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
@@ -46,6 +45,7 @@ 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