Upgrade to version 5.2.2:

5.2.2 (10-Sep-2012)

  Bugs fixed:
  * Server disconnects on the execution of a query following execution of a SP
    returning resultset(s) and OUT parameters. (Bug# 14512187)
  * Crash while executing after binding BLOB datatype as INOUT parameter
    (Bug# 14501952)
  * SP having 2 BLOB OUT parameters crashes at execution (Bug# 14563386)
  * ASSERT for INOUT parameter of BIT(N>3) type (Bug#14560916)
  * Using ADO, driver returns wrong type and value for bit(>1) parameter
    (Bug# 14555713)
  * Blobs used in as INOUT parameters have inconsistent behaviour in ADO
    (Bug# 14580316)
  * my_isspace calls cause ODBC driver crashes (Bug# 14363601)
  * SQLNativeSql did not null-terminate output string after copying
    (Bug# 14559721)
  * Incorrect length value passed to SQLSetConnectAttr could cause
    driver crash. (Bug# 14620420)

  Built using MySQL 5.5.27.

----

5.2.1 (09-Aug-2012)

  Functionality added or changed:
  * Driver prepares statements on server
  * Support of INOUT and OUT parameters(WL#6116)
  * Increased the timeout in tests from 30 to 60 seconds to avoid failures in
    slow tests that involve catalog functions and Information_Schema queries.
  Bugs fixed:
  * Long table names crash OBDC driver. (Bug# 14085211/65200)
  * Close proximity issue when handling OS signlals in myodbc (Bug# 14303803)
  * "String data right truncated" error is not always correct (Bug# 14285620)

  Built using MySQL 5.5.27.

----

5.2.0

  Functionality added or changed:
  * Driver available in Unicode and ANSI versions(WL#5850)
  * Driver by default uses server side prepared statements
  * Connection string option NO_SSPS prevents using of server side prepared
    statements. It is configurable via GUI dialog.

  Built using MySQL 5.5.25.

----

5.1.11

  Functionality added or changed:
  * MyODBC queries log is written to %TEMP%\myodbc.sql, or to C:\myodbc.sql if
    TEMP is not defined.
  * Added pre-fetch functionality implemented through LIMIT to avoid reading the
    entire resultset for full table SELECT queries. (WL#6211)

  Bugs fixed:
  * Fractional parts of second is ignored in SQLGetData. (Bug #12767740/60646)
  * ODBC prepared statements ignore fractional part of temporal data types.
    (Bug #12767761/60648)
  * Memory leak on Windows on each connection attepmt. (Bug #11766029/59059)
  * SQLTables() function does not return the catalog correctly if the wildcard
    or SQL_ALL_CATALOGS is used. (Bug #13914518)

----

5.1.10(02-Feb-2012)

  Functionality added or changed:

  Bugs fixed:
  * In some cases TIMESTAMP field could be described as SQL_NO_NULLS.
    (Bug #13532987)
  * SQLFetch has to return error if indicator pointer is NULL for NULL value.
    (Bug #13542600)
  * A failure on one stmt causes another stmt to fail. (Bug #13097201/#62657)

  Built using MySQL 5.5.18.

----

5.1.9 (04-Oct-2011)

  Functionality added or changed:
  * Support of windows authentication.

  Bugs fixed:
  * SQLFetch() did not return SQL_ERROR if connection was dropped due to a
    timeout. (Bug #39878)
  * MS Access with VARCHAR NOT NULL columns. (Bug #31067)
  * sqlwcharchr might read one SQLWCHAR after end of string. (Bug #61586)
  * Column parameter binding makes SQLExecute not to return SQL_ERROR on
    disconnect. (Bug #59772)
  * If pre-execution failed some catalog functions called right after that
    would return only one row. (Bug #12824839)
  * MyODBC driver does not call mysql_thread_end() when the thread ends causing
    error messages such as this: Error in my_thread_global_end(): 1 threads
    didn't exit. (Bug #57727)
  * When NO_BINARY_RESULT was set driver failed to perform the expected data
    conversion. (Bug#11765110/58038)

  Built using MySQL 5.5.16.

10 files changed, 113 insertions, 88 deletions

diff --git a/databases/myodbc/Makefile b/databases/myodbc/Makefile
index 4cf4e3c92ee..ede21b53114 100644
--- a/databases/myodbc/Makefile
+++ b/databases/myodbc/Makefile
@@ -1,32 +1,27 @@
-# $NetBSD: Makefile,v 1.28 2012/10/02 21:25:22 asau Exp $
+# $NetBSD: Makefile,v 1.29 2012/11/22 10:01:09 jnemeth Exp $
 
-DISTNAME=	mysql-connector-odbc-5.1.8
-PKGNAME=	${DISTNAME:S/mysql-connector-odbc/myodbc/}
-PKGREVISION=	2
+DISTNAME=	mysql-connector-odbc-5.2.2-src
+PKGNAME=	${DISTNAME:S/mysql-connector-odbc/myodbc/:S/-src$//}
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_MYSQL:=Connector-ODBC/5.1/}
+MASTER_SITES=	${MASTER_SITE_MYSQL:=Connector-ODBC/5.2/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mysql.com/
 COMMENT=	ODBC driver (server side) for MySQL
 LICENSE=	gnu-gpl-v2
 
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/doc
-CONFIGURE_ARGS+=	--disable-gui
-CONFIGURE_ARGS+=	--disable-myodbc3i
-CONFIGURE_ARGS+=	--disable-test
-CONFIGURE_ARGS+=	--with-mysql-path=${BUILDLINK_PREFIX.mysql-client}
-CONFIGURE_ARGS+=	--without-samples
+USE_CMAKE=		yes
+CMAKE_ARGS=		-Wno-dev
+#CMAKE_ARGS+=		-DMYSQL_DIR=${BUILDLINK_PREFIX.mysql-client}
+CMAKE_ARGS+=		-DMYSQL_INCLUDE_DIR=${BUILDLINK_PREFIX.mysql-client}/include/mysql
+USE_LANGUAGES=		c c++
 
 INSTALLATION_DIRS=	share/doc/mysql-connector-odbc
+INSTALLATION_DIRS+=	share/mysql-connector-odbc/test
 
 .include "options.mk"
 
-# 5.5 fails on my_free(), which no longer accepts 2 arguments, but 1
-MYSQL_VERSIONS_ACCEPTED=	51 50
+MYSQL_VERSIONS_ACCEPTED=	55 51 50
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/databases/myodbc/PLIST b/databases/myodbc/PLIST
index d47270cfcdb..fda004f58e0 100644
--- a/databases/myodbc/PLIST
+++ b/databases/myodbc/PLIST
@@ -1,9 +1,36 @@
-@comment $NetBSD: PLIST,v 1.8 2011/08/19 07:59:58 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2012/11/22 10:01:10 jnemeth Exp $
 bin/myodbc-installer
-${PLIST.gui}lib/libmyodbc3S.la
-lib/libmyodbc5.la
+${PLIST.gui}lib/libmyodbc5S.so
+lib/libmyodbc5w.so
+share/doc/mysql-connector-odbc/COPYING
 share/doc/mysql-connector-odbc/ChangeLog
 share/doc/mysql-connector-odbc/INSTALL
-share/doc/mysql-connector-odbc/LICENSE.gpl
+share/doc/mysql-connector-odbc/Licenses_for_Third-Party_Components.txt
 share/doc/mysql-connector-odbc/README
 share/doc/mysql-connector-odbc/README.debug
+share/mysql-connector-odbc/test/CTestTestfile.cmake
+share/mysql-connector-odbc/test/my_basics
+share/mysql-connector-odbc/test/my_blob
+share/mysql-connector-odbc/test/my_bug13766
+share/mysql-connector-odbc/test/my_bulk
+share/mysql-connector-odbc/test/my_catalog
+share/mysql-connector-odbc/test/my_curext
+share/mysql-connector-odbc/test/my_cursor
+share/mysql-connector-odbc/test/my_datetime
+share/mysql-connector-odbc/test/my_desc
+share/mysql-connector-odbc/test/my_dyn_cursor
+share/mysql-connector-odbc/test/my_error
+share/mysql-connector-odbc/test/my_info
+share/mysql-connector-odbc/test/my_keys
+share/mysql-connector-odbc/test/my_param
+share/mysql-connector-odbc/test/my_prepare
+share/mysql-connector-odbc/test/my_relative
+share/mysql-connector-odbc/test/my_result
+share/mysql-connector-odbc/test/my_scroll
+share/mysql-connector-odbc/test/my_tran
+share/mysql-connector-odbc/test/my_types
+share/mysql-connector-odbc/test/my_unicode
+share/mysql-connector-odbc/test/my_unixodbc
+share/mysql-connector-odbc/test/my_use_result
+share/mysql-connector-odbc/test/odbc.ini
+share/mysql-connector-odbc/test/odbcinst.ini
diff --git a/databases/myodbc/distinfo b/databases/myodbc/distinfo
index 3c69c3d0c9d..78dd7793ccc 100644
--- a/databases/myodbc/distinfo
+++ b/databases/myodbc/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.8 2011/08/19 07:59:58 adam Exp $
+$NetBSD: distinfo,v 1.9 2012/11/22 10:01:10 jnemeth Exp $
 
-SHA1 (mysql-connector-odbc-5.1.8.tar.gz) = 2272075c66712cf7a05e50eeb4520f7c504c3ae8
-RMD160 (mysql-connector-odbc-5.1.8.tar.gz) = 0db5c4d42c7377f7fc1fa2ad569f50f9a497511e
-Size (mysql-connector-odbc-5.1.8.tar.gz) = 1079813 bytes
-SHA1 (patch-aa) = 008d85389f444ca2f60fee1c67651e0a00d13e4f
-SHA1 (patch-ab) = 0d2782336164bd35729d0a82485ed47d890834f8
-SHA1 (patch-ac) = f7920f3a3321b09c93cfbf2959d52455e1ed7436
-SHA1 (patch-ad) = 74a2067b2b9d1dca4cf798f4af4901dbdde5d51a
+SHA1 (mysql-connector-odbc-5.2.2-src.tar.gz) = f289c1127a67e15d6b179eea3b202a00044624b9
+RMD160 (mysql-connector-odbc-5.2.2-src.tar.gz) = f4485a76be39e4534dcdfceb6b5c92a8a812d171
+Size (mysql-connector-odbc-5.2.2-src.tar.gz) = 573157 bytes
+SHA1 (patch-CMakeLists.txt) = 584d003286c190e03e16a69ebf546587795e55eb
+SHA1 (patch-test_CMakeLists.txt) = 8d02fccbac6e09d97618ea188320fe2d35dbf00b
diff --git a/databases/myodbc/options.mk b/databases/myodbc/options.mk
index 5cbaa94e6d1..c8fd634b5c8 100644
--- a/databases/myodbc/options.mk
+++ b/databases/myodbc/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2011/08/19 07:59:58 adam Exp $
+# $NetBSD: options.mk,v 1.6 2012/11/22 10:01:10 jnemeth Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.myodbc
 PKG_OPTIONS_REQUIRED_GROUPS=	db
@@ -12,21 +12,18 @@ PLIST_VARS+=		gui
 
 .if !empty(PKG_OPTIONS:Mgui)
 .  include "../../x11/qt3-tools/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-gui
-USE_LANGUAGES=		c c++
+#CONFIGURE_ARGS+=	--enable-gui
+#USE_LANGUAGES=		c c++
 PLIST.gui=		yes
 .else
-CONFIGURE_ARGS+=	--disable-gui
+#CONFIGURE_ARGS+=	--disable-gui
 .endif
 
 .if !empty(PKG_OPTIONS:Miodbc)
 .  include "../../databases/iodbc/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-iODBC=${BUILDLINK_PREFIX.iodbc}
-CONFIGURE_ARGS+=	--with-odbc-ini=${PKG_SYSCONFDIR.iodbc}/odbc.ini
 .endif
 
 .if !empty(PKG_OPTIONS:Munixodbc)
 .  include "../../databases/unixodbc/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-unixODBC=${BUILDLINK_PREFIX.unixodbc}
-CONFIGURE_ARGS+=	--with-odbc-ini=${PKG_SYSCONFDIR.unixodbc}/odbc.ini
+CMAKE_ARGS+=		-DWITH_UNIXODBC=1
 .endif
diff --git a/databases/myodbc/patches/patch-CMakeLists.txt b/databases/myodbc/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..78c8c08f38f
--- /dev/null
+++ b/databases/myodbc/patches/patch-CMakeLists.txt
@@ -0,0 +1,39 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2012/11/22 10:01:10 jnemeth Exp $
+
+--- CMakeLists.txt.orig	2012-09-18 10:56:28.000000000 +0000
++++ CMakeLists.txt
+@@ -232,6 +232,8 @@ IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR 
+   SET(LIB_SUBDIR "lib64")
+ ENDIF()
+ 
++SET(DOC_SUBDIR "share/doc/mysql-connector-odbc")
++
+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
+ 
+ ADD_SUBDIRECTORY(util)
+@@ -329,18 +331,18 @@ IF(WIN32)
+ 
+ ELSE(WIN32)
+ 
+-  INSTALL(FILES ChangeLog    DESTINATION .)
+-  INSTALL(FILES README       DESTINATION .)
+-  INSTALL(FILES README.debug DESTINATION .)
+-  INSTALL(FILES INSTALL      DESTINATION .)
++  INSTALL(FILES ChangeLog    DESTINATION ${DOC_SUBDIR})
++  INSTALL(FILES README       DESTINATION ${DOC_SUBDIR})
++  INSTALL(FILES README.debug DESTINATION ${DOC_SUBDIR})
++  INSTALL(FILES INSTALL      DESTINATION ${DOC_SUBDIR})
+   IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
+-    INSTALL(FILES COPYING       DESTINATION .)
++    INSTALL(FILES COPYING       DESTINATION ${DOC_SUBDIR})
+   ELSE()
+-    INSTALL(FILES LICENSE.mysql DESTINATION .)
++    INSTALL(FILES LICENSE.mysql DESTINATION ${DOC_SUBDIR})
+   ENDIF()
+ 
+ ENDIF(WIN32)
+ 
+-INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .)
++INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ${DOC_SUBDIR})
+ 
+ INCLUDE(CPack)
diff --git a/databases/myodbc/patches/patch-aa b/databases/myodbc/patches/patch-aa
deleted file mode 100644
index 6cadbeaa3a7..00000000000
--- a/databases/myodbc/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2010/05/03 05:03:11 jnemeth Exp $
-
---- Makefile.in.orig	2009-11-05 21:35:16.000000000 +0000
-+++ Makefile.in
-@@ -366,7 +366,7 @@ distclean-libtool:
- 	-rm -f libtool config.lt
- install-readmeDATA: $(readme_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(readmedir)" || $(MKDIR_P) "$(DESTDIR)$(readmedir)"
-+	test -z "$(DESTDIR)$(readmedir)" || $(MKDIR_P) "$(DESTDIR)$(readmedir)"
- 	@list='$(readme_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
diff --git a/databases/myodbc/patches/patch-ab b/databases/myodbc/patches/patch-ab
deleted file mode 100644
index c5e3d04e781..00000000000
--- a/databases/myodbc/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2011/08/19 07:59:58 adam Exp $
-
---- driver/Makefile.in.orig	2009-11-05 21:35:15.000000000 +0000
-+++ driver/Makefile.in
-@@ -363,7 +363,7 @@ distclean-hdr:
- 	-rm -f myconf.h stamp-h1
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-+	test -z "$(DESTDIR)$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
diff --git a/databases/myodbc/patches/patch-ac b/databases/myodbc/patches/patch-ac
deleted file mode 100644
index 4eeed8fa8b3..00000000000
--- a/databases/myodbc/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2010/05/03 05:03:11 jnemeth Exp $
-
---- installer/Makefile.in.orig	2009-11-05 21:35:15.000000000 +0000
-+++ installer/Makefile.in
-@@ -288,7 +288,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-+	test -z "$(DESTDIR)$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
diff --git a/databases/myodbc/patches/patch-ad b/databases/myodbc/patches/patch-ad
deleted file mode 100644
index 7d48ecc708a..00000000000
--- a/databases/myodbc/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2011/08/19 07:59:58 adam Exp $
-
---- setup/Makefile.in.orig	2009-11-05 21:35:15.000000000 +0000
-+++ setup/Makefile.in
-@@ -400,7 +400,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-+	test -z "$(DESTDIR)$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
diff --git a/databases/myodbc/patches/patch-test_CMakeLists.txt b/databases/myodbc/patches/patch-test_CMakeLists.txt
new file mode 100644
index 00000000000..d2afde2c4e7
--- /dev/null
+++ b/databases/myodbc/patches/patch-test_CMakeLists.txt
@@ -0,0 +1,21 @@
+$NetBSD: patch-test_CMakeLists.txt,v 1.1 2012/11/22 10:01:10 jnemeth Exp $
+
+--- test/CMakeLists.txt.orig	2012-09-18 10:56:28.000000000 +0000
++++ test/CMakeLists.txt
+@@ -44,7 +44,7 @@ FOREACH(T my_basics my_blob my_bulk my_c
+ 		my_types my_unicode my_unixodbc my_use_result my_bug13766)
+ 	ADD_EXECUTABLE(${T} ${T}.c)
+ 
+-    INSTALL(TARGETS ${T} DESTINATION test COMPONENT tests)
++    INSTALL(TARGETS ${T} DESTINATION share/mysql-connector-odbc/test COMPONENT tests)
+ 
+ 	IF(WIN32)
+ 	  TARGET_LINK_LIBRARIES(${T} ${ODBCLIB} ${ODBCINSTLIB})
+@@ -59,6 +59,6 @@ INSTALL(FILES
+ 	${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake
+ 	${CMAKE_CURRENT_BINARY_DIR}/odbc.ini
+ 	${CMAKE_CURRENT_BINARY_DIR}/odbcinst.ini
+-        DESTINATION test COMPONENT tests)
++        DESTINATION share/mysql-connector-odbc/test COMPONENT tests)
+ 
+