diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2004-03-26 20:49:23 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2004-03-26 20:49:23 +0000 |
| commit | 9a3cd404bf35cdd4a4741776e4a0bde418988f10 (patch) | |
| tree | 887078d7bb41c17514bb4a52e0c460cda988f5d7 /mail | |
| parent | Update to 2.6.0 (diff) | |
- fix slight dependecy bug for sasl2
Notes
Notes:
svn path=/head/; revision=105378
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/sendmail/Makefile | 3 | ||||
| -rw-r--r-- | mail/sendmail812/Makefile | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 1809f73bfe6b..4bebaf209a4e 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -74,7 +74,7 @@ LIB_DEPENDS+= lber.2:${PORTSDIR}/${LDAP_PORT} .else CONFLICTS+= sendmail*+ldap*-8.* .endif -.if defined(SENDMAIL_WITH_SASL) +.if defined(SENDMAIL_WITH_SASL) && !defined(SENDMAIL_WITH_SASL2) SASL_SUFFIX?= +sasl1 CONFLICTS+= sendmail+tls-8.* \ sendmail+tls+ldap-8.* \ @@ -98,7 +98,6 @@ CONFLICTS+= sendmail+tls-8.* \ sendmail+sasl+ldap-8.* \ sendmail+ldap-8.* CONFLICTS+= sendmail-ldap-8.* sendmail-sasl-8.* sendmail-tls-8.* -LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 RUN_DEPENDS+= ${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd .else diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile index 1809f73bfe6b..4bebaf209a4e 100644 --- a/mail/sendmail812/Makefile +++ b/mail/sendmail812/Makefile @@ -74,7 +74,7 @@ LIB_DEPENDS+= lber.2:${PORTSDIR}/${LDAP_PORT} .else CONFLICTS+= sendmail*+ldap*-8.* .endif -.if defined(SENDMAIL_WITH_SASL) +.if defined(SENDMAIL_WITH_SASL) && !defined(SENDMAIL_WITH_SASL2) SASL_SUFFIX?= +sasl1 CONFLICTS+= sendmail+tls-8.* \ sendmail+tls+ldap-8.* \ @@ -98,7 +98,6 @@ CONFLICTS+= sendmail+tls-8.* \ sendmail+sasl+ldap-8.* \ sendmail+ldap-8.* CONFLICTS+= sendmail-ldap-8.* sendmail-sasl-8.* sendmail-tls-8.* -LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 RUN_DEPENDS+= ${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd .else |