From nobody Thu Aug 22 16:40:14 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WqTTB3FyQz5TFDc; Thu, 22 Aug 2024 16:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WqTTB2JvFz43k9; Thu, 22 Aug 2024 16:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724344814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fWllKOz52AUuosCe08Rmr7SM2V7a9fJyY4XO2ZZMMcg=; b=Y513rHfz4nnSnvsdlZ7XXx6J7AmHlIeXPDHABlP3YGbPSi85Rj/f1uI+Nnthu/r/Mq3M/3 C+HZL82AwqTEgGNpkVaTipbiQbEvRjXWN9th7K8In5F2mdf9Lc4X3qHGuaYtjG/Ux40Yzl A4JIprpxZPgSjZIkekUAfCveZu4+rjhBTN7rdUsSYnETYY67MGJCy5KGHEO5XE3teAxTbJ dLFHhpQ8zji1Q554Fkc9ft9qkW0VYPBy0+3TxGNFwi9KeDWxooFSn0OKIRUvdD4+KTIm36 D3fn3cmQclVPZ3VAihpqqzOEQ+JUoKNTbD8d4axuDdFF4wnma5lAvZxqVwtkwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724344814; a=rsa-sha256; cv=none; b=QbRokJGsY4fGipwfm2SAG3nzlu5mvASUID4sEOgNJVYZrZv15ZWjBwHmfcDSHZ3MwxmLZT P9RzuLH2rNE4aXZXx+nxZr7wukSBJtgOynGm1LwBsMGeoOuQLEik7IwlJgWCrLJzbYrvn3 aJOahhW3+67cTK+Wu1CgMgxjVDYoZhABbZGh7eO+XDJP3v+bOdSl2g+jkXYUuNGNqwuIHZ o+7UOMMev5hL6jsqMBPdox/RK2Yi8YE5ECJoNuWA9FLFRRLWkf9WrrXXwO3SLTHI9SwR8n hPb4OkqtQzzq2497hzEJcxfYVoPcgzTT4Hj9PXVZ+7MkhHRhBVnqjvhJovdD8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724344814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fWllKOz52AUuosCe08Rmr7SM2V7a9fJyY4XO2ZZMMcg=; b=KWMxgoSHu9ZSDPax+Watp6VC1gM+eNNFafJ8HfPVge3Wj1o+6UERwDLMyVQgrn6x4RUakv lrjTOJKgKc0c0iWUWOyHvNPe2S8EShnOCH+YscO6dGN5nvzXs4GIAOCBgIrvKnrL97WA3W PbtWnLsgGBMkBAAFDrlmJgXQ1mhC4shNYyEP7BouDczyRVsaxZ0WmJ8x6IXasBivfjZaIg w1M4zz2iIDige4mS7U5oMcN6LvRmAaUXr3NtfdgP59QQS7WFFsIToWlBuRdGL7UKsTd4/A eY7Toedorr9/qmSh6nsNuR7B3IgqnOyqOgBBtYpG/QTwfNRG4OVb7L6oMxa03g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WqTTB1cVHzbLG; Thu, 22 Aug 2024 16:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47MGeEMa035144; Thu, 22 Aug 2024 16:40:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47MGeEZM035133; Thu, 22 Aug 2024 16:40:14 GMT (envelope-from git) Date: Thu, 22 Aug 2024 16:40:14 GMT Message-Id: <202408221640.47MGeEZM035133@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Larry Rosenman Subject: git: 3df350526aed - main - mail/dovecot: pet portclippy List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ler X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3df350526aed62de7bc91d3cb291a05b3a096d87 Auto-Submitted: auto-generated The branch main has been updated by ler: URL: https://cgit.FreeBSD.org/ports/commit/?id=3df350526aed62de7bc91d3cb291a05b3a096d87 commit 3df350526aed62de7bc91d3cb291a05b3a096d87 Author: Larry Rosenman AuthorDate: 2024-08-22 16:38:37 +0000 Commit: Larry Rosenman CommitDate: 2024-08-22 16:40:12 +0000 mail/dovecot: pet portclippy PR: 280866 Reported by: vvd --- mail/dovecot/Makefile | 139 ++++++++++++++++++++++++-------------------------- 1 file changed, 66 insertions(+), 73 deletions(-) diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 44f42b27f94f..712066e165bd 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -23,121 +23,114 @@ LICENSE_COMB= dual LIB_DEPENDS= libzstd.so:archivers/zstd USES= cpe iconv libtool pkgconfig ssl -USE_RC_SUBR= dovecot +USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} +USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var \ --with-docs \ --with-ssl=openssl \ - --with-statedir=/var/db/dovecot \ + --with-statedir=/var/db/${PORTNAME} \ --with-shadow=no \ --with-systemd=no -USE_LDCONFIG= ${PREFIX}/lib/dovecot INSTALL_TARGET= install-strip -USERS= dovecot dovenull +CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} +LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} + +SUB_FILES+= pkg-message +SUB_LIST+= REQUIRE="${_REQUIRE}" +# Default requirement for dovecot rc script +_REQUIRE= LOGIN + +USERS= ${PORTNAME} dovenull GROUPS= ${USERS} -OPTIONS_DEFINE= LIBSODIUM LIBUNWIND LIBWRAP LUA LZ4 DOCS EXAMPLES -OPTIONS_DEFAULT=GSSAPI_NONE LDAP LIBWRAP -OPTIONS_SUB= yes +DOCS= AUTHORS COPYING INSTALL NEWS TODO README +PORTDOCS= * +PORTEXAMPLES= * + +OPTIONS_DEFINE= LIBSODIUM LIBUNWIND LIBWRAP LUA LZ4 DOCS EXAMPLES +OPTIONS_DEFAULT= GSSAPI_NONE LDAP LIBWRAP OPTIONS_GROUP= DB FTS OPTIONS_GROUP_DB= CDB LDAP MYSQL PGSQL SQLITE OPTIONS_GROUP_FTS= ICU LUCENE SOLR TEXTCAT OPTIONS_SINGLE= GSSAPI -OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT +OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE -DB_DESC= Database support -CDB_DESC= CDB database support +OPTIONS_SUB= yes -FTS_DESC= Full text search plugins -ICU_DESC= Use libicu for FTS unicode normalization -LUCENE_DESC= CLucene FTS support -SOLR_DESC= Solr FTS support -TEXTCAT_DESC= Libexttextcat FTS support - -GSSAPI_NONE_DESC= Build without GSSAPI support +CDB_DESC= CDB database support +DB_DESC= Database support +FTS_DESC= Full text search plugins 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 - -# General options +GSSAPI_NONE_DESC= Build without GSSAPI support +ICU_DESC= Use libicu for FTS unicode normalization LIBSODIUM_DESC= Support libsodium based crypts (ARGON2I/ARGON2ID) -LIBSODIUM_LIB_DEPENDS= libsodium.so:security/libsodium -LIBSODIUM_CONFIGURE_WITH= sodium - -LIBUNWIND_CONFIGURE_ON= --with-libunwind=yes -LIBUNWIND_CONFIGURE_OFF= --with-libunwind=no LIBUNWIND_DESC= Get backtraces using libunwind -LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind - -LIBWRAP_CONFIGURE_WITH= libwrap - -LUA_CONFIGURE_WITH= lua -LUA_USES= lua:51,53 - -LZ4_CONFIGURE_WITH= lz4 -LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 +LUCENE_DESC= CLucene FTS support +SOLR_DESC= Solr FTS support +TEXTCAT_DESC= Libexttextcat FTS support -# Databases -CDB_CONFIGURE_WITH= cdb -CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb +CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb +CDB_CONFIGURE_WITH= cdb -LDAP_USES= ldap -LDAP_CONFIGURE_WITH= ldap +GSSAPI_BASE_USES= gssapi +GSSAPI_HEIMDAL_USES= gssapi:heimdal +GSSAPI_MIT_USES= gssapi:mit +GSSAPI_NONE_CONFIGURE_ON= --without-gssapi +GSSAPI_NONE_CONFIGURE_OFF= --with-gssapi ${GSSAPI_CONFIGURE_ARGS} -MYSQL_USES= mysql -MYSQL_CONFIGURE_WITH= mysql +ICU_LIB_DEPENDS= libicui18n.so:devel/icu +ICU_CONFIGURE_WITH= icu -PGSQL_USES= pgsql -PGSQL_CONFIGURE_WITH= pgsql +LDAP_USES= ldap +LDAP_CONFIGURE_WITH= ldap +LDAP_VARS= _REQUIRE+=slapd -SQLITE_USES= sqlite -SQLITE_CONFIGURE_WITH= sqlite +LIBSODIUM_LIB_DEPENDS= libsodium.so:security/libsodium +LIBSODIUM_CONFIGURE_WITH= sodium -# FTS -ICU_CONFIGURE_WITH= icu -ICU_LIB_DEPENDS= libicui18n.so:devel/icu +LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind +LIBUNWIND_CONFIGURE_ON= --with-libunwind=yes +LIBUNWIND_CONFIGURE_OFF= --with-libunwind=no -LUCENE_CONFIGURE_WITH= lucene stemmer -LUCENE_LIB_DEPENDS= libclucene-core.so:textproc/clucene +LIBWRAP_CONFIGURE_WITH= libwrap -SOLR_CONFIGURE_WITH= solr -SOLR_LIB_DEPENDS= libcurl.so:ftp/curl \ - libexpat.so:textproc/expat2 +LUA_USES= lua:51,53 +LUA_CONFIGURE_WITH= lua -TEXTCAT_CONFIGURE_WITH= textcat -TEXTCAT_LIB_DEPENDS= libexttextcat-2.0.so:textproc/libexttextcat +LUCENE_LIB_DEPENDS= libclucene-core.so:textproc/clucene +LUCENE_CONFIGURE_WITH= lucene stemmer -# 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 +LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 +LZ4_CONFIGURE_WITH= lz4 -DOCS= AUTHORS COPYING INSTALL NEWS TODO README -PORTDOCS= * -PORTEXAMPLES= * +MYSQL_USES= mysql +MYSQL_CONFIGURE_WITH= mysql +MYSQL_VARS= _REQUIRE+=mysql -# Default requirement for dovecot rc script -_REQUIRE= LOGIN +PGSQL_USES= pgsql +PGSQL_CONFIGURE_WITH= pgsql +PGSQL_VARS= _REQUIRE+=postgresql -LDAP_VARS= _REQUIRE+=slapd -MYSQL_VARS= _REQUIRE+=mysql -PGSQL_VARS= _REQUIRE+=postgresql +SOLR_LIB_DEPENDS= libcurl.so:ftp/curl \ + libexpat.so:textproc/expat2 +SOLR_CONFIGURE_WITH= solr -SUB_LIST+= REQUIRE="${_REQUIRE}" -SUB_FILES+= pkg-message +SQLITE_USES= sqlite +SQLITE_CONFIGURE_WITH= sqlite -CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} -LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} +TEXTCAT_LIB_DEPENDS= libexttextcat-2.0.so:textproc/libexttextcat +TEXTCAT_CONFIGURE_WITH= textcat post-patch: - @${REINPLACE_CMD} -e 's,/etc/dovecot,${PREFIX}/etc/dovecot,g; \ + @${REINPLACE_CMD} -e 's,/etc/dovecot,${ETCDIR},g; \ s,sysconfdir=/etc,sysconfdir=${PREFIX}/etc,g' \ ${WRKSRC}/doc/example-config/*.conf ${WRKSRC}/doc/example-config/conf.d/* \ ${WRKSRC}/doc/example-config/*.conf.ext