From 602652f5f498977ca9afddad82ce1abd529c8fdb Mon Sep 17 00:00:00 2001
From: bapt <bapt@FreeBSD.org>
Date: Mon, 5 May 2014 16:24:00 +0000
Subject: 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
---
 net/openldap24-server/Makefile | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'net/openldap24-server')

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
-- 
cgit