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.

12 files changed, 38 insertions, 53 deletions

diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 57ece16083e..fa8895fef3e 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2004/03/26 02:27:44 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2004/04/21 21:09:31 cube Exp $
 
 DISTNAME=       pine4.58
 PKGNAME=        pine-4.58
@@ -14,7 +14,7 @@ COMMENT=	Program for Internet News and E-mail
 
 LICENSE=	pine-license
 
-BUILD_DEFS+=	PINE_USE_LDAP
+BUILD_DEFS+=	USE_OPENLDAP
 USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
 
@@ -36,7 +36,7 @@ BUILDNAME= neb
 BUILDFILE= neb
 .endif
 
-.if defined(PINE_USE_LDAP) && (${PINE_USE_LDAP} == "YES")
+.if defined(USE_OPENLDAP) && (${USE_OPENLDAP} == "YES")
 .  include "../../databases/openldap/buildlink2.mk"
 LDAPCFLAGS=    LDAPCFLAGS="-DENABLE_LDAP"
 LDAPLIBS=      LDAPLIBS="-lldap -llber"
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 537902bb3ed..9bf12a1e42d 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/04/14 17:52:53 grant Exp $
+# $NetBSD: Makefile,v 1.31 2004/04/21 21:09:31 cube Exp $
 
 DISTNAME=	postfix-2.0.19-20040312
 PKGNAME=	postfix-20040312
@@ -44,9 +44,9 @@ FIX_RPATH+=	AUXLIBS
 BUILD_DEFS+=	POSTFIX_USE_INET6
 #BUILD_DEFS+=	POSTFIX_USE_TLS
 BUILD_DEFS+=	POSTFIX_USE_PCRE
-BUILD_DEFS+=	POSTFIX_USE_LDAP
 BUILD_DEFS+=	POSTFIX_USE_MYSQL
 BUILD_DEFS+=	POSTFIX_USE_PGSQL
+BUILD_DEFS+=	USE_OPENLDAP
 BUILD_DEFS+=	USE_SASL
 BUILD_DEFS+=	USE_SASL2
 
@@ -75,7 +75,7 @@ AUXLIBS+=	-L${BUILDLINK_PREFIX.pcre}/lib				\
 CCARGS+=	-DNO_PCRE
 .endif
 
-.if defined(POSTFIX_USE_LDAP) && ${POSTFIX_USE_LDAP} == "YES"
+.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == "YES"
 .  include "../../databases/openldap/buildlink3.mk"
 CCARGS+=	-DHAS_LDAP
 AUXLIBS+=	-L${BUILDLINK_PREFIX.openldap}/lib			\
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index fb6b889be92..99ca72e9579 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2004/04/14 17:51:37 grant Exp $
+# $NetBSD: Makefile,v 1.129 2004/04/21 21:09:31 cube Exp $
 
 DISTNAME=	postfix-2.0.19
 CATEGORIES=	mail
@@ -42,9 +42,9 @@ FIX_RPATH+=	AUXLIBS
 BUILD_DEFS+=	POSTFIX_USE_INET6
 BUILD_DEFS+=	POSTFIX_USE_TLS
 BUILD_DEFS+=	POSTFIX_USE_PCRE
-BUILD_DEFS+=	POSTFIX_USE_LDAP
 BUILD_DEFS+=	POSTFIX_USE_MYSQL
 BUILD_DEFS+=	POSTFIX_USE_PGSQL
+BUILD_DEFS+=	USE_OPENLDAP
 BUILD_DEFS+=	USE_SASL
 BUILD_DEFS+=	USE_SASL2
 
@@ -73,7 +73,7 @@ AUXLIBS+=	-L${BUILDLINK_PREFIX.pcre}/lib				\
 CCARGS+=	-DNO_PCRE
 .endif
 
-.if defined(POSTFIX_USE_LDAP) && ${POSTFIX_USE_LDAP} == "YES"
+.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == "YES"
 .  include "../../databases/openldap/buildlink3.mk"
 CCARGS+=	-DHAS_LDAP
 AUXLIBS+=	-L${BUILDLINK_PREFIX.openldap}/lib			\
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index affac5b0e44..491b978e19c 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2004/03/27 22:07:32 tron Exp $
+# $NetBSD: Makefile,v 1.69 2004/04/21 21:09:31 cube Exp $
 
 .include "../../mail/sendmail/Makefile.common"
 
@@ -21,7 +21,7 @@ USE_DB2?=	NO
 .include "../../databases/db/buildlink2.mk"
 .endif
 
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == YES
 .include "../../databases/openldap/buildlink2.mk"
 .endif
 
@@ -45,7 +45,7 @@ post-patch: make-sendmail-siteconfig
 	${CAT} ${FILESDIR}/site.config.m4-tcpwrappers >>${SITECONFIG}
 	${ECHO} -n ' TCPWRAPPERS' >>${DESCR_SRC}
 .endif
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == YES
 	${CAT} ${FILESDIR}/site.config.m4-ldap >>${SITECONFIG}
 	${ECHO} -n ' LDAP' >>${DESCR_SRC}
 .endif
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index c964f89be25..e5b6d0d3486 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2004/03/27 22:07:32 tron Exp $
+# $NetBSD: Makefile.common,v 1.16 2004/04/21 21:09:31 cube Exp $
 #
 # Makefile fragment shared with libmilter
 #
@@ -25,7 +25,7 @@ MAKE_ENV+=	BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
 		BUILDLINK_DIR="${BUILDLINK_DIR}"
 SITECONFIG=	${WRKSRC}/devtools/Site/site.config.m4
 
-BUILD_DEFS+=    USE_INET6 USE_TCPWRAPPERS USE_LDAP USE_DB2 \
+BUILD_DEFS+=    USE_INET6 USE_TCPWRAPPERS USE_OPENLDAP USE_DB2 \
 		USE_SASL USE_SASL2 USE_STARTTLS USE_DB4
 DESCR_SRC=	${WRKDIR}/.DESCR_SRC
 
diff --git a/mail/sendmail811/Makefile b/mail/sendmail811/Makefile
index d62f4931261..9b10afd6879 100644
--- a/mail/sendmail811/Makefile
+++ b/mail/sendmail811/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/04/18 05:10:15 snj Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/21 21:09:31 cube Exp $
 
 DISTNAME=	sendmail.8.11.6
 PKGNAME=	sendmail-8.11.6
@@ -38,7 +38,7 @@ MAKE_ENV+=	BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
 		BUILDLINK_DIR="${BUILDLINK_DIR}"
 SITECONFIG=	${WRKSRC}/devtools/Site/site.config.m4
 
-BUILD_DEFS+=    USE_WIDEPATCH USE_INET6 USE_TCPWRAPPERS USE_LDAP USE_DB2 \
+BUILD_DEFS+=    USE_WIDEPATCH USE_INET6 USE_TCPWRAPPERS USE_OPENLDAP USE_DB2 \
 		USE_SASL USE_STARTTLS
 MESSAGE_SRC=	${WRKDIR}/.MESSAGE_SRC
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
@@ -55,7 +55,7 @@ USE_DB2?=	NO
 .  include "../../databases/db/buildlink3.mk"
 .endif
 
-.if defined(USE_LDAP) && (${USE_LDAP} == "YES")
+.if defined(USE_OPENLDAP) && (${USE_OPENLDAP} == "YES")
 .  include "../../databases/openldap/buildlink3.mk"
 .endif
 
@@ -92,7 +92,7 @@ post-patch:
 .if ${OPSYS} == "SunOS"
 	${CAT} ${FILESDIR}/site.config.m4-solaris >>${SITECONFIG}
 .endif
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == YES
 	${CAT} ${FILESDIR}/site.config.m4-ldap >>${SITECONFIG}
 	${ECHO} -n ' LDAP' >>${DESCR_SRC}
 .endif
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index 2deaf8a70c4..65f22455091 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.232 2004/04/21 17:08:06 tv Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.233 2004/04/21 21:09:32 cube Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -1644,11 +1644,6 @@ PILRC_USE_GTK?=	YES
 # Possible: YES, NO
 # Default: YES
 
-#PINE_USE_LDAP=
-# Compile code into pine to use a LDAP server for an address book. 
-# Possible: undefined, YES
-# Default: undefined (support not compiled in)
-
 #PINFO_USE_NATIVE_CURSES=
 # Used in pinfo to use NetBSD native curses, rather than ncurses.
 # Only works on NetBSD-1.5 and newer.
@@ -1701,11 +1696,6 @@ PKG_LANG?=english
 # Possible: YES, not defined
 # Default: not defined
 
-#POSTFIX_USE_LDAP=YES
-# Add support for LDAP.
-# Possible: YES, not defined
-# Default: not defined
-
 #POSTFIX_USE_MYSQL=YES
 # Add support for MySQL maps.
 # Possible: YES, not defined
@@ -1747,11 +1737,6 @@ PURE_FTPD_USE_VIRTUAL_CHROOT?=	NO
 # Possible: YES, NO
 # Default: NO
 
-#SAMBA_USE_LDAP=YES
-# Add support for LDAP.
-# Possible: YES, not defined
-# Default: not defined
-
 #SASL_USE_GSSAPI=YES
 # Add support for GSSAPI.
 # Possible: YES, not defined
@@ -1993,7 +1978,8 @@ USE_MMX?=	NO
 # Default: NO
 
 USE_OPENLDAP?=	NO
-# Enable openldap support.  Used in gnupg, dovecot.
+# Enable openldap support.  Used in xemacs, gnupg, dovecot, postfix, samba,
+# sendmail, sylpheed, pine and others.
 # Possible: YES, or NO.
 # Default: NO
 
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
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index fe8c9b4ea2a..e1a95a9715e 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/24 14:51:52 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/04/21 21:09:33 cube Exp $
 # FreeBSD Id: Makefile,v 1.11 1998/02/01 03:04:11 itojun Exp
 #
 
@@ -13,12 +13,10 @@ COMMENT=		NNTP multi-server caching daemon
 
 LICENSE=		fee-based-commercial-use
 
-# enable ldap support?
-NNTP_USE_LDAP?=		no
 # enable pgp signed nocem support?
 NNTP_USE_PGP?=		no
 
-.if ${NNTP_USE_LDAP} == yes
+.if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
 DEPENDS+=		openldap-[0-9]*:../../databases/openldap
 .endif
 
@@ -26,7 +24,7 @@ DEPENDS+=		openldap-[0-9]*:../../databases/openldap
 DEPENDS+=		pgp-2.*:../../security/pgp2
 .endif
 
-BUILD_DEFS+=		NNTP_USE_LDAP NNTP_USE_PGP
+BUILD_DEFS+=		USE_OPENLDAP NNTP_USE_PGP
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--localstatedir=/var/spool
diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile
index 938466241b9..c458233c132 100644
--- a/security/cyrus-saslauthd/Makefile
+++ b/security/cyrus-saslauthd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/03/31 06:49:41 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/21 21:09:33 cube Exp $
 
 DISTNAME=	cyrus-sasl-2.1.18
 PKGNAME=	${DISTNAME:S/sasl/saslauthd/}
@@ -27,7 +27,7 @@ PLIST_SRC=		${PKGDIR}/PLIST
 
 ALL_TARGET=		all saslcache testsaslauthd
 
-BUILD_DEFS+=		USE_PAM USE_LDAP SASL_USE_GSSAPI
+BUILD_DEFS+=		USE_PAM USE_OPENLDAP SASL_USE_GSSAPI
 
 SASLSOCKETDIR?=		/var/run/saslauthd
 BUILD_DEFS+=		SASLSOCKETDIR
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+=	--with-saslauthd="${SASLSOCKETDIR}"
 CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.pam}
 .endif
 
-.if defined(USE_LDAP)
+.if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
 .  include "../../databases/openldap/buildlink3.mk"
 .  include "../../security/cyrus-sasl2/buildlink3.mk"
 .  include "../../security/openssl/buildlink3.mk"
@@ -81,7 +81,7 @@ post-install:
 	for f in saslcache testsaslauthd; do				\
 		${INSTALL_PROGRAM} ${WRKSRC}/$$f ${PREFIX}/bin/$$f;	\
 	done
-.if defined(USE_LDAP)
+.if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cyrus-saslauthd
 	${INSTALL_DATA} ${WRKSRC}/LDAP_SASLAUTHD \
 		${PREFIX}/share/doc/cyrus-saslauthd