diff options
| author | cube <cube@pkgsrc.org> | 2004-04-21 21:09:31 +0000 |
|---|---|---|
| committer | cube <cube@pkgsrc.org> | 2004-04-21 21:09:31 +0000 |
| commit | e1aaa019a47227fcfabc7600c4aa35e0a728b70f (patch) | |
| tree | fc2c1dd3e4c87b5b0db0fb1e10cf3ab400c0d2e6 /net | |
| parent | 536a13d16bd4fa80763bb6455dbb8c2a09ebf65d (diff) | |
| download | pkgsrc-e1aaa019a47227fcfabc7600c4aa35e0a728b70f.tar.gz | |
Drop localized *_USE_LDAP definitions and consistently use USE_OPENLDAP
instead. As announced on tech-pkg.
Most notably affected are Postfix, sendmail, Samba and cyrus-saslauthd. Be
sure to update your mk.conf accordingly.
Diffstat (limited to 'net')
| -rw-r--r-- | net/ja-samba/Makefile | 6 | ||||
| -rw-r--r-- | net/samba/Makefile | 7 | ||||
| -rw-r--r-- | net/samba2/Makefile | 6 |
3 files changed, 10 insertions, 9 deletions
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile index 552a7a466b9..5f1f195aca4 100644 --- a/net/ja-samba/Makefile +++ b/net/ja-samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/03/26 02:27:48 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2004/04/21 21:09:32 cube Exp $ .include "Makefile.common" @@ -42,9 +42,9 @@ BUILD_DEFS+= USE_PAM CONFIGURE_ARGS+= --with-pam .endif -.if defined(SAMBA_USE_LDAP) && ${SAMBA_USE_LDAP} == "YES" +.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == "YES" . include "../../databases/openldap/buildlink2.mk" -BUILD_DEFS+= SAMBA_USE_LDAP +BUILD_DEFS+= USE_OPENLDAP CONFIGURE_ARGS+= --with-ldapsam PLIST_SUBST+= SAMBA_LDAP="" .else diff --git a/net/samba/Makefile b/net/samba/Makefile index ee1e38b068f..c0e0e64d77e 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.120 2004/04/15 16:26:31 jmmv Exp $ +# $NetBSD: Makefile,v 1.121 2004/04/21 21:09:32 cube Exp $ DISTNAME= samba-3.0.2a PKGREVISION= 1 @@ -68,7 +68,7 @@ CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} .if defined(SAMBA_WITH_ADS) && !empty(SAMBA_WITH_ADS:M[yY][eE][sS]) . include "../../mk/krb5.buildlink3.mk" -SAMBA_USE_LDAP= yes +SAMBA_USE_LDAP= # defined CONFIGURE_ARGS+= --with-ads CONFIGURE_ARGS+= --with-krb5=${KRB5BASE} .else @@ -93,7 +93,7 @@ PLIST_SRC+= ${PKGDIR}/PLIST.pam .endif BUILD_DEFS+= USE_PAM -.if defined(SAMBA_USE_LDAP) && !empty(SAMBA_USE_LDAP:M[yY][eE][sS]) +.if defined(SAMBA_USE_LDAP) || (defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS])) . include "../../databases/openldap/buildlink3.mk" CONFIGURE_ARGS+= --with-ldap . if defined(SAMBA_USE_LDAP_COMPAT) && \ @@ -103,6 +103,7 @@ CONFIGURE_ARGS+= --with-ldapsam .else CONFIGURE_ARGS+= --without-ldap .endif +BUILD_DEFS+= USE_OPENLDAP BUILD_DEFS+= SAMBA_USE_LDAP BUILD_DEFS+= SAMBA_USE_LDAP_COMPAT diff --git a/net/samba2/Makefile b/net/samba2/Makefile index 7d4d7957523..f674476cf4c 100644 --- a/net/samba2/Makefile +++ b/net/samba2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/03/26 02:27:49 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2004/04/21 21:09:33 cube Exp $ .include "Makefile.common" PKGREVISION= 7 @@ -32,9 +32,9 @@ BUILD_DEFS+= USE_PAM CONFIGURE_ARGS+= --with-pam .endif -.if defined(SAMBA_USE_LDAP) && ${SAMBA_USE_LDAP} == "YES" +.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == "YES" .include "../../databases/openldap/buildlink3.mk" -BUILD_DEFS+= SAMBA_USE_LDAP +BUILD_DEFS+= USE_OPENLDAP CONFIGURE_ARGS+= --with-ldapsam PLIST_SUBST+= SAMBA_LDAP="" .else |