Fix unixODBC vs libiodbc conflicts

Always rely on unixODBC each time a port is looking for libodbc.so
Remove odbc compat from libiodbc
This allows to install both kde and gnome at the same time

While here:
- Convert libiodbc to USES=libtool
- Convert a bunch of libiodbc dependencies to USES=libtool
- Chase libiodbc.so shlib change
- Stagify some ports
- Convert some ports to USES=pgsql

Discussed with:	rakuco (kde)
With hat:	portmgr

3 files changed, 10 insertions, 44 deletions

diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 94387649c60b..638ceabb9d5d 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -47,12 +47,9 @@ CONFLICTS_INSTALL=	asterisk*-1.4* asterisk*-1.6* asterisk*-10*
 
 OPTIONS_DEFINE=	VORBIS PGSQL MYSQL RADIUS SNMP H323 FREETDS JABBER SQLITE GSM \
 		CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323
-OPTIONS_DEFAULT=	VORBIS UNIXODBC PGSQL RADIUS SNMP H323 FREETDS JABBER GSM \
+OPTIONS_DEFAULT=	VORBIS ODBC PGSQL RADIUS SNMP H323 FREETDS JABBER GSM \
 		SQLITE CURL
 
-OPTIONS_RADIO=	ODBC
-OPTIONS_RADIO_ODBC=	IODBC UNIXODBC
-
 OPTIONS_DEFINE_i386=	DAHDI
 OPTIONS_DEFINE_amd64=	DAHDI
 OPTIONS_DEFINE_sparc64=	DAHDI
@@ -114,25 +111,14 @@ CONFIGURE_ARGS+=	--without-dahdi --without-openr2
 #
 # WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV
 # similarly
-.if empty(PORT_OPTIONS:MUNIXODBC)
+.if empty(PORT_OPTIONS:MODBC)
 CONFIGURE_ARGS+=	--without-unixodbc
-.endif
-.if empty(PORT_OPTIONS:MIODBC)
-CONFIGURE_ARGS+=	--without-iodbc
-.endif
-.if empty(PORT_OPTIONS:MUNIXODBC) && empty(PORT_OPTIONS:MIODBC)
 PLIST_SUB+=	WITH_ODBC="@comment "
-.endif
-.if ${PORT_OPTIONS:MUNIXODBC} || ${PORT_OPTIONS:MIODBC}
+.else
 PLIST_SUB+=	WITH_ODBC=""
 USE_AUTOTOOLS=	libltdl
-.if ${PORT_OPTIONS:MUNIXODBC}
 CONFIGURE_ARGS+=	--with-unixodbc --with-ltdl
-LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
-.elif ${PORT_OPTIONS:MIODBC}
-CONFIGURE_ARGS+=	--with-iodbc --with-ltdl
-LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
-.endif
+LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
 .endif
 
 .if ${PORT_OPTIONS:MFREETDS}
diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile
index 8b4db5b9556b..3172a638bf46 100644
--- a/net/asterisk11/Makefile
+++ b/net/asterisk11/Makefile
@@ -46,12 +46,9 @@ CONFLICTS_INSTALL=	asterisk*-1.4* asterisk*-1.6* asterisk*-1.8*
 
 OPTIONS_DEFINE=	VORBIS PGSQL MYSQL RADIUS SNMP FREETDS XMPP SQLITE GSM \
 		CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323
-OPTIONS_DEFAULT=	VORBIS UNIXODBC PGSQL RADIUS SNMP FREETDS \
+OPTIONS_DEFAULT=	VORBIS ODBC PGSQL RADIUS SNMP FREETDS \
 		XMPP GSM SQLITE CURL
 
-OPTIONS_RADIO=	ODBC
-OPTIONS_RADIO_ODBC=	IODBC UNIXODBC
-
 OPTIONS_DEFINE_i386=	DAHDI
 OPTIONS_DEFINE_amd64=	DAHDI
 OPTIONS_DEFINE_sparc64=	DAHDI
@@ -110,25 +107,14 @@ CONFIGURE_ARGS+=	--without-dahdi --without-openr2
 #
 # WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV
 # similarly
-.if empty(PORT_OPTIONS:MUNIXODBC)
+.if empty(PORT_OPTIONS:MODBC)
 CONFIGURE_ARGS+=	--without-unixodbc
-.endif
-.if empty(PORT_OPTIONS:MIODBC)
-CONFIGURE_ARGS+=	--without-iodbc
-.endif
-.if empty(PORT_OPTIONS:MUNIXODBC) && empty(PORT_OPTIONS:MIODBC)
 PLIST_SUB+=	WITH_ODBC="@comment "
-.endif
-.if ${PORT_OPTIONS:MUNIXODBC} || ${PORT_OPTIONS:MIODBC}
+.else
 PLIST_SUB+=	WITH_ODBC=""
 USE_AUTOTOOLS=	libltdl
-.if ${PORT_OPTIONS:MUNIXODBC}
 CONFIGURE_ARGS+=	--with-unixodbc --with-ltdl
-LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
-.elif ${PORT_OPTIONS:MIODBC}
-CONFIGURE_ARGS+=	--with-iodbc --with-ltdl
-LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
-.endif
+LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
 .endif
 
 .if ${PORT_OPTIONS:MFREETDS}
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 15f4ad051253..77eaf33779c4 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		openldap
 DISTVERSION=		2.4.39
+PORTREVISION=		1
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -428,14 +429,7 @@ CONFIGURE_ARGS+=	--enable-spasswd
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=	--enable-sql=${BACKEND_ENABLE}
 PLIST_SUB+=		BACK_SQL=${BACKEND_PLIST}
-WITH_ODBC_TYPE?=	iODBC
-.if ${WITH_ODBC_TYPE:tl} == iodbc
-LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
-.elif ${WITH_ODBC_TYPE:tl} == unixodbc
-LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
-.else
-BROKEN=			choose either iODBC or unixODBC for WITH_ODBC_TYPE
-.endif
+LIB_DEPENDS+=		libodbc.so:${PORTSDIR}/databases/unixODBC
 .else
 PLIST_SUB+=		BACK_SQL="@comment "
 .endif