diff options
| author | mnag <mnag@FreeBSD.org> | 2007-04-15 00:45:08 +0800 |
|---|---|---|
| committer | mnag <mnag@FreeBSD.org> | 2007-04-15 00:45:08 +0800 |
| commit | 7ee2828e671ecbbadf7c9aea46c8f5551b3b0003 (patch) | |
| tree | 55dc2587630e96e9f94a2de48bbef2a0146d6372 /mail/postfix24 | |
| parent | 6062d12ab6c290d9968a29e09447336d0567a02d (diff) | |
| download | freebsd-ports-gnome-7ee2828e671ecbbadf7c9aea46c8f5551b3b0003.tar.gz freebsd-ports-gnome-7ee2828e671ecbbadf7c9aea46c8f5551b3b0003.tar.zst freebsd-ports-gnome-7ee2828e671ecbbadf7c9aea46c8f5551b3b0003.zip | |
- Remove SASL1 support. security/cyrus-sasl will be removed soon.
PR: 111564, 111565, 111566
Submitted by: gabor (partially)
Notified by: gabor
Diffstat (limited to 'mail/postfix24')
| -rw-r--r-- | mail/postfix24/Makefile | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile index 0bd2cf01c268..4b344d2e7ccb 100644 --- a/mail/postfix24/Makefile +++ b/mail/postfix24/Makefile @@ -32,7 +32,7 @@ USE_RC_SUBR= postfix.sh # back compat pull in settings from POSTFIX_OPTIONS for convenience when # make config is run (happens first time port is built, too) -.for o in SASL SASL2 SASLKRB SASLKRB5 SASLKRB5MIT TLS BDB MySQL PgSQL OpenLDAP CDB NIS VDA Test +.for o in SASL2 SASLKRB SASLKRB5 SASLKRB5MIT TLS BDB MySQL PgSQL OpenLDAP CDB NIS VDA Test STATUS_${o}=off .endfor .if defined(POSTFIX_OPTIONS) @@ -42,7 +42,6 @@ STATUS_${o}=on .endif OPTIONS= PCRE "Perl Compatible Regular Expressions" on \ - SASL "Cyrus SASLv1 (Simple Auth. and Sec. Layer)" ${STATUS_SASL} \ SASL2 "Cyrus SASLv2 (Simple Auth. and Sec. Layer)" ${STATUS_SASL2} \ DOVECOT "Dovecot SASL authentication method" off \ SASLKRB "If your SASL req. Kerberos select this option" ${STATUS_SASLKRB} \ @@ -104,17 +103,8 @@ POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre POSTFIX_CCARGS+= -DNO_PCRE .endif -.if defined(WITH_SASL) -.if defined(WITH_SASL2) || defined(WITH_DOVECOT) -BROKEN= Select only one SASL authentication method -.endif -LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl -POSTFIX_CCARGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl1 -POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsasl -lpam -lcrypt -.endif - .if defined(WITH_SASL2) -.if defined(WITH_SASL) || defined(WITH_DOVECOT) +.if defined(WITH_DOVECOT) BROKEN= Select only one SASL authentication method .endif LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 @@ -123,7 +113,7 @@ POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt .endif .if defined(WITH_DOVECOT) -.if defined(WITH_SASL) || defined(WITH_SASL2) +.if defined(WITH_SASL2) BROKEN= Select only one SASL authentication method .endif RUN_DEPENDS+= dovecot:${PORTSDIR}/mail/dovecot @@ -237,17 +227,6 @@ pre-patch: @sleep 10 .endif -.if defined(WITH_SASL) && !defined(WITH_MYSQL) && exists(${LOCALBASE}/lib/libsasl.a) - @if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | ${GREP} -wq "mysql_init"; then \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "Your SASL library it's compiled with MYSQL"; \ - ${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \ - ${ECHO_MSG} "select MYSQL OPTION in config menu."; \ - ${ECHO_MSG} "# make clean config"; \ - ${ECHO_MSG}; \ - sleep 5; \ - fi -.endif .if defined(WITH_SASL2) && !defined(WITH_MYSQL) && exists(${LOCALBASE}/lib/libsasl2.a) @if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \ ${ECHO_MSG}; \ |