diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2007-03-31 19:44:33 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2007-03-31 19:44:33 +0000 |
| commit | d52e405574443d85e84f0d5eeed878aaca7accb2 (patch) | |
| tree | 102e83f7ed12ca67816e92c0c6431feec93e5ae6 /mail | |
| parent | Update to 0.1.5 (diff) | |
- remove support for cyrus-sasl < 2
Notes
Notes:
svn path=/head/; revision=188900
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/sendmail/Makefile | 7 | ||||
| -rw-r--r-- | mail/sendmail/files/site.config.m4.sasl | 4 |
2 files changed, 1 insertions, 10 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 573fa7bff797..904097e1794a 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -93,9 +93,7 @@ CONFLICTS+= sendmail-sasl-8.* sendmail-sasl2-8.* sendmail-tls-8.* USE_OPENLDAP= yes .endif .if defined(SENDMAIL_WITH_SASL) && !defined(SENDMAIL_WITH_SASL2) -SASL_SUFFIX?= +sasl1 -CONFLICTS+= sendmail-ldap-8.* sendmail-sasl2-8.* sendmail-tls-8.* -LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl +SENDMAIL_WITH_SASL2= yes .endif .if defined(SENDMAIL_WITH_SASL2) SASL_SUFFIX?= +sasl2 @@ -131,9 +129,6 @@ SITE+= ${FILESDIR}/site.config.m4 .if !defined(SENDMAIL_WITHOUT_IPV6) SITE+= ${FILESDIR}/site.config.m4.ipv6 .endif -.if defined(SENDMAIL_WITH_SASL) -SITE+= ${FILESDIR}/site.config.m4.sasl -.endif .if defined(SENDMAIL_WITH_SASL2) SITE+= ${FILESDIR}/site.config.m4.sasl2 .endif diff --git a/mail/sendmail/files/site.config.m4.sasl b/mail/sendmail/files/site.config.m4.sasl deleted file mode 100644 index 5c7e9ee0fac4..000000000000 --- a/mail/sendmail/files/site.config.m4.sasl +++ /dev/null @@ -1,4 +0,0 @@ -APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl1') -APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL') -APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib') -APPENDDEF(`conf_sendmail_LIBS', `-lsasl') |