summaryrefslogtreecommitdiff
path: root/mail/sendmail
diff options
context:
space:
mode:
authorcube <cube@pkgsrc.org>2004-04-21 21:09:31 +0000
committercube <cube@pkgsrc.org>2004-04-21 21:09:31 +0000
commite9b89de147389d1f3dfcae0471be331a9b8ad0cc (patch)
treefc2c1dd3e4c87b5b0db0fb1e10cf3ab400c0d2e6 /mail/sendmail
parentc1c8bece07ce92c46b4bbf02e35e654c4f8e0410 (diff)
downloadpkgsrc-e9b89de147389d1f3dfcae0471be331a9b8ad0cc.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 'mail/sendmail')
-rw-r--r--mail/sendmail/Makefile6
-rw-r--r--mail/sendmail/Makefile.common4
2 files changed, 5 insertions, 5 deletions
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