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!

4 files changed, 20 insertions, 20 deletions

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