9 files changed, 70 insertions, 118 deletions

diff --git a/databases/mysql-connector-c/Makefile b/databases/mysql-connector-c/Makefile
index 5aec302392b9..e61e3c941d7e 100644
--- a/databases/mysql-connector-c/Makefile
+++ b/databases/mysql-connector-c/Makefile
@@ -2,10 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	mysql-connector-c
-PORTVERSION=	6.0.2
+PORTVERSION=	6.1.3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	Connector-C
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	MySQL database connector for C
@@ -13,10 +14,9 @@ COMMENT=	MySQL database connector for C
 LICENSE=	GPLv2
 
 USE_MYSQL=	51+
-USES=		cmake
+USES=		cmake:outsource
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/databases/mysql-connector-c/distinfo b/databases/mysql-connector-c/distinfo
index 706c1a03cfce..78e37737741a 100644
--- a/databases/mysql-connector-c/distinfo
+++ b/databases/mysql-connector-c/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-connector-c-6.0.2.tar.gz) = 4b8cb0846d4084c77699399d017989e49c8fea70dcfdd1aac0ebdcff07b6daaa
-SIZE (mysql-connector-c-6.0.2.tar.gz) = 2794254
+SHA256 (mysql-connector-c-6.1.3-src.tar.gz) = 2552494da346a299f672bd9d1df493539c10014a0571286dd98b36ba7757b2b8
+SIZE (mysql-connector-c-6.1.3-src.tar.gz) = 3060172
diff --git a/databases/mysql-connector-c/files/patch-CMakeLists.txt b/databases/mysql-connector-c/files/patch-CMakeLists.txt
deleted file mode 100644
index 98d9b915bc8e..000000000000
--- a/databases/mysql-connector-c/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- CMakeLists.txt.orig	2009-08-07 14:31:12.000000000 +0200
-+++ CMakeLists.txt	2013-02-01 17:33:24.000000000 +0100
-@@ -318,7 +318,7 @@
- ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- 
- INSTALL(DIRECTORY "include/"
--        DESTINATION "include"
-+        DESTINATION "include/mysql-connector-c/"
-         FILES_MATCHING PATTERN "*.h")
- 
- # ----------------------------------------------------------------------
-@@ -366,6 +366,4 @@
-   SET(CPACK_PACKAGE_FILE_NAME         "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
- ENDIF(WIN32)
- 
--INSTALL(FILES "README" "COPYING" "LICENSE.mysql" "EXCEPTIONS-CLIENT" "ChaneLog" DESTINATION "." OPTIONAL)
--
- INCLUDE(CPack)
diff --git a/databases/mysql-connector-c/files/patch-CMakePlatformTests.txt b/databases/mysql-connector-c/files/patch-CMakePlatformTests.txt
deleted file mode 100644
index 83fb2d661afc..000000000000
--- a/databases/mysql-connector-c/files/patch-CMakePlatformTests.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakePlatformTests.txt.orig	2013-02-01 17:25:53.000000000 +0100
-+++ CMakePlatformTests.txt	2013-02-01 17:26:03.000000000 +0100
-@@ -55,7 +55,7 @@
- CHECK_INCLUDE_FILES (sys/socket.h HAVE_SYS_SOCKET_H)
- CHECK_INCLUDE_FILES (sys/stat.h HAVE_SYS_STAT_H)
- CHECK_INCLUDE_FILES (sys/stream.h HAVE_SYS_STREAM_H)
--CHECK_INCLUDE_FILES (sys/timeb.h HAVE_SYS_TIMEB_H)
-+#CHECK_INCLUDE_FILES (sys/timeb.h HAVE_SYS_TIMEB_H)
- CHECK_INCLUDE_FILES (sys/types.h HAVE_SYS_TYPES_H)
- CHECK_INCLUDE_FILES (sys/un.h HAVE_SYS_UN_H)
- CHECK_INCLUDE_FILES (termios.h HAVE_TERMIOS_H)
diff --git a/databases/mysql-connector-c/files/patch-cmake_install_layout.cmake b/databases/mysql-connector-c/files/patch-cmake_install_layout.cmake
new file mode 100644
index 000000000000..10d60d0cf938
--- /dev/null
+++ b/databases/mysql-connector-c/files/patch-cmake_install_layout.cmake
@@ -0,0 +1,21 @@
+--- 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     ".")
diff --git a/databases/mysql-connector-c/files/patch-libmysql_CMakeLists.txt b/databases/mysql-connector-c/files/patch-libmysql_CMakeLists.txt
deleted file mode 100644
index cf3dfa66c6ad..000000000000
--- a/databases/mysql-connector-c/files/patch-libmysql_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- libmysql/CMakeLists.txt.orig	2013-02-01 17:34:32.000000000 +0100
-+++ libmysql/CMakeLists.txt	2013-02-01 17:34:57.000000000 +0100
-@@ -146,9 +146,9 @@
-           ARCHIVE DESTINATION "lib")
- ELSE(WIN32)
-   INSTALL(TARGETS libmysql mysqlclient
--          LIBRARY DESTINATION "lib"
--          ARCHIVE DESTINATION "lib")
-+          LIBRARY DESTINATION "lib/mysql-connector-c/"
-+          ARCHIVE DESTINATION "lib/mysql-connector-c/")
-   INSTALL(FILES ${CMAKE_SOURCE_DIR}/libmysql/libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX}
-                 ${CMAKE_SOURCE_DIR}/libmysql/libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX}
--          DESTINATION "lib")
-+          DESTINATION "lib/mysql-connector-c/")
- ENDIF(WIN32)
diff --git a/databases/mysql-connector-c/files/patch-mysql_config_CMakeLists.txt b/databases/mysql-connector-c/files/patch-mysql_config_CMakeLists.txt
deleted file mode 100644
index cf31b2a74000..000000000000
--- a/databases/mysql-connector-c/files/patch-mysql_config_CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
---- mysql_config/CMakeLists.txt.orig	2013-02-01 17:36:54.000000000 +0100
-+++ mysql_config/CMakeLists.txt	2013-02-01 17:37:06.000000000 +0100
-@@ -32,4 +32,4 @@
- # Installation
- #
- INSTALL(TARGETS mysql_config
--        DESTINATION "bin")
-+        DESTINATION "bin/mysql-connector-c/")
diff --git a/databases/mysql-connector-c/files/patch-mysql_config_mysql_config.c.in b/databases/mysql-connector-c/files/patch-mysql_config_mysql_config.c.in
deleted file mode 100644
index 5a33e1f460a7..000000000000
--- a/databases/mysql-connector-c/files/patch-mysql_config_mysql_config.c.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- mysql_config/mysql_config.c.in.orig	2013-02-01 17:35:59.000000000 +0100
-+++ mysql_config/mysql_config.c.in	2013-02-01 17:36:22.000000000 +0100
-@@ -18,8 +18,8 @@
- #include <my_getopt.h>
- #include <stdio.h>
- 
--#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/include"
--#define LIBS    "-L@CMAKE_INSTALL_PREFIX@/lib -lmysql" \
-+#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/include/mysql-connector-c"
-+#define LIBS    "-L@CMAKE_INSTALL_PREFIX@/lib/mysql-connector-c -lmysql" \
-                 "@extra_dynamic_LDFLAGS@"
- #define CFLAGS  INCLUDE
- #define VERSION "@CONNECTOR_C_VERSION@"
diff --git a/databases/mysql-connector-c/pkg-plist b/databases/mysql-connector-c/pkg-plist
index 47b1865dc6f8..ab385981735e 100644
--- a/databases/mysql-connector-c/pkg-plist
+++ b/databases/mysql-connector-c/pkg-plist
@@ -1,78 +1,74 @@
-include/mysql-connector-c/atomic/gcc_builtins.h
-include/mysql-connector-c/atomic/generic-msvc.h
-include/mysql-connector-c/atomic/nolock.h
-include/mysql-connector-c/atomic/rwlock.h
-include/mysql-connector-c/atomic/x86-gcc.h
-include/mysql-connector-c/base64.h
-include/mysql-connector-c/config-win.h
+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/byte_order_generic_x86_64.h
 include/mysql-connector-c/decimal.h
 include/mysql-connector-c/errmsg.h
-include/mysql-connector-c/hash.h
 include/mysql-connector-c/keycache.h
-include/mysql-connector-c/lf.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_aes.h
-include/mysql-connector-c/my_alarm.h
 include/mysql-connector-c/my_alloc.h
-include/mysql-connector-c/my_atomic.h
 include/mysql-connector-c/my_attribute.h
-include/mysql-connector-c/my_base.h
-include/mysql-connector-c/my_bit.h
-include/mysql-connector-c/my_bitmap.h
-include/mysql-connector-c/my_charsets.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_libwrap.h
 include/mysql-connector-c/my_list.h
-include/mysql-connector-c/my_md5.h
 include/mysql-connector-c/my_net.h
-include/mysql-connector-c/my_no_pthread.h
-include/mysql-connector-c/my_nosys.h
 include/mysql-connector-c/my_pthread.h
-include/mysql-connector-c/my_stacktrace.h
 include/mysql-connector-c/my_sys.h
-include/mysql-connector-c/my_time.h
-include/mysql-connector-c/my_tree.h
-include/mysql-connector-c/my_trie.h
-include/mysql-connector-c/my_uctype.h
-include/mysql-connector-c/my_vle.h
 include/mysql-connector-c/my_xml.h
-include/mysql-connector-c/myisampack.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_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_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/mysys/rijndael.h
-include/mysql-connector-c/mysys_err.h
-include/mysql-connector-c/queues.h
-include/mysql-connector-c/service_versions.h
-include/mysql-connector-c/sha1.h
-include/mysql-connector-c/sha2.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/t_ctype.h
-include/mysql-connector-c/thr_alarm.h
-include/mysql-connector-c/thr_lock.h
 include/mysql-connector-c/typelib.h
-include/mysql-connector-c/violite.h
-include/mysql-connector-c/waiting_threads.h
-include/mysql-connector-c/wqueue.h
-include/mysql-connector-c/mysql_version.h
-include/mysql-connector-c/my_config.h
-lib/mysql-connector-c/libmysql.so.16.0.0
-lib/mysql-connector-c/libmysql.so.16
-lib/mysql-connector-c/libmysql.so
 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
-bin/mysql-connector-c/mysql_config
+lib/mysql-connector-c/libmysqlclient_r.so.18
+libdata/ldconfig/mysql-connector-c
 @dirrm lib/mysql-connector-c
-@dirrm include/mysql-connector-c/atomic
-@dirrm include/mysql-connector-c/mysys
-@dirrm include/mysql-connector-c
 @dirrm bin/mysql-connector-c
+@dirrm include/mysql-connector-c/mysql/psi
+@dirrm include/mysql-connector-c/mysql
+@dirrm include/mysql-connector-c