Attachment 77475 Details for Bug 111564 – mail-postfix.patch

[patch] mail-postfix.patch

mail-postfix.patch (text/plain), 2.73 KB, created by Gabor Kovesdan on 2007-04-14 14:00:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gabor Kovesdan

Created: 2007-04-14 14:00:08 UTC

Size: 2.73 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /usr/cvs/ports/mail/postfix/Makefile,v
>retrieving revision 1.128
>diff -u -r1.128 Makefile
>--- Makefile	5 Apr 2007 16:15:39 -0000	1.128
>+++ Makefile	14 Apr 2007 12:53:31 -0000
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	postfix
> PORTVERSION=	2.4.0
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	mail ipv6
> MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
>@@ -32,7 +33,7 @@
> 
> # 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 +43,6 @@
> .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 +104,8 @@
> 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 +114,7 @@
> .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 +228,6 @@
> 	@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}; \

Actions: View | Diff

Attachments on bug 111564: 77475