Index: databases/ateam_mysql_ldap_auth/Makefile =================================================================== --- databases/ateam_mysql_ldap_auth/Makefile +++ databases/ateam_mysql_ldap_auth/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libconfig.so:devel/libconfig +LIB_DEPENDS= libconfig.so:devel/libconfig \ + libldap.so:net/openldap24-client -USE_OPENLDAP= yes USES= gmake mysql:client,server IGNORE_WITH_MYSQL= 57 80 101m 102m 103m 57p 57w Index: databases/ldb/Makefile =================================================================== --- databases/ldb/Makefile +++ databases/ldb/Makefile @@ -21,6 +21,7 @@ tevent1>=0.9.31:devel/tevent1 \ tdb1>=1.3.12,1:databases/tdb1 \ popt>=0:devel/popt +LIB_DEPENDS= libldap.so:net/openldap24-client CONFLICTS_INSTALL= ldb1[2-6]-1.* @@ -34,7 +35,6 @@ WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log -USE_OPENLDAP= yes PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} Index: databases/ldb12/Makefile =================================================================== --- databases/ldb12/Makefile +++ databases/ldb12/Makefile @@ -23,6 +23,7 @@ tdb1>=1.3.15:databases/tdb1 \ cmocka>=1.1.1:sysutils/cmocka \ popt>=0:devel/popt +LIB_DEPENDS= libldap.so:net/openldap24-client CONFLICTS_INSTALL= ldb-1.1.* ldb1[3-6]-1.* @@ -36,7 +37,6 @@ WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log -USE_OPENLDAP= yes PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} Index: databases/ldb13/Makefile =================================================================== --- databases/ldb13/Makefile +++ databases/ldb13/Makefile @@ -23,6 +23,7 @@ tdb1>=1.3.16:databases/tdb1 \ cmocka>=1.1.1:sysutils/cmocka \ popt>=0:devel/popt +LIB_DEPENDS= libldap.so:net/openldap24-client CONFLICTS_INSTALL= ldb-1.1.* ldb1[24-6]-1.* @@ -36,7 +37,6 @@ WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log -USE_OPENLDAP= yes PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} Index: databases/ldb14/Makefile =================================================================== --- databases/ldb14/Makefile +++ databases/ldb14/Makefile @@ -23,6 +23,7 @@ tdb>=1.3.16:databases/tdb \ cmocka>=1.1.1:sysutils/cmocka \ popt>=0:devel/popt +LIB_DEPENDS= libldap.so:net/openldap24-client CONFLICTS_INSTALL= ldb-1.1.* ldb1[23]-1.* @@ -36,7 +37,6 @@ WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log -USE_OPENLDAP= yes PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} Index: databases/ldb15/Makefile =================================================================== --- databases/ldb15/Makefile +++ databases/ldb15/Makefile @@ -24,6 +24,7 @@ lmdb>=0.9.23:databases/lmdb \ cmocka>=1.1.3:sysutils/cmocka \ popt>=0:devel/popt +LIB_DEPENDS= libldap.so:net/openldap24-client CONFLICTS_INSTALL= ldb-1.1.* ldb1[2-46]-1.* @@ -37,7 +38,6 @@ WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log -USE_OPENLDAP= yes PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} Index: databases/mysql57-client/Makefile =================================================================== --- databases/mysql57-client/Makefile +++ databases/mysql57-client/Makefile @@ -37,7 +37,7 @@ SASLCLIENT_DESC= SASL client plugin module SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -SASLCLIENT_BUILD_DEPENDS= ${LOCALBASE}/include/lber.h:net/openldap24-sasl-client +SASLCLIENT_BUILD_DEPENDS= ${LOCALBASE}/include/lber.h:net/openldap24-client OPTIONS_DEFAULT+= SASLCLIENT # issue 166367: adding symlinks for back-compatibility with ${lib}_r Index: databases/percona57-client/Makefile =================================================================== --- databases/percona57-client/Makefile +++ databases/percona57-client/Makefile @@ -37,7 +37,7 @@ SASLCLIENT_DESC= SASL client plugin module SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -SASLCLIENT_BUILD_DEPENDS= ${LOCALBASE}/include/lber.h:net/openldap24-sasl-client +SASLCLIENT_BUILD_DEPENDS= ${LOCALBASE}/include/lber.h:net/openldap24-client OPTIONS_DEFAULT+= SASLCLIENT OPTIONS_SUB= yes Index: databases/postgresql12-server/Makefile =================================================================== --- databases/postgresql12-server/Makefile +++ databases/postgresql12-server/Makefile @@ -156,7 +156,7 @@ NLS_USES= gettext LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops Index: databases/virtuoso/Makefile =================================================================== --- databases/virtuoso/Makefile +++ databases/virtuoso/Makefile @@ -100,7 +100,7 @@ .if ${PORT_OPTIONS:MLDAP} CONFIGURE_ARGS+=--enable-openldap=${LOCALBASE} -USE_OPENLDAP= yes +LIB_DEPENDS+= libldap.so:net/openldap24-client .else CONFIGURE_ARGS+=--disable-openldap .endif Index: devel/apr1/Makefile =================================================================== --- devel/apr1/Makefile +++ devel/apr1/Makefile @@ -44,7 +44,7 @@ # APR-Util Options BDB_USES= bdb:5+ GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client MYSQL_USES= mysql NSS_LIB_DEPENDS= libnss3.so:security/nss ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC Index: devel/gconf2/Makefile =================================================================== --- devel/gconf2/Makefile +++ devel/gconf2/Makefile @@ -41,7 +41,7 @@ OPTIONS_DEFINE= LDAP DOCS OPTIONS_SUB= yes -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_WITH= openldap post-install: Index: devel/p5-Test-OpenLDAP/Makefile =================================================================== --- devel/p5-Test-OpenLDAP/Makefile +++ devel/p5-Test-OpenLDAP/Makefile @@ -16,13 +16,13 @@ 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 + ${LOCALBASE}/libexec/slapd:net/openldap24-server +LIB_DEPENDS= libldap.so:net/openldap24-client BUILD_DEPENDS= ${RUN_DEPENDS} NO_ARCH= yes USES= perl5 USE_PERL5= configure -USE_OPENLDAP= yes CONFIGURE_ENV= PATH=${PATH}:${PREFIX}/libexec Index: devel/ptlib/Makefile =================================================================== --- devel/ptlib/Makefile +++ devel/ptlib/Makefile @@ -42,6 +42,8 @@ BSDVIDEO_DESC= BSD video support DEBUG_DESC= Install debug library +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client +LDAP_CONFIGURE_ENABLE= openldap .include .if (${OPSYS} == FreeBSD && ${OSVERSION} > 1200085 && ${SSL_DEFAULT} == base) || ${SSL_DEFAULT} == openssl111 @@ -126,13 +128,6 @@ CONFIGURE_ARGS+=--enable-sdl .else CONFIGURE_ARGS+=--disable-sdl -.endif - -.if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes -CONFIGURE_ARGS+=--enable-openldap -.else -CONFIGURE_ARGS+=--disable-openldap .endif # ONLY FOR THE BRAVE! Index: devel/sope2/Makefile =================================================================== --- devel/sope2/Makefile +++ devel/sope2/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ARGS= --with-gnustep --disable-debug --enable-strip -LDAP_USE= OPENLDAP=client +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client PGSQL_USES= pgsql MYSQL_USE= MYSQL=client MEMCACHED_RUN_DEPENDS= ${LOCALBASE}/bin/memcached:databases/memcached Index: devel/sope3/Makefile =================================================================== --- devel/sope3/Makefile +++ devel/sope3/Makefile @@ -40,7 +40,7 @@ CONFIGURE_ARGS= --with-gnustep --disable-debug --enable-strip CONFIGURE_ENV+= CC="${CC}" -LDAP_USE= OPENLDAP=client +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client PGSQL_USES= pgsql MYSQL_USE= MYSQL=client MEMCACHED_RUN_DEPENDS= ${LOCALBASE}/bin/memcached:databases/memcached Index: devel/sope4/Makefile =================================================================== --- devel/sope4/Makefile +++ devel/sope4/Makefile @@ -38,7 +38,7 @@ CONFIGURE_ARGS= --with-gnustep --disable-debug --enable-strip CONFIGURE_ENV+= CC="${CC}" -LDAP_USE= OPENLDAP=client +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client PGSQL_USES= pgsql MYSQL_USE= MYSQL=client MEMCACHED_RUN_DEPENDS= ${LOCALBASE}/bin/memcached:databases/memcached Index: dns/ldapdns/Makefile =================================================================== --- dns/ldapdns/Makefile +++ dns/ldapdns/Makefile @@ -15,9 +15,9 @@ RUN_DEPENDS= setuidgid:sysutils/daemontools \ tcpserver:sysutils/ucspi-tcp +LIB_DEPENDS= libldap.so:net/openldap24-client USES= localbase:ldflags shebangfix tar:xz -USE_OPENLDAP= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} USE_CSTD= gnu89 Index: dns/powerdns/Makefile =================================================================== --- dns/powerdns/Makefile +++ dns/powerdns/Makefile @@ -84,7 +84,7 @@ OPENDBX_LIB_DEPENDS= libopendbx.so:databases/opendbx OPENDBX_VARS= MODULES+=opendbx -OPENLDAP_USE= OPENLDAP=YES +OPENLDAP_LIB_DEPENDS= libldap.so:net/openldap24-client OPENLDAP_CXXFLAGS= -DLDAP_DEPRECATED=1 OPENLDAP_VARS= MODULES+=ldap Index: editors/libreoffice/Makefile =================================================================== --- editors/libreoffice/Makefile +++ editors/libreoffice/Makefile @@ -81,7 +81,8 @@ libraptor2.so:textproc/raptor2 \ librdf.so:textproc/redland \ libfontconfig.so:x11-fonts/fontconfig \ - libserf-1.so:www/serf + libserf-1.so:www/serf \ + libldap.so:net/openldap24-client RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \ ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \ @@ -108,7 +109,6 @@ GNU_CONFIGURE= yes USE_GL= gl glew glu -USE_OPENLDAP= yes USE_PERL5= build USE_XORG= ice sm x11 xaw xext xinerama xrandr xrender USES= autoreconf:build bison compiler:c++14-lang cpe gl gmake gnome \ Index: emulators/wine-devel/Makefile =================================================================== --- emulators/wine-devel/Makefile +++ emulators/wine-devel/Makefile @@ -86,7 +86,7 @@ HAL_LIB_DEPENDS= libhal.so:sysutils/hal LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LIBXSLT_CONFIGURE_WITH= xslt LIBXSLT_LIB_DEPENDS= libxslt.so:textproc/libxslt Index: emulators/wine/Makefile =================================================================== --- emulators/wine/Makefile +++ emulators/wine/Makefile @@ -84,7 +84,7 @@ HAL_LIB_DEPENDS= libhal.so:sysutils/hal LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LIBXSLT_CONFIGURE_WITH= xslt LIBXSLT_LIB_DEPENDS= libxslt.so:textproc/libxslt Index: ftp/curl/Makefile =================================================================== --- ftp/curl/Makefile +++ ftp/curl/Makefile @@ -109,7 +109,7 @@ IPV6_CATEGORIES= ipv6 IPV6_CONFIGURE_ENABLE= ipv6 LDAP_CONFIGURE_ENABLE= ldap -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAPS_CONFIGURE_ENABLE= ldaps LIBSSH2_CONFIGURE_WITH= libssh2 LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2 Index: ftp/pure-ftpd/Makefile =================================================================== --- ftp/pure-ftpd/Makefile +++ ftp/pure-ftpd/Makefile @@ -57,7 +57,7 @@ ANONRESUME_CPPFLAGS= -DANON_CAN_RESUME LARGEFILE_CONFIGURE_ENABLE= largefile LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client MYSQL_CONFIGURE_WITH= mysql MYSQL_USES= mysql PAM_CONFIGURE_WITH= pam Index: irc/anope/Makefile =================================================================== --- irc/anope/Makefile +++ irc/anope/Makefile @@ -28,7 +28,7 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client MYSQL_USES= mysql Index: irc/bitlbee/Makefile =================================================================== --- irc/bitlbee/Makefile +++ irc/bitlbee/Makefile @@ -68,7 +68,7 @@ libgpg-error.so:security/libgpg-error JABBER_CONFIGURE_OFF= --jabber=0 LDAP_CONFIGURE_ON= --ldap=1 -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LIBEVENT_CONFIGURE_ON= --events=libevent --libevent=${LOCALBASE} LIBEVENT_LIB_DEPENDS= libevent.so:devel/libevent LIBPURPLE_CONFIGURE_ON= --purple=1 Index: irc/inspircd/Makefile =================================================================== --- irc/inspircd/Makefile +++ irc/inspircd/Makefile @@ -74,7 +74,7 @@ GNUTLS_USES= pkgconfig GNUTLS_VARS= EXTRAS+=m_ssl_gnutls.cpp -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_VARS= EXTRAS+=m_ldap.cpp MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls Index: lang/php71/Makefile.ext =================================================================== --- lang/php71/Makefile.ext +++ lang/php71/Makefile.ext @@ -166,13 +166,8 @@ .endif .if ${PHP_MODNAME} == "ldap" -CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} - -USE_OPENLDAP= yes - -. ifdef(WANT_OPENLDAP_SASL) +LIB_DEPENDS+= libldap.so:net/openldap24-client CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE} -. endif .endif .if ${PHP_MODNAME} == "mbstring" Index: lang/php72/Makefile.ext =================================================================== --- lang/php72/Makefile.ext +++ lang/php72/Makefile.ext @@ -173,13 +173,8 @@ .endif .if ${PHP_MODNAME} == "ldap" -CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} - -USE_OPENLDAP= yes - -. ifdef(WANT_OPENLDAP_SASL) +LIB_DEPENDS+= libldap.so:net/openldap24-client CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE} -. endif .endif .if ${PHP_MODNAME} == "mbstring" Index: lang/php73/Makefile.ext =================================================================== --- lang/php73/Makefile.ext +++ lang/php73/Makefile.ext @@ -173,13 +173,8 @@ .endif .if ${PHP_MODNAME} == "ldap" -CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} - -USE_OPENLDAP= yes - -. ifdef(WANT_OPENLDAP_SASL) +LIB_DEPENDS+= libldap.so:net/openldap24-client CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE} -. endif .endif .if ${PHP_MODNAME} == "mbstring" Index: lang/php74/Makefile.ext =================================================================== --- lang/php74/Makefile.ext +++ lang/php74/Makefile.ext @@ -167,13 +167,8 @@ .endif .if ${PHP_MODNAME} == "ldap" -CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} - -USE_OPENLDAP= yes - -. ifdef(WANT_OPENLDAP_SASL) +LIB_DEPENDS+= libldap.so:net/openldap24-client CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE} -. endif .endif .if ${PHP_MODNAME} == "mbstring" Index: mail/balsa/Makefile =================================================================== --- mail/balsa/Makefile +++ mail/balsa/Makefile @@ -45,7 +45,7 @@ GPG_DESC= GnuPG support GPG_CONFIGURE_WITH= gpgme GPG_LIB_DEPENDS= libgpgme.so:security/gpgme -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_WITH= ldap GTKSPELL_CONFIGURE_WITH= gtkspell GTKSPELL_LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3 Index: mail/courier/Makefile =================================================================== --- mail/courier/Makefile +++ mail/courier/Makefile @@ -137,7 +137,7 @@ .include "${.CURDIR}/Makefile.own" .if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes +LIB_DEPENDS+= libldap.so:net/openldap24-client WITH_AUTH_LDAP= yes RUN_DEPENDS+= ${LOCALBASE}/lib/courier-authlib/libauthldap.so:net/courier-authlib-ldap CONFIGURE_ARGS+=--with-ldapaliasd Index: mail/cyrus-imapd23/Makefile =================================================================== --- mail/cyrus-imapd23/Makefile +++ mail/cyrus-imapd23/Makefile @@ -54,7 +54,7 @@ IDLED_DESC= Enable IMAP idled support IDLED_CONFIGURE_ENABLE= idled LDAP_PTLOADER_DESC= Enable LDAP ptloader -LDAP_PTLOADER_USE= OPENLDAP=yes +LDAP_PTLOADER_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_PTLOADER_CONFIGURE_ON=--with-ldap=${LOCALBASE} LISTEXT_DESC= Enable IMAP List extensions LISTEXT_CONFIGURE_ENABLE=listext Index: mail/cyrus-imapd24/Makefile =================================================================== --- mail/cyrus-imapd24/Makefile +++ mail/cyrus-imapd24/Makefile @@ -54,7 +54,7 @@ IDLED_DESC= Enable IMAP idled support IDLED_CONFIGURE_ENABLE= idled LDAP_DESC= Enable LDAP support (experimental) -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} MURDER_DESC= Enable IMAP Murder support MURDER_CONFIGURE_ENABLE=murder Index: mail/cyrus-imapd25/Makefile =================================================================== --- mail/cyrus-imapd25/Makefile +++ mail/cyrus-imapd25/Makefile @@ -67,7 +67,7 @@ IDLED_DESC= Enable IMAP idled support IDLED_CONFIGURE_ENABLE= idled LDAP_DESC= Enable LDAP support (experimental) -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} MURDER_DESC= Enable IMAP Murder support MURDER_CONFIGURE_ENABLE=murder Index: mail/cyrus-imapd30/Makefile =================================================================== --- mail/cyrus-imapd30/Makefile +++ mail/cyrus-imapd30/Makefile @@ -65,7 +65,7 @@ IDLED_DESC= Enable IMAP idled support IDLED_CONFIGURE_ENABLE= idled LDAP_DESC= Enable LDAP support (experimental) -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} LMDB_DESC= Use LMDB backend LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb Index: mail/dbmail/Makefile =================================================================== --- mail/dbmail/Makefile +++ mail/dbmail/Makefile @@ -49,7 +49,7 @@ SIEVE_LIB_DEPENDS= libsieve.so:mail/libsieve LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client DBMAIL_USER?= mailnull DBMAIL_GROUP?= mail Index: mail/dovecot-pigeonhole/Makefile =================================================================== --- mail/dovecot-pigeonhole/Makefile +++ mail/dovecot-pigeonhole/Makefile @@ -54,7 +54,7 @@ LDAP_CONFIGURE_WITH= ldap LDAP_CPPFLAGS= -I${LOCALBASE}/include LDAP_LDFLAGS= -L${LOCALBASE}/lib -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client PORTDOCS= sieve/extensions/* sieve/plugins/* sieve/locations/* Index: mail/dovecot/Makefile =================================================================== --- mail/dovecot/Makefile +++ mail/dovecot/Makefile @@ -84,7 +84,7 @@ CDB_CONFIGURE_WITH= cdb CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_WITH= ldap MYSQL_USES= mysql Index: mail/dspam/Makefile =================================================================== --- mail/dspam/Makefile +++ mail/dspam/Makefile @@ -304,7 +304,7 @@ .if ${PORT_OPTIONS:MEXTERNAL_LOOKUP} CONFIGURE_ARGS+= --enable-external-lookup -USE_OPENLDAP= YES +LIB_DEPENDS= libldap.so:net/openldap24-client .endif .if ${PORT_OPTIONS:MUSER_HOMEDIR} Index: mail/evolution/Makefile =================================================================== --- mail/evolution/Makefile +++ mail/evolution/Makefile @@ -89,7 +89,7 @@ LDAP_CMAKE_ON= -DWITH_OPENLDAP=${LOCALBASE} LDAP_CMAKE_OFF= -DWITH_OPENLDAP=OFF -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client YTNEF_DESC= Support MS Outlook TNEF format YTNEF_LIB_DEPENDS= libytnef.so:converters/ytnef Index: mail/gnarwl/Makefile =================================================================== --- mail/gnarwl/Makefile +++ mail/gnarwl/Makefile @@ -10,11 +10,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Email autoresponder that gets data from LDAP -LIB_DEPENDS= libgdbm.so:databases/gdbm +LIB_DEPENDS= libgdbm.so:databases/gdbm \ + libldap.so:net/openldap24-client BUILD_DEPENDS= ${LOCALBASE}/bin/gsed:textproc/gsed USES= iconv gmake groff tar:tgz -USE_OPENLDAP= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --localstatedir="${PREFIX}/var" CPPFLAGS+= -I${LOCALBASE}/include Index: mail/mailutils/Makefile =================================================================== --- mail/mailutils/Makefile +++ mail/mailutils/Makefile @@ -80,7 +80,7 @@ KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet KYOTOCABINET_CONFIGURE_WITH= kyotocabinet -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_WITH= ldap MYSQL_USES= mysql Index: mail/milter-greylist/Makefile =================================================================== --- mail/milter-greylist/Makefile +++ mail/milter-greylist/Makefile @@ -53,7 +53,7 @@ CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE} LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE} LDAP_LDFLAGS= -L${LOCALBASE}/lib -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client .include Index: mail/opendkim/Makefile =================================================================== --- mail/opendkim/Makefile +++ mail/opendkim/Makefile @@ -86,7 +86,7 @@ OPENLDAP_DESC= Store filter policies in LDAP OPENLDAP_CONFIGURE_WITH=openldap -OPENLDAP_USE= OPENLDAP=yes +OPENLDAP_LIB_DEPENDS= libldap.so:net/openldap24-client POPAUTH_DESC= Use POP authentication DB POPAUTH_CONFIGURE_ENABLE= popauth Index: mail/opendkim/Makefile.options =================================================================== --- mail/opendkim/Makefile.options +++ mail/opendkim/Makefile.options @@ -56,7 +56,7 @@ LDAP_CACHING_DESC= LDAP query piggybacking and caching LDAP_CACHING_CONFIGURE_ENABLE= ldap_caching -LDAP_CACHING_USE= OPENLDAP=yes +LDAP_CACHING_LIB_DEPENDS= libldap.so:net/openldap24-client LUA_ONLY_SIGNING= Message signing by Lua only LUA_ONLY_SIGNING_CONFIGURE_ENABLE= lua_only_signing Index: mail/opensmtpd-extras-table-ldap/Makefile =================================================================== --- mail/opensmtpd-extras-table-ldap/Makefile +++ mail/opensmtpd-extras-table-ldap/Makefile @@ -10,7 +10,7 @@ CONFIGURE_ARGS+= --with-table-ldap -USE_OPENLDAP= client +LIB_DEPENDS= libldap.so:net/openldap24-client MASTERDIR= ${.CURDIR}/../opensmtpd-extras SLAVE_PORT= yes Index: mail/perdition/Makefile =================================================================== --- mail/perdition/Makefile +++ mail/perdition/Makefile @@ -111,7 +111,7 @@ .endif .if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes +LIB_DEPENDS= libldap.so:net/openldap24-client CONFIGURE_ARGS+= --enable-ldap \ --with-ldap-schema-directory=${LOCALBASE}/etc/openldap/schema/ \ --disable-ldap-doc Index: mail/postfix-current/Makefile =================================================================== --- mail/postfix-current/Makefile +++ mail/postfix-current/Makefile @@ -51,7 +51,7 @@ 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_LIB_DEPENDS= libldap.so:net/openldap24-client LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MYSQL_USES= mysql PCRE_LIB_DEPENDS= libpcre.so:devel/pcre Index: mail/postfix/Makefile =================================================================== --- mail/postfix/Makefile +++ mail/postfix/Makefile @@ -51,7 +51,7 @@ 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_LIB_DEPENDS= libldap.so:net/openldap24-client LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MYSQL_USES= mysql PCRE_LIB_DEPENDS= libpcre.so:devel/pcre Index: mail/prayer/Makefile =================================================================== --- mail/prayer/Makefile +++ mail/prayer/Makefile @@ -34,7 +34,7 @@ GROUPS= prayer SESSIONCACHE_USES= bdb:5+ -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client SSL_USES= ssl TIDY_LIB_DEPENDS= libtidy.so:www/tidy-lib Index: mail/qmail-activedir/Makefile =================================================================== --- mail/qmail-activedir/Makefile +++ mail/qmail-activedir/Makefile @@ -10,18 +10,15 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Programs to allow qmail to authenticate users through a MS ad +LIB_DEPENDS= libldap.so:net/openldap24-client + USES= 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 Index: mail/sendmail-devel/Makefile =================================================================== --- mail/sendmail-devel/Makefile +++ mail/sendmail-devel/Makefile @@ -69,7 +69,7 @@ TLS_USES= ssl SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASLAUTHD_RUN_DEPENDS= ${LOCALBASE}/sbin/saslauthd:security/cyrus-sasl2-saslauthd -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client BDB_USES= bdb GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_WITH= compat Index: mail/sendmail/Makefile =================================================================== --- mail/sendmail/Makefile +++ mail/sendmail/Makefile @@ -68,7 +68,7 @@ TLS_USES= ssl SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASLAUTHD_RUN_DEPENDS= ${LOCALBASE}/sbin/saslauthd:security/cyrus-sasl2-saslauthd -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client BDB_USES= bdb GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_WITH= compat Index: mail/spamass-milter/Makefile =================================================================== --- mail/spamass-milter/Makefile +++ mail/spamass-milter/Makefile @@ -18,17 +18,14 @@ OPTIONS_DEFINE= LDAP MILTER_PORT DOCS MILTER_PORT_DESC= Build against libmilter port +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client +LDAP_USES= localbase + .include .if exists(${LOCALBASE}/lib/libldap.so) WITH_LDAP=yes .undef WITHOUT_LDAP -.endif - -.if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP=yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib .endif .if ${PORT_OPTIONS:MDOCS} Index: mail/spmfilter/Makefile =================================================================== --- mail/spmfilter/Makefile +++ mail/spmfilter/Makefile @@ -55,10 +55,7 @@ .endif .if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes -.if ${PORT_OPTIONS:MOPENLDAP_VER} -WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} -.endif +LIB_DEPENDS= libldap.so:net/openldap24-client .else CMAKE_ARGS+= -DWITHOUT_LDAP=TRUE .endif Index: mail/tpop3d/Makefile =================================================================== --- mail/tpop3d/Makefile +++ mail/tpop3d/Makefile @@ -51,7 +51,7 @@ PGSQL_CONFIGURE_ON= --enable-auth-pgsql \ --with-pgsql-lib-dir=${LOCALBASE}/lib \ --with-pgsql-include-dir=${LOCALBASE}/include -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_ON= --enable-auth-ldap --with-openldap-root=${LOCALBASE} PERLAUTH_USES= perl5 FIX_PERLAUTH_EXTRA_PATCHES=${PATCHDIR}/extra-patch-auth_perl.c Index: mail/vpopmail/Makefile =================================================================== --- mail/vpopmail/Makefile +++ mail/vpopmail/Makefile @@ -3,7 +3,7 @@ PORTNAME= vpopmail PORTVERSION= 5.4.33 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} @@ -69,7 +69,7 @@ SQL_LOG \ SQL_LOG_TRIM OPTIONS_SINGLE= AUTH -OPTIONS_SINGLE_AUTH= CDB MYSQL PGSQL LDAP LDAP_SASL ORACLE SYBASE +OPTIONS_SINGLE_AUTH= CDB MYSQL PGSQL LDAP ORACLE SYBASE OPTIONS_DEFAULT=MD5_PASSWORDS \ CDB \ @@ -91,7 +91,6 @@ MYSQL_LIMITS_DESC= MySQL mailbox limitations support ORACLE_DESC= Auth via Oracle LDAP_DESC= Auth via LDAP -LDAP_SASL_DESC= Auth via LDAP SASL VALIAS_DESC= Store aliases in DB instead of .qmail files ROAMING_DESC= roaming users support IP_ALIAS_DESC= IP alias support @@ -255,10 +254,7 @@ # End of user-configurable variables .if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes -.if ${PORT_OPTIONS:MLDAP_SASL} -WANT_OPENLDAP_SASL= yes -.endif +LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_FILES= ${WRKSRC}/doc/README.ldap \ ${WRKSRC}/ldap/nsswitch.conf \ ${WRKSRC}/ldap/pam_ldap.conf \ Index: net-im/ekiga/Makefile =================================================================== --- net-im/ekiga/Makefile +++ net-im/ekiga/Makefile @@ -75,8 +75,8 @@ .endif .if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes -LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 +LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 \ + libldap.so:net/openldap24-client CONFIGURE_ARGS+=--enable-ldap --with-ldap-dir="${LOCALBASE}" --with-libsasl2-dir="${LOCALBASE}" PLIST_SUB+= LDAP="" WITH_PLUGINS= 1 Index: net-im/jabberd/Makefile =================================================================== --- net-im/jabberd/Makefile +++ net-im/jabberd/Makefile @@ -82,7 +82,7 @@ BDB_CONFIGURE_ENABLE= db BDB_CONFIGURE_ON= --oldincludedir=/nonexistant -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_ENABLE= ldap FS_CONFIGURE_ENABLE= fs Index: net-mgmt/ccnet-server/Makefile =================================================================== --- net-mgmt/ccnet-server/Makefile +++ net-mgmt/ccnet-server/Makefile @@ -18,7 +18,8 @@ libzdb.so:databases/libzdb \ libuuid.so:misc/e2fsprogs-libuuid \ libevent.so:devel/libevent \ - libjansson.so:devel/jansson + libjansson.so:devel/jansson \ + libldap.so:net/openldap24-client USES= autoreconf compiler:c11 gnome libtool localbase mysql:client \ pathfix pgsql pkgconfig python:-2.7 shebangfix ssl @@ -26,7 +27,6 @@ GH_ACCOUNT= haiwen USE_GNOME= glib20 USE_LDCONFIG= yes -USE_OPENLDAP= yes CONFLICTS= ccnet-[0-9]* Index: net-mgmt/collectd5/Makefile =================================================================== --- net-mgmt/collectd5/Makefile +++ net-mgmt/collectd5/Makefile @@ -191,7 +191,7 @@ ONEWIRE_CONFIGURE_ENABLE= onewire ONEWIRE_CONFIGURE_WITH= libowcapi=${LOCALBASE} -OPENLDAP_USE= OPENLDAP=yes +OPENLDAP_LIB_DEPENDS= libldap.so:net/openldap24-client OPENLDAP_CONFIGURE_ENABLE= openldap OPENLDAP_CONFIGURE_WITH= libldap=${LOCALBASE} Index: net-mgmt/nefu/Makefile =================================================================== --- net-mgmt/nefu/Makefile +++ net-mgmt/nefu/Makefile @@ -39,7 +39,7 @@ LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE}/lib LDAP_CONFIGURE_OFF= --without-ldap -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client HTML_CONFIGURE_ON= --with-html=${WWWDIR} HTML_CONFIGURE_OFF= --without-html Index: net-mgmt/xymon-server/Makefile =================================================================== --- net-mgmt/xymon-server/Makefile +++ net-mgmt/xymon-server/Makefile @@ -57,7 +57,7 @@ .if ${PORT_OPTIONS:MLDAP} MAKE_ENV+= WITH_LDAP=1 -USE_OPENLDAP= yes +LIB_DEPENDS+= libldap.so:net/openldap24-client .endif .if ${PORT_OPTIONS:MNETSNMP} Index: net-mgmt/zabbix22-server/Makefile =================================================================== --- net-mgmt/zabbix22-server/Makefile +++ net-mgmt/zabbix22-server/Makefile @@ -89,7 +89,7 @@ ORACLE_CONFIGURE_WITH= oracle LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client IPMI_CONFIGURE_WITH= openipmi IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi Index: net-mgmt/zabbix3-server/Makefile =================================================================== --- net-mgmt/zabbix3-server/Makefile +++ net-mgmt/zabbix3-server/Makefile @@ -93,7 +93,7 @@ ORACLE_CONFIGURE_WITH= oracle LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client IPMI_CONFIGURE_WITH= openipmi IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi Index: net-mgmt/zabbix4-server/Makefile =================================================================== --- net-mgmt/zabbix4-server/Makefile +++ net-mgmt/zabbix4-server/Makefile @@ -96,7 +96,7 @@ ORACLE_CONFIGURE_WITH= oracle LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client IPMI_CONFIGURE_WITH= openipmi IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi Index: net-mgmt/zabbix42-server/Makefile =================================================================== --- net-mgmt/zabbix42-server/Makefile +++ net-mgmt/zabbix42-server/Makefile @@ -98,7 +98,7 @@ ORACLE_CONFIGURE_WITH= oracle LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client IPMI_CONFIGURE_WITH= openipmi IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi Index: net/Makefile =================================================================== --- net/Makefile +++ net/Makefile @@ -542,7 +542,6 @@ SUBDIR += openbsc SUBDIR += openggsn SUBDIR += openldap24-client - SUBDIR += openldap24-sasl-client SUBDIR += openldap24-server SUBDIR += openmdns SUBDIR += openmpi Index: net/asterisk13/Makefile =================================================================== --- net/asterisk13/Makefile +++ net/asterisk13/Makefile @@ -149,7 +149,7 @@ JAPANESE_RUN_DEPENDS= ${LOCALBASE}/share/asterisk/sounds/ja/digits/0.gsm:japanese/asterisk-sounds LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LUA_CONFIGURE_WITH= lua LUA_USES= lua Index: net/asterisk15/Makefile =================================================================== --- net/asterisk15/Makefile +++ net/asterisk15/Makefile @@ -153,7 +153,7 @@ JAPANESE_RUN_DEPENDS= ${LOCALBASE}/share/asterisk/sounds/ja/digits/0.gsm:japanese/asterisk-sounds LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LUA_CONFIGURE_WITH= lua LUA_USES= lua Index: net/asterisk16/Makefile =================================================================== --- net/asterisk16/Makefile +++ net/asterisk16/Makefile @@ -18,7 +18,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ - libjansson.so:devel/jansson + libjansson.so:devel/jansson \ + libldap.so:net/openldap24-client ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc sparc64 Index: net/ceph12/Makefile =================================================================== --- net/ceph12/Makefile +++ net/ceph12/Makefile @@ -32,7 +32,8 @@ libexpat.so:textproc/expat2 \ liblz4.so:archivers/liblz4 \ libplds4.so:devel/nspr \ - libtcmalloc.so:devel/google-perftools + libtcmalloc.so:devel/google-perftools \ + libldap.so:net/openldap24-client RUN_DEPENDS= \ bash:shells/bash \ ${LOCALBASE}/bin/getopt:misc/getopt \ @@ -48,7 +49,6 @@ USES= cmake:noninja fuse gettext-runtime gmake \ pkgconfig python:2.7 shebangfix ssl USE_PYTHON= cython -USE_OPENLDAP= yes USE_GITHUB= yes GH_ACCOUNT= ceph:DEFAULT Index: net/ceph13/Makefile =================================================================== --- net/ceph13/Makefile +++ net/ceph13/Makefile @@ -37,7 +37,8 @@ libexpat.so:textproc/expat2 \ liblz4.so:archivers/liblz4 \ libplds4.so:devel/nspr \ - libtcmalloc.so:devel/google-perftools + libtcmalloc.so:devel/google-perftools \ + libldap.so:net/openldap24-client RUN_DEPENDS= \ bash:shells/bash \ ${LOCALBASE}/bin/getopt:misc/getopt \ @@ -50,7 +51,6 @@ USES= cmake:noninja fuse gettext-runtime gmake pkgconfig python:2.7 \ shebangfix ssl USE_PYTHON= cython -USE_OPENLDAP= yes USE_GITHUB= yes GH_ACCOUNT= ceph:DEFAULT Index: net/echoping/Makefile =================================================================== --- net/echoping/Makefile +++ net/echoping/Makefile @@ -36,7 +36,7 @@ OPTIONS_DEFAULT=LDAP OPTIONS_SUB= yes -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_VARS= PING_PLUGINS+=ldap PGSQL_USES= pgsql Index: net/fpc-ldap/Makefile =================================================================== --- net/fpc-ldap/Makefile +++ net/fpc-ldap/Makefile @@ -16,6 +16,6 @@ OPENLDAP_DESC= Install OpenLDAP libraries OPTIONS_DEFAULT= OPENLDAP -OPENLDAP_USE= OPENLDAP=yes +OPENLDAP_LIB_DEPENDS= libldap.so:net/openldap24-client .include "${MASTERDIR}/Makefile" Index: net/freeradius3/Makefile =================================================================== --- net/freeradius3/Makefile +++ net/freeradius3/Makefile @@ -3,7 +3,7 @@ PORTNAME= freeradius DISTVERSION= 3.0.19 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \ ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \ @@ -82,8 +82,8 @@ 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_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ + libldap.so:net/openldap24-client LDAP_VARS= _REQUIRE+=slapd MITKRB_PORT_CONFIGURE_ON= --with-rlm-krb5-dir=${LOCALBASE} MITKRB_PORT_LIB_DEPENDS= libkrb5support.so:security/krb5 Index: net/freeswitch/Makefile =================================================================== --- net/freeswitch/Makefile +++ net/freeswitch/Makefile @@ -90,7 +90,8 @@ libvlc.so:multimedia/vlc \ libyaml.so:textproc/libyaml ALL_MODULES_RUN_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa -ALL_MODULES_USE= XORG=x11 OPENLDAP=yes +ALL_MODULES_USE= XORG=x11 +ALL_MODULES_LIB_DEPENDS= libldap.so:net/openldap24-client ALL_MODULES_USES= autoreconf # required by mod_unimrcp 8K_VARS= BITRATES+=8000 Index: net/gnu-dico/Makefile =================================================================== --- net/gnu-dico/Makefile +++ net/gnu-dico/Makefile @@ -44,7 +44,7 @@ PAM_CONFIGURE_ENABLE= pam -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_OFF= --without-ldap NLS_USES= gettext Index: net/gq/Makefile =================================================================== --- net/gq/Makefile +++ net/gq/Makefile @@ -15,10 +15,10 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING -LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring +LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring \ + libldap.so:net/openldap24-client USE_GNOME= intltool libglade2 gnomedocutils -USE_OPENLDAP= yes USES= desktop-file-utils gettext pkgconfig gmake shared-mime-info ssl GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE} --disable-update-mimedb Index: net/isc-dhcp44-server/Makefile =================================================================== --- net/isc-dhcp44-server/Makefile +++ net/isc-dhcp44-server/Makefile @@ -90,7 +90,7 @@ BINLEASES_CONFIGURE_ENABLE= binary-leases PARANOIA_CONFIGURE_ENABLE= paranoia early-chroot LDAP_CONFIGURE_WITH= ldap ldapcrypto -LDAP_USE= OPENLDAP +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_USES= shebangfix LDAP_SSL_USES= ssl LDAP_SSL_VARS= LIBS+=-lssl Index: net/kldap/Makefile =================================================================== --- net/kldap/Makefile +++ net/kldap/Makefile @@ -9,7 +9,8 @@ LICENSE= LGPL21 -LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 +LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ + libldap.so:net/openldap24-client USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= ecm completion config coreaddons i18n kio widgetsaddons service @@ -17,7 +18,6 @@ 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 Index: net/ldap2dns/Makefile =================================================================== --- net/ldap2dns/Makefile +++ net/ldap2dns/Makefile @@ -18,6 +18,7 @@ RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS \ p5-perl-ldap>=0:net/p5-perl-ldap +LIB_DEPENDS= libldap.so:net/openldap24-client USE_GITHUB= yes GH_ACCOUNT= bklang @@ -25,7 +26,6 @@ USES= gmake localbase:ldflags perl5 shebangfix SHEBANG_FILES= scripts/*.pl USE_PERL5= run -USE_OPENLDAP= yes MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LD="${CC}" LDFLAGS="${LDFLAGS}" PORTDOCS= * Index: net/ldapdiff/Makefile =================================================================== --- net/ldapdiff/Makefile +++ net/ldapdiff/Makefile @@ -13,8 +13,9 @@ LICENSE= GPLv3+ +LIB_DEPENDS= libldap.so:net/openldap24-client + USES= iconv tar:tgz -USE_OPENLDAP= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${LOCALBASE} \ --with-ldap-dir=${LOCALBASE} Index: net/ldapscripts/Makefile =================================================================== --- net/ldapscripts/Makefile +++ net/ldapscripts/Makefile @@ -3,6 +3,7 @@ PORTNAME= ldapscripts PORTVERSION= 2.0.8 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \ http://contribs.martymac.org/ldapscripts/ @@ -12,20 +13,13 @@ 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 +RUN_DEPENDS= ldapadd:net/openldap24-client NO_ARCH= yes -OPTIONS_DEFINE= SASL DOCS -SASL_VARS= OPENLDAP_FLAVOUR=-sasl WANT_OPENLDAP_SASL=yes +OPTIONS_DEFINE= DOCS USES= iconv tar:tgz -USE_OPENLDAP= yes LIBDIR= ${PREFIX}/lib/${PORTNAME} MAKE_ENV+= MANDIR=${MANPREFIX}/man \ ETCDIR=${ETCDIR} Index: net/liblinphone/Makefile =================================================================== --- net/liblinphone/Makefile +++ net/liblinphone/Makefile @@ -37,8 +37,8 @@ OPTIONS_SUB= yes LDAP_CMAKE_BOOL= ENABLE_LDAP -LDAP_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ + libldap.so:net/openldap24-client VIDEO_CMAKE_BOOL= ENABLE_VIDEO Index: net/lualdap/Makefile =================================================================== --- net/lualdap/Makefile +++ net/lualdap/Makefile @@ -11,8 +11,9 @@ MAINTAINER= pf@itwf.pl COMMENT= LDAP support for the Lua language +LIB_DEPENDS= libldap.so:net/openldap24-client + USES= gmake lua -USE_OPENLDAP= yes # the CPPFLAGS fixes builds where PREFIX != LOCALBASE CPPFLAGS+= -I${LOCALBASE}/include/${LUA_SUBDIR} Index: net/netatalk3/Makefile =================================================================== --- net/netatalk3/Makefile +++ net/netatalk3/Makefile @@ -59,7 +59,7 @@ MDNSRESPONDER_SUB_LIST= ZEROCONF="mdnsd" LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} LDAP_CFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_OFF= --without-ldap SENDFILE_CONFIGURE_ENABLE=sendfile DBUS_USES= python:2.7 Index: net/nss-pam-ldapd/Makefile =================================================================== --- net/nss-pam-ldapd/Makefile +++ net/nss-pam-ldapd/Makefile @@ -14,10 +14,11 @@ LICENSE= LGPL21 LGPL3 LICENSE_COMB= dual +LIB_DEPENDS= libldap.so:net/openldap24-client + USES= cpe CPE_VENDOR= arthurdejong GNU_CONFIGURE= yes -USE_OPENLDAP= yes USE_RC_SUBR= nslcd PAM_LDAP_SHMAJOR= 1 NSS_LDAP_SHMAJOR= 1 Index: net/nss_ldap/Makefile =================================================================== --- net/nss_ldap/Makefile +++ net/nss_ldap/Makefile @@ -14,13 +14,14 @@ LICENSE= GPLv2 +LIB_DEPENDS= libldap.so:net/openldap24-client + NSS_LDAP_VERSION=265 USES= autoreconf gmake perl5 USE_PERL5= build GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_OPENLDAP= yes OPTIONS_DEFINE= LCLASS KERBEROS SASL OPTIONS_DEFAULT=LCLASS KERBEROS Index: net/openldap24-server/Makefile =================================================================== --- net/openldap24-server/Makefile +++ net/openldap24-server/Makefile @@ -14,22 +14,14 @@ http://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ MASTER_SITE_SUBDIR= openldap-release .if defined(CLIENT_ONLY) -.if ${CLIENT_ONLY} == sasl -PKGNAMESUFFIX= -sasl-client -.else PKGNAMESUFFIX= -client -.endif .else PKGNAMESUFFIX?= -server .endif MAINTAINER= delphij@FreeBSD.org .if defined(CLIENT_ONLY) -.if ${CLIENT_ONLY} == sasl -COMMENT= Open source LDAP client implementation with SASL2 support -.else COMMENT= Open source LDAP client implementation -.endif .else COMMENT= Open source LDAP server implementation .endif @@ -39,19 +31,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -.if defined(CLIENT_ONLY) -.if ${CLIENT_ONLY} == sasl -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \ - ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[0-3].* -.else -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-3].* \ - ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.* -.endif -.endif - GNU_CONFIGURE= yes # :keepla because port uses lt_dlopen -USES= cpe libtool:keepla ssl tar:tgz +USES= cpe libtool:keepla ssl tar:tgz localbase .if !defined(CLIENT_ONLY) USERS= ldap GROUPS= ldap @@ -70,10 +52,10 @@ OPENLDAP_SHLIB_MINOR= 10.11 OPENLDAP_MAJOR= ${DISTVERSION:R} -OPTIONS_DEFINE= DEBUG FETCH GSSAPI +OPTIONS_DEFINE= DEBUG FETCH SASL +OPTIONS_DEFAULT= SASL FETCH_DESC= Enable fetch(3) support -GSSAPI_DESC= With GSSAPI support (implies SASL support) .if defined(CLIENT_ONLY) OPTIONS_DEFINE+= DOCS @@ -83,13 +65,13 @@ OPTIONS_DEFINE+= ACCESSLOG AUDITLOG COLLECT CONSTRAINT DDS OPTIONS_DEFINE+= DEREF DYNGROUP DYNLIST MEMBEROF PPOLICY PROXYCACHE OPTIONS_DEFINE+= REFINT RETCODE RWM SEQMOD SSSVLV SYNCPROV TRANSLUCENT -OPTIONS_DEFINE+= UNIQUE VALSORT SMBPWD SHA2 DYNAMIC_BACKENDS SASL +OPTIONS_DEFINE+= UNIQUE VALSORT SMBPWD SHA2 OPTIONS_DEFINE+= LMPASSWD OPTIONS_DEFINE+= OUTLOOK OPTIONS_DEFINE+= LASTBIND OPTIONS_DEFINE+= KQUEUE -OPTIONS_DEFAULT= MDB SYNCPROV DYNAMIC_BACKENDS +OPTIONS_DEFAULT+= MDB SYNCPROV DYNACL_DESC= Run-time loadable ACL (experimental) ACI_DESC= Per-object ACI (experimental) @@ -130,56 +112,13 @@ SMBPWD_DESC= With Samba Password hashes overlay SHA2_DESC= With SHA2 Password hashes overlay LMPASSWD_DESC= With LM hash password support (DEPRECATED) -DYNAMIC_BACKENDS_DESC= Build dynamic backends OUTLOOK_DESC= Force caseIgnoreOrderingMatch on name attribute (experimental) LASTBIND_DESC= With lastbind overlay KQUEUE_DESC= With kqueue support (experimental) .endif -.if defined(CLIENT_ONLY) -OPENLDAP_PORTREVISION= ${PORTREVISION_CLIENT} -OPENLDAP_PKGFILESUFX= .client -.else -OPENLDAP_PORTREVISION= ${PORTREVISION_SERVER} -OPENLDAP_PKGFILESUFX= -.endif - CONFIGURE_SED= -e 's,uuid/uuid.h,xxuuid/uuid.h,g' -.include - -.if defined(CLIENT_ONLY) -PORTDOCS= CHANGES drafts rfc - -.if ${CLIENT_ONLY} == sasl -PORT_OPTIONS+= SASL -.endif -.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 -USE_OPENLDAP= yes -WANT_OPENLDAP_VER= 24 - -LIB_DEPENDS+= libicudata.so:devel/icu - -.if ${PORT_OPTIONS:MGSSAPI} && empty(PORT_OPTIONS:MSASL) -PORT_OPTIONS+= SASL -.endif - -.if ${PORT_OPTIONS:MSASL} -WANT_OPENLDAP_SASL= yes -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* -PKGNAMESUFFIX= -sasl-server -.if ${PORT_OPTIONS:MGSSAPI} -RUN_DEPENDS+= cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi -.endif -.else -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.* -.endif - -.endif - DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX} PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX} @@ -202,28 +141,25 @@ --disable-dependency-tracking \ --enable-dynamic -.if ${PORT_OPTIONS:MSASL} -LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 -CONFIGURE_ARGS+= --with-cyrus-sasl -.else -CONFIGURE_ARGS+= --without-cyrus-sasl -.endif - +SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 +SASL_CONFIGURE_WITH= cyrus-sasl .if defined(CLIENT_ONLY) -# client specific configuration +OPENLDAP_PORTREVISION= ${PORTREVISION_CLIENT} +OPENLDAP_PKGFILESUFX= .client CONFIGURE_ARGS+= --disable-slapd \ --disable-monitor \ --disable-bdb \ --disable-relay \ --disable-syncprov -SUB_FILES+= pkg-message.client -PKGMESSAGE= ${WRKSRC}/pkg-message.client +PORTDOCS= CHANGES drafts rfc +SUB_FILES+= pkg-message${OPENLDAP_PKGFILESUFX} +PKGMESSAGE= ${WRKSRC}/pkg-message${OPENLDAP_PKGFILESUFX} USE_LDCONFIG= yes - .else -# server specific configuration +OPENLDAP_PORTREVISION= ${PORTREVISION_SERVER} +OPENLDAP_PKGFILESUFX= USE_LDCONFIG= ${PREFIX}/libexec/openldap SUB_FILES+= pkg-message pkg-deinstall @@ -231,302 +167,96 @@ EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in -.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSLAPI} -LIB_DEPENDS+= libltdl.so:devel/libltdl -CONFIGURE_ARGS+= --enable-modules -PLIST_SUB+= MODULES="" -.else -PLIST_SUB+= MODULES="@comment " -.endif +LIB_DEPENDS+= libldap.so:net/openldap24-client \ + libicudata.so:devel/icu \ + libltdl.so:devel/libltdl -SED_MODULES= -e 's/\(moduleload[ ]*back_[a-z]*\)\.la/\1/' - -.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} -BACKEND_ENABLE= "mod" -BACKEND_PLIST= "" -SED_MODULES+= -e 's/\# *\(modulepath\)/\1/' \ - -e 's/\# *\(moduleload[ ]*back_bdb\)/\1/' -.else -BACKEND_ENABLE= "yes" -BACKEND_PLIST= "@comment " -.endif - -OVERLAY_ENABLE= yes - -CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \ +CONFIGURE_ARGS+= --enable-modules \ + --localstatedir=${LOCALSTATEDIR} \ --enable-crypt \ - --enable-ldap=${BACKEND_ENABLE} \ - --enable-meta=${BACKEND_ENABLE} \ + --enable-ldap=mod \ + --enable-meta=mod \ --enable-rewrite \ - --enable-null=${BACKEND_ENABLE} \ - --enable-monitor=${BACKEND_ENABLE} + --enable-null=mod \ + --enable-monitor=mod -PLIST_SUB+= BACKEND=${BACKEND_PLIST} - -.if ${PORT_OPTIONS:MACCESSLOG} -CONFIGURE_ARGS+= --enable-accesslog=${OVERLAY_ENABLE} -.endif - -.if ${PORT_OPTIONS:MAUDITLOG} -CONFIGURE_ARGS+= --enable-auditlog=${OVERLAY_ENABLE} -.endif - -.if ${PORT_OPTIONS:MCOLLECT} -CONFIGURE_ARGS+= --enable-collect=${OVERLAY_ENABLE} -.endif - -.if ${PORT_OPTIONS:MCONSTRAINT} -CONFIGURE_ARGS+= --enable-constraint=${OVERLAY_ENABLE} -.endif - -.if ${PORT_OPTIONS:MDDS} -CONFIGURE_ARGS+= --enable-dds=${OVERLAY_ENABLE} -.endif - -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --enable-debug=yes -.endif - MAKE_ENV+= STRIP=${STRIP} -.if ${PORT_OPTIONS:MDEREF} -CONFIGURE_ARGS+= --enable-deref=${OVERLAY_ENABLE} -.endif +SED_MODULES= -e 's/\(moduleload[ ]*back_[a-z]*\)\.la/\1/' \ + -e 's/\# *\(modulepath\)/\1/' \ + -e 's/\# *\(moduleload[ ]*back_bdb\)/\1/' -.if ${PORT_OPTIONS:MDYNGROUP} -CONFIGURE_ARGS+= --enable-dyngroup=${OVERLAY_ENABLE} -.endif +ACCESSLOG_CONFIGURE_ENABLE= accesslog +AUDITLOG_CONFIGURE_ENABLE= auditlog +COLLECT_CONFIGURE_ENABLE= collect +CONSTRAINT_CONFIGURE_ENABLE= constraint +DDS_CONFIGURE_ENABLE= dds +DEBUG_CONFIGURE_ENABLE= debug +DEREF_CONFIGURE_ENABLE= deref +DYNGROUP_CONFIGURE_ENABLE= dyngroup +DYNLIST_CONFIGURE_ENABLE= dynlist +LMPASSWD_CONFIGURE_ENABLE= lmpasswd +MEMBEROF_CONFIGURE_ENABLE= memberof +POLICY_CONFIGURE_ENABLE= ppolicy +PROXYCACHE_CONFIGURE_ENABLE= proxycache +REFINT_CONFIGURE_ENABLE= refint +RETCODE_CONFIGURE_ENABLE= retcode +RWM_CONFIGURE_ENABLE= rwm +SEQMOD_CONFIGURE_ENABLE= seqmod +SSSVLV_CONFIGURE_ENABLE= sssvlv +SYNCPROV_CONFIGURE_ENABLE= syncprov +TRANSLUCENT_CONFIGURE_ENABLE= translucent +UNIQUE_CONFIGURE_ENABLE= unique +VALSORT_CONFIGURE_ENABLE= valsort +ACI_CONFIGURE_ENABLE= aci +DYNACL_CONFIGURE_ENABLE= dynacl -.if ${PORT_OPTIONS:MDYNLIST} -CONFIGURE_ARGS+= --enable-dynlist=${OVERLAY_ENABLE} -.endif - -.if ${PORT_OPTIONS:MLMPASSWD} -CONFIGURE_ARGS+= --enable-lmpasswd -.endif - -.if ${PORT_OPTIONS:MMEMBEROF} -CONFIGURE_ARGS+= --enable-memberof=${OVERLAY_ENABLE} -.endif - -.if ${PORT_OPTIONS:MPPOLICY} -CONFIGURE_ARGS+= --enable-ppolicy=${OVERLAY_ENABLE} -.endif - -.if ${PORT_OPTIONS:MPROXYCACHE} -CONFIGURE_ARGS+= --enable-proxycache=${OVERLAY_ENABLE} -.endif - -.if ${PORT_OPTIONS:MREFINT} -CONFIGURE_ARGS+= --enable-refint=${OVERLAY_ENABLE} -.endif - -.if ${PORT_OPTIONS:MRETCODE} -CONFIGURE_ARGS+= --enable-retcode=${OVERLAY_ENABLE} -.endif - -.if ${PORT_OPTIONS:MRWM} -CONFIGURE_ARGS+= --enable-rwm=${OVERLAY_ENABLE} -.endif - -.if ${PORT_OPTIONS:MSEQMOD} -CONFIGURE_ARGS+= --enable-seqmod=${OVERLAY_ENABLE} -.else -CONFIGURE_ARGS+= --disable-seqmod -.endif - -.if ${PORT_OPTIONS:MSSSVLV} -CONFIGURE_ARGS+= --enable-sssvlv=${OVERLAY_ENABLE} -.endif - -.if ${PORT_OPTIONS:MSYNCPROV} -CONFIGURE_ARGS+= --enable-syncprov=${OVERLAY_ENABLE} -.else -CONFIGURE_ARGS+= --disable-syncprov -.endif - -.if ${PORT_OPTIONS:MTRANSLUCENT} -CONFIGURE_ARGS+= --enable-translucent=${OVERLAY_ENABLE} -.endif - -.if ${PORT_OPTIONS:MUNIQUE} -CONFIGURE_ARGS+= --enable-unique=${OVERLAY_ENABLE} -.endif - -.if ${PORT_OPTIONS:MVALSORT} -CONFIGURE_ARGS+= --enable-valsort=${OVERLAY_ENABLE} -.endif - -.if ${PORT_OPTIONS:MACI} -CONFIGURE_ARGS+= --enable-aci -.endif - -.if ${PORT_OPTIONS:MDYNACL} -CONFIGURE_ARGS+= --enable-dynacl -.endif - -.if ${PORT_OPTIONS:MLASTBIND} -CONFIGURE_ARGS+= --enable-lastbind -.endif - -.if !${PORT_OPTIONS:MBDB} -CONFIGURE_ARGS+= --disable-bdb \ - --disable-hdb -PLIST_SUB+= BACK_BDB="@comment " \ - BACK_HDB="@comment " -.else - -USES+= bdb +# Backends +# +BDB_CONFIGURE_ENABLE= bdb=mod hdb=mod +BDB_USES= bdb INVALID_BDB_VER= 6 - -CONFIGURE_ARGS+= --enable-bdb=${BACKEND_ENABLE} \ - --enable-hdb=${BACKEND_ENABLE} -PLIST_SUB+= BACK_BDB=${BACKEND_PLIST} \ - BACK_HDB=${BACKEND_PLIST} - -CPPFLAGS+= -I${BDB_INCLUDE_DIR} -LDFLAGS+= -L${BDB_LIB_DIR} -CONFIGURE_SED+= -e 's,ol_DB_LIB=$$,&-l${BDB_LIB_NAME:R},' \ +BDB_CPPFLAGS= -I${BDB_INCLUDE_DIR} +BDB_LDFLAGS= -I${BDB_LIB_DIR} +BDB_CONFIGURE_SED+= -e 's,ol_DB_LIB=$$,&-l${BDB_LIB_NAME:R},' \ -e 's,(ol_cv_lib_db=)yes$$,\1-l${BDB_LIB_NAME:R},' -.endif -.if ${PORT_OPTIONS:MDNSSRV} -CONFIGURE_ARGS+= --enable-dnssrv=${BACKEND_ENABLE} -PLIST_SUB+= BACK_DNSSRV=${BACKEND_PLIST} -.else -PLIST_SUB+= BACK_DNSSRV="@comment " -.endif +DNSSRV_CONFIGURE_ENABLE= dndsrv=mod +MDB_CONFIGURE_ENABLE= mdb=mod +PASSWD_CONFIGURE_ENABLE= passwd=mod +RELAY_CONFIGURE_ENABLE= relay=mod +SHELL_CONFIGURE_ENABLE= shell=mod +SHELL_CONFIGURE_OFF= --without-threads +SOCK_CONFIGURE_ENABLE= sock=mod +PERL_CONFIGURE_ENABLE= perl=mod +SASL_CONFIGURE_ENABLE= spasswd +ODBC_CONFIGURE_ENABLE= sql=mod +ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC +RLOOKUPS_CONFIGURE_ENABLE= rlookups +SLAPI_CONFIGURE_ENABLE= slapi +SLAPI_USE= LDCONFIG +SLP_CONFIGURE_ENABLE= slp +SLP_LIB_DEPENDS= libslp.so:net/openslp +TCP_WRAPPERS_ENABLE= wrappers -.if ${PORT_OPTIONS:MMDB} -CONFIGURE_ARGS+= --enable-mdb=${BACKEND_ENABLE} -PLIST_SUB+= BACK_MDB=${BACKEND_PLIST} -.else -PLIST_SUB+= BACK_MDB="@comment " -.endif - -.if ${PORT_OPTIONS:MPASSWD} -CONFIGURE_ARGS+= --enable-passwd=${BACKEND_ENABLE} -PLIST_SUB+= BACK_PASSWD=${BACKEND_PLIST} -.else -PLIST_SUB+= BACK_PASSWD="@comment " -.endif - -.if ${PORT_OPTIONS:MRELAY} -CONFIGURE_ARGS+= --enable-relay=${BACKEND_ENABLE} -PLIST_SUB+= BACK_RELAY=${BACKEND_PLIST} -.else -PLIST_SUB+= BACK_RELAY="@comment " -.endif - -.if ${PORT_OPTIONS:MSHELL} -CONFIGURE_ARGS+= --without-threads --enable-shell=${BACKEND_ENABLE} -PLIST_SUB+= BACK_SHELL=${BACKEND_PLIST} -.else -PLIST_SUB+= BACK_SHELL="@comment " -WANT_OPENLDAP_THREADS= yes -.endif - -.if ${PORT_OPTIONS:MSOCK} -CONFIGURE_ARGS+= --enable-sock=${BACKEND_ENABLE} -PLIST_SUB+= BACK_SOCK=${BACKEND_PLIST} -.else -PLIST_SUB+= BACK_SOCK="@comment " -.endif - -.if ${PORT_OPTIONS:MPERL} -USES+= perl5 -CONFIGURE_ARGS+= --enable-perl=${BACKEND_ENABLE} -CONFIGURE_ENV+= PERLBIN="${PERL}" -PLIST_SUB+= BACK_PERL=${BACKEND_PLIST} -.else -PLIST_SUB+= BACK_PERL="@comment " -.endif - -.if ${PORT_OPTIONS:MSASL} -CONFIGURE_ARGS+= --enable-spasswd -.endif - -.if ${PORT_OPTIONS:MODBC} -CONFIGURE_ARGS+= --enable-sql=${BACKEND_ENABLE} -PLIST_SUB+= BACK_SQL=${BACKEND_PLIST} -LIB_DEPENDS+= libodbc.so:databases/unixODBC -LDFLAGS+= -L${LOCALBASE}/lib -.else -PLIST_SUB+= BACK_SQL="@comment " -.endif - -.if ${PORT_OPTIONS:MSMBPWD} -PLIST_SUB+= SMBPWD="" -.else -PLIST_SUB+= SMBPWD="@comment " -.endif - -.if ${PORT_OPTIONS:MSHA2} -PLIST_SUB+= SHA2="" -.else -PLIST_SUB+= SHA2="@comment " -.endif - -.if ${PORT_OPTIONS:MLASTBIND} -PLIST_SUB+= LASTBIND="" -.else -PLIST_SUB+= LASTBIND="@comment " -.endif - -.if ${PORT_OPTIONS:MRLOOKUPS} -CONFIGURE_ARGS+= --enable-rlookups -PLIST_SUB+= RLOOKUPS="" -.else -PLIST_SUB+= RLOOKUPS="@comment " -.endif - -.if ${PORT_OPTIONS:MSLAPI} -CONFIGURE_ARGS+= --enable-slapi -PLIST_SUB+= SLAPI="" -USE_LDCONFIG= yes -.else -PLIST_SUB+= SLAPI="@comment " -.endif - -.if ${PORT_OPTIONS:MSLP} -CONFIGURE_ARGS+= --enable-slp -LIB_DEPENDS+= libslp.so:net/openslp -.endif - -# Include tcp-wrapper support -.if ${PORT_OPTIONS:MTCP_WRAPPERS} -CONFIGURE_ARGS+= --enable-wrappers -.endif - # Force using caseIgnoreOrderingMatch on 'name' attribute. # This may be a violation of RFC 4519 2.18 definition. # See http://www.openldap.org/lists/openldap-technical/201211/msg00175.html -.if ${PORT_OPTIONS:MOUTLOOK} -EXTRA_PATCHES+= ${FILESDIR}/extrapatch-outlook-servers__slapd__schema_prep.c -.endif +OUTLOOK_ENABLE= ${FILESDIR}/extrapatch-outlook-servers__slapd__schema_prep.c -.if ${PORT_OPTIONS:MKQUEUE} -BUILD_DEPENDS+= autoconf>0:devel/autoconf -EXTRA_PATCHES+= ${FILESDIR}/extrapatch-ITS6300 -.endif +KQUEUE_BUILD_DEPENDS= autoconf>0:devel/autoconf +KQUEUE_EXTRA_PATCHES+= ${FILESDIR}/extrapatch-ITS6300 -# end of client/server specific configuration -.endif +OPTIONS_SUB= yes -.if defined(WITH_CLDAP) -CPPFLAGS+= -DLDAP_CONNECTIONLESS -.endif - -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib - -.if defined(CLIENT_ONLY) -.else SUB_LIST+= RC_DIR=${PREFIX} \ LDAP_RUN_DIR=${LDAP_RUN_DIR} \ DATABASEDIR=${DATABASEDIR} + .endif +FETCH_CONFIGURE_WITH= fetch + PLIST_SUB+= ${SUB_LIST} PLIST_SUB+= SHLIB_MAJOR=${OPENLDAP_SHLIB_MAJOR} PLIST_SUB+= SHLIB_MINOR=${OPENLDAP_SHLIB_MINOR} @@ -534,9 +264,8 @@ .include -.if !${PORT_OPTIONS:MFETCH} +.if ${PORT_OPTIONS:MFETCH} CONFIGURE_ARGS+= --without-fetch -.else . if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" || ${SSL_DEFAULT} != base BROKEN= using OpenSSL from ports and OPTION FETCH together is not supported . endif @@ -549,46 +278,43 @@ -e 's|^CC =.*|CC = ${CC}|g' \ ${SED_MODULES} ${WRKSRC}/contrib/slapd-modules/*/Makefile \ ${WRKSRC}/contrib/slapd-modules/*/*/Makefile -.if defined(CONFIGURE_SED) - @${REINPLACE_CMD} -E ${CONFIGURE_SED} \ + +post-patch-BDB-on: + @${REINPLACE_CMD} -E ${BDB_CONFIGURE_SED} \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -.endif pre-configure: @if [ -n "`${PKG_INFO} -xI '^bind\(84\)\{0,1\}-base-8\.' 2>/dev/null`" ]; then \ ${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \ ${FALSE}; \ fi -.if ${PORT_OPTIONS:MKQUEUE} + +pre-configure-KQUEUE-on: @(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf) -.endif .if !defined(CLIENT_ONLY) test: build @(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test) -post-build: - @${DO_NADA} -.if ${PORT_OPTIONS:MSMBPWD} +post-build-SMBPWD-on: @(cd ${BUILD_WRKSRC}/contrib/slapd-modules/smbk5pwd && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} DEFS="-DDO_SAMBA" prefix="${PREFIX}" all) -.endif -.if ${PORT_OPTIONS:MSHA2} + +post-build-SHA2-on: @(cd ${BUILD_WRKSRC}/contrib/slapd-modules/passwd/sha2 && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} prefix="${PREFIX}" all) -.endif -.if ${PORT_OPTIONS:MLASTBIND} + +post-build-LASTBIND-on: @(cd ${BUILD_WRKSRC}/contrib/slapd-modules/lastbind && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} prefix="${PREFIX}" all) .endif -.endif -pre-install: .if !defined(CLIENT_ONLY) +pre-install: ${MKDIR} ${STAGEDIR}${DATABASEDIR} .endif @@ -609,30 +335,25 @@ done .else ${MKDIR} ${STAGEDIR}${LDAP_RUN_DIR} -.if ${PORT_OPTIONS:MSMBPWD} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so +.endif + +post-install-SMBPWD-on: (cd ${WRKSRC}/contrib/slapd-modules/smbk5pwd && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} prefix="${PREFIX}" install) ${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/smbk5pwd.a -.endif -.if ${PORT_OPTIONS:MSHA2} + +post-install-SHA2-on: (cd ${WRKSRC}/contrib/slapd-modules/passwd/sha2 && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} prefix="${PREFIX}" install) ${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/pw-sha2.a -.endif -.if ${PORT_OPTIONS:MLASTBIND} + +post-install-LASTBIND-on: (cd ${WRKSRC}/contrib/slapd-modules/lastbind && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} prefix="${PREFIX}" install) ${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/lastbind.a -.endif -.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSMBPWD} || ${PORT_OPTIONS:MSHA2} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so -.endif -.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSLAPI} - ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/openldap -.endif -.endif # defined(CLIENT_ONLY) .include Index: net/openldap24-server/pkg-plist =================================================================== --- net/openldap24-server/pkg-plist +++ net/openldap24-server/pkg-plist @@ -27,68 +27,68 @@ @sample %%ETCDIR%%/schema/ppolicy.schema.sample @sample %%ETCDIR%%/slapd.conf.sample @sample %%ETCDIR%%/slapd.ldif.sample -%%BACK_BDB%%%%ETCDIR%%/DB_CONFIG.example +%%BDB%%%%ETCDIR%%/DB_CONFIG.example %%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% %%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% %%SLAPI%%lib/libslapi.a %%SLAPI%%lib/libslapi.la %%SLAPI%%lib/libslapi.so -%%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -%%BACK_BDB%%libexec/openldap/back_bdb.la -%%BACK_BDB%%libexec/openldap/back_bdb.so -%%BACK_HDB%%libexec/openldap/back_hdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_HDB%%libexec/openldap/back_hdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -%%BACK_HDB%%libexec/openldap/back_hdb.la -%%BACK_HDB%%libexec/openldap/back_hdb.so -%%BACKEND%%libexec/openldap/back_ldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACKEND%%libexec/openldap/back_ldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -%%BACKEND%%libexec/openldap/back_ldap.la -%%BACKEND%%libexec/openldap/back_ldap.so -%%BACKEND%%libexec/openldap/back_meta-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACKEND%%libexec/openldap/back_meta-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -%%BACKEND%%libexec/openldap/back_meta.la -%%BACKEND%%libexec/openldap/back_meta.so -%%BACKEND%%libexec/openldap/back_monitor-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACKEND%%libexec/openldap/back_monitor-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -%%BACKEND%%libexec/openldap/back_monitor.la -%%BACKEND%%libexec/openldap/back_monitor.so -%%BACKEND%%libexec/openldap/back_null-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACKEND%%libexec/openldap/back_null-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -%%BACKEND%%libexec/openldap/back_null.la -%%BACKEND%%libexec/openldap/back_null.so -%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -%%BACK_DNSSRV%%libexec/openldap/back_dnssrv.la -%%BACK_DNSSRV%%libexec/openldap/back_dnssrv.so -%%BACK_MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -%%BACK_MDB%%libexec/openldap/back_mdb.la -%%BACK_MDB%%libexec/openldap/back_mdb.so -%%BACK_PASSWD%%libexec/openldap/back_passwd-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_PASSWD%%libexec/openldap/back_passwd-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -%%BACK_PASSWD%%libexec/openldap/back_passwd.la -%%BACK_PASSWD%%libexec/openldap/back_passwd.so -%%BACK_PERL%%libexec/openldap/back_perl-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_PERL%%libexec/openldap/back_perl-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -%%BACK_PERL%%libexec/openldap/back_perl.la -%%BACK_PERL%%libexec/openldap/back_perl.so -%%BACK_RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -%%BACK_RELAY%%libexec/openldap/back_relay.la -%%BACK_RELAY%%libexec/openldap/back_relay.so -%%BACK_SHELL%%libexec/openldap/back_shell-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_SHELL%%libexec/openldap/back_shell-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -%%BACK_SHELL%%libexec/openldap/back_shell.la -%%BACK_SHELL%%libexec/openldap/back_shell.so -%%BACK_SOCK%%libexec/openldap/back_sock-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_SOCK%%libexec/openldap/back_sock-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -%%BACK_SOCK%%libexec/openldap/back_sock.la -%%BACK_SOCK%%libexec/openldap/back_sock.so -%%BACK_SQL%%libexec/openldap/back_sql-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% -%%BACK_SQL%%libexec/openldap/back_sql-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% -%%BACK_SQL%%libexec/openldap/back_sql.la -%%BACK_SQL%%libexec/openldap/back_sql.so +%%BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% +%%BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +%%BDB%%libexec/openldap/back_bdb.la +%%BDB%%libexec/openldap/back_bdb.so +%%BDB%%libexec/openldap/back_hdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% +%%BDB%%libexec/openldap/back_hdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +%%BDB%%libexec/openldap/back_hdb.la +%%BDB%%libexec/openldap/back_hdb.so +libexec/openldap/back_ldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% +libexec/openldap/back_ldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +libexec/openldap/back_ldap.la +libexec/openldap/back_ldap.so +libexec/openldap/back_meta-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% +libexec/openldap/back_meta-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +libexec/openldap/back_meta.la +libexec/openldap/back_meta.so +libexec/openldap/back_monitor-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% +libexec/openldap/back_monitor-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +libexec/openldap/back_monitor.la +libexec/openldap/back_monitor.so +libexec/openldap/back_null-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% +libexec/openldap/back_null-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +libexec/openldap/back_null.la +libexec/openldap/back_null.so +%%DNSSRV%%libexec/openldap/back_dnssrv-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% +%%DNSSRV%%libexec/openldap/back_dnssrv-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +%%DNSSRV%%libexec/openldap/back_dnssrv.la +%%DNSSRV%%libexec/openldap/back_dnssrv.so +%%MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% +%%MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +%%MDB%%libexec/openldap/back_mdb.la +%%MDB%%libexec/openldap/back_mdb.so +%%PASSWD%%libexec/openldap/back_passwd-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% +%%PASSWD%%libexec/openldap/back_passwd-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +%%PASSWD%%libexec/openldap/back_passwd.la +%%PASSWD%%libexec/openldap/back_passwd.so +%%PERL%%libexec/openldap/back_perl-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% +%%PERL%%libexec/openldap/back_perl-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +%%PERL%%libexec/openldap/back_perl.la +%%PERL%%libexec/openldap/back_perl.so +%%RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% +%%RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +%%RELAY%%libexec/openldap/back_relay.la +%%RELAY%%libexec/openldap/back_relay.so +%%SHELL%%libexec/openldap/back_shell-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% +%%SHELL%%libexec/openldap/back_shell-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +%%SHELL%%libexec/openldap/back_shell.la +%%SHELL%%libexec/openldap/back_shell.so +%%SOCK%%libexec/openldap/back_sock-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% +%%SOCK%%libexec/openldap/back_sock-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +%%SOCK%%libexec/openldap/back_sock.la +%%SOCK%%libexec/openldap/back_sock.so +%%ODBC%%libexec/openldap/back_sql-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%% +%%ODBC%%libexec/openldap/back_sql-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +%%ODBC%%libexec/openldap/back_sql.la +%%ODBC%%libexec/openldap/back_sql.so %%SHA2%%libexec/openldap/pw-sha2.la %%SHA2%%libexec/openldap/pw-sha2.so %%SHA2%%libexec/openldap/pw-sha2.so.0 @@ -165,7 +165,5 @@ sbin/slappasswd sbin/slapschema sbin/slaptest -@dir %%ETCDIR%%/schema -%%MODULES%%@dir libexec/openldap @dir(%%LDAP_USER%%,%%LDAP_GROUP%%,775) %%LDAP_RUN_DIR%% @dir(%%LDAP_USER%%,%%LDAP_GROUP%%,775) %%DATABASEDIR%% Index: net/openradius/Makefile =================================================================== --- net/openradius/Makefile +++ net/openradius/Makefile @@ -35,7 +35,7 @@ .include .if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= YES +LIB_DEPENDS+= libldap.so:net/openldap24-client PLIST_SUB+= LDAP="" SCRIPTS_ENV+= USE_LDAP=yes .else Index: net/opensips/Makefile =================================================================== --- net/opensips/Makefile +++ net/opensips/Makefile @@ -52,7 +52,7 @@ MEMCACHED_DESC= Build with memcached support TESTS_DESC= Install smoke tests -LDAP_USE= OPENLDAP=client +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client MYSQL_USES= mysql:client PGSQL_USES= pgsql Index: net/proftpd-mod_ldap/Makefile =================================================================== --- net/proftpd-mod_ldap/Makefile +++ net/proftpd-mod_ldap/Makefile @@ -11,11 +11,12 @@ LICENSE= GPLv2 +LIB_DEPENDS= libldap.so:net/openldap24-client + DESCR= ${.CURDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../../ftp/proftpd -USE_OPENLDAP= yes USES= ssl INCLUDEDIRS= ${LOCALBASE}/include Index: net/proxy-suite/Makefile =================================================================== --- net/proxy-suite/Makefile +++ net/proxy-suite/Makefile @@ -34,7 +34,7 @@ # OPTIONAL: include ldap-support # .if defined(WITH_LDAP) -USE_OPENLDAP= yes +LIB_DEPENDS+= libldap.so:net/openldap24-client CONFIGURE_ARGS+= --with-libldap=${LOCALBASE}/lib .else CONFIGURE_ARGS+= --without-libldap Index: net/py-ldap/Makefile =================================================================== --- net/py-ldap/Makefile +++ net/py-ldap/Makefile @@ -2,6 +2,7 @@ PORTNAME= ldap PORTVERSION= 3.1.0 +PORTREVISION= 1 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,24 +16,14 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:devel/py-pyasn1-modules@${PY_FLAVOR} +LIB_DEPENDS= libldap.so:net/openldap24-client CONFLICTS_INSTALL= py27-pyldap USES= python USE_PYTHON= autoplist distutils -USE_OPENLDAP= yes -WANT_OPENLDAP_VER= 24 -OPTIONS_DEFINE= SASL - -SASL_VARS= WANT_OPENLDAP_SASL=yes -SASL_CONFLICTS= openldap24-client-2.* - post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py - -do-configure-SASL-off: - @cd ${WRKSRC} && ${PYTHON_CMD} setup.py -q setopt -c _ldap -s HAVE_TLS -o defines - @cd ${WRKSRC} && ${PYTHON_CMD} setup.py -q saveopts post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_ldap.so Index: net/py-ldap0/Makefile =================================================================== --- net/py-ldap0/Makefile +++ net/py-ldap0/Makefile @@ -2,7 +2,7 @@ PORTNAME= ldap0 PORTVERSION= 0.0.60 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,13 +13,12 @@ LICENSE= PSFL RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.2.1:devel/py-pyasn1-modules@${PY_FLAVOR} +LIB_DEPENDS= libldap.so:net/openldap24-client MAKE_ENV+= INCLUDES=${LOCALBASE}/include -WANT_OPENLDAP_SASL=yes USES= python:2.7 USE_LOCALE= en_US.UTF-8 -USE_OPENLDAP= yes USE_PYTHON= autoplist distutils .include Index: net/samba410/Makefile =================================================================== --- net/samba410/Makefile +++ net/samba410/Makefile @@ -346,7 +346,7 @@ LDAP_CONFIGURE_WITH= ldap LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE} -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_VARS= SAMBA4_MODULES+=idmap_ldap GSSAPI_MIT_CONFIGURE_ON= --with-system-mitkrb5 ${GSSAPIBASEDIR} \ Index: net/samba48/Makefile =================================================================== --- net/samba48/Makefile +++ net/samba48/Makefile @@ -342,7 +342,7 @@ LDAP_CONFIGURE_WITH= ldap LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE} -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_VARS= SAMBA4_MODULES+=idmap_ldap GSSAPI_MIT_CONFIGURE_ON= --with-system-mitkrb5 ${GSSAPIBASEDIR} \ Index: net/ss5/Makefile =================================================================== --- net/ss5/Makefile +++ net/ss5/Makefile @@ -15,8 +15,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-[0-9]+//} +LIB_DEPENDS= libldap.so:net/openldap24-client + USES= ssl -USE_OPENLDAP= yes USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes Index: net/x2goclient/Makefile =================================================================== --- net/x2goclient/Makefile +++ net/x2goclient/Makefile @@ -29,7 +29,7 @@ OPTIONS_DEFINE= DOCS LDAP OPTIONS_DEFAULT= LDAP -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CFLAGS= -DUSELDAP LDAP_QMAKE_ON= LIBS+="-lX11 -lXpm -lcups -lldap" LDAP_QMAKE_OFF= LIBS+="-lX11 -lXpm -lcups" Index: net/yptransitd/Makefile =================================================================== --- net/yptransitd/Makefile +++ net/yptransitd/Makefile @@ -13,8 +13,9 @@ LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +LIB_DEPENDS= libldap.so:net/openldap24-client + USES= bison -USE_OPENLDAP= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE} USE_LDCONFIG= yes Index: news/nntpcache/Makefile =================================================================== --- news/nntpcache/Makefile +++ news/nntpcache/Makefile @@ -35,7 +35,7 @@ RADIUS_CONFIGURE_WITH= authinfo-radius RADIUS_VARS= AUTHINFO_EXT+=authinfo_radius.ext -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_WITH= authinfo-ldap LDAP_CPPFLAGS= -I${PREFIX}/include -I${LOCALBASE}/include LDAP_LDFLAGS= -L${PREFIX}/lib -L${LOCALBASE}/lib Index: print/cups-filters/Makefile =================================================================== --- print/cups-filters/Makefile +++ print/cups-filters/Makefile @@ -103,7 +103,7 @@ LDAP_CONFIGURE_ENABLE= ldap LDAP_DESC= Get printer locations from an LDAP server -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client # Default PDF-to-PostScript renderer Index: security/clamav/Makefile =================================================================== --- security/clamav/Makefile +++ security/clamav/Makefile @@ -91,7 +91,7 @@ JSON_CONFIGURE_WITH= libjson JSON_LIB_DEPENDS= libjson-c.so:devel/json-c LDAP_LDFLAGS= -lldap -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LHA_RUN_DEPENDS= lha:archivers/lha MILTER_CONFIGURE_WITH= sendmail=/usr/sbin/sendmail MILTER_CONFIGURE_ENABLE=milter Index: security/courier-authlib/Makefile =================================================================== --- security/courier-authlib/Makefile +++ security/courier-authlib/Makefile @@ -112,7 +112,7 @@ OPTIONS_DEFINE+= DOCS DOCS= README.ldap -USE_OPENLDAP= yes +LIB_DEPENDS+= libldap.so:net/openldap24-client CONFIGURE_ARGS+=--with-authldap .else CONFIGURE_ARGS+=--without-authldap Index: security/cyrus-sasl2-ldapdb/Makefile =================================================================== --- security/cyrus-sasl2-ldapdb/Makefile +++ security/cyrus-sasl2-ldapdb/Makefile @@ -6,13 +6,7 @@ CYRUS_CONFIGURE_ARGS= --enable-ldapdb --with-ldap=${LOCALBASE} -OPTIONS_DEFINE= OPENLDAP_SASL -OPENLDAP_SASL_DESC= OpenLDAP client with SASL2 support -OPENLDAP_SASL_VARS= WANT_OPENLDAP_SASL=yes +.include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common" -USE_OPENLDAP= yes -.if defined(WITH_OPENLDAP_VER) -WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} -.endif +LIB_DEPENDS+= libldap.so:net/openldap24-client -.include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common" Index: security/cyrus-sasl2-saslauthd/Makefile =================================================================== --- security/cyrus-sasl2-saslauthd/Makefile +++ security/cyrus-sasl2-saslauthd/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PKGNAMESUFFIX= -saslauthd -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= SASL authentication server for cyrus-sasl2 @@ -14,7 +14,7 @@ CYRUS_CONFIGURE_ARGS= --with-saslauthd=${SASLAUTHD_RUNPATH} CONFIGURE_ENV+= andrew_cv_runpath_switch=none -OPTIONS_DEFINE= DOCS HTTPFORM OPENLDAP OPENLDAP_SASL +OPTIONS_DEFINE= DOCS HTTPFORM OPENLDAP OPTIONS_RADIO= GSSAPI SASLDB OPTIONS_RADIO_SASLDB= BDB1 BDB GDBM OPTIONS_DEFAULT= BDB1 @@ -22,10 +22,8 @@ HTTPFORM_DESC= Enable HTTP form authentication HTTPFORM_CONFIGURE_ENABLE=httpform OPENLDAP_DESC= Use OpenLDAP -OPENLDAP_USE= OPENLDAP=yes +OPENLDAP_LIB_DEPENDS= libldap.so:net/openldap24-client OPENLDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} -OPENLDAP_SASL_DESC= OpenLDAP client with SASL2 support -OPENLDAP_SASL_VARS= WANT_OPENLDAP_SASL=yes SASLDB_DESC= Experimental SASLdb authentication module BDB_USES= bdb Index: security/dirmngr/Makefile =================================================================== --- security/dirmngr/Makefile +++ security/dirmngr/Makefile @@ -18,10 +18,10 @@ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libksba.so:security/libksba \ - libpth.so:devel/pth + libpth.so:devel/pth \ + libldap.so:net/openldap24-client USES= gmake iconv tar:bzip2 -USE_OPENLDAP= yes GNU_CONFIGURE= yes INFO= dirmngr Index: security/gnupg/Makefile =================================================================== --- security/gnupg/Makefile +++ security/gnupg/Makefile @@ -52,7 +52,7 @@ LDAP_CONFIGURE_WITH= ldap=${LOCALBASE} LDAP_LIBS= -L${LOCALBASE}/lib -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext Index: security/gnupg1/Makefile =================================================================== --- security/gnupg1/Makefile +++ security/gnupg1/Makefile @@ -45,7 +45,7 @@ LIBUSB_CONFIGURE_WITH= libusb=${LOCALBASE} -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_WITH= ldap=${LOCALBASE} NLS_USES= gettext Index: security/heimdal/Makefile =================================================================== --- security/heimdal/Makefile +++ security/heimdal/Makefile @@ -80,7 +80,7 @@ SQLITE_CONFIGURE_WITH= sqlite3 LDAP_DESC= Enable OpenLDAP KDC backend support -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_ON= --with-openldap-include="${LOCALBASE}/include" \ --with-openldap-lib="${LOCALBASE}/lib" LDAP_CONFIGURE_WITH= openldap Index: security/ike/Makefile =================================================================== --- security/ike/Makefile +++ security/ike/Makefile @@ -32,7 +32,7 @@ DEBUG_CMAKE_ON= -DDEBUG=YES -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CMAKE_ON= -DLDAP=YES NATT_CMAKE_ON= -DNATT=YES Index: security/ipsec-tools/Makefile =================================================================== --- security/ipsec-tools/Makefile +++ security/ipsec-tools/Makefile @@ -71,7 +71,7 @@ GSSAPI_LDFLAGS= -L${LOCALBASE}/lib GSSAPI_CONFIGURE_ENABLE=gssapi RADIUS_CONFIGURE_WITH= libradius -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_ON= --with-libldap=${LOCALBASE} LDAP_CONFIGURE_OFF= --without-libldap SAUNSPEC_CONFIGURE_ENABLE= samode-unspec Index: security/krb5-115/Makefile =================================================================== --- security/krb5-115/Makefile +++ security/krb5-115/Makefile @@ -53,7 +53,7 @@ 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_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_WITH= ldap NLS_USES= gettext READLINE_USES= readline Index: security/krb5-116/Makefile =================================================================== --- security/krb5-116/Makefile +++ security/krb5-116/Makefile @@ -50,7 +50,7 @@ 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_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_WITH= ldap NLS_USES= gettext READLINE_USES= readline Index: security/krb5-117/Makefile =================================================================== --- security/krb5-117/Makefile +++ security/krb5-117/Makefile @@ -50,7 +50,7 @@ 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_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_WITH= ldap LMDB_DESC= OpenLDAP Lightning Memory-Mapped Database support LMDB_CONFIGURE_WITH= lmdb Index: security/krb5-devel/Makefile =================================================================== --- security/krb5-devel/Makefile +++ security/krb5-devel/Makefile @@ -48,7 +48,7 @@ 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_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_WITH= ldap LMDB_DESC= OpenLDAP Lightning Memory-Mapped Database support LMDB_CONFIGURE_WITH= lmdb Index: security/opencryptoki/Makefile =================================================================== --- security/opencryptoki/Makefile +++ security/opencryptoki/Makefile @@ -15,11 +15,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LIB_DEPENDS= libtspi.so:security/trousers +LIB_DEPENDS= libtspi.so:security/trousers \ + libldap.so:net/openldap24-client USES= alias autoreconf gmake libtool localbase ssl tar:tgz USE_GCC= yes -USE_OPENLDAP= yes USE_LDCONFIG= ${PREFIX}/lib/opencryptoki USE_GITHUB= yes INSTALL_TARGET= install-strip Index: security/openscep/Makefile =================================================================== --- security/openscep/Makefile +++ security/openscep/Makefile @@ -13,7 +13,7 @@ CONFLICTS_INSTALL= nss-3.* USES= apache:2.2+ gmake libtool ssl -USE_OPENLDAP= yes +LIB_DEPENDS= libldap.so:net/openldap24-client GNU_CONFIGURE= yes USE_LDCONFIG= yes Index: security/openvas8-libraries/Makefile =================================================================== --- security/openvas8-libraries/Makefile +++ security/openvas8-libraries/Makefile @@ -35,7 +35,7 @@ OPTIONS_DEFAULT=LDAP LDAP_CMAKE_OFF= -DBUILD_WITHOUT_LDAP=1 -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client RADIUS_CMAKE_ON=-DBUILD_WITH_RADIUS=1 RADIUS_LIB_DEPENDS= libfreeradius-client.so:net/freeradius-client Index: security/openvpn-auth-ldap/Makefile =================================================================== --- security/openvpn-auth-ldap/Makefile +++ security/openvpn-auth-ldap/Makefile @@ -14,6 +14,7 @@ LICENSE= BSD3CLAUSE +LIB_DEPENDS= libldap.so:net/openldap24-client BUILD_DEPENDS= re2c:devel/re2c \ check>=0:devel/check \ ${LOCALBASE}/include/openvpn-plugin.h:security/openvpn @@ -25,7 +26,6 @@ USES= autoreconf objc ssl tar:xz GNU_CONFIGURE= yes -USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-openldap=${LOCALBASE} \ --with-openvpn=${LOCALBASE}/include \ --with-objc-runtime=GNU \ Index: security/pam_ldap/Makefile =================================================================== --- security/pam_ldap/Makefile +++ security/pam_ldap/Makefile @@ -12,8 +12,9 @@ MAINTAINER= marcus@FreeBSD.org COMMENT= Pam module for authenticating with LDAP +LIB_DEPENDS= libldap.so:net/openldap24-client + GNU_CONFIGURE= yes -USE_OPENLDAP= yes USES= perl5 gmake USE_PERL5= build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.//g} Index: security/pam_yubico/Makefile =================================================================== --- security/pam_yubico/Makefile +++ security/pam_yubico/Makefile @@ -33,7 +33,7 @@ man/man1/ykpamcfg.1.gz LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client STATIC_CONFIGURE_ENABLE= static STATIC_PLIST_FILES= lib/security/pam_yubico.a Index: security/seahorse/Makefile =================================================================== --- security/seahorse/Makefile +++ security/seahorse/Makefile @@ -37,7 +37,7 @@ OPTIONS_DEFINE= LDAP AVAHI OPTIONS_DEFAULT=LDAP AVAHI LDAP_CONFIGURE_ENABLE= ldap -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_DESC= LDAP keyserver support (for gpg) AVAHI_DESC= DNS-SD key sharing AVAHI_CONFIGURE_ENABLE= sharing Index: security/sssd/Makefile =================================================================== --- security/sssd/Makefile +++ security/sssd/Makefile @@ -26,7 +26,8 @@ libnss3.so:security/nss \ libsasl2.so:security/cyrus-sasl2 \ libinotify.so:devel/libinotify \ - libplds4.so:devel/nspr + libplds4.so:devel/nspr \ + libldap.so:net/openldap24-client BUILD_DEPENDS= xmlcatalog:textproc/libxml2 \ docbook-xsl>=1:textproc/docbook-xsl \ xsltproc:textproc/libxslt \ @@ -53,7 +54,6 @@ SUB_FILES= pkg-message USE_LDCONFIG= yes -USE_OPENLDAP= yes USES= autoreconf cpe gettext gmake iconv libtool pathfix pkgconfig \ python:2.7 shebangfix gssapi:mit INSTALL_TARGET= install-strip Index: security/strongswan/Makefile =================================================================== --- security/strongswan/Makefile +++ security/strongswan/Makefile @@ -90,7 +90,7 @@ KERNELLIBIPSEC_CONFIGURE_ON= --enable-kernel-libipsec LOADTESTER_CONFIGURE_ON=--enable-load-tester LDAP_CONFIGURE_ON= --enable-ldap -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client MEDIATION_CONFIGURE_ON= --enable-mediation MYSQL_CONFIGURE_ON= --enable-mysql MYSQL_USES= mysql Index: security/sudo/Makefile =================================================================== --- security/sudo/Makefile +++ security/sudo/Makefile @@ -65,7 +65,7 @@ INSULTS_CONFIGURE_ON= --with-insults INSULTS_CONFIGURE_ON+= --with-all-insults -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_ON= --with-ldap=${PREFIX} SUDO_LDAP_CONF?= ldap.conf LDAP_CONFIGURE_ON+= --with-ldap-conf-file=${PREFIX}/etc/${SUDO_LDAP_CONF} Index: sysutils/adtool/Makefile =================================================================== --- sysutils/adtool/Makefile +++ sysutils/adtool/Makefile @@ -10,9 +10,10 @@ MAINTAINER= joseph@randomnetworks.com COMMENT= Active Directory administration tool +LIB_DEPENDS= libldap.so:net/openldap24-client + USES= gmake libtool GNU_CONFIGURE= yes -USE_OPENLDAP= yes CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} Index: sysutils/am-utils/Makefile =================================================================== --- sysutils/am-utils/Makefile +++ sysutils/am-utils/Makefile @@ -36,7 +36,7 @@ INFO= am-utils DOCS= AUTHORS BUGS FAQ NEWS README.attrcache -OPENLDAP_USE= OPENLDAP=yes +OPENLDAP_LIB_DEPENDS= libldap.so:net/openldap24-client OPENLDAP_CONFIGURE_WITH= ldap OPENLDAP_CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ CPPFLAGS="-I${LOCALBASE}/include" Index: sysutils/cpu/Makefile =================================================================== --- sysutils/cpu/Makefile +++ sysutils/cpu/Makefile @@ -10,9 +10,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Change Password Utility for LDAP +LIB_DEPENDS= libldap.so:net/openldap24-client + USES= tar:bzip2 libtool GNU_CONFIGURE= yes -USE_OPENLDAP= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --datadir=${PREFIX}/share/cpu --with-ldap=${LOCALBASE} INSTALL_TARGET= install-strip Index: sysutils/eclat/Makefile =================================================================== --- sysutils/eclat/Makefile +++ sysutils/eclat/Makefile @@ -28,7 +28,7 @@ GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_WITH= gdbm -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_WITH= ldap post-patch: Index: sysutils/ldapvi/Makefile =================================================================== --- sysutils/ldapvi/Makefile +++ sysutils/ldapvi/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv2 -LIB_DEPENDS= libpopt.so:devel/popt +LIB_DEPENDS= libpopt.so:devel/popt \ + libldap.so:net/openldap24-client USES= gmake iconv ncurses pkgconfig -USE_OPENLDAP= yes USE_GNOME= glib20 GNU_CONFIGURE= yes MAKEFILE= GNUmakefile @@ -29,11 +29,6 @@ PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz \ ${DOCSDIR_REL}/manual.css ${DOCSDIR_REL}/manual.xml \ ${DOCSDIR_REL}/bg.png ${DOCSDIR_REL}/html.xsl - -# XXX should probably be converted to OptionsNG -.if !defined(WANT_OPENLDAP_SASL) || defined(WITHOUT_SASL) -CONFIGURE_ARGS= --without-sasl -.endif post-patch: @${REINPLACE_CMD} -e 's/-lssl/-lcrypto/' ${WRKSRC}/configure Index: sysutils/msktutil/Makefile =================================================================== --- sysutils/msktutil/Makefile +++ sysutils/msktutil/Makefile @@ -3,6 +3,7 @@ PORTNAME= msktutil PORTVERSION= 1.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -12,14 +13,13 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libudns.so:dns/udns +LIB_DEPENDS= libudns.so:dns/udns \ + libldap.so:net/openldap24-client USES= autoreconf ssl USE_GITHUB= yes -USE_OPENLDAP= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-sasldir=${LOCALBASE} --with-ldapdir=${LOCALBASE} -WANT_OPENLDAP_SASL= yes OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT Index: www/aws/Makefile =================================================================== --- www/aws/Makefile +++ www/aws/Makefile @@ -48,7 +48,7 @@ OPENSSL_USES= ssl GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client CONF_ARGS= PROCESSORS=${MAKE_JOBS_NUMBER} CONF_ARGS+= GCC=ada Index: www/c-icap/Makefile =================================================================== --- www/c-icap/Makefile +++ www/c-icap/Makefile @@ -54,7 +54,7 @@ MEMCACHE_CONFIGURE_WITH= memcached MEMCACHE_LIB_DEPENDS= libmemcached.so:databases/libmemcached -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_ON= --with-ldap=yes LDAP_CONFIGURE_OFF= --with-ldap=no Index: www/mod_cfg_ldap/Makefile =================================================================== --- www/mod_cfg_ldap/Makefile +++ www/mod_cfg_ldap/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE USES= apache:2.2+ -USE_OPENLDAP= yes +LIB_DEPENDS= libldap.so:net/openldap24-client AP_FAST_BUILD= yes AP_GENPLIST= yes Index: www/mod_webauth/Makefile =================================================================== --- www/mod_webauth/Makefile +++ www/mod_webauth/Makefile @@ -12,10 +12,10 @@ COMMENT= Apache module for authenticating users with Kerberos v5 LIB_DEPENDS= libcurl.so:ftp/curl \ - libsasl2.so:security/cyrus-sasl2 + libsasl2.so:security/cyrus-sasl2 \ + libldap.so:net/openldap24-client USES= apache:2.4 libtool pathfix pkgconfig ssl -USE_OPENLDAP= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ldap-lib=${LOCALBASE}/lib \ Index: www/sarg/Makefile =================================================================== --- www/sarg/Makefile +++ www/sarg/Makefile @@ -36,7 +36,7 @@ PHP_CONFIGURE_OFF= --disable-sargphp PCRE_CONFIGURE_WITH= pcre PCRE_LIB_DEPENDS= libpcre.so:devel/pcre -LDAP_USE= USE_OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_WITH= ldap ICONV_USES= iconv ICONV_CONFIGURE_WITH= iconv Index: www/squid/Makefile =================================================================== --- www/squid/Makefile +++ www/squid/Makefile @@ -62,7 +62,7 @@ ARP_ACL_CONFIGURE_ENABLE= eui AUTH_LDAP_CFLAGS= -I${LOCALBASE}/include AUTH_LDAP_LDFLAGS= -L${LOCALBASE}/lib -AUTH_LDAP_USE= OPENLDAP=yes +AUTH_LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client AUTH_LDAP_VARS= BASIC_AUTH+=LDAP EXTERNAL_ACL+=LDAP_group AUTH_SASL_CFLAGS= -I${LOCALBASE}/include AUTH_SASL_CPPFLAGS= -I${LOCALBASE}/include Index: www/squid3/Makefile =================================================================== --- www/squid3/Makefile +++ www/squid3/Makefile @@ -66,7 +66,7 @@ ARP_ACL_CONFIGURE_ENABLE= eui AUTH_LDAP_CFLAGS= -I${LOCALBASE}/include AUTH_LDAP_LDFLAGS= -L${LOCALBASE}/lib -AUTH_LDAP_USE= OPENLDAP=yes +AUTH_LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client AUTH_LDAP_VARS= BASIC_AUTH+=LDAP EXTERNAL_ACL+=LDAP_group AUTH_SASL_CFLAGS= -I${LOCALBASE}/include AUTH_SASL_CPPFLAGS= -I${LOCALBASE}/include Index: www/squidguard/Makefile =================================================================== --- www/squidguard/Makefile +++ www/squidguard/Makefile @@ -57,7 +57,7 @@ LDAP_CONFIGURE_ON= --with-ldap LDAP_CONFIGURE_OFF= --without-ldap LDAP_LDFLAGS= -L${LOCALBASE}/lib -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client .include Index: www/xshttpd/Makefile =================================================================== --- www/xshttpd/Makefile +++ www/xshttpd/Makefile @@ -28,7 +28,7 @@ OPTIONS_DEFAULT=SSL PCRE SSL_USES= ssl SSL_CONFIGURE_WITH= ssl -LDAP_USE= OPENLDAP=yes +LDAP_LIB_DEPENDS= libldap.so:net/openldap24-client LDAP_CONFIGURE_WITH= ldap M4_CONFIG_DESC= Enable m4 configuration preprocessor M4_CONFIG_CONFIGURE_WITH=preprocessor