diff options
| author | dinoex <dinoex@FreeBSD.org> | 2004-03-27 04:49:23 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2004-03-27 04:49:23 +0800 |
| commit | 42dffb98d942052367af8bc090675d9e3ee26c56 (patch) | |
| tree | fda32ec09882ae474e628c664fd71bd4a3722e90 | |
| parent | 323d9128a4a8b2ca0950bba6dde234b3f233a607 (diff) | |
| download | freebsd-ports-gnome-42dffb98d942052367af8bc090675d9e3ee26c56.tar.gz freebsd-ports-gnome-42dffb98d942052367af8bc090675d9e3ee26c56.tar.zst freebsd-ports-gnome-42dffb98d942052367af8bc090675d9e3ee26c56.zip | |
- fix slight dependecy bug for sasl2
| -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 |