svn commit: r452542 - head/mail/dovecot

[Adam Weinberger]

Author: adamw
Date: Fri Oct 20 16:51:15 2017
New Revision: 452542
URL: https://svnweb.freebsd.org/changeset/ports/452542

Log:
  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.

Modified:
  head/mail/dovecot/Makefile
  head/mail/dovecot/pkg-plist

Modified: head/mail/dovecot/Makefile
==============================================================================
--- head/mail/dovecot/Makefile	Fri Oct 20 16:25:06 2017	(r452541)
+++ head/mail/dovecot/Makefile	Fri Oct 20 16:51:15 2017	(r452542)
@@ -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/
 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
 

Modified: head/mail/dovecot/pkg-plist
==============================================================================
--- head/mail/dovecot/pkg-plist	Fri Oct 20 16:25:06 2017	(r452541)
+++ head/mail/dovecot/pkg-plist	Fri Oct 20 16:51:15 2017	(r452542)
@@ -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