Update unixodbc-* packages to 2.2.11 (latest stable version).

See http://www.unixodbc.org/ for the list of changes... sorry but
this package was not updated in 5 years, the list might be very large!

3 files changed, 31 insertions, 28 deletions

diff --git a/databases/unixodbc-ODBCConfig/Makefile b/databases/unixodbc-ODBCConfig/Makefile
index f10b9e8cb6c..b319664f803 100644
--- a/databases/unixodbc-ODBCConfig/Makefile
+++ b/databases/unixodbc-ODBCConfig/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:05 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/23 20:50:47 xtraeme Exp $
 
 PKGNAME=		unixodbc-ODBCConfig-${ODBC_BASE_VERS}
-PKGREVISION=		4
 COMMENT=		GUI tool for unixODBC driver configuration
 
 .include "../../databases/unixodbc/Makefile.common"
@@ -17,8 +16,6 @@ CONFIGURE_ENV+=		USER_LDFLAGS=${LDFLAGS:M*:Q}
 CONFIGURE_ENV+=		ac_cv_have_x=${_AC_CV_HAVE_X:Q}
 CONFIGURE_ENV+=		ac_cv_have_qt=${_AC_CV_HAVE_QT:Q}
 
-MAKE_FLAGS+=		ODBCConfig_DEPENDENCIES=""
-
 _EXTRA_INCLUDES?=	${LOCALBASE}/include:${X11BASE}/include
 _EXTRA_LIBS?=		${LOCALBASE}/lib:${X11BASE}/lib
 _AC_CV_HAVE_X?=		have_x=yes					\
diff --git a/databases/unixodbc-ODBCConfig/distinfo b/databases/unixodbc-ODBCConfig/distinfo
index 10d919c85a6..377ac75d674 100644
--- a/databases/unixodbc-ODBCConfig/distinfo
+++ b/databases/unixodbc-ODBCConfig/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 16:33:10 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/01/23 20:50:47 xtraeme Exp $
 
-SHA1 (unixODBC-2.0.11.tar.gz) = 8bfc4d03b8284ada319c5203352ec42c862cd34c
-RMD160 (unixODBC-2.0.11.tar.gz) = ee2f81fcb11d169ae19e80f0301f275e0b13441f
-Size (unixODBC-2.0.11.tar.gz) = 1734287 bytes
-SHA1 (patch-aa) = 6764c8e0988d2a3e9eaa70f377a72b70cef8e109
+SHA1 (unixODBC-2.2.11.tar.gz) = a8869c38d0f1bb18b33e5165a2a79dd8770f98b3
+RMD160 (unixODBC-2.2.11.tar.gz) = 533a2733aa9f49bf9e3fd062b6d0ebfdff4dfcf1
+Size (unixODBC-2.2.11.tar.gz) = 2406740 bytes
+SHA1 (patch-aa) = 9c71211c69a658406d85fffdb1c30fb348e1d535
diff --git a/databases/unixodbc-ODBCConfig/patches/patch-aa b/databases/unixodbc-ODBCConfig/patches/patch-aa
index caf221e53ee..7b2f47a7ada 100644
--- a/databases/unixodbc-ODBCConfig/patches/patch-aa
+++ b/databases/unixodbc-ODBCConfig/patches/patch-aa
@@ -1,25 +1,31 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/11/06 04:09:25 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2006/01/23 20:50:47 xtraeme Exp $
 
---- ODBCConfig/Makefile.in.orig	Sat Oct 20 13:54:02 2001
-+++ ODBCConfig/Makefile.in
-@@ -26,7 +26,7 @@
- sysconfdir = @sysconfdir@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
--libdir = @libdir@
-+libdir = /usr/pkg/lib/ODBCConfig
- infodir = @infodir@
- mandir = @mandir@
- includedir = @includedir@
-@@ -185,9 +185,9 @@
+--- ODBCConfig/Makefile.in.orig	2006-01-23 21:42:52.000000000 +0100
++++ ODBCConfig/Makefile.in	2006-01-23 21:43:28.000000000 +0100
+@@ -207,13 +207,10 @@
+ @QT_TRUE@ODBCConfig_LDADD = @X_LDFLAGS@ \
+ @QT_TRUE@	@QT_LDFLAGS@ \
+ @QT_TRUE@	@USER_LDFLAGS@ \
+-@QT_TRUE@	@LIB_QT@ \
+-@QT_TRUE@	../odbcinst/libodbcinst.la \
+-@QT_TRUE@	../extras/libodbcextraslc.la \
+-@QT_TRUE@	../DriverManager/libodbc.la 
++@QT_TRUE@	@LIB_QT@ -lodbc
  
- @QT_TRUE@bin_PROGRAMS = ODBCConfig
  
--@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@     -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
-+@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@     -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"$(libdir)\" $(INCLTDL)
+-@QT_TRUE@ODBCConfig_DEPENDANCIES = ../odbcinst/libodbcinst.la ../extras/libodbcextraslc.la ../DriverManager/libodbc.la
++@QT_TRUE@ODBCConfig_DEPENDANCIES =
  
--@QT_TRUE@ODBCConfig_LDADD = @X_LDFLAGS@ 	@QT_LDFLAGS@ 	@USER_LDFLAGS@ 	@LIB_QT@ 	../odbcinst/libodbcinst.la 	../extras/libodbcextraslc.la 	../DriverManager/libodbc.la
-+@QT_TRUE@ODBCConfig_LDADD = $(X_LDFLAGS) 	$(QT_LDFLAGS) 	$(USER_LDFLAGS) 	$(LIB_QT) 	-lodbcinst 	-lodbcextras 	-lodbc $(PTH_LIBS) $(LIBLTDL)
+ @QT_TRUE@ODBCConfig_SOURCES = \
+ @QT_TRUE@	main.cpp
+@@ -227,9 +224,7 @@
  
- @QT_TRUE@ODBCConfig_DEPENDANCIES = ../odbcinst/libodbcinst.la ../extras/libodbcextraslc.la ../DriverManager/libodbc.la
+ @QT_TRUE@am_ODBCConfig_OBJECTS = main.$(OBJEXT)
+ ODBCConfig_OBJECTS = $(am_ODBCConfig_OBJECTS)
+-@QT_TRUE@ODBCConfig_DEPENDENCIES = ../odbcinst/libodbcinst.la \
+-@QT_TRUE@	../extras/libodbcextraslc.la \
+-@QT_TRUE@	../DriverManager/libodbc.la
++@QT_TRUE@ODBCConfig_DEPENDENCIES =
+ @QT_FALSE@ODBCConfig_DEPENDENCIES =
+ ODBCConfig_LDFLAGS =