diff options
author | Xin LI <delphij@FreeBSD.org> | 2021-08-01 01:31:01 -0700 |
---|---|---|
committer | Xin LI <delphij@FreeBSD.org> | 2021-08-01 01:32:35 -0700 |
commit | 974e13b50148c5c8e7b33a1cb7e9dbaa9aedbc70 (patch) | |
tree | b859452da4f6b6583b7d951258145569954d1c63 /Mk | |
parent | www/pmwiki: Update to 2.2.141 (diff) |
net/openldap24-server: Make SASL permanent for OpenLDAP port.
PR: ports/257374
Reviewed by: obrien
Approved by: portmgr (exp-run by antoine)
Differential Revision: https://reviews.freebsd.org/D31301
Diffstat (limited to 'Mk')
-rw-r--r-- | Mk/bsd.ldap.mk | 13 | ||||
-rw-r--r-- | Mk/bsd.port.mk | 5 |
2 files changed, 2 insertions, 16 deletions
diff --git a/Mk/bsd.ldap.mk b/Mk/bsd.ldap.mk index 4e192fdf62e1..6967fcd2d48e 100644 --- a/Mk/bsd.ldap.mk +++ b/Mk/bsd.ldap.mk @@ -20,9 +20,6 @@ Database_Include_MAINTAINER= ports@FreeBSD.org # Default: 24. # WANT_OPENLDAP_VER # - Maintainer can set an arbitrary version of OpenLDAP by using it. -# WANT_OPENLDAP_SASL -# - User-defined variable to depend upon SASL-enabled OpenLDAP -# client. Must NOT be set in a port Makefile. # IGNORE_OPENLDAP_OPENLDAP # - This variable can be defined if the ports doesn't support # one or more version of OpenLDAP. @@ -64,14 +61,6 @@ IGNORE= cannot install: OpenLDAP versions mismatch: openldap${_OPENLDAP_VER}-cli CFLAGS+= -DLDAP_DEPRECATED _OPENLDAP_CLIENT_PKG!= ${PKG_INFO} -Ex openldap.\*-client 2>/dev/null; ${ECHO_CMD} -_OPENLDAP_FLAVOUR= ${_OPENLDAP_CLIENT_PKG:C/openldap//:C/-client-.*//} - -.if defined(WANT_OPENLDAP_SASL) -.if !empty(_OPENLDAP_CLIENT_PKG) && empty(_OPENLDAP_FLAVOUR) -IGNORE= cannot install: SASL support requested and ${_OPENLDAP_CLIENT_PKG} is installed -.endif -_OPENLDAP_FLAVOUR= -sasl -.endif # And now we are checking if we can use it .if defined(OPENLDAP${OPENLDAP_VER}_LIB) @@ -86,7 +75,7 @@ IGNORE= cannot install: doesn't work with OpenLDAP version: ${OPENLDAP_VER} (Do . endif . endfor .endif # IGNORE_WITH_OPENLDAP -LIB_DEPENDS+= ${OPENLDAP${OPENLDAP_VER}_LIB}:net/openldap${OPENLDAP_VER}${_OPENLDAP_FLAVOUR}-client +LIB_DEPENDS+= ${OPENLDAP${OPENLDAP_VER}_LIB}:net/openldap${OPENLDAP_VER}-client .else IGNORE= cannot install: unknown OpenLDAP version: ${OPENLDAP_VER} .endif # Check for correct libs diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index c9532fa5af2e..5bdaf10cec64 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -364,11 +364,8 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # USE_OPENLDAP - If set, this port uses the OpenLDAP libraries. # Implies: WANT_OPENLDAP_VER?=24 # WANT_OPENLDAP_VER -# - Legal values are: 23, 24 +# - Legal values are: 24 # If set to an unknown value, the port is marked BROKEN. -# WANT_OPENLDAP_SASL -# - If set, the system should use OpenLDAP libraries -# with SASL support. ## # USE_JAVA - If set, this port relies on the Java language. # Implies inclusion of bsd.java.mk. (Also see |