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

Collapse All | Expand All

(-)Makefile (-21 / +11 lines)
Lines 36-42 Link Here
36
OPTIONS_SINGLE=		RESOLV
36
OPTIONS_SINGLE=		RESOLV
37
OPTIONS_SINGLE_RESOLV=	STOCK_RESOLVER UNBOUND
37
OPTIONS_SINGLE_RESOLV=	STOCK_RESOLVER UNBOUND
38
OPTIONS_DEFINE=		FILTER CURL GNUTLS JANSSON LDNS LMDB LUA MEMCACHED \
38
OPTIONS_DEFINE=		FILTER CURL GNUTLS JANSSON LDNS LMDB LUA MEMCACHED \
39
			BDB_BASE OPENDBX OPENLDAP POPAUTH QUERY_CACHE SASL
39
			BDB_BASE OPENDBX OPENLDAP POPAUTH QUERY_CACHE SASL STATS STATSEXT
40
OPTIONS_DEFAULT=	FILTER LUA UNBOUND
40
OPTIONS_DEFAULT=	FILTER LUA UNBOUND
41
41
42
STOCK_RESOLVER_DESC=	Use the stock resolver library
42
STOCK_RESOLVER_DESC=	Use the stock resolver library
Lines 82-87 Link Here
82
OPENDBX_DESC=		Store filter policies via OpenDBX
82
OPENDBX_DESC=		Store filter policies via OpenDBX
83
OPENDBX_CONFIGURE_WITH=	odbx
83
OPENDBX_CONFIGURE_WITH=	odbx
84
OPENDBX_LIB_DEPENDS=	libopendbx.so:databases/opendbx
84
OPENDBX_LIB_DEPENDS=	libopendbx.so:databases/opendbx
85
OPENDBX_IMPLIES=        LUA STATS
85
86
86
OPENLDAP_DESC=		Store filter policies in LDAP
87
OPENLDAP_DESC=		Store filter policies in LDAP
87
OPENLDAP_CONFIGURE_WITH=openldap
88
OPENLDAP_CONFIGURE_WITH=openldap
Lines 96-101 Link Here
96
SASL_DESC=		Enable SASL authentication with LDAP
97
SASL_DESC=		Enable SASL authentication with LDAP
97
SASL_CONFIGURE_WITH=	sasl
98
SASL_CONFIGURE_WITH=	sasl
98
99
100
STATS_DESC=                    Per-message and per-signature statistics
101
STATS_CONFIGURE_ENABLE=                stats
102
STATS_IMPLIES=		LUA
103
104
STATSEXT_DESC=                 Localized stats extensions
105
STATSEXT_CONFIGURE_ENABLE=     statsext
106
STATSEXT_IMPLIES=	STATS LUA
107
99
DOCS_CONFIGURE_ON=	--docdir=${WRKDIR}/doc
108
DOCS_CONFIGURE_ON=	--docdir=${WRKDIR}/doc
100
109
101
MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
110
MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
Lines 117-146 Link Here
117
CONFIGURE_ARGS+=	--with-milter=${MILTERBASE}
126
CONFIGURE_ARGS+=	--with-milter=${MILTERBASE}
118
.endif
127
.endif
119
128
120
.if ${PORT_OPTIONS:MLUA_ONLY_SIGNING} || \
121
    ${PORT_OPTIONS:MRBL}
122
.if !${PORT_OPTIONS:MLUA}
123
IGNORE= options LUA_ONLY_SIGNING and RBL require LUA as well
124
.endif
125
.endif
126
127
.if ${PORT_OPTIONS:MREPUTATION}
128
.if !${PORT_OPTIONS:MCURL} || !${PORT_OPTIONS:MJANSSON}
129
IGNORE= option REPUTATION requires CURL and JANSSON as well
130
.endif
131
.endif
132
133
.if ${PORT_OPTIONS:MSTATSEXT}
134
.if !${PORT_OPTIONS:MSTATS} || !${PORT_OPTIONS:MLUA}
135
IGNORE= option STATSEXT requires STATS and LUA as well
136
.endif
137
.endif
138
139
.if ${PORT_OPTIONS:MPOPAUTH}             \
129
.if ${PORT_OPTIONS:MPOPAUTH}             \
140
	|| ${PORT_OPTIONS:MQUERY_CACHE}  \
130
	|| ${PORT_OPTIONS:MQUERY_CACHE}  \
141
	|| ${PORT_OPTIONS:MLDAP_CACHING} \
131
	|| ${PORT_OPTIONS:MLDAP_CACHING} \
142
	|| ${PORT_OPTIONS:MREPUTATION}   \
132
	|| ${PORT_OPTIONS:MREPUTATION}   \
143
	|| ${PORT_OPTIONS:MSTATS}
133
	|| ${PORT_OPTIONS:MSTATS} 
144
. if ${PORT_OPTIONS:MBDB_BASE}
134
. if ${PORT_OPTIONS:MBDB_BASE}
145
CONFIGURE_ARGS+=	--with-db-lib=c
135
CONFIGURE_ARGS+=	--with-db-lib=c
146
. else
136
. else
(-)Makefile.options (-7 / +4 lines)
Lines 31-37 Link Here
31
			LDAP_CACHING POSTGRES_RECONNECT_HACK \
31
			LDAP_CACHING POSTGRES_RECONNECT_HACK \
32
			RATE_LIMIT RBL REPLACE_RULES REPRRD \
32
			RATE_LIMIT RBL REPLACE_RULES REPRRD \
33
			REPUTATION RESIGN SENDER_MACRO \
33
			REPUTATION RESIGN SENDER_MACRO \
34
			SOCKETDB STATS STATSEXT VBR
34
			SOCKETDB VBR
35
35
36
ADSP_LISTS_DESC=		ADSP filtering for lists (experimental)
36
ADSP_LISTS_DESC=		ADSP filtering for lists (experimental)
37
ADSP_LISTS_CONFIGURE_ENABLE=	adsp_lists
37
ADSP_LISTS_CONFIGURE_ENABLE=	adsp_lists
Lines 60-65 Link Here
60
60
61
LUA_ONLY_SIGNING=		Message signing by Lua only
61
LUA_ONLY_SIGNING=		Message signing by Lua only
62
LUA_ONLY_SIGNING_CONFIGURE_ENABLE=	lua_only_signing
62
LUA_ONLY_SIGNING_CONFIGURE_ENABLE=	lua_only_signing
63
LUA_ONLY_SIGNING_IMPLIES=		LUA
63
64
64
POSTGRES_RECONNECT_HACK_DESC=	PostgreSQL connection error detection bug hack
65
POSTGRES_RECONNECT_HACK_DESC=	PostgreSQL connection error detection bug hack
65
POSTGRES_RECONNECT_HACK_CONFIGURE_ENABLE=	postgresql_reconnect_hack
66
POSTGRES_RECONNECT_HACK_CONFIGURE_ENABLE=	postgresql_reconnect_hack
Lines 69-74 Link Here
69
70
70
RBL_DESC=			Realtime Blacklist query support
71
RBL_DESC=			Realtime Blacklist query support
71
RBL_CONFIGURE_ENABLE=		rbl
72
RBL_CONFIGURE_ENABLE=		rbl
73
RBL_IMPLIES=			LUA
72
74
73
REPLACE_RULES_DESC=		String substition when signing
75
REPLACE_RULES_DESC=		String substition when signing
74
REPLACE_RULES_CONFIGURE_ENABLE=	replace_rules
76
REPLACE_RULES_CONFIGURE_ENABLE=	replace_rules
Lines 79-84 Link Here
79
81
80
REPUTATION_DESC=		Reputation check (experimental)
82
REPUTATION_DESC=		Reputation check (experimental)
81
REPUTATION_CONFIGURE_ENABLE=	reputation
83
REPUTATION_CONFIGURE_ENABLE=	reputation
84
REPUTATION_IMPLIES=		CURL JANSON
82
85
83
RESIGN_DESC=			One-step resigning
86
RESIGN_DESC=			One-step resigning
84
RESIGN_CONFIGURE_ENABLE=	resign
87
RESIGN_CONFIGURE_ENABLE=	resign
Lines 89-99 Link Here
89
SOCKETDB_DESC=			Arbitrary socket data sets
92
SOCKETDB_DESC=			Arbitrary socket data sets
90
SOCKETDB_CONFIGURE_ENABLE=	socketdb
93
SOCKETDB_CONFIGURE_ENABLE=	socketdb
91
94
92
STATS_DESC=			Per-message and per-signature statistics
93
STATS_CONFIGURE_ENABLE=		stats
94
95
STATSEXT_DESC=			Localized stats extensions
96
STATSEXT_CONFIGURE_ENABLE=	statsext
97
98
VBR_DESC=			Vouch-By-Reference support
95
VBR_DESC=			Vouch-By-Reference support
99
VBR_CONFIGURE_ENABLE=		vbr
96
VBR_CONFIGURE_ENABLE=		vbr

Return to bug 211723