diff options
| author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2023-02-08 04:50:40 -0600 |
|---|---|---|
| committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2023-02-08 04:53:56 -0600 |
| commit | 6e1233be229212a0496f42d611bd40f3e3a628da (patch) | |
| tree | 7be6239b98a0dff1d377ec09f371b55fb10dd508 | |
| parent | www/mybb: Update to 1.8.33 (diff) | |
Mk/**ldap.mk: Convert USE_LDAP to USES=ldap
Convert the USE_LDAP=yes to USES=ldap and adds the following features:
- Adds the argument USES=ldap:server to add openldap2{4|5|6}-server as
RUN_DEPENDS
- Adds the argument USES=ldap<version> and replaces WANT_OPENLDAP_VER
- Adds OPENLDAP versions in bsd.default-versions.mk
- Adds USE_OPENLDAP/WANT_OPENLDAP_VER in Mk/bsd.sanity.mk
- Changes consumers to use the features
Reviewed by: delphij
Approved by: portmgr
Differential Revision: https://reviews.freebsd.org/D38233
159 files changed, 275 insertions, 336 deletions
diff --git a/Mk/Uses/ldap.mk b/Mk/Uses/ldap.mk new file mode 100644 index 000000000000..e2cbc1e407cc --- /dev/null +++ b/Mk/Uses/ldap.mk @@ -0,0 +1,109 @@ +# Provide support for OpenLDAP +# Feature: ldap +# Usage: USES=ldap or USES=ldap:args +# Valid ARGS: <version>, client, server, (none) +# +# version If no version is given (by the maintainer via the port), try to +# find the currently installed version. Fall back to default if +# necessary (OpenLDAP-2.6 = 26, look at bsd.default-versions.mk for +# possible values). +# client Depends on the libldap library (default) +# server +# Depend on the server at runtime. If none of these is +# set, depends on the client. +# +# IGNORE_WITH_OPENLDAP +# This variable can be defined if the ports does not support one +# or more version of OpenLDAP. +# WITH_OPENLDAP_VER +# User defined variable to set OpenLDAP version. +# OPENLDAP_VER +# Detected OpenLDAP version. +# +# MAINTAINER: ports@FreeBSD.org + +.if !defined(_INCLUDE_USES_LDAP_MK) +_INCLUDE_USES_LDAP_MK= yes + +. if !empty(ldap_ARGS) +.undef _WANT_OPENLDAP_VER +.undef _WANT_OPENLDAP_SERVER +_OPENLDAP_ARGS= ${ldap_ARGS:S/,/ /g} +. if ${_OPENLDAP_ARGS:Mserver} +_WANT_OPENLDAP_SERVER= yes +_OPENLDAP_ARGS:= ${_OPENLDAP_ARGS:Nserver} +. endif +. if ${_OPENLDAP_ARGS:Mclient} +_WANT_OPENLDAP_CLIENT= yes +_OPENLDAP_ARGS:= ${_OPENLDAP_ARGS:Nclient} +. endif + +# Port requested a version +. if !empty(_OPENLDAP_ARGS) +_WANT_OPENLDAP_VER= ${_OPENLDAP_ARGS} +. endif +. endif # !empty(ldap_ARGS) + +. if defined(DEFAULT_OPENLDAP_VER) +WARNING+= "DEFAULT_OPENLDAP_VER is defined, consider using DEFAULT_VERSIONS=openldap=${DEFAULT_OPENLDAP_VER} instead" +. endif + +DEFAULT_OPENLDAP_VER?= ${OPENLDAP_DEFAULT:S/.//} +# OpenLDAP client version currently supported. +# When adding a version, please keep the comment in +# Mk/bsd.default-versions.mk in sync. +# OpenLDAP client versions currently supported +OPENLDAP24_LIB= libldap-2.4.so.2 +OPENLDAP25_LIB= libldap-2.5.so.0 +OPENLDAP26_LIB= libldap.so.2 + +. if exists(${LOCALBASE}/bin/ldapwhoami) +_OPENLDAP_VER!= ${LOCALBASE}/bin/ldapwhoami -VV 2>&1 | ${GREP} ldapwhoami | ${SED} -E 's/.*OpenLDAP: ldapwhoami (2)\.([0-9]).*/\1\2/' +. endif + +. if defined(WANT_OPENLDAP_VER) +. if defined(WITH_OPENLDAP_VER) && ${WITH_OPENLDAP_VER} != ${WANT_OPENLDAP_VER} +IGNORE= cannot install: the port wants openldap${WANT_OPENLDAP_VER}-client and you try to install openldap${WITH_OPENLDAP_VER}-client +. endif +OPENLDAP_VER= ${WANT_OPENLDAP_VER} +. elif defined(WITH_OPENLDAP_VER) +OPENLDAP_VER= ${WITH_OPENLDAP_VER} +. else +. if defined(_OPENLDAP_VER) +OPENLDAP_VER= ${_OPENLDAP_VER} +. else +OPENLDAP_VER= ${DEFAULT_OPENLDAP_VER} +. endif +. endif # WANT_OPENLDAP_VER + +. if defined(_OPENLDAP_VER) +. if ${_OPENLDAP_VER} != ${OPENLDAP_VER} +IGNORE= cannot install: OpenLDAP versions mismatch: openldap${_OPENLDAP_VER}-client is installed and wanted version is openldap${OPENLDAP_VER}-client +. endif +. endif + +CFLAGS+= -DLDAP_DEPRECATED + +_OPENLDAP_CLIENT= net/openldap${OPENLDAP_VER}-client +_OPENLDAP_SERVER= net/openldap${OPENLDAP_VER}-server + +# And now we are checking if we can use it +. if defined(OPENLDAP${OPENLDAP_VER}_LIB) +. if defined(IGNORE_WITH_OPENLDAP) +. for VER in ${IGNORE_WITH_OPENLDAP} +. if (${OPENLDAP_VER} == "${VER}") +IGNORE= cannot install: doesn't work with OpenLDAP version: ${OPENLDAP_VER} (Doesn't support OpenLDAP ${IGNORE_WITH_OPENLDAP}) +. endif +. endfor +. endif # IGNORE_WITH_OPENLDAP +. if defined(_WANT_OPENLDAP_SERVER) +RUN_DEPENDS+= ${LOCALBASE}/libexec/slapd:${_OPENLDAP_SERVER} +. endif +. if defined(_WANT_OPENLDAP_CLIENT) || !defined(_WANT_OPENLDAP_SERVER) +LIB_DEPENDS+= ${OPENLDAP${OPENLDAP_VER}_LIB}:${_OPENLDAP_CLIENT} +. endif +. else +IGNORE= cannot install: unknown OpenLDAP version: ${OPENLDAP_VER} +. endif # Check for correct libs + +.endif # !defined(_INCLUDE_USES_LDAP_MK) diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index b6a0cbeb1f4d..14d27d2e1daa 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -19,7 +19,7 @@ LOCALBASE?= /usr/local . for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC \ GHOSTSCRIPT GL GO IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM \ - LUA LUAJIT MONO MYSQL NINJA NODEJS PERL5 PGSQL PHP PYTHON \ + LUA LUAJIT MONO MYSQL NINJA NODEJS OPENLDAP PERL5 PGSQL PHP PYTHON \ PYTHON2 PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH . if defined(${lang}_DEFAULT) ERROR+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf" @@ -95,6 +95,8 @@ MYSQL_DEFAULT?= 5.7 NINJA_DEFAULT?= ninja # Possible value: 14, 16, 18, 19, current, lts (Note: current = 19 and lts = 18) NODEJS_DEFAULT?= lts +# Possible value: 24, 25, 26 +OPENLDAP_DEFAULT?= 26 # Possible values: 5.32, 5.34, 5.36, devel . if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \ defined(PACKAGE_BUILDING)) diff --git a/Mk/bsd.ldap.mk b/Mk/bsd.ldap.mk deleted file mode 100644 index 7e6ec2ffa9f4..000000000000 --- a/Mk/bsd.ldap.mk +++ /dev/null @@ -1,87 +0,0 @@ -# -*- tab-width: 4; -*- -# ex: ts=4 - -.if defined(_POSTMKINCLUDED) && !defined(Ldap_Post_Include) - -Ldap_Post_Include= bsd.ldap.mk -Database_Include_MAINTAINER= ports@FreeBSD.org - -# For including this file define macro USE_OPENLDAP. Defining macro like -# USE_OPENLDAP_VER or WANT_OPENLDAP_VER will include this file too. -# -## -# USE_OPENLDAP - Add OpenLDAP client dependency. -# If no version is given (by the maintainer via the port or -# by the user via defined variable), try to find the -# currently installed version. Fall back to default if -# necessary (OpenLDAP 2.4 = 24). -# DEFAULT_OPENLDAP_VER -# - OpenLDAP default version. Can be overriden within a port. -# Default: 24. -# WANT_OPENLDAP_VER -# - Maintainer can set an arbitrary version of OpenLDAP by using it. -# IGNORE_OPENLDAP_OPENLDAP -# - This variable can be defined if the ports doesn't support -# one or more version of OpenLDAP. -# WITH_OPENLDAP_VER -# - User defined variable to set OpenLDAP version. -# OPENLDAP_VER -# - Detected OpenLDAP version. - -. if defined(USE_OPENLDAP) -DEFAULT_OPENLDAP_VER?= 26 -# OpenLDAP client versions currently supported -OPENLDAP24_LIB= libldap-2.4.so.2 -OPENLDAP25_LIB= libldap-2.5.so.0 -OPENLDAP26_LIB= libldap.so.2 - -. if exists(${LOCALBASE}/bin/ldapwhoami) -_OPENLDAP_VER!= ${LOCALBASE}/bin/ldapwhoami -VV 2>&1 | ${GREP} ldapwhoami | ${SED} -E 's/.*OpenLDAP: ldapwhoami (2)\.([0-9]).*/\1\2/' -. endif - -. if defined(WANT_OPENLDAP_VER) -. if defined(WITH_OPENLDAP_VER) && ${WITH_OPENLDAP_VER} != ${WANT_OPENLDAP_VER} -IGNORE= cannot install: the port wants openldap${WANT_OPENLDAP_VER}-client and you try to install openldap${WITH_OPENLDAP_VER}-client -. endif -OPENLDAP_VER= ${WANT_OPENLDAP_VER} -. elif defined(WITH_OPENLDAP_VER) -OPENLDAP_VER= ${WITH_OPENLDAP_VER} -. else -. if defined(_OPENLDAP_VER) -OPENLDAP_VER= ${_OPENLDAP_VER} -. else -OPENLDAP_VER= ${DEFAULT_OPENLDAP_VER} -. endif -. endif # WANT_OPENLDAP_VER - -. if defined(_OPENLDAP_VER) -. if ${_OPENLDAP_VER} != ${OPENLDAP_VER} -IGNORE= cannot install: OpenLDAP versions mismatch: openldap${_OPENLDAP_VER}-client is installed and wanted version is openldap${OPENLDAP_VER}-client -. endif -. endif - -CFLAGS+= -DLDAP_DEPRECATED - -_OPENLDAP_CLIENT_PKG!= ${PKG_INFO} -Ex openldap.\*-client 2>/dev/null; ${ECHO_CMD} - -# And now we are checking if we can use it -. if defined(OPENLDAP${OPENLDAP_VER}_LIB) -# compatability shim -. if defined(BROKEN_WITH_OPENLDAP) -IGNORE_WITH_OPENLDAP=${BROKEN_WITH_OPENLDAP} -. endif -. if defined(IGNORE_WITH_OPENLDAP) -. for VER in ${IGNORE_WITH_OPENLDAP} -. if (${OPENLDAP_VER} == "${VER}") -IGNORE= cannot install: doesn't work with OpenLDAP version: ${OPENLDAP_VER} (Doesn't support OpenLDAP ${IGNORE_WITH_OPENLDAP}) -. endif -. endfor -. endif # IGNORE_WITH_OPENLDAP -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 - -. endif # defined(USE_OPENLDAP) - -.endif # defined(_POSTMKINCLUDED) && !defined(Ldap_Post_Include) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index b20876eff9f0..184fbbfe3db3 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1863,10 +1863,6 @@ MAKE_ENV+= ${b}="${${b}}" . endfor . endif -. if defined(USE_OPENLDAP) || defined(WANT_OPENLDAP_VER) -.include "${PORTSDIR}/Mk/bsd.ldap.mk" -. endif - . if defined(USE_RC_SUBR) SUB_FILES+= ${USE_RC_SUBR} . endif diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index 516b33e0a518..557b72a30509 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -209,7 +209,8 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \ USE_FPC_RUN WANT_FPC_BASE WANT_FPC_ALL USE_QT4 USE_QT5 QT_NONSTANDARD \ XORG_CAT CARGO_USE_GITHUB CARGO_USE_GITLAB CARGO_GIT_SUBDIR \ USE_RUBY USE_RUBY_EXTCONF USE_RUBY_SETUP RUBY_NO_BUILD_DEPENDS \ - RUBY_NO_RUN_DEPENDS USE_APACHE USE_APACHE_BUILD USE_APACHE_RUN + RUBY_NO_RUN_DEPENDS USE_APACHE USE_APACHE_BUILD USE_APACHE_RUN \ + USE_OPENLDAP WANT_OPENLDAP_VER SANITY_DEPRECATED= MLINKS \ USE_MYSQL WANT_MYSQL_VER \ PYDISTUTILS_INSTALLNOSINGLE @@ -244,6 +245,7 @@ USE_SCONS_ALT= USES=scons USE_DRUPAL_ALT= USES=drupal USE_PYDISTUTILS_ALT= USE_PYTHON=distutils USE_PGSQL_ALT= USES=pgsql +USE_OPENLDAP_ALT= USES=ldap INSTALLS_SHLIB_ALT= USE_LDCONFIG NEED_ROOT_ALT= USES=fakeroot or USES=uidfix PYTHON_CONCURRENT_INSTALL_ALT= USE_PYTHON=concurrent @@ -262,6 +264,7 @@ USE_FIREBIRD_ALT= USES=firebird USE_BDB_ALT= USES=bdb:${USE_BDB} USE_MYSQL_ALT= USES=mysql:${USE_MYSQL} WANT_MYSQL_VER_ALT= USES=mysql:${WANT_MYSQL_VER} +WANT_OPENLDAP_VER_ALT= USES=ldap:${WANT_OPENLDAP_VER} USE_OPENSSL_ALT= USES=ssl USE_PHPIZE_ALT= USES=php:phpize USE_PHPEXT_ALT= USES=php:ext diff --git a/databases/ateam_mysql57_ldap_auth/Makefile b/databases/ateam_mysql57_ldap_auth/Makefile index 1b7ba9a0ed40..62b9ecfe9967 100644 --- a/databases/ateam_mysql57_ldap_auth/Makefile +++ b/databases/ateam_mysql57_ldap_auth/Makefile @@ -14,8 +14,7 @@ IGNORE_WITH_MYSQL= 56 80 101m 102m 103m LIB_DEPENDS= libconfig.so:devel/libconfig -USES= compiler:c++11-lang gmake mysql:57,client,server -USE_OPENLDAP= yes +USES= compiler:c++11-lang gmake ldap mysql:57,client,server USE_GITHUB= yes GH_ACCOUNT= ateamsystems diff --git a/databases/ateam_mysql_ldap_auth/Makefile b/databases/ateam_mysql_ldap_auth/Makefile index 720c36967c99..4396a514ac58 100644 --- a/databases/ateam_mysql_ldap_auth/Makefile +++ b/databases/ateam_mysql_ldap_auth/Makefile @@ -15,8 +15,7 @@ EXPIRATION_DATE= 2023-06-30 LIB_DEPENDS= libconfig.so:devel/libconfig -USE_OPENLDAP= yes -USES= gmake mysql:client,server +USES= gmake ldap mysql:client,server IGNORE_WITH_MYSQL= 57 80 101m 102m 103m 57p 57w diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index f5e3dae8733c..16f6607fecb2 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -65,7 +65,7 @@ KERBEROS_USES= ssl LDAP_CMAKE_ON= -DWITH_OPENLDAP=${LOCALBASE} LDAP_CMAKE_OFF= -DWITH_OPENLDAP=OFF -LDAP_USE= openldap=yes +LDAP_USES= ldap VAPI_USES= vala:build VAPI_CMAKE_BOOL= ENABLE_VALA_BINDINGS diff --git a/databases/ldb15/Makefile b/databases/ldb15/Makefile index 5a3b08a91a33..5cecb3d54d79 100644 --- a/databases/ldb15/Makefile +++ b/databases/ldb15/Makefile @@ -31,12 +31,11 @@ CONFLICTS_INSTALL= ldb[0-9][0-9] samba4[0-9][0-9] # include/ldb.h lib/python3.8/ #nopython_CONFLICTS= ldb #default_CONFLICTS= ldb-nopython -USES= compiler gettext-runtime pkgconfig waf +USES= compiler gettext-runtime ldap pkgconfig waf USE_LDCONFIG= yes WAF_CMD= ${BUILD_WRKSRC}/buildtools/bin/waf CONFIGURE_LOG= ${BUILD_WRKSRC}/bin/config.log -USE_OPENLDAP= yes PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} diff --git a/databases/ldb20/Makefile b/databases/ldb20/Makefile index 41199ae8c945..4c4895d01c8d 100644 --- a/databases/ldb20/Makefile +++ b/databases/ldb20/Makefile @@ -26,12 +26,11 @@ LDB_DEPENDS= talloc>=2.2.0:devel/talloc \ CONFLICTS_INSTALL= ldb[0-9][0-9] # include/ldb.h -USES= compiler pkgconfig waf +USES= compiler ldap pkgconfig waf USE_LDCONFIG= yes WAF_CMD= ${BUILD_WRKSRC}/buildtools/bin/waf CONFIGURE_LOG= ${BUILD_WRKSRC}/bin/config.log -USE_OPENLDAP= yes PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} diff --git a/databases/ldb21/Makefile b/databases/ldb21/Makefile index f874bb3c6ab3..5a82ea00d743 100644 --- a/databases/ldb21/Makefile +++ b/databases/ldb21/Makefile @@ -23,7 +23,7 @@ LDB_DEPENDS= talloc>=2.2.0:devel/talloc \ cmocka>=1.1.3:sysutils/cmocka \ popt>=0:devel/popt -USES= compiler pkgconfig waf +USES= compiler ldap pkgconfig waf CONFLICTS_INSTALL= ldb[0-9][0-9] # include/ldb.h @@ -31,7 +31,6 @@ USE_LDCONFIG= yes WAF_CMD= ${BUILD_WRKSRC}/buildtools/bin/waf CONFIGURE_LOG= ${BUILD_WRKSRC}/bin/config.log -USE_OPENLDAP= yes PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} diff --git a/databases/ldb22/Makefile b/databases/ldb22/Makefile index a2a82f83b01e..3081d2478c0c 100644 --- a/databases/ldb22/Makefile +++ b/databases/ldb22/Makefile @@ -24,7 +24,7 @@ TEST_DEPENDS= ${LDB_DEPENDS} \ cmocka>=1.1.3:sysutils/cmocka RUN_DEPENDS= ${LDB_DEPENDS} -USES= compiler pkgconfig waf +USES= compiler ldap pkgconfig waf CONFLICTS_INSTALL= ldb[0-9][0-9] # include/ldb.h @@ -32,7 +32,6 @@ USE_LDCONFIG= yes WAF_CMD= ${BUILD_WRKSRC}/buildtools/bin/waf CONFIGURE_LOG= ${BUILD_WRKSRC}/bin/config.log -USE_OPENLDAP= yes PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile index 2f26c34db2f4..3f09ecff651a 100644 --- a/databases/libgda5/Makefile +++ b/databases/libgda5/Makefile @@ -61,7 +61,7 @@ CONFIGURE_ARGS+= --without-bdb .endif .if ${LIBGDA5_SLAVE}==ldap -USE_OPENLDAP= yes +USES= ldap CONFIGURE_ARGS+= --with-ldap=${LOCALBASE} .else CONFIGURE_ARGS+= --without-ldap diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile index c1a312aafec8..ec2127d9803f 100644 --- a/databases/mysql57-client/Makefile +++ b/databases/mysql57-client/Makefile @@ -34,7 +34,7 @@ OPTIONS_GROUP_PLUGINS= SASLCLIENT SASLCLIENT_DESC= SASL client plugin module SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -SASLCLIENT_USE= OPENLDAP=yes +SASLCLIENT_USES= ldap OPTIONS_DEFAULT+= SASLCLIENT # issue 166367: adding symlinks for back-compatibility with ${lib}_r diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile index 6ee35754d862..d5f01f4b1f67 100644 --- a/databases/mysql80-client/Makefile +++ b/databases/mysql80-client/Makefile @@ -33,7 +33,7 @@ OPTIONS_GROUP_PLUGINS= SASLCLIENT SASLCLIENT_DESC= SASL client plugin module SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -SASLCLIENT_USE= OPENLDAP=yes +SASLCLIENT_USES= ldap OPTIONS_DEFAULT+= SASLCLIENT OPTIONS_SUB= yes diff --git a/databases/percona57-client/Makefile b/databases/percona57-client/Makefile index 62cedd6416aa..c7491369167f 100644 --- a/databases/percona57-client/Makefile +++ b/databases/percona57-client/Makefile @@ -34,7 +34,7 @@ OPTIONS_GROUP_PLUGINS= SASLCLIENT SASLCLIENT_DESC= SASL client plugin module SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -SASLCLIENT_USE= OPENLDAP=yes +SASLCLIENT_USES= ldap OPTIONS_DEFAULT+= SASLCLIENT OPTIONS_SUB= yes diff --git a/databases/postgresql15-server/Makefile b/databases/postgresql15-server/Makefile index 16d458ab0f3c..6639a6500fe0 100644 --- a/databases/postgresql15-server/Makefile +++ b/databases/postgresql15-server/Makefile @@ -164,7 +164,7 @@ NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile index e7859889eb20..043e321b348f 100644 --- a/databases/virtuoso/Makefile +++ b/databases/virtuoso/Makefile @@ -99,7 +99,7 @@ CONFIGURE_ARGS+=--disable-krb .if ${PORT_OPTIONS:MLDAP} CONFIGURE_ARGS+=--enable-openldap=${LOCALBASE} -USE_OPENLDAP= yes +USES= ldap .else CONFIGURE_ARGS+=--disable-openldap .endif diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index 644cd93f517c..d3ba4db4a51e 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -43,7 +43,7 @@ SSL_DESC= OpenSSL crypto driver # APR-Util Options BDB_USES= bdb:5+ GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap MYSQL_USES= mysql NSS_LIB_DEPENDS= libnss3.so:security/nss ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC diff --git a/devel/p5-Test-OpenLDAP/Makefile b/devel/p5-Test-OpenLDAP/Makefile index f0e7b42f0567..9df623458b27 100644 --- a/devel/p5-Test-OpenLDAP/Makefile +++ b/devel/p5-Test-OpenLDAP/Makefile @@ -14,14 +14,12 @@ LICENSE_COMB= dual RUN_DEPENDS= \ p5-Data-UUID>0:devel/p5-Data-UUID \ - p5-perl-ldap>0:net/p5-perl-ldap \ - ${LOCALBASE}/libexec/slapd:net/openldap${OPENLDAP_VER}-server + p5-perl-ldap>0:net/p5-perl-ldap BUILD_DEPENDS= ${RUN_DEPENDS} NO_ARCH= yes -USES= perl5 +USES= ldap:server perl5 USE_PERL5= configure -USE_OPENLDAP= yes CONFIGURE_ENV= PATH=${PATH}:${PREFIX}/libexec diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile index 885adb42edba..63d38fb9a98c 100644 --- a/devel/ptlib/Makefile +++ b/devel/ptlib/Makefile @@ -135,7 +135,7 @@ CONFIGURE_ARGS+=--disable-sdl .endif .if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes +USES+= ldap CONFIGURE_ARGS+=--enable-openldap .else CONFIGURE_ARGS+=--disable-openldap diff --git a/devel/sope/Makefile b/devel/sope/Makefile index 78ee0b05b7ee..e9f971cddc36 100644 --- a/devel/sope/Makefile +++ b/devel/sope/Makefile @@ -38,7 +38,7 @@ MEMCACHED_DESC= Install memcached MYSQL_DESC= Build with MySQL support PGSQL_DESC= Build with PostgreSQL support -LDAP_USE= OPENLDAP=client +LDAP_USES= ldap MEMCACHED_RUN_DEPENDS= ${LOCALBASE}/bin/memcached:databases/memcached MYSQL_USES= mysql PGSQL_USES= pgsql diff --git a/devel/sope2/Makefile b/devel/sope2/Makefile index 43c25ce4efa9..f46e17294f43 100644 --- a/devel/sope2/Makefile +++ b/devel/sope2/Makefile @@ -22,7 +22,6 @@ OPTIONS_DEFINE= LDAP MYSQL PGSQL MEMCACHED OPTIONS_DEFAULT= LDAP PGSQL MEMCACHED OPTIONS_SUB= yes -LDAP_DESC= Build with LDAP support MYSQL_DESC= Build with MySQL support PGSQL_DESC= Build with PostgreSQL support MEMCACHED_DESC= Install memcached @@ -37,7 +36,7 @@ SUB_LIST+= GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \ CONFIGURE_ARGS= --with-gnustep --disable-debug --enable-strip -LDAP_USE= OPENLDAP=client +LDAP_USES= ldap PGSQL_USES= pgsql MYSQL_USES= mysql MEMCACHED_RUN_DEPENDS= ${LOCALBASE}/bin/memcached:databases/memcached diff --git a/dns/bind916/Makefile b/dns/bind916/Makefile index ff27843fc5be..38053bf5d72c 100644 --- a/dns/bind916/Makefile +++ b/dns/bind916/Makefile @@ -100,7 +100,7 @@ DLZ_BDB_USES= bdb DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes -DLZ_LDAP_USE= OPENLDAP=yes +DLZ_LDAP_USES= ldap DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes DLZ_MYSQL_USES= mysql diff --git a/dns/ldapdns/Makefile b/dns/ldapdns/Makefile index ede96663468c..a23274d9eac3 100644 --- a/dns/ldapdns/Makefile +++ b/dns/ldapdns/Makefile @@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= setuidgid:sysutils/daemontools \ tcpserver:sysutils/ucspi-tcp -USES= localbase:ldflags shebangfix tar:xz -USE_OPENLDAP= yes +USES= ldap localbase:ldflags shebangfix tar:xz HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} USE_CSTD= gnu89 diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile index 2babc53071c8..194334f50d7a 100644 --- a/dns/powerdns/Makefile +++ b/dns/powerdns/Makefile @@ -96,7 +96,7 @@ MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} MYSQL_CONFIGURE_OFF= --without-mysql MYSQL_VARS= MODULES+=gmysql -OPENLDAP_USE= OPENLDAP=YES +OPENLDAP_USES= ldap OPENLDAP_CXXFLAGS= -DLDAP_DEPRECATED=1 OPENLDAP_VARS= MODULES+=ldap diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 014e36456e62..1e0e7135bebf 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -118,11 +118,10 @@ SHEBANG_GLOB= *.py GNU_CONFIGURE= yes USES= autoreconf:build bison compiler:c++17-lang cpe desktop-file-utils \ - gettext gl gmake gnome jpeg localbase:ldflags perl5 pkgconfig \ + gettext gl gmake gnome jpeg ldap localbase:ldflags perl5 pkgconfig \ python:3.8+ shebangfix shared-mime-info ssl tar:xz xorg USE_GL= gl glew glu USE_GNOME= cairo glib20 libxml2 libxslt -USE_OPENLDAP= yes USE_PERL5= build USE_XORG= ice sm x11 xaw xcb xext xinerama xrandr xrender diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index a45d1a3c8170..1b1967127d67 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -89,7 +89,7 @@ GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap MONO_RUN_DEPENDS= wine-mono>0:emulators/wine-mono diff --git a/finance/odoo/Makefile b/finance/odoo/Makefile index 16b40d144fb2..48502ba13a4e 100644 --- a/finance/odoo/Makefile +++ b/finance/odoo/Makefile @@ -64,9 +64,8 @@ RUN_DEPENDS= wkhtmltopdf>0:converters/wkhtmltopdf \ ${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR} -USES= cpe python:3.7+ pgsql shebangfix +USES= cpe ldap python:3.7+ pgsql shebangfix USE_PYTHON= distutils -USE_OPENLDAP= yes SHEBANG_LANG= python SHEBANG_FILES= ${WRKSRC}/${PORTNAME}-bin diff --git a/finance/odoo14/Makefile b/finance/odoo14/Makefile index 2f5194f2a7f5..74495a69575b 100644 --- a/finance/odoo14/Makefile +++ b/finance/odoo14/Makefile @@ -66,9 +66,8 @@ RUN_DEPENDS= wkhtmltopdf>0:converters/wkhtmltopdf \ ${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR} -USES= cpe python:3.7+ pgsql shebangfix +USES= cpe ldap python:3.7+ pgsql shebangfix USE_PYTHON= distutils -USE_OPENLDAP= yes SHEBANG_LANG= python SHEBANG_FILES= ${WRKSRC}/${PORTNAME}-bin diff --git a/finance/odoo15/Makefile b/finance/odoo15/Makefile index 1a9478c05c77..6b53f1b6b2bf 100644 --- a/finance/odoo15/Makefile +++ b/finance/odoo15/Makefile @@ -66,9 +66,8 @@ RUN_DEPENDS= wkhtmltopdf>0:converters/wkhtmltopdf \ ${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR} -USES= cpe python:3.7+ pgsql shebangfix +USES= cpe ldap python:3.7+ pgsql shebangfix USE_PYTHON= distutils -USE_OPENLDAP= yes SHEBANG_LANG= python SHEBANG_FILES= ${WRKSRC}/${PORTNAME}-bin diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index 040359c87a65..818a353e6736 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -105,7 +105,7 @@ IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 IMAP_CONFIGURE_ENABLE= imap IPV6_CONFIGURE_ENABLE= ipv6 LDAP_CONFIGURE_ENABLE= ldap -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAPS_CONFIGURE_ENABLE= ldaps LIBSSH2_CONFIGURE_WITH= libssh2 LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2 diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile index 624118c04454..880a2ef04f78 100644 --- a/ftp/pure-ftpd/Makefile +++ b/ftp/pure-ftpd/Makefile @@ -51,7 +51,7 @@ ANONRENAME_CPPFLAGS= -DANON_CAN_RENAME ANONRESUME_CPPFLAGS= -DANON_CAN_RESUME LARGEFILE_CONFIGURE_ENABLE= largefile LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap MYSQL_CONFIGURE_WITH= mysql MYSQL_USES= mysql PAM_CONFIGURE_WITH= pam diff --git a/irc/anope/Makefile b/irc/anope/Makefile index 19c62f36f4cb..57be759c9f4e 100644 --- a/irc/anope/Makefile +++ b/irc/anope/Makefile @@ -27,7 +27,7 @@ TRE_DESC= Tre Regex Module GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap MYSQL_USES= mysql diff --git a/irc/atheme-services/Makefile b/irc/atheme-services/Makefile index 548737cc380e..db61c8ba45dc 100644 --- a/irc/atheme-services/Makefile +++ b/irc/atheme-services/Makefile @@ -43,7 +43,7 @@ OPTIONS_SUB= yes CONTRIB_CONFIGURE_ENABLE= contrib CRACKLIB_LIB_DEPENDS= libcrack.so:security/cracklib CRACKLIB_CONFIGURE_WITH= cracklib -LDAP_USE= openldap=yes +LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile index 5319ab4a9758..8bc53ac840a2 100644 --- a/irc/bitlbee/Makefile +++ b/irc/bitlbee/Makefile @@ -66,7 +66,7 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \ libgpg-error.so:security/libgpg-error JABBER_CONFIGURE_OFF= --jabber=0 LDAP_CONFIGURE_ON= --ldap=1 -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LIBEVENT_CONFIGURE_ON= --events=libevent --libevent=${LOCALBASE} LIBEVENT_LIB_DEPENDS= libevent.so:devel/libevent LIBPURPLE_CONFIGURE_ON= --purple=1 diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile index 84c2d36ea182..8530ea784526 100644 --- a/irc/inspircd/Makefile +++ b/irc/inspircd/Makefile @@ -68,7 +68,7 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_USES= pkgconfig GNUTLS_VARS= EXTRAS+=m_ssl_gnutls.cpp -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_VARS= EXTRAS+=m_ldap.cpp MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls MBEDTLS_VARS= EXTRAS+=m_ssl_mbedtls.cpp diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile index 2956b79bf7c6..f09b80d39653 100644 --- a/irc/quassel/Makefile +++ b/irc/quassel/Makefile @@ -13,11 +13,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs -USES= cmake compiler:c++11-lib cpe pkgconfig qca qt:5 tar:xz +USES= cmake compiler:c++11-lib cpe ldap pkgconfig qca qt:5 tar:xz USE_GITHUB= nodefault #GH_ACCOUNT= ${PORTNAME} #GH_PROJECT= ${PORTNAME} -USE_OPENLDAP= yes USE_QT= buildtools:build core network qmake:build CPE_VENDOR= quassel-irc diff --git a/lang/php80/Makefile.ext b/lang/php80/Makefile.ext index 8f47bdbfa6a0..8621f7c23145 100644 --- a/lang/php80/Makefile.ext +++ b/lang/php80/Makefile.ext @@ -179,7 +179,7 @@ CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \ CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \ PHP_OPENSSL=yes - + LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USES+= ssl .endif @@ -197,8 +197,7 @@ BUILD_DEPENDS= re2c:devel/re2c .if ${PHP_MODNAME} == "ldap" CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE} - -USE_OPENLDAP= yes +USE+= ldap .endif .if ${PHP_MODNAME} == "mbstring" diff --git a/lang/php81/Makefile b/lang/php81/Makefile index 88e42e1399c3..d4459d4f88b7 100644 --- a/lang/php81/Makefile +++ b/lang/php81/Makefile @@ -363,8 +363,7 @@ BUILD_DEPENDS= re2c:devel/re2c .if ${PHP_MODNAME} == "ldap" CONFIGURE_ARGS+= --with-ldap-sasl=${LOCALBASE} \ --with-ldap=${LOCALBASE} - -USE_OPENLDAP= yes +USES+= ldap .endif .if ${PHP_MODNAME} == "mbstring" diff --git a/lang/php82/Makefile b/lang/php82/Makefile index 8757e39835e3..f3c553f590a9 100644 --- a/lang/php82/Makefile +++ b/lang/php82/Makefile @@ -364,8 +364,7 @@ BUILD_DEPENDS= re2c:devel/re2c .if ${PHP_MODNAME} == "ldap" CONFIGURE_ARGS+= --with-ldap-sasl=${LOCALBASE} \ --with-ldap=${LOCALBASE} - -USE_OPENLDAP= yes +USES+= ldap .endif .if ${PHP_MODNAME} == "mbstring" diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile index accd8e32a8c2..d30d6089e99b 100644 --- a/mail/alpine/Makefile +++ b/mail/alpine/Makefile @@ -59,7 +59,7 @@ CONS25_EXTRA_PATCHES= ${FILESDIR}/cons25-alpine_keymenu.c IPV6_CONFIGURE_WITH= ipv6 # Option LDAP -LDAP_USE= openldap=yes +LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap LDAP_CFLAGS= -I${LOCALBASE}/include LDAP_LDFLAGS= -L${LOCALBASE}/lib diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index 4536046f539e..a08f660f0eaf 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -42,7 +42,7 @@ GTKSV_DESC= GtkSourceview support GPG_DESC= GnuPG support GPG_CONFIGURE_WITH= gpgme GPG_LIB_DEPENDS= libgpgme.so:security/gpgme -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap GTKSPELL_CONFIGURE_WITH= gtkspell GTKSPELL_LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3 diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index e6eea73f94f5..0768af936156 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -51,7 +51,7 @@ ENCHANT_CONFIGURE_ENABLE= enchant IPV6_CONFIGURE_ENABLE= ipv6 -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_ENABLE= ldap NLS_USES= gettext-tools diff --git a/mail/cone/Makefile b/mail/cone/Makefile index 59042e4b28ea..8aa1d491c78e 100644 --- a/mail/cone/Makefile +++ b/mail/cone/Makefile @@ -17,11 +17,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING.GPL BUILD_DEPENDS= gpgv:security/gnupg1 LIB_DEPENDS= libaspell.so:textproc/aspell \ libcourier-unicode.so:devel/courier-unicode \ - libidn.so:dns/libidn \ - libldap_r.so:net/openldap24-client + libidn.so:dns/libidn RUN_DEPENDS= gpgv:security/gnupg1 -USES= compiler:c++11-lang fam gettext gmake gnome iconv \ +USES= compiler:c++11-lang fam gettext gmake gnome iconv ldap:24 \ localbase:ldflags ncurses perl5 pkgconfig shebangfix ssl \ tar:bzip2 USE_GNOME= libxml2 diff --git a/mail/courier/Makefile b/mail/courier/Makefile index 45e36b3a803e..c47d70c00adf 100644 --- a/mail/courier/Makefile +++ b/mail/courier/Makefile @@ -138,7 +138,7 @@ PERIODIC_DESC= modify/create periodic.conf .include "${.CURDIR}/Makefile.own" .if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes +USES+= ldap WITH_AUTH_LDAP= yes RUN_DEPENDS+= ${LOCALBASE}/lib/courier-authlib/libauthldap.so:net/courier-authlib-ldap CONFIGURE_ARGS+=--with-ldapaliasd diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index 602a9fe633cf..84fcab96d093 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -52,7 +52,7 @@ BDB_CONFIGURE_ON= --with-bdb-incdir=${BDB_INCLUDE_DIR} \ IDLED_DESC= Enable IMAP idled support IDLED_CONFIGURE_ENABLE= idled LDAP_PTLOADER_DESC= Enable LDAP ptloader -LDAP_PTLOADER_USE= OPENLDAP=yes +LDAP_PTLOADER_USES= ldap LDAP_PTLOADER_CONFIGURE_ON=--with-ldap=${LOCALBASE} LISTEXT_DESC= Enable IMAP List extensions LISTEXT_CONFIGURE_ENABLE=listext diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index 794ac23f463c..55591c3eb130 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -51,7 +51,7 @@ BDB_CONFIGURE_ON= --with-bdb-incdir=${BDB_INCLUDE_DIR} \ IDLED_DESC= Enable IMAP idled support IDLED_CONFIGURE_ENABLE= idled LDAP_DESC= Enable LDAP support (experimental) -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} MURDER_DESC= Enable IMAP Murder support MURDER_CONFIGURE_ENABLE=murder diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile index 0a872e19376b..15028c490cc4 100644 --- a/mail/cyrus-imapd25/Makefile +++ b/mail/cyrus-imapd25/Makefile @@ -63,7 +63,7 @@ HTTP_USE= GNOME=libxml2 IDLED_DESC= Enable IMAP idled support IDLED_CONFIGURE_ENABLE= idled LDAP_DESC= Enable LDAP support (experimental) -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} MURDER_DESC= Enable IMAP Murder support MURDER_CONFIGURE_ENABLE=murder diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile index 6a3caeefdaf0..9a5ca6e5354b 100644 --- a/mail/cyrus-imapd30/Makefile +++ b/mail/cyrus-imapd30/Makefile @@ -67,7 +67,7 @@ HTTP_USE= GNOME=libxml2 IDLED_DESC= Enable IMAP idled support IDLED_CONFIGURE_ENABLE= idled LDAP_DESC= Enable LDAP support (experimental) -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} LMDB_DESC= Use LMDB backend LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb diff --git a/mail/cyrus-imapd32/Makefile b/mail/cyrus-imapd32/Makefile index b32226d46817..572e7c9ade98 100644 --- a/mail/cyrus-imapd32/Makefile +++ b/mail/cyrus-imapd32/Makefile @@ -72,7 +72,7 @@ HTTP_USE= GNOME=libxml2 IDLED_DESC= Enable IMAP idled support IDLED_CONFIGURE_ENABLE= idled LDAP_DESC= Enable LDAP support (experimental) -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} MURDER_DESC= Enable IMAP Murder support MURDER_CONFIGURE_ENABLE=murder diff --git a/mail/cyrus-imapd34/Makefile b/mail/cyrus-imapd34/Makefile index f5a375816b83..be3369465ad5 100644 --- a/mail/cyrus-imapd34/Makefile +++ b/mail/cyrus-imapd34/Makefile @@ -90,7 +90,7 @@ HTTP_USE= GNOME=libxml2 IDLED_DESC= Enable IMAP idled support IDLED_CONFIGURE_ENABLE= idled LDAP_DESC= Enable LDAP support (experimental) -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} MURDER_DESC= Enable IMAP Murder support MURDER_CONFIGURE_ENABLE=murder diff --git a/mail/cyrus-imapd36/Makefile b/mail/cyrus-imapd36/Makefile index 90ffb4e28ce4..dbe13c5612a0 100644 --- a/mail/cyrus-imapd36/Makefile +++ b/mail/cyrus-imapd36/Makefile @@ -91,7 +91,7 @@ HTTP_USE= GNOME=libxml2 IDLED_DESC= Enable IMAP idled support IDLED_CONFIGURE_ENABLE= idled LDAP_DESC= Enable LDAP support (experimental) -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} LDAP_CONFIGURE_OFF= --without-ldap MURDER_DESC= Enable IMAP Murder support diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile index 1e76698bfdf1..ef959312cfc5 100644 --- a/mail/dbmail/Makefile +++ b/mail/dbmail/Makefile @@ -47,8 +47,7 @@ SIEVE_DESC= Sieve mail sorting language support DOCS= AUTHORS CHANGELOG.md INSTALL README THANKS UPGRADING -LDAP_USES= gettext-runtime -LDAP_USE= OPENLDAP=yes +LDAP_USES= gettext-runtime ldap LDAP_CONFIGURE_WITH= ldap SIEVE_LIB_DEPENDS= libsieve.so:mail/libsieve SIEVE_CONFIGURE_WITH= sieve diff --git a/mail/dovecot-pigeonhole/Makefile b/mail/dovecot-pigeonhole/Makefile index 91d70d68d601..f6b5766e1f94 100644 --- a/mail/dovecot-pigeonhole/Makefile +++ b/mail/dovecot-pigeonhole/Makefile @@ -49,7 +49,7 @@ MANAGESIEVE_CONFIGURE_WITH= managesieve LDAP_CONFIGURE_WITH= ldap LDAP_CPPFLAGS= -I${LOCALBASE}/include LDAP_LDFLAGS= -L${LOCALBASE}/lib -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap PORTDOCS= sieve/extensions/* sieve/plugins/* sieve/locations/* diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 7465de6f81b5..4e4190a81059 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -85,7 +85,7 @@ LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 CDB_CONFIGURE_WITH= cdb CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap MYSQL_USES= mysql diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index 70c28d661d56..9a412c98cb88 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -304,7 +304,7 @@ PLIST_SUB+= NOSETUID="" .if ${PORT_OPTIONS:MEXTERNAL_LOOKUP} CONFIGURE_ARGS+= --enable-external-lookup -USE_OPENLDAP= YES +USES+= ldap .endif .if ${PORT_OPTIONS:MUSER_HOMEDIR} diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index cf977611d49a..957e4a0e9e8e 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -89,7 +89,7 @@ OPTIONS_GROUP_SPAM= BOGOFILTER SPAMASSASSIN LDAP_CMAKE_ON= -DWITH_OPENLDAP=${LOCALBASE} LDAP_CMAKE_OFF= -DWITH_OPENLDAP=OFF -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap YTNEF_DESC= Support MS Outlook TNEF format YTNEF_LIB_DEPENDS= libytnef.so:converters/ytnef diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 5714816ebe68..2242ff7608fa 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -54,7 +54,7 @@ ICONV_USES= iconv:lib,build INTERNATIONAL_LIB_DEPENDS= libidn.so:dns/libidn LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MYSQL_USES= mysql -OPENLDAP_USE= openldap=yes +OPENLDAP_USES= ldap PGSQL_LIB_DEPENDS= libicudata.so:devel/icu PGSQL_USES= pgsql pkgconfig REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis @@ -321,10 +321,6 @@ SEDLIST+= -e 's,XX_ICONV_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib ${ICONV_LIB},' \ SEDLIST+= -e 's,XX_ICONV_LIBS_XX,,' .endif -.if ${PORT_OPTIONS:MOPENLDAP_VER} && ${WITH_OPENLDAP_VER:tl} != "auto" -WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} -.endif - .if ${PORT_OPTIONS:MOPENLDAP} LDAP_LIB_TYPE= OPENLDAP2 SEDLIST+= -e 's,XX_LDAP_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -llber -lldap,' \ diff --git a/mail/gnarwl/Makefile b/mail/gnarwl/Makefile index 7020536a68ac..0113636afcf8 100644 --- a/mail/gnarwl/Makefile +++ b/mail/gnarwl/Makefile @@ -12,8 +12,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libgdbm.so:databases/gdbm -USES= iconv gmake groff tar:tgz -USE_OPENLDAP= yes +USES= iconv gmake groff ldap tar:tgz GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --localstatedir="${PREFIX}/var" CPPFLAGS+= -I${LOCALBASE}/include diff --git a/mail/mailutils/Makefile b/mail/mailutils/Makefile index 9bc72d3c73ee..a59b6de51178 100644 --- a/mail/mailutils/Makefile +++ b/mail/mailutils/Makefile @@ -80,7 +80,7 @@ GDBM_CONFIGURE_WITH= gdbm KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet KYOTOCABINET_CONFIGURE_WITH= kyotocabinet -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap MYSQL_USES= mysql diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile index 33b1eae4d6aa..314bd92b18d3 100644 --- a/mail/milter-greylist/Makefile +++ b/mail/milter-greylist/Makefile @@ -56,7 +56,7 @@ GEOIP_CONFIGURE_ON= --with-libmaxminddb=${LOCALBASE} CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE} LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE} LDAP_LDFLAGS= -L${LOCALBASE}/lib -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap .include <bsd.port.options.mk> diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile index 0a0ee017100f..25294939abd9 100644 --- a/mail/opendkim/Makefile +++ b/mail/opendkim/Makefile @@ -84,7 +84,7 @@ OPENDBX_LIB_DEPENDS= libopendbx.so:databases/opendbx OPENLDAP_DESC= Store filter policies in LDAP OPENLDAP_CONFIGURE_WITH=openldap -OPENLDAP_USE= OPENLDAP=yes +OPENLDAP_USES= ldap POPAUTH_DESC= Use POP authentication DB POPAUTH_CONFIGURE_ENABLE= popauth diff --git a/mail/opensmtpd-extras-table-ldap/Makefile b/mail/opensmtpd-extras-table-ldap/Makefile index eddfdcccb861..6603aab46d2e 100644 --- a/mail/opensmtpd-extras-table-ldap/Makefile +++ b/mail/opensmtpd-extras-table-ldap/Makefile @@ -7,7 +7,7 @@ PLIST_FILES= libexec/opensmtpd/table-ldap CONFIGURE_ARGS+= --with-table-ldap -USE_OPENLDAP= client +USES= ldap MASTERDIR= ${.CURDIR}/../opensmtpd-extras SLAVE_PORT= yes diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile index fa393b4bc0c8..6044ef244e27 100644 --- a/mail/perdition/Makefile +++ b/mail/perdition/Makefile @@ -110,7 +110,7 @@ PLIST_SUB+= PGSQL="@comment " .endif .if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes +USES+= ldap CONFIGURE_ARGS+= --enable-ldap \ --with-ldap-schema-directory=${LOCALBASE}/etc/openldap/schema/ \ --disable-ldap-doc diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 30f05b9566d2..c6eaeda78c63 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -88,7 +88,7 @@ BDB_USES= bdb BLACKLISTD_EXTRA_PATCHES= ${FILESDIR}/extra-patch-blacklistd CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb EAI_LIB_DEPENDS= libicuuc.so:devel/icu -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MYSQL_USES?= mysql PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 @@ -263,9 +263,6 @@ POSTFIX_DYN_AUXLIBS+= "AUXLIBS_SQLITE=-L${LOCALBASE}/lib -lsqlite3 -lpthread" .if ${PORT_OPTIONS:MLDAP} DYN_EXT+= ldap -. if defined(WITH_OPENLDAP_VER) -WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} -. endif POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include \ -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -llber" diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index f6561241cc33..e1ba529c1215 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -106,7 +106,7 @@ BLACKLISTD_DESC= Enable blacklistd support CDB_DESC= CDB maps lookups EAI_DESC= Email Address Internationalization (SMTPUTF8) support INST_BASE_DESC= Install into /usr and /etc/postfix -LDAP_DESC= LDAP maps (uses WITH_OPENLDAP_VER) +LDAP_DESC= LDAP maps LMDB_DESC= LMDB maps PCRE2_DESC= Use Perl Compatible Regular Expressions, version 2 RG1_DESC= Kerberos network authentication protocol type @@ -119,7 +119,7 @@ BDB_USES= bdb BLACKLISTD_EXTRA_PATCHES= ${FILESDIR}/extra-patch-blacklistd CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb EAI_LIB_DEPENDS= libicuuc.so:devel/icu -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MYSQL_USES?= mysql PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 @@ -300,9 +300,6 @@ POSTFIX_DYN_AUXLIBS+= "AUXLIBS_SQLITE=-L${LOCALBASE}/lib -lsqlite3 -lpthread" .if ${PORT_OPTIONS:MLDAP} DYN_EXT+= ldap -. if defined(WITH_OPENLDAP_VER) -WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} -. endif POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include \ -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -llber" diff --git a/mail/qmail-activedir/Makefile b/mail/qmail-activedir/Makefile index c1f79c1e98e1..49165bdd1525 100644 --- a/mail/qmail-activedir/Makefile +++ b/mail/qmail-activedir/Makefile @@ -8,19 +8,14 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Programs to allow qmail to authenticate users through a MS ad WWW= http://fo2k.com/qmail-activedir/ -USES= qmail:run +USES= ldap qmail:run SUB_FILES= pkg-message SUB_LIST+= QMAIL_PREFIX=${QMAIL_PREFIX} -USE_OPENLDAP= yes BINARIES= checkadpassword qmail-adgetpw create_alias_files CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -Wall -lldap -.if defined(WITH_OPENLDAP_VER) -WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} -.endif - OPTIONS_DEFINE= DOCS post-patch: diff --git a/mail/sendmail-devel/Makefile b/mail/sendmail-devel/Makefile index 396386ff6c96..9bbb2220917d 100644 --- a/mail/sendmail-devel/Makefile +++ b/mail/sendmail-devel/Makefile @@ -72,7 +72,7 @@ TLS_USES= ssl SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASLAUTHD_RUN_DEPENDS= saslauthd:security/cyrus-sasl2-saslauthd DANE_IMPLIES= TLS -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_IMPLIES= DANE BDB_USES= bdb GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 9417d3c2b2b2..eab2a8b114a1 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -71,7 +71,7 @@ TLS_USES= ssl SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASLAUTHD_RUN_DEPENDS= saslauthd:security/cyrus-sasl2-saslauthd DANE_IMPLIES= TLS -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_IMPLIES= DANE BDB_USES= bdb GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile index cd302a64ebb1..1148b1b1acc0 100644 --- a/mail/spamass-milter/Makefile +++ b/mail/spamass-milter/Makefile @@ -24,7 +24,7 @@ WITH_LDAP=yes .endif .if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP=yes +USE+= ldap CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .endif diff --git a/mail/spmfilter/Makefile b/mail/spmfilter/Makefile index cb6c08167c8e..44f18639981f 100644 --- a/mail/spmfilter/Makefile +++ b/mail/spmfilter/Makefile @@ -54,10 +54,7 @@ CMAKE_ARGS+= -DENABLE_DEBUG=TRUE .endif .if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes -.if ${PORT_OPTIONS:MOPENLDAP_VER} -WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} -.endif +USES+= ldap .else CMAKE_ARGS+= -DWITHOUT_LDAP=TRUE .endif diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index 144eb7cd441a..a70af224cfa0 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -69,7 +69,7 @@ GTKSPELL_CONFIGURE_ENABLE= gtkspell HIDE_OSSIG_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_main.c LDAP_CONFIGURE_ENABLE= ldap -LDAP_USE= openldap=yes +LDAP_USES= ldap ONIGURUMA_LIB_DEPENDS= libonig.so:devel/oniguruma ONIGURUMA_CONFIGURE_ENABLE= oniguruma diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile index 8f16d1a0bfa0..dc5f18dfb8ef 100644 --- a/mail/tpop3d/Makefile +++ b/mail/tpop3d/Makefile @@ -49,7 +49,7 @@ PGSQL_USES= pgsql PGSQL_CONFIGURE_ON= --enable-auth-pgsql \ --with-pgsql-lib-dir=${LOCALBASE}/lib \ --with-pgsql-include-dir=${LOCALBASE}/include -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_ON= --enable-auth-ldap --with-openldap-root=${LOCALBASE} PERLAUTH_USES= perl5 FIX_PERLAUTH_EXTRA_PATCHES=${PATCHDIR}/extra-patch-auth_perl.c diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile index 370959980593..a03b5cc197a2 100644 --- a/mail/vpopmail/Makefile +++ b/mail/vpopmail/Makefile @@ -252,7 +252,7 @@ VPOPMAIL_DIR?= ${PREFIX}/vpopmail # End of user-configurable variables .if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes +USES+= ldap LDAP_FILES= ${WRKSRC}/doc/README.ldap \ ${WRKSRC}/ldap/nsswitch.conf \ ${WRKSRC}/ldap/pam_ldap.conf \ diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile index 6f7f4a2d0d54..0519f617a9e3 100644 --- a/net-im/jabberd/Makefile +++ b/net-im/jabberd/Makefile @@ -80,7 +80,7 @@ BDB_USES= bdb BDB_CONFIGURE_ENABLE= db BDB_CONFIGURE_ON= --oldincludedir=/nonexistant -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_ENABLE= ldap FS_CONFIGURE_ENABLE= fs diff --git a/net-mgmt/adcli/Makefile b/net-mgmt/adcli/Makefile index 3b1a612f25df..65cd4c224ccb 100644 --- a/net-mgmt/adcli/Makefile +++ b/net-mgmt/adcli/Makefile @@ -9,7 +9,6 @@ WWW= https://www.freedesktop.org/software/realmd/adcli/adcli.html LICENSE= LGPL21 -USE_OPENLDAP= yes BUILD_DEPENDS= xsltproc:textproc/libxslt \ docbook-xml>0:textproc/docbook-xml \ docbook-xsl>0:textproc/docbook-xsl @@ -28,7 +27,7 @@ CONFIGURE_ENV+= ac_cv_path_KRB5_CONFIG=${KRB5CONFIG} \ ac_cv_path_XMLTO=${PORT_OPTIONS:MDOCS:S|DOCS|${LOCALBASE}/bin/xmlto|:S|^$|${TRUE}|} CONFIGURE_ARGS= --sysconfdir=/etc -USES= autoreconf libtool +USES= autoreconf ldap libtool # Kerberos may or may not be there, but LDAP always is: CFLAGS+= -I${LOCALBASE}/include diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile index 2d7e987b8f3d..daedbdd58e7a 100644 --- a/net-mgmt/collectd5/Makefile +++ b/net-mgmt/collectd5/Makefile @@ -192,7 +192,7 @@ ONEWIRE_LIB_DEPENDS= libow.so:comms/owfs ONEWIRE_CONFIGURE_ENABLE= onewire ONEWIRE_CONFIGURE_WITH= libowcapi=${LOCALBASE} -OPENLDAP_USE= OPENLDAP=yes +OPENLDAP_USES= ldap OPENLDAP_CONFIGURE_ENABLE= openldap OPENLDAP_CONFIGURE_WITH= libldap=${LOCALBASE} diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile index 72b105b9bbfb..586896560c23 100644 --- a/net-mgmt/monitoring-plugins/Makefile +++ b/net-mgmt/monitoring-plugins/Makefile @@ -82,7 +82,7 @@ FPING_CONFIGURE_OFF= ac_cv_path_PATH_TO_FPING6= \ IPV6_CONFIGURE_WITH= ipv6 -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap MYSQL_USES= mysql diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile index fdd702287696..44b32169332f 100644 --- a/net-mgmt/nagios-plugins/Makefile +++ b/net-mgmt/nagios-plugins/Makefile @@ -85,7 +85,7 @@ FPING_CONFIGURE_OFF= ac_cv_path_PATH_TO_FPING6= \ IPV6_CONFIGURE_WITH= ipv6 -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap MYSQL_USES= mysql diff --git a/net-mgmt/seafile-server/Makefile b/net-mgmt/seafile-server/Makefile index d8e794c39c25..88a916a0c58c 100644 --- a/net-mgmt/seafile-server/Makefile +++ b/net-mgmt/seafile-server/Makefile @@ -58,7 +58,7 @@ FUSE_CONFIGURE_ENABLE= fuse FUSE_LIB_DEPENDS= libfuse.so:sysutils/fusefs-libs LDAP_CONFIGURE_ENABLE= ldap -LDAP_USE= openldap=yes +LDAP_USES= ldap NLS_USES= gettext diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile index bbe5a11eb0ce..7710f884a484 100644 --- a/net-mgmt/xymon-server/Makefile +++ b/net-mgmt/xymon-server/Makefile @@ -56,7 +56,7 @@ NETSNMP_DESC=Enable Net-SNMP support .if ${PORT_OPTIONS:MLDAP} MAKE_ENV+= WITH_LDAP=1 -USE_OPENLDAP= yes +USE+= ldap .endif .if ${PORT_OPTIONS:MNETSNMP} diff --git a/net-mgmt/zabbix4-server/Makefile b/net-mgmt/zabbix4-server/Makefile index 8ca08d483db9..3bd1e85486a3 100644 --- a/net-mgmt/zabbix4-server/Makefile +++ b/net-mgmt/zabbix4-server/Makefile @@ -96,7 +96,7 @@ SQLITE_USES+= sqlite:3 ORACLE_CONFIGURE_WITH= oracle LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap IPMI_CONFIGURE_WITH= openipmi IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi diff --git a/net-mgmt/zabbix5-server/Makefile b/net-mgmt/zabbix5-server/Makefile index 8e85d9c1fd56..1c09f79558b6 100644 --- a/net-mgmt/zabbix5-server/Makefile +++ b/net-mgmt/zabbix5-server/Makefile @@ -96,7 +96,7 @@ SQLITE_USES+= sqlite:3 ORACLE_CONFIGURE_WITH= oracle LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap IPMI_CONFIGURE_WITH= openipmi IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi diff --git a/net-mgmt/zabbix6-server/Makefile b/net-mgmt/zabbix6-server/Makefile index bc3fb7ea8ff5..9d29a3804ee0 100644 --- a/net-mgmt/zabbix6-server/Makefile +++ b/net-mgmt/zabbix6-server/Makefile @@ -105,7 +105,7 @@ IPMI_CONFIGURE_WITH= openipmi IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap MYSQL_CONFIGURE_ON= --with-mysql MYSQL_USES+= compiler:c11 mysql:80 diff --git a/net-mgmt/zabbix62-server/Makefile b/net-mgmt/zabbix62-server/Makefile index cd47762c74a3..5f0b61293e6f 100644 --- a/net-mgmt/zabbix62-server/Makefile +++ b/net-mgmt/zabbix62-server/Makefile @@ -105,7 +105,7 @@ IPMI_CONFIGURE_WITH= openipmi IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap MYSQL_CONFIGURE_ON= --with-mysql MYSQL_USES+= compiler:c11 mysql:80 diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index 391f932c586d..b4ef3f255616 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -143,7 +143,7 @@ GSM_CONFIGURE_WITH= gsm GSM_LIB_DEPENDS= libgsm.so:audio/gsm LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LUA_CONFIGURE_WITH= lua LUA_USES= lua diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile index 1a0889852ea2..1bc09b5c0505 100644 --- a/net/asterisk18/Makefile +++ b/net/asterisk18/Makefile @@ -143,7 +143,7 @@ GSM_CONFIGURE_WITH= gsm GSM_LIB_DEPENDS= libgsm.so:audio/gsm LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LUA_CONFIGURE_WITH= lua LUA_USES= lua diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile index ecc4bf269f0a..9e5c98063e88 100644 --- a/net/ceph14/Makefile +++ b/net/ceph14/Makefile @@ -60,11 +60,10 @@ RUN_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR} -USES= cmake:noninja compiler:c++17-lang cpe dos2unix fuse gettext-runtime gmake ncurses \ +USES= cmake:noninja compiler:c++17-lang cpe dos2unix fuse gettext-runtime gmake ldap ncurses \ pkgconfig python:3.8-3.9 readline shebangfix ssl CPE_VENDOR= linuxfoundation USE_PYTHON= cython py3kplist -USE_OPENLDAP= yes USE_GITHUB= yes GH_ACCOUNT= ceph:DEFAULT DOS2UNIX_FILES= src/pybind/mgr/diskprediction_cloud/common/__init__.py diff --git a/net/echoping/Makefile b/net/echoping/Makefile index d93fe0b070da..56e55ea567f4 100644 --- a/net/echoping/Makefile +++ b/net/echoping/Makefile @@ -34,7 +34,7 @@ OPTIONS_DEFINE= LDAP PGSQL OPTIONS_DEFAULT=LDAP OPTIONS_SUB= yes -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_VARS= PING_PLUGINS+=ldap PGSQL_USES= pgsql diff --git a/net/fpc-ldap/Makefile b/net/fpc-ldap/Makefile index 18092b929fe2..5625ed30028a 100644 --- a/net/fpc-ldap/Makefile +++ b/net/fpc-ldap/Makefile @@ -14,6 +14,6 @@ OPTIONS_DEFINE= OPENLDAP OPENLDAP_DESC= Install OpenLDAP libraries OPTIONS_DEFAULT= OPENLDAP -OPENLDAP_USE= OPENLDAP=yes +OPENLDAP_USES= ldap .include "${MASTERDIR}/Makefile" diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index 840ed30cfc03..fc2798cdbcc3 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -107,7 +107,7 @@ FIREBIRD_CONFIGURE_WITH= rlm_sql_firebird FIREBIRD_USES= firebird LDAP_CONFIGURE_WITH= rlm_ldap LDAP_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -LDAP_USE= OPENLDAP +LDAP_USES= ldap LDAP_VARS= _REQUIRE+=slapd MITKRB_PORT_CONFIGURE_ON= --with-rlm-krb5-dir=${LOCALBASE} MITKRB_PORT_LIB_DEPENDS= libkrb5support.so:security/krb5 diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile index b60864677883..ee74341e2631 100644 --- a/net/gnu-dico/Makefile +++ b/net/gnu-dico/Makefile @@ -38,7 +38,7 @@ GSASL_CONFIGURE_WITH= gsasl GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 GUILE_CONFIGURE_OFF= --without-guile -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_OFF= --without-ldap NLS_USES= gettext diff --git a/net/gq/Makefile b/net/gq/Makefile index a673790a1f03..a29478511714 100644 --- a/net/gq/Makefile +++ b/net/gq/Makefile @@ -18,10 +18,9 @@ BROKEN_FreeBSD_14= ld: error: duplicate symbol: dt_entry_handler LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring -USES= desktop-file-utils gettext gmake gnome pkgconfig \ +USES= desktop-file-utils gettext gmake gnome ldap pkgconfig \ shared-mime-info ssl USE_GNOME= intltool libglade2 -USE_OPENLDAP= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE} --disable-update-mimedb diff --git a/net/isc-dhcp44-server/Makefile b/net/isc-dhcp44-server/Makefile index 6b4bbfe6248f..720d84f736ab 100644 --- a/net/isc-dhcp44-server/Makefile +++ b/net/isc-dhcp44-server/Makefile @@ -90,8 +90,7 @@ PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \ BINLEASES_CONFIGURE_ENABLE= binary-leases PARANOIA_CONFIGURE_ENABLE= paranoia early-chroot LDAP_CONFIGURE_WITH= ldap ldapcrypto -LDAP_USE= OPENLDAP -LDAP_USES= shebangfix +LDAP_USES= ldap shebangfix LDAP_SSL_USES= ssl LDAP_SSL_VARS= LIBS+=-lssl LDAP_IMPLIES= IPV6 diff --git a/net/kldap/Makefile b/net/kldap/Makefile index b6ebd4d84f27..fad82ff93836 100644 --- a/net/kldap/Makefile +++ b/net/kldap/Makefile @@ -11,14 +11,13 @@ LICENSE= LGPL21 LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ libqt5keychain.so:security/qtkeychain@qt5 -USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz +USES= cmake compiler:c++11-lib gettext kde:5 ldap qt:5 tar:xz USE_KDE= completion config coreaddons i18n kio widgetsaddons service \ ecm:build # pim components USE_KDE+= mbox USE_QT= concurrent core dbus gui network widgets \ buildtools:build qmake:build -USE_OPENLDAP= yes USE_LDCONFIG= yes DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr diff --git a/net/ldapdiff/Makefile b/net/ldapdiff/Makefile index dfbba234a60b..be7fb4b50852 100644 --- a/net/ldapdiff/Makefile +++ b/net/ldapdiff/Makefile @@ -11,8 +11,7 @@ WWW= https://launchpad.net/ldapdiff LICENSE= GPLv3+ -USES= cpe iconv tar:tgz -USE_OPENLDAP= yes +USES= cpe iconv ldap tar:tgz GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${LOCALBASE} \ --with-ldap-dir=${LOCALBASE} diff --git a/net/ldapscripts/Makefile b/net/ldapscripts/Makefile index 7d58a3ac7d43..ba9346c276bd 100644 --- a/net/ldapscripts/Makefile +++ b/net/ldapscripts/Makefile @@ -11,19 +11,11 @@ WWW= https://contribs.martymac.org LICENSE= GPLv2 -RUN_DEPENDS= ldapadd:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \ - ldapsearch:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \ - ldapdelete:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \ - ldapmodify:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \ - ldapmodrdn:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \ - ldappasswd:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client - NO_ARCH= yes OPTIONS_DEFINE= SASL DOCS -USES= iconv tar:tgz -USE_OPENLDAP= yes +USES= iconv ldap tar:tgz LIBDIR= ${PREFIX}/lib/${PORTNAME} MAKE_ENV+= MANDIR=${MANPREFIX}/man \ ETCDIR=${ETCDIR} diff --git a/net/liblinphone/Makefile b/net/liblinphone/Makefile index f7dffd44ec83..d929b3ff58d4 100644 --- a/net/liblinphone/Makefile +++ b/net/liblinphone/Makefile @@ -46,7 +46,7 @@ OPTIONS_DEFAULT= LDAP VIDEO OPTIONS_SUB= yes LDAP_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CMAKE_BOOL= ENABLE_LDAP VIDEO_CMAKE_BOOL= ENABLE_VIDEO diff --git a/net/lualdap/Makefile b/net/lualdap/Makefile index e09f0deae11e..c23c35d442f6 100644 --- a/net/lualdap/Makefile +++ b/net/lualdap/Makefile @@ -11,8 +11,7 @@ WWW= https://github.com/lualdap/lualdap LICENSE= MIT -USES= gmake lua:module -USE_OPENLDAP= yes +USES= gmake ldap lua:module USE_GITHUB= yes USE_CSTD= c99 diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index 659a299aa0c1..9551415c796f 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -58,7 +58,7 @@ MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder MDNSRESPONDER_SUB_LIST= ZEROCONF="mdnsd" LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} LDAP_CFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_OFF= --without-ldap SENDFILE_CONFIGURE_ENABLE=sendfile DBUS_USES= gnome python diff --git a/net/nss-pam-ldapd/Makefile b/net/nss-pam-ldapd/Makefile index 149d5edfd438..da980d0bc012 100644 --- a/net/nss-pam-ldapd/Makefile +++ b/net/nss-pam-ldapd/Makefile @@ -12,10 +12,9 @@ WWW= https://arthurdejong.org/nss-pam-ldapd/ LICENSE= LGPL21 LGPL3 LICENSE_COMB= dual -USES= cpe +USES= cpe ldap CPE_VENDOR= arthurdejong GNU_CONFIGURE= yes -USE_OPENLDAP= yes USE_RC_SUBR= nslcd PAM_LDAP_SHMAJOR= 1 NSS_LDAP_SHMAJOR= 1 diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile index 011783508ed7..58da552b15b6 100644 --- a/net/nss_ldap/Makefile +++ b/net/nss_ldap/Makefile @@ -14,11 +14,10 @@ LICENSE= GPLv2 NSS_LDAP_VERSION=265 -USES= autoreconf cpe gmake perl5 +USES= autoreconf cpe gmake ldap perl5 USE_PERL5= build GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_OPENLDAP= yes CPE_VENDOR= padl OPTIONS_DEFINE= LCLASS KERBEROS diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile index 961f42ec6192..1dc1566522a7 100644 --- a/net/ntopng/Makefile +++ b/net/ntopng/Makefile @@ -24,9 +24,8 @@ LIB_DEPENDS= librrd.so:databases/rrdtool \ libhiredis.so:databases/hiredis BUILD_DEPENDS= bash:shells/bash -USES= autoreconf compiler:c++11-lang cpe gmake libtool localbase \ +USES= autoreconf compiler:c++11-lang cpe gmake ldap libtool localbase \ lua:54 mysql pathfix pkgconfig shebangfix sqlite ssl -USE_OPENLDAP= yes SUB_FILES= ntopng-geoip2update.sh pkg-deinstall SHEBANG_FILES= httpdocs/misc/ntopng-add-user.sh \ diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index fc1a1fc4b841..0c4dfdeb7751 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -46,11 +46,6 @@ GNU_CONFIGURE= yes # :keepla because port uses lt_dlopen USES= cpe libtool:keepla ssl tar:tgz -WANT_OPENLDAP_VER?= 24 -.if ${WANT_OPENLDAP_VER} != 24 -BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER} -.endif - PORTREVISION_CLIENT= 4 PORTREVISION_SERVER= 11 OPENLDAP_SHLIB_MAJOR= 2 @@ -370,15 +365,11 @@ OPENLDAP_PKGFILESUFX= .client PORTDOCS= CHANGES drafts rfc -.if defined(USE_OPENLDAP) -BROKEN= you have USE_OPENLDAP variable defined either in environment or in make(1) arguments; please undefine and try again -.endif .else OPENLDAP_PORTREVISION= ${PORTREVISION_SERVER} OPENLDAP_PKGFILESUFX= -USE_OPENLDAP= yes -WANT_OPENLDAP_VER= 24 +USES+= ldap:24 LIB_DEPENDS+= libicudata.so:devel/icu diff --git a/net/openradius/Makefile b/net/openradius/Makefile index 6870cfc2fadd..0e2ced955b92 100644 --- a/net/openradius/Makefile +++ b/net/openradius/Makefile @@ -33,7 +33,7 @@ OPTIONS_DEFINE= LDAP DOCS EXAMPLES .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= YES +USES=+ ldap PLIST_SUB+= LDAP="" SCRIPTS_ENV+= USE_LDAP=yes .else diff --git a/net/opensips31/Makefile b/net/opensips31/Makefile index 7ab84d8c694a..527cd81bc1f8 100644 --- a/net/opensips31/Makefile +++ b/net/opensips31/Makefile @@ -56,7 +56,7 @@ TESTS_DESC= Install smoke tests HTTP_LIB_DEPENDS= libmicrohttpd.so:www/libmicrohttpd HTTP_VARS= EXTRA_MODULES+=httpd -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_VARS= EXTRA_MODULES+="ldap h350" MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached diff --git a/net/proftpd-mod_ldap/Makefile b/net/proftpd-mod_ldap/Makefile index 819de694fa03..5de3f07e3fec 100644 --- a/net/proftpd-mod_ldap/Makefile +++ b/net/proftpd-mod_ldap/Makefile @@ -13,8 +13,7 @@ DESCR= ${.CURDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../../ftp/proftpd -USE_OPENLDAP= yes -USES= cpe ssl +USES= cpe ldap ssl INCLUDEDIRS= ${LOCALBASE}/include LIBDIRS= ${LOCALBASE}/lib diff --git a/net/proxy-suite/Makefile b/net/proxy-suite/Makefile index 1f55cf2f169e..ab163c1ccc7c 100644 --- a/net/proxy-suite/Makefile +++ b/net/proxy-suite/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --enable-rfc1579 # OPTIONAL: include ldap-support # .if defined(WITH_LDAP) -USE_OPENLDAP= yes +USES+= ldap CONFIGURE_ARGS+= --with-libldap=${LOCALBASE}/lib .else CONFIGURE_ARGS+= --without-libldap diff --git a/net/py-ldap/Makefile b/net/py-ldap/Makefile index ba69aa5f37b0..9accb51f2ec2 100644 --- a/net/py-ldap/Makefile +++ b/net/py-ldap/Makefile @@ -15,9 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENCE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:devel/py-pyasn1-modules@${PY_FLAVOR} -USES= python:3.6+ +USES= ldap python:3.6+ USE_PYTHON= autoplist distutils -USE_OPENLDAP= yes post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py diff --git a/net/py-ldap0/Makefile b/net/py-ldap0/Makefile index ae86d6953103..367b98b52f72 100644 --- a/net/py-ldap0/Makefile +++ b/net/py-ldap0/Makefile @@ -12,11 +12,10 @@ LICENSE= PSFL RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.4.5:devel/py-pyasn1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.2.5:devel/py-pyasn1-modules@${PY_FLAVOR} # Cyrus needs PLAIN / CRAM-MD5 / DIGEST-MD5 enabled -TEST_DEPENDS= ${LOCALBASE}/libexec/slapd:net/openldap24-server +TEST_DEPENDS= ${LOCALBASE}/libexec/slapd:net/openldap${OPENLDAP_VER}-server -USES= localbase python:3.6+ +USES= ldap:24 localbase python:3.6+ USE_LOCALE= en_US.UTF-8 -USE_OPENLDAP= yes USE_PYTHON= autoplist distutils USE_GITLAB= yes diff --git a/net/samba413/Makefile b/net/samba413/Makefile index 5a3f59c6d26e..509e109497eb 100644 --- a/net/samba413/Makefile +++ b/net/samba413/Makefile @@ -362,7 +362,7 @@ GSSAPI_HEIMDAL_PREVENTS_MSG= GSSAPI_HEIMDAL and AD_DC enable conflicting options LDAP_CONFIGURE_WITH= ldap LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE} -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_VARS= SAMBA4_MODULES+=idmap_ldap LIBZFS_CONFIGURE_WITH= libzfs diff --git a/net/samba416/Makefile b/net/samba416/Makefile index ee739448679f..a6af47e1c4fa 100644 --- a/net/samba416/Makefile +++ b/net/samba416/Makefile @@ -380,7 +380,7 @@ GSSAPI_HEIMDAL_PREVENTS_MSG= GSSAPI_HEIMDAL and AD_DC enable conflicting options LDAP_CONFIGURE_WITH= ldap LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE} -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_VARS= SAMBA4_MODULES+=idmap_ldap LIBZFS_CONFIGURE_WITH= libzfs diff --git a/net/ss5/Makefile b/net/ss5/Makefile index cfdfc3980c03..a5a5a223a4b4 100644 --- a/net/ss5/Makefile +++ b/net/ss5/Makefile @@ -16,8 +16,7 @@ BROKEN_FreeBSD_14= ld: error: duplicate symbol: ACMutex WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-[0-9]+//} -USES= ssl -USE_OPENLDAP= yes +USES= ldap ssl USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes diff --git a/net/x2goclient/Makefile b/net/x2goclient/Makefile index cccca0216512..7b9f6b43b0c8 100644 --- a/net/x2goclient/Makefile +++ b/net/x2goclient/Makefile @@ -28,7 +28,7 @@ QMAKE_ARGS= QMAKE_LRELEASE="${LRELEASE}" OPTIONS_DEFINE= DOCS LDAP OPTIONS_DEFAULT= LDAP -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CFLAGS= -DUSELDAP LDAP_QMAKE_ON= LIBS+="-lX11 -lXpm -lcups -lldap" LDAP_QMAKE_OFF= LIBS+="-lX11 -lXpm -lcups" diff --git a/net/yptransitd/Makefile b/net/yptransitd/Makefile index f1e421bdc189..3164fd39d11c 100644 --- a/net/yptransitd/Makefile +++ b/net/yptransitd/Makefile @@ -11,8 +11,7 @@ WWW= http://yptransitd.sourceforge.net/ LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= bison -USE_OPENLDAP= yes +USES= ldap bison GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE} USE_LDCONFIG= yes diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile index dc51e464bb18..6258201c13ac 100644 --- a/news/nntpcache/Makefile +++ b/news/nntpcache/Makefile @@ -43,7 +43,7 @@ OPTIONS_DEFINE= LDAP RADIUS SPAMPHOBIA DOCS SPAMPHOBIA_DESC= Spamphobia NoCeM support -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_WITH= authinfo-ldap LDAP_CPPFLAGS= -I${PREFIX}/include -I${LOCALBASE}/include LDAP_LDFLAGS= -L${PREFIX}/lib -L${LOCALBASE}/lib diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile index 945881c02a39..b8afc6436a5e 100644 --- a/print/cups-filters/Makefile +++ b/print/cups-filters/Makefile @@ -108,7 +108,7 @@ AVAHI_SUB_LIST_OFF= AVAHI_DAEMON= LDAP_CONFIGURE_ENABLE= ldap LDAP_DESC= Get printer locations from an LDAP server -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap # Default PDF-to-PostScript renderer diff --git a/security/clamav-lts/Makefile b/security/clamav-lts/Makefile index f0977628dbc5..a79eef7ffc59 100644 --- a/security/clamav-lts/Makefile +++ b/security/clamav-lts/Makefile @@ -93,7 +93,7 @@ ICONV_CONFIGURE_WITH= iconv IPV6_CONFIGURE_ENABLE= ipv6 JSON_LIB_DEPENDS= libjson-c.so:devel/json-c JSON_CONFIGURE_WITH= libjson=${LOCALBASE} -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_LDFLAGS= -lldap -L${LOCALBASE}/lib LHA_RUN_DEPENDS= lha:archivers/lha .if !exists(/usr/lib/libmilter.so) diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index c0d9ad839f08..f018a299a421 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -109,7 +109,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool OPTIONS_DEFINE+= DOCS DOCS= README.ldap -USE_OPENLDAP= yes +USES+= ldap CONFIGURE_ARGS+=--with-authldap .else CONFIGURE_ARGS+=--without-authldap diff --git a/security/cyrus-sasl2-ldapdb/Makefile b/security/cyrus-sasl2-ldapdb/Makefile index d542afdd1220..c83d15c389c8 100644 --- a/security/cyrus-sasl2-ldapdb/Makefile +++ b/security/cyrus-sasl2-ldapdb/Makefile @@ -5,6 +5,6 @@ WWW= https://www.cyrusimap.org/sasl/ CYRUS_CONFIGURE_ARGS= --enable-ldapdb --with-ldap=${LOCALBASE} -USE_OPENLDAP= yes +USES= ldap .include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common" diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile index 98eeb8d035fd..e9b3c9318ef6 100644 --- a/security/cyrus-sasl2-saslauthd/Makefile +++ b/security/cyrus-sasl2-saslauthd/Makefile @@ -20,7 +20,7 @@ OPTIONS_DEFAULT= BDB1 HTTPFORM_DESC= Enable HTTP form authentication HTTPFORM_CONFIGURE_ENABLE=httpform OPENLDAP_DESC= Use OpenLDAP -OPENLDAP_USE= OPENLDAP=yes +OPENLDAP_USES= ldap OPENLDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} SASLDB_DESC= Experimental SASLdb authentication module diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile index 06d813b0d050..de96158a7ba7 100644 --- a/security/dirmngr/Makefile +++ b/security/dirmngr/Makefile @@ -18,8 +18,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libksba.so:security/libksba \ libpth.so:devel/pth -USES= gmake iconv tar:bzip2 -USE_OPENLDAP= yes +USES= gmake iconv ldap tar:bzip2 GNU_CONFIGURE= yes INFO= dirmngr diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 6860156fa8ac..018ca8a1bfa3 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -47,7 +47,7 @@ LARGE_RSA_CONFIGURE_ENABLE= large-secmem LDAP_CONFIGURE_WITH= ldap=${LOCALBASE} LDAP_LIBS= -L${LOCALBASE}/lib -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile index a66a9ea313a4..b0ede8602c13 100644 --- a/security/gnupg1/Makefile +++ b/security/gnupg1/Makefile @@ -45,7 +45,7 @@ ICONV_CONFIGURE_ENABLE= gnupg-iconv LIBUSB_CONFIGURE_WITH= libusb=${LOCALBASE} -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap=${LOCALBASE} NLS_USES= gettext diff --git a/security/gvm-libs/Makefile b/security/gvm-libs/Makefile index 4efd4d4408b5..d62927b15a91 100644 --- a/security/gvm-libs/Makefile +++ b/security/gvm-libs/Makefile @@ -34,7 +34,7 @@ OPTIONS_DEFINE= LDAP RADIUS LDAP_CMAKE_ON= -DBUILD_WITH_LDAP=1 LDAP_CMAKE_OFF= -DBUILD_WITH_LDAP=0 -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap RADIUS_CMAKE_ON= -DBUILD_WITH_RADIUS=1 RADIUS_CMAKE_OFF= -DBUILD_WITH_RADIUS=0 RADIUS_LIB_DEPENDS= libfreeradius-client.so:net/freeradius-client diff --git a/security/heimdal-devel/Makefile b/security/heimdal-devel/Makefile index ceed684badb7..ec6894ffdfb8 100644 --- a/security/heimdal-devel/Makefile +++ b/security/heimdal-devel/Makefile @@ -91,7 +91,7 @@ SQLITE_CONFIGURE_ON= --with-sqlite3-include="${LOCALBASE}/include" \ SQLITE_CONFIGURE_WITH= sqlite3 LDAP_DESC= Enable OpenLDAP KDC backend support -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_ON= --with-openldap-include="${LOCALBASE}/include" \ --with-openldap-lib="${LOCALBASE}/lib" LDAP_CONFIGURE_WITH= openldap diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index adbb67229a1f..51e1bb3f096d 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -80,7 +80,7 @@ SQLITE_CONFIGURE_ON= --with-sqlite3-include="${LOCALBASE}/include" \ SQLITE_CONFIGURE_WITH= sqlite3 LDAP_DESC= Enable OpenLDAP KDC backend support -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_ON= --with-openldap-include="${LOCALBASE}/include" \ --with-openldap-lib="${LOCALBASE}/lib" LDAP_CONFIGURE_WITH= openldap diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile index d68736e88829..a557a282a5ce 100644 --- a/security/ipsec-tools/Makefile +++ b/security/ipsec-tools/Makefile @@ -64,7 +64,7 @@ GSSAPI_CFLAGS= -I${LOCALBASE}/include GSSAPI_LDFLAGS= -L${LOCALBASE}/lib GSSAPI_CONFIGURE_ENABLE=gssapi RADIUS_CONFIGURE_WITH= libradius -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_ON= --with-libldap=${LOCALBASE} LDAP_CONFIGURE_OFF= --without-libldap SAUNSPEC_CONFIGURE_ENABLE= samode-unspec diff --git a/security/krb5-118/Makefile b/security/krb5-118/Makefile index 333a851254fd..cb984b96eed3 100644 --- a/security/krb5-118/Makefile +++ b/security/krb5-118/Makefile @@ -50,7 +50,7 @@ KRB5_HTML_DESC= Install krb5 HTML documentation DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for-realm LDAP= Enable LDAP support -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap LMDB_DESC= OpenLDAP Lightning Memory-Mapped Database support LMDB_CONFIGURE_WITH= lmdb diff --git a/security/krb5-119/Makefile b/security/krb5-119/Makefile index ff774d4f0098..2ce7ca72df8f 100644 --- a/security/krb5-119/Makefile +++ b/security/krb5-119/Makefile @@ -46,7 +46,7 @@ KRB5_HTML_DESC= Install krb5 HTML documentation DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for-realm LDAP= Enable LDAP support -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap LMDB_DESC= OpenLDAP Lightning Memory-Mapped Database support LMDB_CONFIGURE_WITH= lmdb diff --git a/security/krb5-120/Makefile b/security/krb5-120/Makefile index e630d51aaa0b..11cc5da213d2 100644 --- a/security/krb5-120/Makefile +++ b/security/krb5-120/Makefile @@ -46,7 +46,7 @@ KRB5_HTML_DESC= Install krb5 HTML documentation DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for-realm LDAP= Enable LDAP support -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap LMDB_DESC= OpenLDAP Lightning Memory-Mapped Database support LMDB_CONFIGURE_WITH= lmdb diff --git a/security/krb5-devel/Makefile b/security/krb5-devel/Makefile index 27fb83ca5b9a..ea1f22b390c8 100644 --- a/security/krb5-devel/Makefile +++ b/security/krb5-devel/Makefile @@ -45,7 +45,7 @@ CMD_LINE_EDITING_DESC= Command line editing for kadmin and ktutil DNS_FOR_REALM_DESC= Enable DNS lookups for Kerberos realm names DNS_FOR_REALM_CONFIGURE_ENABLE= dns-for-realm LDAP= Enable LDAP support -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap LMDB_DESC= OpenLDAP Lightning Memory-Mapped Database support LMDB_CONFIGURE_WITH= lmdb diff --git a/security/libpki/Makefile b/security/libpki/Makefile index 1b6ec397730e..178ad059e790 100644 --- a/security/libpki/Makefile +++ b/security/libpki/Makefile @@ -35,7 +35,7 @@ MYSQL_DESC= "Enable MySQL support" PGSQL_DESC= "Enable PostgreSQL support" DNS_CONFIGURE_ENABLE= dns -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_ENABLE= ldap MYSQL_USES= mysql MYSQL_CONFIGURE_ENABLE= mysql diff --git a/security/opencryptoki/Makefile b/security/opencryptoki/Makefile index b457650ece7b..0b0fa6c75acd 100644 --- a/security/opencryptoki/Makefile +++ b/security/opencryptoki/Makefile @@ -15,8 +15,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libtspi.so:security/trousers \ libepoll-shim.so:devel/libepoll-shim -USES= alias autoreconf bison gmake libtool localbase ssl tar:tgz -USE_OPENLDAP= yes +USES= alias autoreconf bison gmake ldap libtool localbase ssl tar:tgz USE_LDCONFIG= ${PREFIX}/lib/opencryptoki USE_GITHUB= yes GNU_CONFIGURE= yes diff --git a/security/openscep/Makefile b/security/openscep/Makefile index 67fd39562883..dd25c44dc64b 100644 --- a/security/openscep/Makefile +++ b/security/openscep/Makefile @@ -14,13 +14,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING DEPRECATED= Do not support recent RFC 8894 EXPIRATION_DATE= 2023-03-31 -USES= apache gmake libtool ssl +USES= apache gmake ldap libtool ssl BROKEN_SSL= base BROKEN_SSL_REASON= unexpected type name 'issuer_and_subject_t': expected expression IGNORE_SSL= libressl libressl-devel IGNORE_SSL_REASON= unknown ASN1 functions USE_LDCONFIG= yes -USE_OPENLDAP= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-html-install-dir="${PREFIX}/www/openscep" \ diff --git a/security/openvpn-auth-ldap/Makefile b/security/openvpn-auth-ldap/Makefile index 2d0d5751b991..d1ee27a3f7e1 100644 --- a/security/openvpn-auth-ldap/Makefile +++ b/security/openvpn-auth-ldap/Makefile @@ -19,11 +19,10 @@ BUILD_DEPENDS= re2c:devel/re2c \ # and https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=235776 # appears to document issues on some systems when --with-openssl # is missing. -USES= autoreconf objc ssl tar:xz +USES= autoreconf ldap objc ssl tar:xz USE_GITHUB= yes GH_ACCOUNT= threerings GNU_CONFIGURE= yes -USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-openldap=${LOCALBASE} \ --with-openvpn=${LOCALBASE}/include \ --with-objc-runtime=GNU \ diff --git a/security/pam_ldap/Makefile b/security/pam_ldap/Makefile index bc6f6c997f2f..c3770e206931 100644 --- a/security/pam_ldap/Makefile +++ b/security/pam_ldap/Makefile @@ -14,8 +14,7 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING.LIB -USES= cpe gmake perl5 shebangfix -USE_OPENLDAP= yes +USES= cpe gmake ldap perl5 shebangfix USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ldap-conf-file=${PREFIX}/etc/${PAM_LDAP_CONF} \ diff --git a/security/pam_pkcs11/Makefile b/security/pam_pkcs11/Makefile index 3213b4a956fd..3c279020ad70 100644 --- a/security/pam_pkcs11/Makefile +++ b/security/pam_pkcs11/Makefile @@ -31,7 +31,7 @@ OPTIONS_SUB= yes CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_WITH= curl -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap # Users can only choose either NSS or SSL diff --git a/security/pam_yubico/Makefile b/security/pam_yubico/Makefile index 7bfff842a11a..7c47f33c879c 100644 --- a/security/pam_yubico/Makefile +++ b/security/pam_yubico/Makefile @@ -33,7 +33,7 @@ CR_CONFIGURE_WITH= cr CR_PLIST_FILES= bin/ykpamcfg \ man/man1/ykpamcfg.1.gz -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap STATIC_CONFIGURE_ENABLE= static diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index 68636782f039..96a3de781503 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -50,7 +50,7 @@ LDAP_DESC= LDAP keyserver support (for gpg) AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app AVAHI_MESON_TRUE= key-sharing -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_MESON_TRUE= ldap-support .include <bsd.port.mk> diff --git a/security/sssd/Makefile b/security/sssd/Makefile index ee10b4e4f2a2..281febf34c0b 100644 --- a/security/sssd/Makefile +++ b/security/sssd/Makefile @@ -61,10 +61,9 @@ SUB_FILES= pkg-message TEST_TARGET= check -USES= autoreconf cpe gettext gmake iconv libtool pathfix pkgconfig \ +USES= autoreconf cpe gettext gmake iconv ldap libtool pathfix pkgconfig \ python:3.6+ shebangfix gssapi:mit USE_LDCONFIG= yes -USE_OPENLDAP= yes INSTALL_TARGET= install-strip CPE_VENDOR= fedoraproject diff --git a/security/strongswan/Makefile b/security/strongswan/Makefile index 0461fc205ffa..0654cc82aa70 100644 --- a/security/strongswan/Makefile +++ b/security/strongswan/Makefile @@ -102,7 +102,7 @@ IKEV1_CONFIGURE_OFF= --disable-ikev1 IPSECKEY_CONFIGURE_ON= --enable-ipseckey KDF_CONFIGURE_ON= --enable-kdf KERNELLIBIPSEC_CONFIGURE_ON= --enable-kernel-libipsec -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_ON= --enable-ldap LIBC_CONFIGURE_ON= --with-printf-hooks=glibc LOADTESTER_CONFIGURE_ON= --enable-load-tester diff --git a/security/sudo/Makefile b/security/sudo/Makefile index 673b94caf04f..5cb9590d1d19 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -63,7 +63,7 @@ NLS_CFLAGS= -I${LOCALBASE}/include INSULTS_CONFIGURE_ON= --with-insults INSULTS_CONFIGURE_ON+= --with-all-insults -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_ON= --with-ldap=${PREFIX} SUDO_LDAP_CONF?= ldap.conf LDAP_CONFIGURE_ON+= --with-ldap-conf-file=${PREFIX}/etc/${SUDO_LDAP_CONF} diff --git a/sysutils/adtool/Makefile b/sysutils/adtool/Makefile index 7b96a33b4ca7..7161986de7ca 100644 --- a/sysutils/adtool/Makefile +++ b/sysutils/adtool/Makefile @@ -8,9 +8,8 @@ MAINTAINER= joseph@randomnetworks.com COMMENT= Active Directory administration tool WWW= https://gp2x.org/adtool/ -USES= gmake libtool +USES= gmake ldap libtool GNU_CONFIGURE= yes -USE_OPENLDAP= yes CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} diff --git a/sysutils/am-utils/Makefile b/sysutils/am-utils/Makefile index 2fb536baebc6..78e8ddee5e6a 100644 --- a/sysutils/am-utils/Makefile +++ b/sysutils/am-utils/Makefile @@ -34,8 +34,7 @@ INSTALL_TARGET= install-strip INFO= am-utils PORTDOCS= AUTHORS BUGS FAQ NEWS README.attrcache -OPENLDAP_USES= localbase:ldflags -OPENLDAP_USE= OPENLDAP=yes +OPENLDAP_USES= ldap localbase:ldflags OPENLDAP_CONFIGURE_WITH= ldap OPENLDAP_PORTDOCS= README.ldap ldap-id.txt ldap.schema diff --git a/sysutils/eclat/Makefile b/sysutils/eclat/Makefile index f312d1eea1e5..ad983e395d4f 100644 --- a/sysutils/eclat/Makefile +++ b/sysutils/eclat/Makefile @@ -28,7 +28,7 @@ OPTIONS_DEFAULT= GDBM GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_WITH= gdbm -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap post-patch: diff --git a/sysutils/ldapvi/Makefile b/sysutils/ldapvi/Makefile index dd2a3ea2a0ba..5cbd18d57b8e 100644 --- a/sysutils/ldapvi/Makefile +++ b/sysutils/ldapvi/Makefile @@ -13,8 +13,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libpopt.so:devel/popt -USES= gmake gnome iconv ncurses pkgconfig -USE_OPENLDAP= yes +USES= gmake gnome iconv ldap ncurses pkgconfig USE_GNOME= glib20 GNU_CONFIGURE= yes MAKEFILE= GNUmakefile diff --git a/sysutils/msktutil/Makefile b/sysutils/msktutil/Makefile index 10294bc8c6e4..9cc8891e101e 100644 --- a/sysutils/msktutil/Makefile +++ b/sysutils/msktutil/Makefile @@ -12,9 +12,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi -USES= autoreconf ssl +USES= autoreconf ldap ssl USE_GITHUB= yes -USE_OPENLDAP= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-sasldir=${LOCALBASE} --with-ldapdir=${LOCALBASE} diff --git a/sysutils/omnibackup/Makefile b/sysutils/omnibackup/Makefile index f067909758b5..fe5b565875d1 100644 --- a/sysutils/omnibackup/Makefile +++ b/sysutils/omnibackup/Makefile @@ -22,7 +22,7 @@ OPTIONS_DEFAULT= \ MYSQL OPENLDAP_DESC= OpenLDAP support -OPENLDAP_USE= OPENLDAP=yes +OPENLDAP_USES= ldap NO_ARCH= yes NO_BUILD= yes diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile index 6550e99b4807..bb1744740f19 100644 --- a/www/c-icap/Makefile +++ b/www/c-icap/Makefile @@ -52,7 +52,7 @@ LARGE_FILES_CONFIGURE_ENABLE= large-files MEMCACHE_CONFIGURE_WITH= memcached MEMCACHE_LIB_DEPENDS= libmemcached.so:databases/libmemcached -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_ON= --with-ldap=yes LDAP_CONFIGURE_OFF= --with-ldap=no diff --git a/www/glewlwyd/Makefile b/www/glewlwyd/Makefile index 3903b777e0f3..c871844f2d93 100644 --- a/www/glewlwyd/Makefile +++ b/www/glewlwyd/Makefile @@ -24,7 +24,6 @@ LIB_DEPENDS= libjansson.so:devel/jansson \ libjwt.so:www/libjwt \ libgnutls.so:security/gnutls \ libconfig.so:devel/libconfig \ - liblber.so:net/openldap24-client \ librhonabwy.so:security/rhonabwy \ libiddawc.so:security/iddawc @@ -38,7 +37,7 @@ RUN_DEPENDS= yder>1.4.14:devel/yder \ orcania>2.2.1:devel/orcania \ oath-toolkit>0:security/oath-toolkit -USES= cmake cpe pgsql sqlite +USES= cmake cpe ldap:24 pgsql sqlite USE_GITHUB= yes GH_ACCOUNT= babelouest diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index a3151f28e468..962ee5daf577 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -67,7 +67,7 @@ KRB5_LDFLAGS= ${GSSAPILDFLAGS} KRB5_LIBS= ${GSSAPILIBS} KRB5_USES= gssapi:mit LDAP_CONFIGURE_WITH= ldap -LDAP_USE= openldap=yes +LDAP_USES= ldap LDAP_VARS= REQUIRE+=slapd LUA_USES= lua LUA_CONFIGURE_WITH= lua diff --git a/www/mod_cfg_ldap/Makefile b/www/mod_cfg_ldap/Makefile index 4280c096aca8..a81385179b3b 100644 --- a/www/mod_cfg_ldap/Makefile +++ b/www/mod_cfg_ldap/Makefile @@ -11,8 +11,7 @@ WWW= https://sourceforge.net/projects/modcfgldap/ LICENSE= BSD3CLAUSE -USES= apache -USE_OPENLDAP= yes +USES= apache ldap AP_FAST_BUILD= yes AP_GENPLIST= yes diff --git a/www/mod_webauth/Makefile b/www/mod_webauth/Makefile index 3bf530c01fae..d0d825c7a1f1 100644 --- a/www/mod_webauth/Makefile +++ b/www/mod_webauth/Makefile @@ -12,8 +12,7 @@ WWW= http://webauth.stanford.edu/ LIB_DEPENDS= libcurl.so:ftp/curl \ libsasl2.so:security/cyrus-sasl2 -USES= apache libtool pathfix pkgconfig ssl -USE_OPENLDAP= yes +USES= apache ldap libtool pathfix pkgconfig ssl USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ldap-lib=${LOCALBASE}/lib \ diff --git a/www/sarg/Makefile b/www/sarg/Makefile index 3afc2e4b174d..a30e845b4ed7 100644 --- a/www/sarg/Makefile +++ b/www/sarg/Makefile @@ -36,7 +36,7 @@ PHP_CONFIGURE_ON= --enable-sargphp="${ETCDIR}" PHP_CONFIGURE_OFF= --disable-sargphp PCRE_CONFIGURE_WITH= pcre PCRE_LIB_DEPENDS= libpcre.so:devel/pcre -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap ICONV_USES= iconv ICONV_CONFIGURE_WITH= iconv diff --git a/www/squid-devel/Makefile b/www/squid-devel/Makefile index 2d9d992c8b44..45b03134502d 100644 --- a/www/squid-devel/Makefile +++ b/www/squid-devel/Makefile @@ -63,7 +63,7 @@ OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \ ARP_ACL_CONFIGURE_ENABLE= eui AUTH_LDAP_CFLAGS= -I${LOCALBASE}/include AUTH_LDAP_LDFLAGS= -L${LOCALBASE}/lib -AUTH_LDAP_USE= OPENLDAP=yes +AUTH_LDAP_USES= ldap AUTH_LDAP_VARS= BASIC_AUTH+=LDAP DIGEST_AUTH+="eDirectory LDAP" EXTERNAL_ACL+="LDAP_group eDirectory_userip" AUTH_SASL_CFLAGS= -I${LOCALBASE}/include AUTH_SASL_CPPFLAGS= -I${LOCALBASE}/include diff --git a/www/squid/Makefile b/www/squid/Makefile index e7b616b505f4..afd42c55a175 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -58,7 +58,7 @@ OPTIONS_DEFAULT=ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF FS_AUFS \ WCCPV2 ARP_ACL_CONFIGURE_ENABLE= eui -AUTH_LDAP_USE= OPENLDAP=yes +AUTH_LDAP_USES= ldap AUTH_LDAP_VARS= BASIC_AUTH+=LDAP DIGEST_AUTH+="eDirectory LDAP" EXTERNAL_ACL+="LDAP_group eDirectory_userip" AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 AUTH_SASL_VARS= BASIC_AUTH+=SASL diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile index 4c968c55abc7..f8a9b30471d1 100644 --- a/www/squidguard/Makefile +++ b/www/squidguard/Makefile @@ -55,7 +55,7 @@ STRIP_NTDOMAIN_EXTRA_PATCHES= ${FILESDIR}/extra-patch-strip.diff:-p0 LDAP_CONFIGURE_ON= --with-ldap LDAP_CONFIGURE_OFF= --without-ldap LDAP_LDFLAGS= -L${LOCALBASE}/lib -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap .include <bsd.port.options.mk> |