Update iodbc to 3.52.5.

Pointed out in PR 35383.

Jan 05 2007, V3.52.5:
    * Added support for FileDSN
    * Added support for Connection Pooling
    * Added check for tracefile size
    * Call ODBC 2.x functions in driver if application uses ODBC 2.x only calls
    * Fixed problem parsing driver result in SQLSetStmtAttr
    * Fixed source code readability
    * Fixed bug in overwriting driver name
    * Fixed check for /Library/ODBC for Mac OS X
    * Fixed prototypes
    * Rewrote bootstrap script and configure summary
    * Use localtime_r in tracing when available
    * Fixed build issues with Mac OS X
    * Small code cleanups and fixes

Jan 26 2006, V3.52.4:
    * Added support for Mac OS X 10.4 Universal kit (ppc, ppc64 and i386)
    * Removed dependency between iodbc and iodbcinst shared libraries
    * Cleanup Mac OS X build process
    * Clarify LGPL license conditions
    * Fixed problem with error on subsequent SQLExecute statements
    * Fixed problem building 64bit GUI components
    * Fixed compiler warnings
    * Fixed problem determining which compiler to use on AIX
    * Enabled SHLIB_PATH on HP/UX
    * Fixed problem using # as comment in odbc.ini file
    * Disabled --disable-odbc3 flag
    * Small code cleanups and fixes

pkgsrc chages:
Fix comment and descr, refrect current status.

6 files changed, 23 insertions, 38 deletions

diff --git a/databases/iodbc/DESCR b/databases/iodbc/DESCR
index 9e6c79df145..bfa02f3fe11 100644
--- a/databases/iodbc/DESCR
+++ b/databases/iodbc/DESCR
@@ -1,8 +1,8 @@
-iODBC (intrinsic Open Database Connectivity) driver manager
-is compatible with ODBC 2.x specification and performs exactly
-same jobs of ODBC 2.x driver manager(i.e. driver loading,
+iODBC (Independent Open Database Connectivity) driver manager
+is compatible with ODBC 3.x specification and performs exactly
+same jobs of ODBC 3.x driver manager(i.e. driver loading,
 Parameters and function sequence checking, driver's function
-Invoking, etc.). Any ODBC driver works with ODBC 2.0 driver
+Invoking, etc.). Any ODBC driver works with ODBC 3.0 driver
 Manager will also work with iODBC driver manager and vice versa.
 
 Applications (using ODBC function calls) linked with
diff --git a/databases/iodbc/Makefile b/databases/iodbc/Makefile
index 0e6fd6752fb..0ff9f815f2c 100644
--- a/databases/iodbc/Makefile
+++ b/databases/iodbc/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2006/03/14 16:00:40 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/01/12 17:27:20 obache Exp $
 
-DISTNAME=	libiodbc-3.52.3
+DISTNAME=	libiodbc-3.52.5
 PKGNAME=	${DISTNAME:S/^lib//}
 CATEGORIES=	databases
 MASTER_SITES=	http://www.iodbc.org/downloads/iODBC/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.iodbc.org/
-COMMENT=	ODBC 2.x driver manager
+COMMENT=	ODBC 3.x driver manager
 
 CONFLICTS+=	unixodbc-[0-9]*
 
diff --git a/databases/iodbc/distinfo b/databases/iodbc/distinfo
index 4f6873c17ba..c0b257ac35b 100644
--- a/databases/iodbc/distinfo
+++ b/databases/iodbc/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/12/30 21:03:59 jlam Exp $
+$NetBSD: distinfo,v 1.5 2007/01/12 17:27:20 obache Exp $
 
-SHA1 (libiodbc-3.52.3.tar.gz) = 01c0925994011f5249a164177203570c399cb1d0
-RMD160 (libiodbc-3.52.3.tar.gz) = d90ef82b9a8624fac107ec9e3196023ab3c30ec8
-Size (libiodbc-3.52.3.tar.gz) = 720332 bytes
-SHA1 (patch-aa) = a17457eae6fcce66ff754d122a248526c663d60e
-SHA1 (patch-ab) = d0bfad834a2b3594844bb1420b4f609b42a7acb5
-SHA1 (patch-ac) = 79388bb9aa18d12266d99593e69bbb44b0243f03
+SHA1 (libiodbc-3.52.5.tar.gz) = 8982d433daa1344dd9c12b7b507950057b9af6a8
+RMD160 (libiodbc-3.52.5.tar.gz) = 2d9be4a4c0586d5dd117ab0d5347e5c79df6b584
+Size (libiodbc-3.52.5.tar.gz) = 752941 bytes
+SHA1 (patch-aa) = 581a97a77224218b87e41b641473a21161b60851
+SHA1 (patch-ac) = fb2b030717e9d60dd1a815fd76ae626bb73e3469
diff --git a/databases/iodbc/patches/patch-aa b/databases/iodbc/patches/patch-aa
index 792690cc8e8..7a0437e683e 100644
--- a/databases/iodbc/patches/patch-aa
+++ b/databases/iodbc/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.3 2005/12/30 21:03:59 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2007/01/12 17:27:20 obache Exp $
 
 Rip out a completely non-standard and hokey way to determine if wchar_t
 is a valid type.
 
---- include/sqltypes.h.orig	2005-10-08 07:42:02.000000000 -0400
+--- include/sqltypes.h.orig	2006-01-26 09:50:59.000000000 +0000
 +++ include/sqltypes.h
-@@ -388,16 +388,7 @@ SQLGUID;
+@@ -393,17 +393,7 @@ SQLGUID;
  typedef unsigned short SQLWCHAR;
  #else
  #  include <stdlib.h>
@@ -14,7 +14,8 @@ is a valid type.
 -      defined(_WCHAR_T)			|| \
 -      defined(_WCHAR_T_DEFINED)		|| \
 -      defined(_WCHAR_T_DECLARED)        || \
--      defined(_BSD_WCHAR_T_DEFINED_)
+-      defined(_BSD_WCHAR_T_DEFINED_)    || \
+-      defined(_BSD_WCHAR_T_)
  typedef wchar_t SQLWCHAR;
 -#  else
 -#    error Please make sure your system supports the wchar_t type
diff --git a/databases/iodbc/patches/patch-ab b/databases/iodbc/patches/patch-ab
deleted file mode 100644
index 8edae90032e..00000000000
--- a/databases/iodbc/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/12/30 21:03:59 jlam Exp $
-
-By inspection, driverbuf is meant to be a character buffer.
-
---- iodbc/connect.c.orig	2005-11-04 08:14:52.000000000 -0500
-+++ iodbc/connect.c
-@@ -398,7 +398,7 @@ _iodbcdm_driverload (
-   HPROC hproc;
-   SQLRETURN retcode = SQL_SUCCESS;
-   sqlstcode_t sqlstat = en_00000;
--  char *driverbuf[1024];
-+  char driverbuf[1024];
- 
-   if (path == NULL || ((char *) path)[0] == '\0')
-     {
diff --git a/databases/iodbc/patches/patch-ac b/databases/iodbc/patches/patch-ac
index b61a86afe8c..026a0190a59 100644
--- a/databases/iodbc/patches/patch-ac
+++ b/databases/iodbc/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2005/12/30 21:03:59 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2007/01/12 17:27:20 obache Exp $
 
---- samples/Makefile.in.orig	2005-11-07 05:27:44.000000000 -0500
+--- samples/Makefile.in.orig	2007-01-05 12:54:29.000000000 +0000
 +++ samples/Makefile.in
-@@ -566,9 +566,9 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -572,9 +572,9 @@ uninstall-am: uninstall-binPROGRAMS unin
  
  
  install-exec-hook:
@@ -12,6 +12,6 @@ $NetBSD: patch-ac,v 1.1 2005/12/30 21:03:59 jlam Exp $
 +	$(mkinstalldirs) ${DESTDIR}${datadir}/examples/iodbc
 +	cp $(srcdir)/iodbctest.c ${DESTDIR}${datadir}/examples/iodbc/iodbctest.c
 +	cp $(srcdir)/Makefile.sample ${DESTDIR}${datadir}/examples/iodbc/Makefile
+ @DARWIN_TRUE@	-/usr/bin/lipo ${DESTDIR}${bindir}/iodbctest -remove ppc64 -output ${DESTDIR}${bindir}/iodbctest
+ @DARWIN_TRUE@	-/usr/bin/lipo ${DESTDIR}${bindir}/iodbctestw -remove ppc64 -output ${DESTDIR}${bindir}/iodbctestw
  
- uninstall-hook:
- 	rm -f ${DESTDIR}${pkgdatadir}/samples/iodbctest.c