[Midnightbsd-cvs] mports [19434] trunk/Mk/extensions/ldap.mk: update depends checking for ldap

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Jun 9 22:13:03 EDT 2015


Revision: 19434
          http://svnweb.midnightbsd.org/mports/?rev=19434
Author:   laffer1
Date:     2015-06-09 22:13:02 -0400 (Tue, 09 Jun 2015)
Log Message:
-----------
update depends checking for ldap

Modified Paths:
--------------
    trunk/Mk/extensions/ldap.mk

Modified: trunk/Mk/extensions/ldap.mk
===================================================================
--- trunk/Mk/extensions/ldap.mk	2015-06-10 02:12:09 UTC (rev 19433)
+++ trunk/Mk/extensions/ldap.mk	2015-06-10 02:13:02 UTC (rev 19434)
@@ -32,7 +32,8 @@
 .if defined(USE_OPENLDAP)
 DEFAULT_OPENLDAP_VER?=	24
 # OpenLDAP client versions currently supported
-OPENLDAP24_LIBVER=	2.4.8
+OPENLDAP23_LIB=		libldap-2.3.so.2
+OPENLDAP24_LIB=		libldap-2.4.so.2
 
 .if exists(${LOCALBASE}/bin/ldapwhoami)
 _OPENLDAP_VER!=	${LOCALBASE}/bin/ldapwhoami -VV 2>&1 | ${GREP} ldapwhoami | ${SED} -E 's/.*OpenLDAP: ldapwhoami (2)\.(3|4).*/\1\2/'
@@ -72,7 +73,7 @@
 .endif
 
 # And now we are checking if we can use it
-.if defined(OPENLDAP${OPENLDAP_VER}_LIBVER)
+.if defined(OPENLDAP${OPENLDAP_VER}_LIB)
 # compatability shim
 .if defined(BROKEN_WITH_OPENLDAP)
 IGNORE_WITH_OPENLDAP=${BROKEN_WITH_OPENLDAP}
@@ -84,7 +85,7 @@
 .		endif
 .	endfor
 .endif # IGNORE_WITH_OPENLDAP
-LIB_DEPENDS+=	ldap-${OPENLDAP${OPENLDAP_VER}_LIBVER}:${PORTSDIR}/net/openldap${OPENLDAP_VER}${_OPENLDAP_FLAVOUR}-client
+LIB_DEPENDS+=	${OPENLDAP${OPENLDAP_VER}_LIB}:${PORTSDIR}/net/openldap${OPENLDAP_VER}${_OPENLDAP_FLAVOUR}-client
 .else
 IGNORE=		cannot install: unknown OpenLDAP version: ${OPENLDAP_VER}
 .endif # Check for correct libs



More information about the Midnightbsd-cvs mailing list