diff options
Diffstat (limited to 'net')
30 files changed, 31 insertions, 62 deletions
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index 391f932c586d..b4ef3f255616 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -143,7 +143,7 @@ GSM_CONFIGURE_WITH= gsm GSM_LIB_DEPENDS= libgsm.so:audio/gsm LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LUA_CONFIGURE_WITH= lua LUA_USES= lua diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile index 1a0889852ea2..1bc09b5c0505 100644 --- a/net/asterisk18/Makefile +++ b/net/asterisk18/Makefile @@ -143,7 +143,7 @@ GSM_CONFIGURE_WITH= gsm GSM_LIB_DEPENDS= libgsm.so:audio/gsm LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LUA_CONFIGURE_WITH= lua LUA_USES= lua diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile index ecc4bf269f0a..9e5c98063e88 100644 --- a/net/ceph14/Makefile +++ b/net/ceph14/Makefile @@ -60,11 +60,10 @@ RUN_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR} -USES= cmake:noninja compiler:c++17-lang cpe dos2unix fuse gettext-runtime gmake ncurses \ +USES= cmake:noninja compiler:c++17-lang cpe dos2unix fuse gettext-runtime gmake ldap ncurses \ pkgconfig python:3.8-3.9 readline shebangfix ssl CPE_VENDOR= linuxfoundation USE_PYTHON= cython py3kplist -USE_OPENLDAP= yes USE_GITHUB= yes GH_ACCOUNT= ceph:DEFAULT DOS2UNIX_FILES= src/pybind/mgr/diskprediction_cloud/common/__init__.py diff --git a/net/echoping/Makefile b/net/echoping/Makefile index d93fe0b070da..56e55ea567f4 100644 --- a/net/echoping/Makefile +++ b/net/echoping/Makefile @@ -34,7 +34,7 @@ OPTIONS_DEFINE= LDAP PGSQL OPTIONS_DEFAULT=LDAP OPTIONS_SUB= yes -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_VARS= PING_PLUGINS+=ldap PGSQL_USES= pgsql diff --git a/net/fpc-ldap/Makefile b/net/fpc-ldap/Makefile index 18092b929fe2..5625ed30028a 100644 --- a/net/fpc-ldap/Makefile +++ b/net/fpc-ldap/Makefile @@ -14,6 +14,6 @@ OPTIONS_DEFINE= OPENLDAP OPENLDAP_DESC= Install OpenLDAP libraries OPTIONS_DEFAULT= OPENLDAP -OPENLDAP_USE= OPENLDAP=yes +OPENLDAP_USES= ldap .include "${MASTERDIR}/Makefile" diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index 840ed30cfc03..fc2798cdbcc3 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -107,7 +107,7 @@ FIREBIRD_CONFIGURE_WITH= rlm_sql_firebird FIREBIRD_USES= firebird LDAP_CONFIGURE_WITH= rlm_ldap LDAP_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -LDAP_USE= OPENLDAP +LDAP_USES= ldap LDAP_VARS= _REQUIRE+=slapd MITKRB_PORT_CONFIGURE_ON= --with-rlm-krb5-dir=${LOCALBASE} MITKRB_PORT_LIB_DEPENDS= libkrb5support.so:security/krb5 diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile index b60864677883..ee74341e2631 100644 --- a/net/gnu-dico/Makefile +++ b/net/gnu-dico/Makefile @@ -38,7 +38,7 @@ GSASL_CONFIGURE_WITH= gsasl GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 GUILE_CONFIGURE_OFF= --without-guile -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_OFF= --without-ldap NLS_USES= gettext diff --git a/net/gq/Makefile b/net/gq/Makefile index a673790a1f03..a29478511714 100644 --- a/net/gq/Makefile +++ b/net/gq/Makefile @@ -18,10 +18,9 @@ BROKEN_FreeBSD_14= ld: error: duplicate symbol: dt_entry_handler LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring -USES= desktop-file-utils gettext gmake gnome pkgconfig \ +USES= desktop-file-utils gettext gmake gnome ldap pkgconfig \ shared-mime-info ssl USE_GNOME= intltool libglade2 -USE_OPENLDAP= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE} --disable-update-mimedb diff --git a/net/isc-dhcp44-server/Makefile b/net/isc-dhcp44-server/Makefile index 6b4bbfe6248f..720d84f736ab 100644 --- a/net/isc-dhcp44-server/Makefile +++ b/net/isc-dhcp44-server/Makefile @@ -90,8 +90,7 @@ PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \ BINLEASES_CONFIGURE_ENABLE= binary-leases PARANOIA_CONFIGURE_ENABLE= paranoia early-chroot LDAP_CONFIGURE_WITH= ldap ldapcrypto -LDAP_USE= OPENLDAP -LDAP_USES= shebangfix +LDAP_USES= ldap shebangfix LDAP_SSL_USES= ssl LDAP_SSL_VARS= LIBS+=-lssl LDAP_IMPLIES= IPV6 diff --git a/net/kldap/Makefile b/net/kldap/Makefile index b6ebd4d84f27..fad82ff93836 100644 --- a/net/kldap/Makefile +++ b/net/kldap/Makefile @@ -11,14 +11,13 @@ LICENSE= LGPL21 LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ libqt5keychain.so:security/qtkeychain@qt5 -USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz +USES= cmake compiler:c++11-lib gettext kde:5 ldap qt:5 tar:xz USE_KDE= completion config coreaddons i18n kio widgetsaddons service \ ecm:build # pim components USE_KDE+= mbox USE_QT= concurrent core dbus gui network widgets \ buildtools:build qmake:build -USE_OPENLDAP= yes USE_LDCONFIG= yes DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr diff --git a/net/ldapdiff/Makefile b/net/ldapdiff/Makefile index dfbba234a60b..be7fb4b50852 100644 --- a/net/ldapdiff/Makefile +++ b/net/ldapdiff/Makefile @@ -11,8 +11,7 @@ WWW= https://launchpad.net/ldapdiff LICENSE= GPLv3+ -USES= cpe iconv tar:tgz -USE_OPENLDAP= yes +USES= cpe iconv ldap tar:tgz GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${LOCALBASE} \ --with-ldap-dir=${LOCALBASE} diff --git a/net/ldapscripts/Makefile b/net/ldapscripts/Makefile index 7d58a3ac7d43..ba9346c276bd 100644 --- a/net/ldapscripts/Makefile +++ b/net/ldapscripts/Makefile @@ -11,19 +11,11 @@ WWW= https://contribs.martymac.org LICENSE= GPLv2 -RUN_DEPENDS= ldapadd:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \ - ldapsearch:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \ - ldapdelete:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \ - ldapmodify:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \ - ldapmodrdn:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \ - ldappasswd:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client - NO_ARCH= yes OPTIONS_DEFINE= SASL DOCS -USES= iconv tar:tgz -USE_OPENLDAP= yes +USES= iconv ldap tar:tgz LIBDIR= ${PREFIX}/lib/${PORTNAME} MAKE_ENV+= MANDIR=${MANPREFIX}/man \ ETCDIR=${ETCDIR} diff --git a/net/liblinphone/Makefile b/net/liblinphone/Makefile index f7dffd44ec83..d929b3ff58d4 100644 --- a/net/liblinphone/Makefile +++ b/net/liblinphone/Makefile @@ -46,7 +46,7 @@ OPTIONS_DEFAULT= LDAP VIDEO OPTIONS_SUB= yes LDAP_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CMAKE_BOOL= ENABLE_LDAP VIDEO_CMAKE_BOOL= ENABLE_VIDEO diff --git a/net/lualdap/Makefile b/net/lualdap/Makefile index e09f0deae11e..c23c35d442f6 100644 --- a/net/lualdap/Makefile +++ b/net/lualdap/Makefile @@ -11,8 +11,7 @@ WWW= https://github.com/lualdap/lualdap LICENSE= MIT -USES= gmake lua:module -USE_OPENLDAP= yes +USES= gmake ldap lua:module USE_GITHUB= yes USE_CSTD= c99 diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index 659a299aa0c1..9551415c796f 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -58,7 +58,7 @@ MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder MDNSRESPONDER_SUB_LIST= ZEROCONF="mdnsd" LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} LDAP_CFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CONFIGURE_OFF= --without-ldap SENDFILE_CONFIGURE_ENABLE=sendfile DBUS_USES= gnome python diff --git a/net/nss-pam-ldapd/Makefile b/net/nss-pam-ldapd/Makefile index 149d5edfd438..da980d0bc012 100644 --- a/net/nss-pam-ldapd/Makefile +++ b/net/nss-pam-ldapd/Makefile @@ -12,10 +12,9 @@ WWW= https://arthurdejong.org/nss-pam-ldapd/ LICENSE= LGPL21 LGPL3 LICENSE_COMB= dual -USES= cpe +USES= cpe ldap CPE_VENDOR= arthurdejong GNU_CONFIGURE= yes -USE_OPENLDAP= yes USE_RC_SUBR= nslcd PAM_LDAP_SHMAJOR= 1 NSS_LDAP_SHMAJOR= 1 diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile index 011783508ed7..58da552b15b6 100644 --- a/net/nss_ldap/Makefile +++ b/net/nss_ldap/Makefile @@ -14,11 +14,10 @@ LICENSE= GPLv2 NSS_LDAP_VERSION=265 -USES= autoreconf cpe gmake perl5 +USES= autoreconf cpe gmake ldap perl5 USE_PERL5= build GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_OPENLDAP= yes CPE_VENDOR= padl OPTIONS_DEFINE= LCLASS KERBEROS diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile index 961f42ec6192..1dc1566522a7 100644 --- a/net/ntopng/Makefile +++ b/net/ntopng/Makefile @@ -24,9 +24,8 @@ LIB_DEPENDS= librrd.so:databases/rrdtool \ libhiredis.so:databases/hiredis BUILD_DEPENDS= bash:shells/bash -USES= autoreconf compiler:c++11-lang cpe gmake libtool localbase \ +USES= autoreconf compiler:c++11-lang cpe gmake ldap libtool localbase \ lua:54 mysql pathfix pkgconfig shebangfix sqlite ssl -USE_OPENLDAP= yes SUB_FILES= ntopng-geoip2update.sh pkg-deinstall SHEBANG_FILES= httpdocs/misc/ntopng-add-user.sh \ diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index fc1a1fc4b841..0c4dfdeb7751 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -46,11 +46,6 @@ GNU_CONFIGURE= yes # :keepla because port uses lt_dlopen USES= cpe libtool:keepla ssl tar:tgz -WANT_OPENLDAP_VER?= 24 -.if ${WANT_OPENLDAP_VER} != 24 -BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER} -.endif - PORTREVISION_CLIENT= 4 PORTREVISION_SERVER= 11 OPENLDAP_SHLIB_MAJOR= 2 @@ -370,15 +365,11 @@ OPENLDAP_PKGFILESUFX= .client PORTDOCS= CHANGES drafts rfc -.if defined(USE_OPENLDAP) -BROKEN= you have USE_OPENLDAP variable defined either in environment or in make(1) arguments; please undefine and try again -.endif .else OPENLDAP_PORTREVISION= ${PORTREVISION_SERVER} OPENLDAP_PKGFILESUFX= -USE_OPENLDAP= yes -WANT_OPENLDAP_VER= 24 +USES+= ldap:24 LIB_DEPENDS+= libicudata.so:devel/icu diff --git a/net/openradius/Makefile b/net/openradius/Makefile index 6870cfc2fadd..0e2ced955b92 100644 --- a/net/openradius/Makefile +++ b/net/openradius/Makefile @@ -33,7 +33,7 @@ OPTIONS_DEFINE= LDAP DOCS EXAMPLES .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= YES +USES=+ ldap PLIST_SUB+= LDAP="" SCRIPTS_ENV+= USE_LDAP=yes .else diff --git a/net/opensips31/Makefile b/net/opensips31/Makefile index 7ab84d8c694a..527cd81bc1f8 100644 --- a/net/opensips31/Makefile +++ b/net/opensips31/Makefile @@ -56,7 +56,7 @@ TESTS_DESC= Install smoke tests HTTP_LIB_DEPENDS= libmicrohttpd.so:www/libmicrohttpd HTTP_VARS= EXTRA_MODULES+=httpd -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_VARS= EXTRA_MODULES+="ldap h350" MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached diff --git a/net/proftpd-mod_ldap/Makefile b/net/proftpd-mod_ldap/Makefile index 819de694fa03..5de3f07e3fec 100644 --- a/net/proftpd-mod_ldap/Makefile +++ b/net/proftpd-mod_ldap/Makefile @@ -13,8 +13,7 @@ DESCR= ${.CURDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../../ftp/proftpd -USE_OPENLDAP= yes -USES= cpe ssl +USES= cpe ldap ssl INCLUDEDIRS= ${LOCALBASE}/include LIBDIRS= ${LOCALBASE}/lib diff --git a/net/proxy-suite/Makefile b/net/proxy-suite/Makefile index 1f55cf2f169e..ab163c1ccc7c 100644 --- a/net/proxy-suite/Makefile +++ b/net/proxy-suite/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --enable-rfc1579 # OPTIONAL: include ldap-support # .if defined(WITH_LDAP) -USE_OPENLDAP= yes +USES+= ldap CONFIGURE_ARGS+= --with-libldap=${LOCALBASE}/lib .else CONFIGURE_ARGS+= --without-libldap diff --git a/net/py-ldap/Makefile b/net/py-ldap/Makefile index ba69aa5f37b0..9accb51f2ec2 100644 --- a/net/py-ldap/Makefile +++ b/net/py-ldap/Makefile @@ -15,9 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENCE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:devel/py-pyasn1-modules@${PY_FLAVOR} -USES= python:3.6+ +USES= ldap python:3.6+ USE_PYTHON= autoplist distutils -USE_OPENLDAP= yes post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py diff --git a/net/py-ldap0/Makefile b/net/py-ldap0/Makefile index ae86d6953103..367b98b52f72 100644 --- a/net/py-ldap0/Makefile +++ b/net/py-ldap0/Makefile @@ -12,11 +12,10 @@ LICENSE= PSFL RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.4.5:devel/py-pyasn1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.2.5:devel/py-pyasn1-modules@${PY_FLAVOR} # Cyrus needs PLAIN / CRAM-MD5 / DIGEST-MD5 enabled -TEST_DEPENDS= ${LOCALBASE}/libexec/slapd:net/openldap24-server +TEST_DEPENDS= ${LOCALBASE}/libexec/slapd:net/openldap${OPENLDAP_VER}-server -USES= localbase python:3.6+ +USES= ldap:24 localbase python:3.6+ USE_LOCALE= en_US.UTF-8 -USE_OPENLDAP= yes USE_PYTHON= autoplist distutils USE_GITLAB= yes diff --git a/net/samba413/Makefile b/net/samba413/Makefile index 5a3f59c6d26e..509e109497eb 100644 --- a/net/samba413/Makefile +++ b/net/samba413/Makefile @@ -362,7 +362,7 @@ GSSAPI_HEIMDAL_PREVENTS_MSG= GSSAPI_HEIMDAL and AD_DC enable conflicting options LDAP_CONFIGURE_WITH= ldap LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE} -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_VARS= SAMBA4_MODULES+=idmap_ldap LIBZFS_CONFIGURE_WITH= libzfs diff --git a/net/samba416/Makefile b/net/samba416/Makefile index ee739448679f..a6af47e1c4fa 100644 --- a/net/samba416/Makefile +++ b/net/samba416/Makefile @@ -380,7 +380,7 @@ GSSAPI_HEIMDAL_PREVENTS_MSG= GSSAPI_HEIMDAL and AD_DC enable conflicting options LDAP_CONFIGURE_WITH= ldap LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE} -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_VARS= SAMBA4_MODULES+=idmap_ldap LIBZFS_CONFIGURE_WITH= libzfs diff --git a/net/ss5/Makefile b/net/ss5/Makefile index cfdfc3980c03..a5a5a223a4b4 100644 --- a/net/ss5/Makefile +++ b/net/ss5/Makefile @@ -16,8 +16,7 @@ BROKEN_FreeBSD_14= ld: error: duplicate symbol: ACMutex WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-[0-9]+//} -USES= ssl -USE_OPENLDAP= yes +USES= ldap ssl USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes diff --git a/net/x2goclient/Makefile b/net/x2goclient/Makefile index cccca0216512..7b9f6b43b0c8 100644 --- a/net/x2goclient/Makefile +++ b/net/x2goclient/Makefile @@ -28,7 +28,7 @@ QMAKE_ARGS= QMAKE_LRELEASE="${LRELEASE}" OPTIONS_DEFINE= DOCS LDAP OPTIONS_DEFAULT= LDAP -LDAP_USE= OPENLDAP=yes +LDAP_USES= ldap LDAP_CFLAGS= -DUSELDAP LDAP_QMAKE_ON= LIBS+="-lX11 -lXpm -lcups -lldap" LDAP_QMAKE_OFF= LIBS+="-lX11 -lXpm -lcups" diff --git a/net/yptransitd/Makefile b/net/yptransitd/Makefile index f1e421bdc189..3164fd39d11c 100644 --- a/net/yptransitd/Makefile +++ b/net/yptransitd/Makefile @@ -11,8 +11,7 @@ WWW= http://yptransitd.sourceforge.net/ LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= bison -USE_OPENLDAP= yes +USES= ldap bison GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE} USE_LDCONFIG= yes |