- Chase unixODBC shlib bump

47 files changed, 81 insertions, 61 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
diff --git a/devel/poco-ssl/Makefile b/devel/poco-ssl/Makefile
index 171fb572d218..4f926d266fe0 100644
--- a/devel/poco-ssl/Makefile
+++ b/devel/poco-ssl/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	poco
 PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel net
 MASTER_SITES=	SF/${PORTNAME}/sources/${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX=	-ssl
diff --git a/devel/ptlib26/Makefile b/devel/ptlib26/Makefile
index 9f1b2cb2b76b..67f94eed7175 100644
--- a/devel/ptlib26/Makefile
+++ b/devel/ptlib26/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ptlib
 PORTVERSION=	2.6.7
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/opalvoip/v3.6%20Lalande/Final/
 DISTNAME=	ptlib-${PORTVERSION}
@@ -55,7 +56,7 @@ ALL_TARGET=	optshared
 
 .if defined(WITH_ODBC)
 CONFIGURE_ARGS+=	--enable-odbc
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 .else
 CONFIGURE_ARGS+=	--disable-odbc
 .endif
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 3dfc4b84c611..b5f5c84cbc7f 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdal
 PORTVERSION=	1.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/gdal/ \
 		ftp://ftp.remotesensing.org/pub/gdal/ \
@@ -159,7 +159,7 @@ CONFIGURE_ARGS+=	--with-netcdf=no
 .endif
 
 .if defined(WITH_ODBC)
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=	--with-odbc=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--with-odbc=no
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index e6f0b9add2b8..105c71e8844f 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	r14b04
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
@@ -91,7 +91,7 @@ USE_GCC=	4.2+
 .if !defined(WITHOUT_ODBC)
 DRIVER_MANAGER?=	iodbc
 .if ${DRIVER_MANAGER} == "unixodbc"
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 .else # assume we're using iodbc
 LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 .endif
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index e6f0b9add2b8..105c71e8844f 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	r14b04
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
@@ -91,7 +91,7 @@ USE_GCC=	4.2+
 .if !defined(WITHOUT_ODBC)
 DRIVER_MANAGER?=	iodbc
 .if ${DRIVER_MANAGER} == "unixodbc"
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 .else # assume we're using iodbc
 LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 .endif
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index ce0748a26af8..9b2cc9287233 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -37,7 +37,7 @@ USE_MYSQL=	yes
 
 .if ${PKGNAMESUFFIX} == "-odbc"
 .	if defined(WITH_ODBC)
-LIB_DEPENDS=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS=	odbc.2:${PORTSDIR}/databases/unixODBC
 .	endif
 .endif
 
diff --git a/lang/php4/Makefile.ext b/lang/php4/Makefile.ext
index d6489c705a2b..3819c1549360 100644
--- a/lang/php4/Makefile.ext
+++ b/lang/php4/Makefile.ext
@@ -217,7 +217,7 @@ CONFIGURE_ARGS+=--with-ncurses=/usr
 .endif
 
 .if ${PHP_MODNAME} == "odbc"
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 
 CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE}
 .endif
diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext
index 45878e639b21..4e36f7238835 100644
--- a/lang/php5/Makefile.ext
+++ b/lang/php5/Makefile.ext
@@ -534,7 +534,7 @@ LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
 
 CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE}
 .else
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 
 CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE}
 .endif
@@ -554,7 +554,7 @@ LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
 
 CONFIGURE_ARGS+=--with-pdo-odbc=iODBC,${LOCALBASE}
 .else
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 
 CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
 .endif
diff --git a/lang/php52/Makefile.ext b/lang/php52/Makefile.ext
index 03658932796b..93dcd8e89db0 100644
--- a/lang/php52/Makefile.ext
+++ b/lang/php52/Makefile.ext
@@ -232,7 +232,7 @@ CONFIGURE_ARGS+=--with-oci8=${LOCALBASE}/oracle8-client
 .endif
 
 .if ${PHP_MODNAME} == "odbc"
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 
 CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE}
 .endif
@@ -296,7 +296,7 @@ USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 
 CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
 
diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext
index 45878e639b21..4e36f7238835 100644
--- a/lang/php53/Makefile.ext
+++ b/lang/php53/Makefile.ext
@@ -534,7 +534,7 @@ LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
 
 CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE}
 .else
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 
 CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE}
 .endif
@@ -554,7 +554,7 @@ LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
 
 CONFIGURE_ARGS+=--with-pdo-odbc=iODBC,${LOCALBASE}
 .else
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 
 CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
 .endif
diff --git a/lang/pike76/Makefile b/lang/pike76/Makefile
index 5fa794c28f55..5bea760ef0b0 100644
--- a/lang/pike76/Makefile
+++ b/lang/pike76/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pike76
 PORTVERSION=	7.6.112
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	lang
 MASTER_SITES=	ftp://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \
 		http://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \
@@ -170,7 +170,7 @@ CONFIGURE_ARGS+=	--without-msql
 .endif
 
 .if defined(WITH_UNIXODBC)
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=	--with-odbc
 .endif
 
diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index 680be6089fea..bd38f6bcd8e3 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	swi-pl
 PORTVERSION=	5.10.5
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.swi-prolog.org/download/stable/src/
 DISTNAME=	pl-${PORTVERSION}
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index e0be12b17f86..1518d3474f71 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perdition
 PORTVERSION=	1.17.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail net security
 MASTER_SITES=	http://www.vergenet.net/linux/perdition/download/${PORTVERSION}/
 
@@ -138,7 +138,7 @@ PLIST_SUB+=		OPENLDAP="@comment "
 
 .if defined(WITH_ODBC)
 CONFIGURE_ARGS+=	--enable-odbc
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 PLIST_SUB+=		ODBC=""
 MAN8+=			perditiondb_odbc_makedb.8
 .else
diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index b75b86b749c4..8f5b74be1cb3 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gretl
 PORTVERSION=	1.9.7
+PORTREVISION=	1
 CATEGORIES=	math finance
 MASTER_SITES=	SF
 
@@ -73,7 +74,7 @@ PLIST_SUB+=		NLS="@comment "
 
 .if defined(WITH_ODBC)
 CONFIGURE_ARGS+=	--with-odbc
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 PLIST_SUB+=		ODBC=""
 .else
 CONFIGURE_ARGS+=	--without-odbc
diff --git a/net-mgmt/macroscope/Makefile b/net-mgmt/macroscope/Makefile
index 7da47b8d9dd6..8fe5a9d01608 100644
--- a/net-mgmt/macroscope/Makefile
+++ b/net-mgmt/macroscope/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		macroscope
 PORTVERSION=		1.0.3787
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=		net-mgmt
 MASTER_SITES=		ftp://ftp.berlios.de/pub/macroscope/ \
 			http://white-raven.pisem.net/
diff --git a/net-mgmt/netxms/Makefile b/net-mgmt/netxms/Makefile
index d43cd1c5c0c6..2001c20a4c0b 100644
--- a/net-mgmt/netxms/Makefile
+++ b/net-mgmt/netxms/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netxms
 PORTVERSION=	1.0.13
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.netxms.org/download/
 
@@ -137,7 +138,7 @@ PLIST_SUB+=	SQLITE="@comment "
 .if defined(WITH_ODBC)
 CONFIGURE_ARGS+=	--with-odbc
 PLIST_SUB+=	ODBC=""
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 .else
 PLIST_SUB+=	ODBC="@comment "
 .endif
diff --git a/net-mgmt/zabbix-server/Makefile b/net-mgmt/zabbix-server/Makefile
index ecc7bba89dbb..1b7380357118 100644
--- a/net-mgmt/zabbix-server/Makefile
+++ b/net-mgmt/zabbix-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zabbix
 PORTVERSION=	1.8.10
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile
index ecc7bba89dbb..1b7380357118 100644
--- a/net-mgmt/zabbix2-server/Makefile
+++ b/net-mgmt/zabbix2-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zabbix
 PORTVERSION=	1.8.10
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 40ef962d6530..69a842dc7a5d 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.8.9.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -134,7 +135,7 @@ PLIST_SUB+=	WITH_ODBC=""
 USE_AUTOTOOLS=	libltdl
 .if defined(WITH_UODBC)
 CONFIGURE_ARGS+=	--with-unixodbc --with-ltdl
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 .elif defined(WITH_IODBC)
 CONFIGURE_ARGS+=	--with-iodbc --with-ltdl
 LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index 806b0688c91e..454f91872ce2 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	10.1.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -132,7 +133,7 @@ PLIST_SUB+=	WITH_ODBC=""
 USE_AUTOTOOLS=	libltdl
 .if defined(WITH_UODBC)
 CONFIGURE_ARGS+=	--with-unixodbc --with-ltdl
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 .elif defined(WITH_IODBC)
 CONFIGURE_ARGS+=	--with-iodbc --with-ltdl
 LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index a6b44f6b29f3..f114ec384262 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.4.42
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -100,7 +101,7 @@ CONFIGURE_ARGS+= --without-odbc
 PLIST_SUB+=	WITH_ODBC=""
 CONFIGURE_ARGS+= --with-odbc --with-ltdl
 USE_AUTOTOOLS+=	libltdl
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 .endif
 
 .if !defined(WITH_FREETDS)
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 4e2b444b6229..da313d43580f 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.6.2.22
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -129,7 +130,7 @@ PLIST_SUB+=	WITH_ODBC=""
 USE_AUTOTOOLS=	libltdl
 .if defined(WITH_UODBC)
 CONFIGURE_ARGS+=	--with-unixodbc --with-ltdl
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 .elif defined(WITH_IODBC)
 CONFIGURE_ARGS+=	--with-iodbc --with-ltdl
 LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
diff --git a/net/callweaver/Makefile b/net/callweaver/Makefile
index 90a8f7282a14..97507837acf7 100644
--- a/net/callweaver/Makefile
+++ b/net/callweaver/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	callweaver
 PORTVERSION=	1.2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	http://devs.callweaver.org/release/
 EXTRACT_SUFX=	.tgz
@@ -117,7 +117,7 @@ PLIST_SUB+=	FAX="@comment "
 
 #.if defined(WITH_ODBC)
 #CONFIGURE_ARGS+=	--enable-odbc
-#LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+#LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 #.else
 #CONFIGURE_ARGS+=	--disable-odbc
 #.endif
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 272bc72834ca..a75de4691223 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freeradius
 PORTVERSION?=	1.1.8
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
@@ -167,7 +167,7 @@ PLIST_SUB+=	PGSQL="@comment "
 .ifdef(WITH_UNIXODBC)
 CONFIGURE_ARGS+=--with-rlm_sql_unixodbc
 PLIST_SUB+=	UNIXODBC=""
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 .else
 CONFIGURE_ARGS+=--without-rlm_sql_unixodbc
 PLIST_SUB+=	UNIXODBC="@comment "
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index c36cd436e4a6..3dc0f3e77822 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	freeradius
 DISTVERSION=	2.1.12
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
@@ -146,7 +147,7 @@ PLIST_SUB+=	PGSQL="@comment "
 .ifdef(WITH_UNIXODBC)
 CONFIGURE_ARGS+=--with-rlm_sql_unixodbc
 PLIST_SUB+=	UNIXODBC=""
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 .else
 CONFIGURE_ARGS+=--without-rlm_sql_unixodbc
 PLIST_SUB+=	UNIXODBC="@comment "
diff --git a/net/freeswitch-core/Makefile b/net/freeswitch-core/Makefile
index c97069ee3337..4a7d80378511 100644
--- a/net/freeswitch-core/Makefile
+++ b/net/freeswitch-core/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	freeswitch-core
 PORTVERSION=	1.0.7.1
 PORTEPOCH=	1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://dl.dropbox.com/u/152504/ \
 		http://files.freeswitch.org/downloads/libs/:2 \
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 2df83f34da03..b8b6e2b93320 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		openldap
 DISTVERSION=		2.3.43
+PORTREVISION=	1
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -335,7 +336,7 @@ PLIST_SUB+=		BACK_SQL=${BACKEND_PLIST}
 .if defined(WITH_IODBC)
 LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 .elif defined(WITH_UNIXODBC)
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 .endif
 .else
 PLIST_SUB+=		BACK_SQL="@comment "
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index c1f63f58c8d0..f41efc7686cc 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		openldap
 DISTVERSION=		2.4.26
+PORTREVISION=	1
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -401,7 +402,7 @@ WITH_ODBC_TYPE?=	iODBC
 .if ${WITH_ODBC_TYPE:L} == iodbc
 LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 .elif ${WITH_ODBC_TYPE:L} == unixodbc
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 .else
 BROKEN=			choose either iODBC or unixODBC for WITH_ODBC_TYPE
 .endif
diff --git a/net/openser/Makefile b/net/openser/Makefile
index 9f01d71df50d..e9b5d05bc150 100644
--- a/net/openser/Makefile
+++ b/net/openser/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openser
 PORTVERSION=	1.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://openser.org/pub/openser/${PORTVERSION}/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-tls_src
@@ -85,7 +85,7 @@ MAKE_ENV+=	POSTGRESQL=postgres
 .endif
 
 .if defined(WITH_UNIXODBC)
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 MODULES+=	unixodbc
 .else
 MAKE_ENV+=	UNIXODBC=unixodbc
diff --git a/security/snort/Makefile b/security/snort/Makefile
index 2c6a5197c707..60629c1b2eb6 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	snort
 PORTVERSION=	2.9.2.1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF/snort/snort \
 		http://people.rit.edu/rpsfa/distfiles/
@@ -97,7 +98,7 @@ CONFIGURE_ARGS+=	--with-mysql=no
 .endif
 
 .if defined(WITH_ODBC)
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=	--with-odbc=${LOCALBASE}
 LDFLAGS+=		${PTHREAD_LIBS}
 .else
diff --git a/textproc/sphinxsearch-devel/Makefile b/textproc/sphinxsearch-devel/Makefile
index 6c5983c83506..5328cdc6cd7c 100644
--- a/textproc/sphinxsearch-devel/Makefile
+++ b/textproc/sphinxsearch-devel/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	sphinxsearch
 PORTVERSION=	2.0.1b
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	textproc databases
 MASTER_SITES=	http://sphinxsearch.com/files/
@@ -78,7 +78,7 @@ CONFIGURE_ARGS+=        --enable-id64
 
 .if defined(WITH_UNIXODBC)
 CONFIGURE_ARGS+=        --with-unixodbc
-LIB_DEPENDS+=           odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=           odbc.2:${PORTSDIR}/databases/unixODBC
 .else
 CONFIGURE_ARGS+=        --without-unixodbc
 .endif
diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile
index 4eaaa3d2b27a..76ec85486386 100644
--- a/textproc/sphinxsearch/Makefile
+++ b/textproc/sphinxsearch/Makefile
@@ -10,6 +10,7 @@
 
 PORTNAME=	sphinxsearch
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	textproc databases
 MASTER_SITES=	http://sphinxsearch.com/files/
 DISTNAME=	sphinx-${PORTVERSION}-release
@@ -76,7 +77,7 @@ CONFIGURE_ARGS+=	--enable-id64
 
 .if defined(WITH_UNIXODBC)
 CONFIGURE_ARGS+=	--with-unixodbc
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 .else
 CONFIGURE_ARGS+=	--without-unixodbc
 .endif