diff options
| author | adamw <adamw@FreeBSD.org> | 2017-10-21 00:51:15 +0800 |
|---|---|---|
| committer | adamw <adamw@FreeBSD.org> | 2017-10-21 00:51:15 +0800 |
| commit | a50b31ad13cd2ead3379bb83b7b0c54208e9d1bd (patch) | |
| tree | 19dac34a100b8ce6ce3d2d0357719f05846269df /mail | |
| parent | 7fcdc902e94ea870443a39f33c926b777b28d6f7 (diff) | |
| download | freebsd-ports-gnome-a50b31ad13cd2ead3379bb83b7b0c54208e9d1bd.tar.gz freebsd-ports-gnome-a50b31ad13cd2ead3379bb83b7b0c54208e9d1bd.tar.zst freebsd-ports-gnome-a50b31ad13cd2ead3379bb83b7b0c54208e9d1bd.zip | |
Add back the LIBWRAP option, but default it to on
eugen noted that it's not uncommon for people to build WITHOUT_TCP_WRAPPERS,
and forcing the libwrap option gives them no recourse. So I'm adding back
the libwrap option, but defaulting it to on now---people who've compiled
WITHOUT_TCP_WRAPPERS will know how to build a custom dovecot.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/dovecot/Makefile | 9 | ||||
| -rw-r--r-- | mail/dovecot/pkg-plist | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 2c4ada6a43df..6d9a1b3f3782 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -33,8 +33,7 @@ CONFIGURE_ARGS= --localstatedir=/var \ --with-statedir=/var/db/dovecot \ --without-shadow \ --with-ssl=openssl \ - --with-docs \ - --with-libwrap + --with-docs USE_LDCONFIG= ${PREFIX}/lib/dovecot INSTALL_TARGET= install-strip @@ -42,8 +41,8 @@ INSTALL_TARGET= install-strip USERS= dovecot dovenull GROUPS= ${USERS} -OPTIONS_DEFINE= LZ4 VPOPMAIL DOCS EXAMPLES -OPTIONS_DEFAULT=GSSAPI_NONE +OPTIONS_DEFINE= LIBWRAP LZ4 VPOPMAIL DOCS EXAMPLES +OPTIONS_DEFAULT=GSSAPI_NONE LIBWRAP OPTIONS_SUB= yes OPTIONS_GROUP= DB FTS @@ -71,6 +70,8 @@ GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5 # General options +LIBWRAP_CONFIGURE_WITH= libwrap + LZ4_CONFIGURE_WITH= lz4 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 diff --git a/mail/dovecot/pkg-plist b/mail/dovecot/pkg-plist index 599f2892734e..36b30c8fd807 100644 --- a/mail/dovecot/pkg-plist +++ b/mail/dovecot/pkg-plist @@ -736,7 +736,6 @@ libexec/dovecot/script libexec/dovecot/script-login libexec/dovecot/ssl-params libexec/dovecot/stats -libexec/dovecot/tcpwrap libexec/dovecot/xml2text man/man1/deliver.1.gz man/man1/doveadm-acl.1.gz @@ -807,6 +806,7 @@ share/aclocal/dovecot.m4 %%LDAP%%lib/dovecot/libdovecot-ldap.so %%LDAP%%lib/dovecot/libdovecot-ldap.so.0 %%LDAP%%lib/dovecot/libdovecot-ldap.so.0.0.0 +%%LIBWRAP%%libexec/dovecot/tcpwrap %%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.a %%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.so %%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.a |