Update to mysql-connector-odbc-3.51.26r1127 (from 3.51.12). Most

important change: 3.51.12 doesn't work anymore with mysql-client-5.0.67nb1,
a function has been removed from the mysql-client library.
Other changes:
  * lots of bug fixes
  * Added FLAG_COLUMN_SIZE_S32 to limit the reported column size to a
    signed 32-bit integer. This option is automatically enabled for ADO
    applications, in order to work around a bug in ADO. (Bug #13776)
  * Added FLAG_MULTI_STATEMENTS to allow issuing queries that contain
    multiple statements. Also added to the setup GUI. (Bug #7445)
  * Removed support for the TRACE and TRACEFILE DSN options. The standard
    ODBC logging should be used.
  * Added support for SQL_ATTR_ROW_BIND_OFFSET_PTR in normal cursors.
    (Bug #6741)
  * Added SSL options to the GUI setup dialog.
  * Added an option (CHARSET) for specifying the default character
    set for a connection. This must be used instead of a "SET NAMES"
    statement. Also available from the GUI setup dialog. (Related
    to Bug #6667 and Bug #9498.)
  * Dis-allow NULL ptr for null indicator when calling SQLGetData()
    if value is null. Now returns SQL_ERROR w/state 22002.
  * Fixed calling convention ptr and wrong free in myodbc3i, and fixed
    the null terminating (was only one, not two) when writing DSN to string.
  * Added support for using SSL. This is not yet exposed in the setup GUI,
    but must be enabled through configuration files or the DSN. (Bug #12918)
  * Added auto-reconnect option because automatic reconnect is now
    disabled by default in libmysql
  * Added auto is null option (Bug #10910)
  * Added support for SQLMoreResults
  * Checking SQL_ATTR_CONNECTION_DEAD now always calls mysql_ping() to
    check for a dead connection.
  * Remove ODBC escape syntax { and } that begin and terminate statements,
    allowing {CALL (?)} for procedures that don't require OUT or INOUT
    parameters
  * Improved regression tests
  * Added --with-separate-debug-driver ./configure option

5 files changed, 17 insertions, 56 deletions

diff --git a/databases/myodbc/Makefile b/databases/myodbc/Makefile
index 5cf64f4606c..ba0a024d717 100644
--- a/databases/myodbc/Makefile
+++ b/databases/myodbc/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2007/01/14 14:37:44 obache Exp $
+# $NetBSD: Makefile,v 1.18 2008/11/11 20:29:27 bouyer Exp $
 #
 
-DISTNAME=	mysql-connector-odbc-3.51.12
+DISTNAME=	mysql-connector-odbc-3.51.26r1127
 PKGNAME=	${DISTNAME:S/mysql-connector-odbc/myodbc/}
-PKGREVISION=	3
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_MYSQL:=MyODBC3/}
+MASTER_SITES=	${MASTER_SITE_MYSQL:=Connector-ODBC/3.51/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mysql.com/
@@ -16,15 +15,13 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake
 
 CONFIGURE_ARGS+=	--with-mysql-path=${BUILDLINK_PREFIX.mysql-client}
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	--disable-gui
 CONFIGURE_ARGS+=	--disable-myodbc3i
 CONFIGURE_ARGS+=	--without-samples
 CONFIGURE_ARGS+=	--disable-test
 
-INSTALLATION_DIRS=	share/doc/myodbc
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/README* ${PREFIX}/share/doc/myodbc
+INSTALLATION_DIRS=	share/doc/mysql-connector-odbc
 
 .include "options.mk"
 .include "../../devel/libltdl/buildlink3.mk"
diff --git a/databases/myodbc/PLIST b/databases/myodbc/PLIST
index e85922c9961..81571497d3f 100644
--- a/databases/myodbc/PLIST
+++ b/databases/myodbc/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:42:59 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/11/11 20:29:27 bouyer Exp $
 bin/myodbc3m
 lib/libmyodbc3.la
 ${PLIST.gui}lib/libmyodbc3S.la
 lib/libmyodbc3_r.la
-share/doc/myodbc/README
-share/doc/myodbc/README.osx
-share/doc/myodbc/README.unix
-share/doc/myodbc/README.win
-@dirrm share/doc/myodbc
+share/doc/mysql-connector-odbc/ChangeLog
+share/doc/mysql-connector-odbc/INSTALL
+share/doc/mysql-connector-odbc/LICENSE.exceptions
+share/doc/mysql-connector-odbc/LICENSE.gpl
+share/doc/mysql-connector-odbc/README
+share/doc/mysql-connector-odbc/README.debug
+@dirrm share/doc/mysql-connector-odbc
diff --git a/databases/myodbc/distinfo b/databases/myodbc/distinfo
index 9d6831043a9..e355f884ca7 100644
--- a/databases/myodbc/distinfo
+++ b/databases/myodbc/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.5 2007/01/14 14:37:44 obache Exp $
+$NetBSD: distinfo,v 1.6 2008/11/11 20:29:27 bouyer Exp $
 
-SHA1 (mysql-connector-odbc-3.51.12.tar.gz) = c4a8de079b255d2aa745295f4121ec5e9091de59
-RMD160 (mysql-connector-odbc-3.51.12.tar.gz) = 295bdca51ad5fd7bf0a56ccb161fe5a0463e71ef
-Size (mysql-connector-odbc-3.51.12.tar.gz) = 979942 bytes
-SHA1 (patch-aa) = d49eb5b4c637303063784a63790411342593b855
-SHA1 (patch-ab) = a1a5da635425ccd029d12d00cb1ac3516618db45
+SHA1 (mysql-connector-odbc-3.51.26r1127.tar.gz) = 1800c13cb3394210b3b543e63284e125c8f6986f
+RMD160 (mysql-connector-odbc-3.51.26r1127.tar.gz) = fec50270c8de0a6fe6324decedfd9d6705ffa807
+Size (mysql-connector-odbc-3.51.26r1127.tar.gz) = 954125 bytes
diff --git a/databases/myodbc/patches/patch-aa b/databases/myodbc/patches/patch-aa
deleted file mode 100644
index c17a071cbcb..00000000000
--- a/databases/myodbc/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/01/23 18:53:45 xtraeme Exp $
-
---- driver/results.c.orig	2006-01-23 19:13:42.000000000 +0100
-+++ driver/results.c	2006-01-23 19:14:15.000000000 +0100
-@@ -49,6 +49,7 @@
- #include "myodbc3.h"
- #include <m_ctype.h>
- #include <locale.h>
-+#include <sys/param.h>
- 
- #define SQL_MY_PRIMARY_KEY 1212
- 
-@@ -543,7 +544,7 @@
-   @purpose : rerunrs column atribute values
- */
- 
--#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined(BSD)
- SQLRETURN SQL_API SQLColAttribute( SQLHSTMT  StatementHandle,
-                                    SQLUSMALLINT ColumnNumber,
-                                    SQLUSMALLINT FieldIdentifier,
diff --git a/databases/myodbc/patches/patch-ab b/databases/myodbc/patches/patch-ab
deleted file mode 100644
index d1bd4fac672..00000000000
--- a/databases/myodbc/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/01/14 14:37:44 obache Exp $
-
---- util/MYODBCUtilReadDataSourceStr.c.orig	2005-10-09 19:33:40.000000000 +0000
-+++ util/MYODBCUtilReadDataSourceStr.c
-@@ -19,8 +19,9 @@
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
- 
- #include "MYODBCUtil.h"
-+#include <sys/param.h>
- 
--#if defined(__APPLE__) || defined(WIN32) || defined(__sparc)
-+#if defined(__APPLE__) || defined(WIN32) || defined(__sparc) || defined(BSD)
- char *strndup( const char *s, size_t n )
- {
-     size_t nAvail;