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!

10 files changed, 81 insertions, 63 deletions

diff --git a/databases/unixodbc-DataManager/Makefile b/databases/unixodbc-DataManager/Makefile
index 5f1bf6bc45b..9c694fc579c 100644
--- a/databases/unixodbc-DataManager/Makefile
+++ b/databases/unixodbc-DataManager/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2005/12/05 23:55:05 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2006/01/23 20:50:47 xtraeme Exp $
 
 PKGNAME=		unixodbc-DataManager-${ODBC_BASE_VERS}
-PKGREVISION=		4
 COMMENT=		GUI tool for unixODBC data source management
 
 .include "../../databases/unixodbc/Makefile.common"
diff --git a/databases/unixodbc-DataManager/distinfo b/databases/unixodbc-DataManager/distinfo
index 6b5be383034..77c8fd63a37 100644
--- a/databases/unixodbc-DataManager/distinfo
+++ b/databases/unixodbc-DataManager/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) = 55afe4f9b9b701f5313952c51093f5f33b6d4bd6
+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) = ed9978797592c484f38fe04f94dc64f5f6cfa3ec
diff --git a/databases/unixodbc-DataManager/patches/patch-aa b/databases/unixodbc-DataManager/patches/patch-aa
index 5298f915d17..2433ae75a38 100644
--- a/databases/unixodbc-DataManager/patches/patch-aa
+++ b/databases/unixodbc-DataManager/patches/patch-aa
@@ -1,13 +1,29 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/11/06 04:10:12 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2006/01/23 20:50:47 xtraeme Exp $
 
---- DataManager/Makefile.in.orig	Sat Oct 20 13:54:10 2001
-+++ DataManager/Makefile.in
-@@ -187,7 +187,7 @@
+--- DataManager/Makefile.in.orig	2005-02-07 11:36:35.000000000 +0100
++++ DataManager/Makefile.in	2006-01-23 21:33:57.000000000 +0100
+@@ -206,13 +206,10 @@
+ @QT_TRUE@	@QT_LDFLAGS@ \
+ @QT_TRUE@	@USER_LDFLAGS@ \
+ @QT_TRUE@	@LIB_QT@ \
+-@QT_TRUE@	../odbcinst/libodbcinst.la \
+-@QT_TRUE@	../DriverManager/libodbc.la 
++@QT_TRUE@	-lodbc \
  
- @QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@
  
--@QT_TRUE@DataManager_LDADD = @X_LDFLAGS@ 	@QT_LDFLAGS@ 	@USER_LDFLAGS@ 	@LIB_QT@ 	../odbcinst/libodbcinst.la 	../DriverManager/libodbc.la 
-+@QT_TRUE@DataManager_LDADD = $(X_LDFLAGS) 	$(QT_LDFLAGS) 	$(USER_LDFLAGS) 	$(LIB_QT) 	-lodbcinst 	-lodbc $(PTH_LIBS) $(LIBLTDL)
+ @QT_TRUE@DataManager_DEPENDANCIES = \
+-@QT_TRUE@    ../odbcinst/libodbcinst.la \
+-@QT_TRUE@	../DriverManager/libodbc.la 
  
- @QT_TRUE@DataManager_DEPENDANCIES =     ../odbcinst/libodbcinst.la 	../DriverManager/libodbc.la 
+ 
+ @QT_TRUE@DataManager_SOURCES = \
+@@ -314,8 +311,7 @@
+ @QT_TRUE@	mclassISQL.$(OBJEXT) mclassConnectionFrame.$(OBJEXT) \
+ @QT_TRUE@	mclassBrowseFrame.$(OBJEXT) mclassBrowse.$(OBJEXT)
+ DataManager_OBJECTS = $(am_DataManager_OBJECTS)
+-@QT_TRUE@DataManager_DEPENDENCIES = ../odbcinst/libodbcinst.la \
+-@QT_TRUE@	../DriverManager/libodbc.la
++@QT_TRUE@DataManager_DEPENDENCIES = 
+ @QT_FALSE@DataManager_DEPENDENCIES =
+ DataManager_LDFLAGS =
  
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 =
  
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile
index 939804dd9e6..cf23f7f2201 100644
--- a/databases/unixodbc/Makefile
+++ b/databases/unixodbc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2006/01/06 18:36:52 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/01/23 20:50:47 xtraeme Exp $
 
 PKGNAME=		unixodbc-${ODBC_BASE_VERS}
-PKGREVISION=		5
 COMMENT=		ODBC 2.x/3.x driver manager
 
 CONFLICTS+=		iodbc-[0-9]*
@@ -16,24 +15,23 @@ FILES_SUBST+=		UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR:Q}
 
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 
-CONF_FILES=		${EGDIR}/odbcinst.ini ${PKG_SYSCONFDIR}/odbcinst.ini
-CONF_FILES+=		/dev/null ${PKG_SYSCONFDIR}/odbc.ini
+CONF_FILES=		${EGDIR}/odbc.ini ${PKG_SYSCONFDIR}/odbc.ini
 OWN_DIRS=		${PKG_SYSCONFDIR}/ODBCDataSources
 
 post-patch: fix-driver-installation
 
 SUBST_CLASSES+=		paths
-SUBST_FILES.paths=	${WRKDIR}/odbcinst.ini
+SUBST_FILES.paths=	${WRKDIR}/odbc.ini
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@UNIXODBC_DRIVERS_DIR@,${UNIXODBC_DRIVERS_DIR},g'
 SUBST_STAGE.paths=	post-patch
 
 post-extract:
-	${CP} ${FILESDIR}/odbcinst.ini.in ${WRKDIR}/odbcinst.ini
+	${CP} ${FILESDIR}/odbcinst.ini.in ${WRKDIR}/odbc.ini
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKDIR}/odbcinst.ini ${EGDIR}/odbcinst.ini
+	${INSTALL_DATA} ${WRKDIR}/odbc.ini ${EGDIR}/odbc.ini
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/unixodbc/Makefile.common b/databases/unixodbc/Makefile.common
index 23af8779bba..b2fd6ddf08a 100644
--- a/databases/unixodbc/Makefile.common
+++ b/databases/unixodbc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2005/12/05 23:55:05 rillig Exp $
+# $NetBSD: Makefile.common,v 1.20 2006/01/23 20:50:47 xtraeme Exp $
 
 DISTNAME=	unixODBC-${ODBC_DIST_VERS}
 CATEGORIES=	databases
@@ -12,7 +12,7 @@ HOMEPAGE?=	http://www.unixodbc.org/
 # ODBC_DIST_VERS	version number on the php distfile
 # ODBC_BASE_VERS	pkgsrc-mangled version number (convert pl -> .)
 #
-ODBC_DIST_VERS=		2.0.11
+ODBC_DIST_VERS=		2.2.11
 ODBC_BASE_VERS=		${ODBC_DIST_VERS}
 
 USE_LIBTOOL=		YES
@@ -28,8 +28,6 @@ PTHREAD_OPTS+=		require
 # shared library.  The sources define all the relevant symbols (yywrap), so
 # libfl.a isn't needed.
 #
-MAKE_FLAGS+=		LIBLTDL="-lltdl"
-MAKE_FLAGS+=		INCLTDL="-I${BUILDLINK_PREFIX.ltdl}/include"
 MAKE_FLAGS+=		LEXLIB=""
 MAKE_ENV+=		AM_MAKEFLAGS=${MAKE_FLAGS:Q}
 
diff --git a/databases/unixodbc/PLIST b/databases/unixodbc/PLIST
index 8ed3a73e28f..614742f889d 100644
--- a/databases/unixodbc/PLIST
+++ b/databases/unixodbc/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:23 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/01/23 20:50:47 xtraeme Exp $
 bin/dltest
 bin/isql
+bin/iusql
+bin/odbc_config
 bin/odbcinst
 include/autotest.h
 include/odbcinst.h
@@ -14,9 +16,9 @@ lib/libboundparam.la
 lib/libgtrtst.la
 lib/libodbc.la
 lib/libodbccr.la
-lib/libodbcextras.la
 lib/libodbcinst.la
 ${UNIXODBC_DRIVERS_DIR}/libesoobS.la
+${UNIXODBC_DRIVERS_DIR}/libmimerS.la
 ${UNIXODBC_DRIVERS_DIR}/libnn.la
 ${UNIXODBC_DRIVERS_DIR}/libodbcdrvcfg1S.la
 ${UNIXODBC_DRIVERS_DIR}/libodbcdrvcfg2S.la
@@ -24,6 +26,8 @@ ${UNIXODBC_DRIVERS_DIR}/libodbcminiS.la
 ${UNIXODBC_DRIVERS_DIR}/libodbcmyS.la
 ${UNIXODBC_DRIVERS_DIR}/libodbcnnS.la
 ${UNIXODBC_DRIVERS_DIR}/libodbcpsql.la
+${UNIXODBC_DRIVERS_DIR}/libodbcpsql.so.1
+${UNIXODBC_DRIVERS_DIR}/libodbcpsql.so.1.0.0
 ${UNIXODBC_DRIVERS_DIR}/libodbcpsqlS.la
 ${UNIXODBC_DRIVERS_DIR}/libodbctxt.la
 ${UNIXODBC_DRIVERS_DIR}/libodbctxtS.la
@@ -32,6 +36,6 @@ ${UNIXODBC_DRIVERS_DIR}/liboraodbcS.la
 ${UNIXODBC_DRIVERS_DIR}/libsapdbS.la
 ${UNIXODBC_DRIVERS_DIR}/libtdsS.la
 ${UNIXODBC_DRIVERS_DIR}/libtemplate.la
-share/examples/${PKGBASE}/odbcinst.ini
-@dirrm share/examples/${PKGBASE}
+share/examples/unixodbc/odbc.ini
+@dirrm share/examples/unixodbc
 @dirrm ${UNIXODBC_DRIVERS_DIR}
diff --git a/databases/unixodbc/distinfo b/databases/unixodbc/distinfo
index c11f746168c..07f1c44e9d3 100644
--- a/databases/unixodbc/distinfo
+++ b/databases/unixodbc/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) = 082138af760a8ba572da5f9a32fb7865a1ed7823
+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) = 828007b7aaa2034cf00831d17f601225d4fff05c