databases/mariadb-connector-c: Update to 3.0.2

 - Major version update to 3.0.2
 - Fix PKGNAME
 - Add LICENSE_FILE
 - Add iconv and curl dependencies
 - Remove post-install fix
 - Remove now redundant patch

4 files changed, 24 insertions, 71 deletions

diff --git a/databases/mariadb-connector-c/Makefile b/databases/mariadb-connector-c/Makefile
index 0d04ba666f71..d664e463f303 100644
--- a/databases/mariadb-connector-c/Makefile
+++ b/databases/mariadb-connector-c/Makefile
@@ -1,7 +1,7 @@
 # $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}/ \
@@ -11,13 +11,13 @@ MASTER_SITES=	http://ftp.osuosl.org/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
@@ -27,18 +27,14 @@ CONFLICTS_INSTALL=	mariadb[0-9]*-client-* \
 			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 <bsd.port.mk>
diff --git a/databases/mariadb-connector-c/distinfo b/databases/mariadb-connector-c/distinfo
index 42eb2ce8132a..b4194f1e7a59 100644
--- a/databases/mariadb-connector-c/distinfo
+++ b/databases/mariadb-connector-c/distinfo
@@ -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
diff --git a/databases/mariadb-connector-c/files/patch-libmariadb_ma__secure.c b/databases/mariadb-connector-c/files/patch-libmariadb_ma__secure.c
deleted file mode 100644
index e9231dc863e2..000000000000
--- a/databases/mariadb-connector-c/files/patch-libmariadb_ma__secure.c
+++ /dev/null
@@ -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();
diff --git a/databases/mariadb-connector-c/pkg-plist b/databases/mariadb-connector-c/pkg-plist
index 73a58dbd92e8..468e8b381002 100644
--- a/databases/mariadb-connector-c/pkg-plist
+++ b/databases/mariadb-connector-c/pkg-plist
@@ -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