From owner-svn-ports-all@FreeBSD.ORG Tue Jul 1 16:04:14 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 96E3E1BA; Tue, 1 Jul 2014 16:04:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7809A21C6; Tue, 1 Jul 2014 16:04:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s61G4E2d055180; Tue, 1 Jul 2014 16:04:14 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s61G4Esf055177; Tue, 1 Jul 2014 16:04:14 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407011604.s61G4Esf055177@svn.freebsd.org> From: Adam Weinberger Date: Tue, 1 Jul 2014 16:04:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360050 - head/mail/dovecot2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jul 2014 16:04:14 -0000 Author: adamw Date: Tue Jul 1 16:04:13 2014 New Revision: 360050 URL: http://svnweb.freebsd.org/changeset/ports/360050 QAT: https://qat.redports.org/buildarchive/r360050/ Log: Enable support for GSSAPI from ports using USES=gssapi magic. PORTREVISION bump for this. PR: ports/187721 Submitted by: dewayne@heuristicsystems.com.au While we're here: - More general cleanups - Improve COMMENT and pkg-descr Modified: head/mail/dovecot2/Makefile head/mail/dovecot2/pkg-descr Modified: head/mail/dovecot2/Makefile ============================================================================== --- head/mail/dovecot2/Makefile Tue Jul 1 16:03:25 2014 (r360049) +++ head/mail/dovecot2/Makefile Tue Jul 1 16:04:13 2014 (r360050) @@ -3,12 +3,13 @@ PORTNAME= dovecot PORTVERSION= 2.2.13 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= http://www.dovecot.org/releases/${PORTVERSION:R}/ PKGNAMESUFFIX= 2 MAINTAINER= adamw@FreeBSD.org -COMMENT= Secure and compact IMAP and POP3 servers +COMMENT= Secure, fast and powerful IMAP and POP3 server LICENSE= LGPL21 MIT LICENSE_COMB= dual @@ -43,12 +44,11 @@ INSTALL_TARGET= install-strip USERS= dovecot dovenull GROUPS= ${USERS} -# Default requirement for dovecot rc script -_REQUIRE= LOGIN - -OPTIONS_DEFINE= KQUEUE SSL GSSAPI VPOPMAIL LDAP LUCENE PGSQL MYSQL SQLITE \ +OPTIONS_DEFINE= KQUEUE SSL VPOPMAIL LDAP LUCENE PGSQL MYSQL SQLITE \ SOLR DOCS EXAMPLES LIBWRAP -OPTIONS_DEFAULT=KQUEUE SSL +OPTIONS_SINGLE= GSSAPI +OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT +OPTIONS_DEFAULT=KQUEUE SSL GSSAPI_NONE OPTIONS_SUB= yes KQUEUE_DESC= kqueue(2) support @@ -56,37 +56,49 @@ VPOPMAIL_DESC= vpopmail support LUCENE_DESC= CLucene FTS support SOLR_DESC= Solr FTS support +GSSAPI_NONE_DESC= Build without GSSAPI support +GSSAPI_BASE_DESC= Use GSSAPI from base +GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal +GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5 + DOCS_CONFIGURE_WITH= docs -GSSAPI_CONFIGURE_WITH= gssapi -GSSAPI_LDFLAGS= -lgssapi_krb5 +GSSAPI_NONE_CONFIGURE_ON= --without-gssapi +GSSAPI_BASE_USES= gssapi +GSSAPI_BASE_CONFIGURE_ON= --with-gssapi ${GSSAPI_CONFIGURE_ARGS} +GSSAPI_HEIMDAL_USES= gssapi:heimdal +GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi ${GSSAPI_CONFIGURE_ARGS} +GSSAPI_MIT_USES= gssapi:mit +GSSAPI_MIT_CONFIGURE_ON= --with-gssapi ${GSSAPI_CONFIGURE_ARGS} KQUEUE_CONFIGURE_OFF= --with-ioloop=poll KQUEUE_CONFIGURE_ON= --with-ioloop=kqueue -LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes +LDAP_CONFIGURE_WITH= ldap +LDAP_RC_REQUIRE= slapd LIBWRAP_CONFIGURE_WITH= libwrap LUCENE_CONFIGURE_WITH= lucene LUCENE_LIB_DEPENDS= libclucene-core.so:${PORTSDIR}/textproc/clucene -MYSQL_CONFIGURE_WITH= mysql MYSQL_USE= MYSQL=yes +MYSQL_CONFIGURE_WITH= mysql +MYSQL_RC_REQUIRE= mysql -PGSQL_CONFIGURE_WITH= pgsql PGSQL_USE= PGSQL=yes +PGSQL_CONFIGURE_WITH= pgsql +PGSQL_RC_REQUIRE= postgresql -SOLR_BUILD_DEPENDS= curl:${PORTSDIR}/ftp/curl SOLR_CONFIGURE_WITH= solr +SOLR_BUILD_DEPENDS= curl:${PORTSDIR}/ftp/curl SOLR_LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 -SQLITE_CONFIGURE_WITH= sqlite SQLITE_USE= SQLITE=3 +SQLITE_CONFIGURE_WITH= sqlite -SSL_CONFIGURE_OFF= --without-ssl -SSL_CONFIGURE_ON= --with-ssl=openssl +SSL_CONFIGURE_WITH= ssl=openssl VPOPMAIL_BUILD_DEPENDS= ${LOCALBASE}/vpopmail/bin/vchkpw:${PORTSDIR}/mail/vpopmail VPOPMAIL_CONFIGURE_WITH=vpopmail @@ -101,17 +113,12 @@ PORTEXAMPLES= * BROKEN= Does not build on arm .endif -.if ${PORT_OPTIONS:MLDAP} -_REQUIRE+= slapd -.endif - -.if ${PORT_OPTIONS:MPGSQL} -_REQUIRE+= postgresql -.endif +# Default requirement for dovecot rc script +_REQUIRE= LOGIN -.if ${PORT_OPTIONS:MMYSQL} -_REQUIRE+= mysql -.endif +.for opt in ${PORT_OPTIONS} +_REQUIRE+= ${${opt}_RC_REQUIRE} +.endfor SUB_LIST+= REQUIRE="${_REQUIRE}" SUB_FILES+= pkg-message Modified: head/mail/dovecot2/pkg-descr ============================================================================== --- head/mail/dovecot2/pkg-descr Tue Jul 1 16:03:25 2014 (r360049) +++ head/mail/dovecot2/pkg-descr Tue Jul 1 16:04:13 2014 (r360050) @@ -1,7 +1,11 @@ -Dovecot is a secure and compact IMAP server which is in the early stages -of development. It supports Maildirs and mbox formats and much of the -IMAP v4 protocol including SSL/TLS. IPv6 support is also included. -Dovecot supports authentication with OpenLDAP, PostgreSQL, MySQL, vpopmail -and PAM. +Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like +systems, written with security primarily in mind. Dovecot is an excellent +choice for both small and large installations. It's fast, simple to set up, +requires no special administration and it uses very little memory. + +Dovecot is high-performing, self-optimizing, self-healing, and easily +extensible. It includes IMAP4rev1 and POP3 support. IPv6, SSL and TLS are +supported. It supports multiple commonly used IMAP extensions, including SORT, +THREAD and IDLE. WWW: http://www.dovecot.org/