From owner-svn-ports-head@freebsd.org Tue Oct 11 21:59:40 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0DD77C0B296; Tue, 11 Oct 2016 21:59:40 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 DC98F3FE; Tue, 11 Oct 2016 21:59:39 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9BLxdoV041409; Tue, 11 Oct 2016 21:59:39 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9BLxc5l041408; Tue, 11 Oct 2016 21:59:38 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201610112159.u9BLxc5l041408@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Tue, 11 Oct 2016 21:59:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423802 - 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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Oct 2016 21:59:40 -0000 Author: adamw Date: Tue Oct 11 21:59:38 2016 New Revision: 423802 URL: https://svnweb.freebsd.org/changeset/ports/423802 Log: - When DOCS is enabled but EXAMPLES is not, two files that are supposed to be examples are bundled into DOCSDIR. Fix this by installing them into EXAMPLESDIR regardless of the EXAMPLES knob and trust pkg to DTRT - Make vpopmail depend on vpopmail-the-package, instead of vchkpw-the-silly-looking-path-under-LOCALBASE - Turn the curl dependency in the SOLR knob to a LIB_DEPENDS instead of a BUILD_DEPENDS, so that curl is available at runtime as well - Categorize the OPTIONS helpers under the same categories they're listed under in the OPTIONS dialogue, to aid with organization PORTREVISION bump for the potential plist and dependency changes. Modified: head/mail/dovecot2/Makefile Modified: head/mail/dovecot2/Makefile ============================================================================== --- head/mail/dovecot2/Makefile Tue Oct 11 21:56:59 2016 (r423801) +++ head/mail/dovecot2/Makefile Tue Oct 11 21:59:38 2016 (r423802) @@ -14,7 +14,7 @@ PORTNAME= dovecot PORTVERSION= 2.2.25 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail ipv6 MASTER_SITES= http://www.dovecot.org/releases/${PORTVERSION:R}/ PKGNAMESUFFIX= 2 @@ -72,50 +72,54 @@ 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 -CDB_CONFIGURE_WITH= cdb -CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb - -GSSAPI_NONE_CONFIGURE_ON= --without-gssapi -GSSAPI_NONE_CONFIGURE_OFF= --with-gssapi ${GSSAPI_CONFIGURE_ARGS} -GSSAPI_BASE_USES= gssapi -GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_MIT_USES= gssapi:mit - -ICU_CONFIGURE_WITH= icu -ICU_LIB_DEPENDS= libicui18n.so:devel/icu -ICU_USES= pkgconfig - +# General options KQUEUE_CONFIGURE_OFF= --with-ioloop=poll --with-notify=none KQUEUE_CONFIGURE_ON= --with-ioloop=kqueue --with-notify=kqueue -LDAP_USE= OPENLDAP=yes -LDAP_CONFIGURE_WITH= ldap - LIBWRAP_CONFIGURE_WITH= libwrap -LUCENE_CONFIGURE_WITH= lucene -LUCENE_LIB_DEPENDS= libclucene-core.so:textproc/clucene - LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 +VPOPMAIL_BUILD_DEPENDS= vpopmail>=0:mail/vpopmail +VPOPMAIL_CONFIGURE_WITH=vpopmail + +# Databases +CDB_CONFIGURE_WITH= cdb +CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb + +LDAP_USE= OPENLDAP=yes +LDAP_CONFIGURE_WITH= ldap + MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= pgsql -SOLR_CONFIGURE_WITH= solr -SOLR_BUILD_DEPENDS= curl:ftp/curl -SOLR_LIB_DEPENDS= libexpat.so:textproc/expat2 - SQLITE_USES= sqlite:3 SQLITE_CONFIGURE_WITH= sqlite +# FTS +ICU_CONFIGURE_WITH= icu +ICU_LIB_DEPENDS= libicui18n.so:devel/icu +ICU_USES= pkgconfig + +LUCENE_CONFIGURE_WITH= lucene +LUCENE_LIB_DEPENDS= libclucene-core.so:textproc/clucene + +SOLR_CONFIGURE_WITH= solr +SOLR_LIB_DEPENDS= libcurl.so:ftp/curl \ + libexpat.so:textproc/expat2 + TEXTCAT_CONFIGURE_WITH= textcat TEXTCAT_LIB_DEPENDS= libtextcat.so:textproc/libtextcat -VPOPMAIL_BUILD_DEPENDS= ${LOCALBASE}/vpopmail/bin/vchkpw:mail/vpopmail -VPOPMAIL_CONFIGURE_WITH=vpopmail +# GSSAPI +GSSAPI_NONE_CONFIGURE_ON= --without-gssapi +GSSAPI_NONE_CONFIGURE_OFF= --with-gssapi ${GSSAPI_CONFIGURE_ARGS} +GSSAPI_BASE_USES= gssapi +GSSAPI_HEIMDAL_USES= gssapi:heimdal +GSSAPI_MIT_USES= gssapi:mit DOCS= AUTHORS COPYING COPYING.LGPL COPYING.MIT INSTALL NEWS TODO README PORTDOCS= * @@ -156,13 +160,13 @@ post-patch: @${REINPLACE_CMD} -e '/^[^#]/s|/usr|${LOCALBASE}|' \ ${WRKSRC}/src/plugins/fts/decode2text.sh -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) - -post-install-EXAMPLES-on: +post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${MV} ${STAGEDIR}${DOCSDIR}/dovecot-openssl.cnf ${STAGEDIR}${EXAMPLESDIR} ${MV} ${STAGEDIR}${DOCSDIR}/mkcert.sh ${STAGEDIR}${EXAMPLESDIR} +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) + .include