View | Details | Raw Unified | Return to bug 205162 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-18 / +11 lines)
Lines 45-53 Link Here
45
OPTIONS_DEFINE=	BDB CDB DOCS EAI INST_BASE LDAP LDAP_SASL LMDB MYSQL \
45
OPTIONS_DEFINE=	BDB CDB DOCS EAI INST_BASE LDAP LDAP_SASL LMDB MYSQL \
46
		NIS PCRE PGSQL SASL SPF SQLITE TEST TLS VDA
46
		NIS PCRE PGSQL SASL SPF SQLITE TEST TLS VDA
47
47
48
OPTIONS_RADIO=		RG1 RG2
48
OPTIONS_RADIO=		RG1
49
OPTIONS_RADIO_RG1=	DOVECOT DOVECOT2
49
OPTIONS_RADIO_RG1=	SASLKRB5 SASLKMIT
50
OPTIONS_RADIO_RG2=	SASLKRB5 SASLKMIT
51
OPTIONS_DEFAULT=	PCRE TLS EAI
50
OPTIONS_DEFAULT=	PCRE TLS EAI
52
51
53
BDB_USE=		BDB=yes
52
BDB_USE=		BDB=yes
Lines 74-83 Link Here
74
TEST_DESC=	SMTP/LMTP test server and generator
73
TEST_DESC=	SMTP/LMTP test server and generator
75
VDA_DESC=	VDA (Virtual Delivery Agent)
74
VDA_DESC=	VDA (Virtual Delivery Agent)
76
75
77
RG1_DESC=	Dovecot SASL authentication methods
76
SASL_DESC=	Cyrus SASL support (Dovecot SASL is always build in)
78
DOVECOT_DESC=	Dovecot 1.x SASL authentication method
77
RG1_DESC=	Kerberos network authentication protocol type
79
DOVECOT2_DESC=	Dovecot 2.x SASL authentication method
80
RG2_DESC=	Kerberos network authentication protocol type
81
SASLKRB5_DESC=	If your SASL req. Kerberos5, select this
78
SASLKRB5_DESC=	If your SASL req. Kerberos5, select this
82
SASLKMIT_DESC=	If your SASL req. MIT Kerberos5, select this
79
SASLKMIT_DESC=	If your SASL req. MIT Kerberos5, select this
83
80
Lines 149-156 Link Here
149
			-Wmissing-prototypes -Wformat -Wno-comment
146
			-Wmissing-prototypes -Wformat -Wno-comment
150
147
151
# Default requirement for postfix rc script
148
# Default requirement for postfix rc script
152
_REQUIRE=		LOGIN cleanvar
149
_REQUIRE=		LOGIN cleanvar dovecot
153
150
151
# Always build with Dovecot SASL support, Cyrus is optional
152
# see Postfix HISOTORY 20051222
153
POSTFIX_CCARGS+=	-DUSE_SASL_AUTH
154
154
.if ${PORT_OPTIONS:MEAI}
155
.if ${PORT_OPTIONS:MEAI}
155
POSTFIX_CCARGS+=	-DHAS_EAI -I${LOCALBASE}/include
156
POSTFIX_CCARGS+=	-DHAS_EAI -I${LOCALBASE}/include
156
POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -licuuc
157
POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -licuuc
Lines 167-185 Link Here
167
.endif
168
.endif
168
169
169
.if ${PORT_OPTIONS:MSASL}
170
.if ${PORT_OPTIONS:MSASL}
170
POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
171
POSTFIX_CCARGS+=	-DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
171
POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
172
POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
172
.endif
173
174
.if ${PORT_OPTIONS:MDOVECOT} || ${PORT_OPTIONS:MDOVECOT2}
175
.if ${PORT_OPTIONS:MDOVECOT}
176
RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
177
.else
173
.else
178
RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot2
174
POSTFIX_CCARGS+=	-DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
179
.endif
175
.endif
180
POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
181
_REQUIRE+=		dovecot
182
.endif
183
176
184
.if ${PORT_OPTIONS:MSASLKRB5}
177
.if ${PORT_OPTIONS:MSASLKRB5}
185
POSTFIX_AUXLIBS+=	-lkrb5 -lhx509 -lcrypto -lcrypt -lcom_err -lasn1 -lroken
178
POSTFIX_AUXLIBS+=	-lkrb5 -lhx509 -lcrypto -lcrypt -lcom_err -lasn1 -lroken

Return to bug 205162