Index: Makefile =================================================================== --- Makefile (revision 420065) +++ Makefile (working copy) @@ -36,7 +36,7 @@ OPTIONS_SINGLE= RESOLV OPTIONS_SINGLE_RESOLV= STOCK_RESOLVER UNBOUND OPTIONS_DEFINE= FILTER CURL GNUTLS JANSSON LDNS LMDB LUA MEMCACHED \ - BDB_BASE OPENDBX OPENLDAP POPAUTH QUERY_CACHE SASL + BDB_BASE OPENDBX OPENLDAP POPAUTH QUERY_CACHE SASL STATS STATSEXT OPTIONS_DEFAULT= FILTER LUA UNBOUND STOCK_RESOLVER_DESC= Use the stock resolver library @@ -82,6 +82,7 @@ OPENDBX_DESC= Store filter policies via OpenDBX OPENDBX_CONFIGURE_WITH= odbx OPENDBX_LIB_DEPENDS= libopendbx.so:databases/opendbx +OPENDBX_IMPLIES= LUA STATS OPENLDAP_DESC= Store filter policies in LDAP OPENLDAP_CONFIGURE_WITH=openldap @@ -96,6 +97,14 @@ SASL_DESC= Enable SASL authentication with LDAP SASL_CONFIGURE_WITH= sasl +STATS_DESC= Per-message and per-signature statistics +STATS_CONFIGURE_ENABLE= stats +STATS_IMPLIES= LUA + +STATSEXT_DESC= Localized stats extensions +STATSEXT_CONFIGURE_ENABLE= statsext +STATSEXT_IMPLIES= STATS LUA + DOCS_CONFIGURE_ON= --docdir=${WRKDIR}/doc MAKE_ARGS+= pkgconfigdir="${PREFIX}/libdata/pkgconfig" @@ -117,30 +126,11 @@ CONFIGURE_ARGS+= --with-milter=${MILTERBASE} .endif -.if ${PORT_OPTIONS:MLUA_ONLY_SIGNING} || \ - ${PORT_OPTIONS:MRBL} -.if !${PORT_OPTIONS:MLUA} -IGNORE= options LUA_ONLY_SIGNING and RBL require LUA as well -.endif -.endif - -.if ${PORT_OPTIONS:MREPUTATION} -.if !${PORT_OPTIONS:MCURL} || !${PORT_OPTIONS:MJANSSON} -IGNORE= option REPUTATION requires CURL and JANSSON as well -.endif -.endif - -.if ${PORT_OPTIONS:MSTATSEXT} -.if !${PORT_OPTIONS:MSTATS} || !${PORT_OPTIONS:MLUA} -IGNORE= option STATSEXT requires STATS and LUA as well -.endif -.endif - .if ${PORT_OPTIONS:MPOPAUTH} \ || ${PORT_OPTIONS:MQUERY_CACHE} \ || ${PORT_OPTIONS:MLDAP_CACHING} \ || ${PORT_OPTIONS:MREPUTATION} \ - || ${PORT_OPTIONS:MSTATS} + || ${PORT_OPTIONS:MSTATS} . if ${PORT_OPTIONS:MBDB_BASE} CONFIGURE_ARGS+= --with-db-lib=c . else Index: Makefile.options =================================================================== --- Makefile.options (revision 420065) +++ Makefile.options (working copy) @@ -31,7 +31,7 @@ LDAP_CACHING POSTGRES_RECONNECT_HACK \ RATE_LIMIT RBL REPLACE_RULES REPRRD \ REPUTATION RESIGN SENDER_MACRO \ - SOCKETDB STATS STATSEXT VBR + SOCKETDB VBR ADSP_LISTS_DESC= ADSP filtering for lists (experimental) ADSP_LISTS_CONFIGURE_ENABLE= adsp_lists @@ -60,6 +60,7 @@ LUA_ONLY_SIGNING= Message signing by Lua only LUA_ONLY_SIGNING_CONFIGURE_ENABLE= lua_only_signing +LUA_ONLY_SIGNING_IMPLIES= LUA POSTGRES_RECONNECT_HACK_DESC= PostgreSQL connection error detection bug hack POSTGRES_RECONNECT_HACK_CONFIGURE_ENABLE= postgresql_reconnect_hack @@ -69,6 +70,7 @@ RBL_DESC= Realtime Blacklist query support RBL_CONFIGURE_ENABLE= rbl +RBL_IMPLIES= LUA REPLACE_RULES_DESC= String substition when signing REPLACE_RULES_CONFIGURE_ENABLE= replace_rules @@ -79,6 +81,7 @@ REPUTATION_DESC= Reputation check (experimental) REPUTATION_CONFIGURE_ENABLE= reputation +REPUTATION_IMPLIES= CURL JANSON RESIGN_DESC= One-step resigning RESIGN_CONFIGURE_ENABLE= resign @@ -89,11 +92,5 @@ SOCKETDB_DESC= Arbitrary socket data sets SOCKETDB_CONFIGURE_ENABLE= socketdb -STATS_DESC= Per-message and per-signature statistics -STATS_CONFIGURE_ENABLE= stats - -STATSEXT_DESC= Localized stats extensions -STATSEXT_CONFIGURE_ENABLE= statsext - VBR_DESC= Vouch-By-Reference support VBR_CONFIGURE_ENABLE= vbr