[pkgsrc/trunk]: pkgsrc Drop localized *_USE_LDAP definitions and consistently...

[cube <cube%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/baf3e9e1e0c8
branches:  trunk
changeset: 473618:baf3e9e1e0c8
user:      cube <cube%pkgsrc.org@localhost>
date:      Wed Apr 21 21:09:31 2004 +0000

description:
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:

 mail/pine/Makefile                |   6 +++---
 mail/postfix-current/Makefile     |   6 +++---
 mail/postfix/Makefile             |   6 +++---
 mail/sendmail/Makefile            |   6 +++---
 mail/sendmail/Makefile.common     |   4 ++--
 mail/sendmail811/Makefile         |   8 ++++----
 mk/bsd.pkg.defaults.mk            |  20 +++-----------------
 net/ja-samba/Makefile             |   6 +++---
 net/samba/Makefile                |   7 ++++---
 net/samba2/Makefile               |   6 +++---
 news/nntpcache/Makefile           |   8 +++-----
 security/cyrus-saslauthd/Makefile |   8 ++++----
 12 files changed, 38 insertions(+), 53 deletions(-)

diffs (truncated from 366 to 300 lines):

diff -r d145eb686f1b -r baf3e9e1e0c8 mail/pine/Makefile
--- a/mail/pine/Makefile        Wed Apr 21 20:50:41 2004 +0000
+++ b/mail/pine/Makefile        Wed Apr 21 21:09:31 2004 +0000
@@ -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 @@
 
 LICENSE=       pine-license
 
-BUILD_DEFS+=   PINE_USE_LDAP
+BUILD_DEFS+=   USE_OPENLDAP
 USE_BUILDLINK2=        YES
 USE_PKGINSTALL=        YES
 
@@ -36,7 +36,7 @@
 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 -r d145eb686f1b -r baf3e9e1e0c8 mail/postfix-current/Makefile
--- a/mail/postfix-current/Makefile     Wed Apr 21 20:50:41 2004 +0000
+++ b/mail/postfix-current/Makefile     Wed Apr 21 21:09:31 2004 +0000
@@ -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 @@
 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 @@
 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 -r d145eb686f1b -r baf3e9e1e0c8 mail/postfix/Makefile
--- a/mail/postfix/Makefile     Wed Apr 21 20:50:41 2004 +0000
+++ b/mail/postfix/Makefile     Wed Apr 21 21:09:31 2004 +0000
@@ -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 @@
 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 @@
 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 -r d145eb686f1b -r baf3e9e1e0c8 mail/sendmail/Makefile
--- a/mail/sendmail/Makefile    Wed Apr 21 20:50:41 2004 +0000
+++ b/mail/sendmail/Makefile    Wed Apr 21 21:09:31 2004 +0000
@@ -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 @@
 .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 @@
        ${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 -r d145eb686f1b -r baf3e9e1e0c8 mail/sendmail/Makefile.common
--- a/mail/sendmail/Makefile.common     Wed Apr 21 20:50:41 2004 +0000
+++ b/mail/sendmail/Makefile.common     Wed Apr 21 21:09:31 2004 +0000
@@ -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 @@
                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 -r d145eb686f1b -r baf3e9e1e0c8 mail/sendmail811/Makefile
--- a/mail/sendmail811/Makefile Wed Apr 21 20:50:41 2004 +0000
+++ b/mail/sendmail811/Makefile Wed Apr 21 21:09:31 2004 +0000
@@ -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 @@
                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 @@
 .  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 @@
 .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 -r d145eb686f1b -r baf3e9e1e0c8 mk/bsd.pkg.defaults.mk
--- a/mk/bsd.pkg.defaults.mk    Wed Apr 21 20:50:41 2004 +0000
+++ b/mk/bsd.pkg.defaults.mk    Wed Apr 21 21:09:31 2004 +0000
@@ -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 @@
 # 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 @@
 # 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 @@
 # 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 @@
 # 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 -r d145eb686f1b -r baf3e9e1e0c8 net/ja-samba/Makefile
--- a/net/ja-samba/Makefile     Wed Apr 21 20:50:41 2004 +0000
+++ b/net/ja-samba/Makefile     Wed Apr 21 21:09:31 2004 +0000
@@ -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 @@
 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 -r d145eb686f1b -r baf3e9e1e0c8 net/samba/Makefile
--- a/net/samba/Makefile        Wed Apr 21 20:50:41 2004 +0000
+++ b/net/samba/Makefile        Wed Apr 21 21:09:31 2004 +0000
@@ -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 @@
 
 .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 @@
 .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 @@
 .else
 CONFIGURE_ARGS+=       --without-ldap
 .endif
+BUILD_DEFS+=           USE_OPENLDAP
 BUILD_DEFS+=           SAMBA_USE_LDAP
 BUILD_DEFS+=           SAMBA_USE_LDAP_COMPAT
 
diff -r d145eb686f1b -r baf3e9e1e0c8 net/samba2/Makefile
--- a/net/samba2/Makefile       Wed Apr 21 20:50:41 2004 +0000
+++ b/net/samba2/Makefile       Wed Apr 21 21:09:31 2004 +0000
@@ -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 @@
 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 -r d145eb686f1b -r baf3e9e1e0c8 news/nntpcache/Makefile
--- a/news/nntpcache/Makefile   Wed Apr 21 20:50:41 2004 +0000