- Chase unixODBC shlib bump

15 files changed, 25 insertions, 21 deletions

diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 1fd7daba933f..5390bff74f00 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	freetds
 PORTVERSION=	0.91
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 68e768a5a49f..c48fea580e19 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	freetds
 PORTVERSION=	0.64
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index 100677317459..33acad3ee588 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	grass
 PORTVERSION=	6.4.1
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	databases geography
 MASTER_SITES=	http://grass.itc.it/grass64/source/ \
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index 864141f705b3..a25c4cde7de8 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	hk_classes
 PORTVERSION=	0.8.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases
 MASTER_SITES=	SF/hk-classes/${PORTNAME}/${PORTVERSION}
 
@@ -77,7 +77,7 @@ PLIST_SUB+=	POSTGRESQL="@comment "
 .endif
 
 .if defined(WITH_ODBC)
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=	--with-odbc-incdir=${LOCALBASE}/include/\
 			--with-odbc-libdir=${LOCALBASE}/lib
 PLIST_SUB+=	ODBC=""
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 7c25189984d7..c5a1b13f8a8f 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libgda2
 PORTVERSION=	1.2.4
-PORTREVISION?=	5
+PORTREVISION?=	6
 PORTEPOCH?=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
@@ -149,7 +149,7 @@ PLIST_SUB+=		MDB:="@comment "
 .endif
 
 .if !defined(WITHOUT_ODBC) && defined(WITH_ODBC)
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=	--with-odbc=${LOCALBASE}
 PLIST_SUB+=		ODBC:=""
 .else
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 326f6d889be1..f4f30933558e 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libgda3
 PORTVERSION?=	3.0.4
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:R}
@@ -93,7 +93,7 @@ CONFIGURE_ARGS+=	--without-mdb
 .endif
 
 .if ${LIBGDA3_SLAVE}=="odbc"
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=	--with-odbc=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-odbc
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index b870f01c4205..6dac8384dde7 100644
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libodbc++
 PORTVERSION=	0.2.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	databases devel
 MASTER_SITES=	SF/libodbcxx/libodbc%2B%2B/${PORTVERSION}
 
@@ -37,7 +37,7 @@ WITH_UNIXODBC?=	yes
 LIB_DEPENDS=	iodbc.3:${PORTSDIR}/databases/libiodbc
 CONFIGURE_ARGS+=	--with-iodbc=${LOCALBASE}
 .elif defined(WITH_UNIXODBC)
-LIB_DEPENDS=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS=	odbc.2:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=	--with-odbc=${LOCALBASE}
 .endif
 
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
index bb1962cbcd72..92145576c4de 100644
--- a/databases/mysql-connector-odbc/Makefile
+++ b/databases/mysql-connector-odbc/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	mysql-connector-odbc
 PORTVERSION=	3.51.26
 DISTVERSIONSUFFIX=	r1127
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	Connector-ODBC/3.51
@@ -46,7 +46,7 @@ WITH_UNIXODBC?=	yes
 .endif
 
 .if defined(WITH_UNIXODBC)
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 BUILD_DEPENDS=		unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=	--with-odbc-ini=${LOCALBASE}/etc/odbc.ini \
 			--with-unixODBC=${LOCALBASE}
diff --git a/databases/mysql2odbc/Makefile b/databases/mysql2odbc/Makefile
index d606c9042469..44a081eebee1 100644
--- a/databases/mysql2odbc/Makefile
+++ b/databases/mysql2odbc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mysql2odbc
 PORTVERSION=	0.99.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	http://www.iodbc.org/downloads/mysql2odbc/
 
diff --git a/databases/oracle_odbc_driver/Makefile b/databases/oracle_odbc_driver/Makefile
index 5095851ad151..9fb62f54b687 100644
--- a/databases/oracle_odbc_driver/Makefile
+++ b/databases/oracle_odbc_driver/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	oracle_odbc_driver
 PORTVERSION=	0.5.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://home.fnal.gov/~dbox/oracle/odbc/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
diff --git a/databases/p5-DBD-ODBC/Makefile b/databases/p5-DBD-ODBC/Makefile
index d7c79fdaab31..67ca9e151354 100644
--- a/databases/p5-DBD-ODBC/Makefile
+++ b/databases/p5-DBD-ODBC/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	DBD-ODBC
 PORTVERSION=	1.33
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MJEVANS
@@ -40,7 +41,7 @@ WITH_IODBC?=	yes
 LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
 MYODBC=	iodbc
 .elif defined(WITH_UNIXODBC)
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 MYODBC=	unixodbc
 post-configure:
 	@${PERL} -pi -e 's/-lodbc/-lodbc ${PTHREAD_LIBS}/g;' \
diff --git a/databases/py-odbc/Makefile b/databases/py-odbc/Makefile
index c40f72858ffd..47e5a790f5ae 100644
--- a/databases/py-odbc/Makefile
+++ b/databases/py-odbc/Makefile
@@ -19,7 +19,7 @@
 
 PORTNAME=	pyodbc
 PORTVERSION=	2.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -40,7 +40,7 @@ WITH_UNIXODBC=	yes
 
 .if defined(WITH_UNIXODBC)
 # I.e. even if WITH_IODBC is defined
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 BUILD_DEPENDS+=	unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC
 .else
 LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
diff --git a/databases/qt-odbc-plugin/Makefile b/databases/qt-odbc-plugin/Makefile
index 6c4bf4d504f1..f557d9f7b70f 100644
--- a/databases/qt-odbc-plugin/Makefile
+++ b/databases/qt-odbc-plugin/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qt-${DB}-plugin
 PORTVERSION=	3.3.8
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
diff --git a/databases/ruby-odbc/Makefile b/databases/ruby-odbc/Makefile
index 4bee80a8e308..4fb20914da08 100644
--- a/databases/ruby-odbc/Makefile
+++ b/databases/ruby-odbc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	odbc
 PORTVERSION=	0.99991
+PORTREVISION=	1
 CATEGORIES=	databases ruby
 MASTER_SITES=	http://www.ch-werner.de/rubyodbc/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Ruby extension library to use ODBC data sources
 
-LIB_DEPENDS=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS=	odbc.2:${PORTSDIR}/databases/unixODBC
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index fd7da68dc60e..4a3cadf1c72c 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	${SQLRELAY_PORTNAME}
 PORTVERSION=	${SQLRELAY_PORTVERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	SF
 
@@ -96,8 +96,8 @@ CONFIGURE_ARGS+=	--disable-postgresql
 IF_POSTGRESQL=	"@comment "
 .endif
 
-.if defined(WITH_ODBC) && ${WITH_ODBC:L} != no
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+.if defined(WITH_[BODBC) && ${WITH_ODBC:L} != no
+LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=	--with-odbc-prefix="${LOCALBASE}"
 IF_ODBC=	""
 .else