From nobody Mon May 02 13:20:52 2022 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 BB9161AAB70F; Mon, 2 May 2022 13:20:52 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KsNyD4sVpz3l0R; Mon, 2 May 2022 13:20:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651497652; 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=TxXg2pPI4qvdGVWsrw9CSwCaXPUFD9Xpu2a+MNTkNF0=; b=bOFSqlpD+6bh/8TrzxHIpg6QAfLiVaxNdRi078gvPXDqefsDiikLtAlB8mpujCy/Tfwuvh mxHb0YsiELa9/6UxEiJyaVJxbxLXlzE0MXtgS+Hq0kVsNlCRw2paPxxXOMCf9OhpShPLsx ilMkHaGspy8yD8epBVxQQTCPeqE5iocLF9qy29RDrVKdY+5Ve1mc6wD6jC3vABoY5wJ7vl upAn8j53Q+quhU4KsCdkt6e8NOGa20jfNN4qPp5X2l9HHqWVS9FU6FiG7Zz16lVmss2Axc 03Skhp2IUIlZqPZiFBUxBKOzYJpMpax4mimnENqav/dE7APIlsrDx+meSYG3JA== 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 8735E2077; Mon, 2 May 2022 13:20:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 242DKqtW079360; Mon, 2 May 2022 13:20:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 242DKq6W079359; Mon, 2 May 2022 13:20:52 GMT (envelope-from git) Date: Mon, 2 May 2022 13:20:52 GMT Message-Id: <202205021320.242DKq6W079359@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitri Goutnik Subject: git: e49c427ac102 - main - mail/mutt: New hcache options change default to lmdb 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dmgk X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e49c427ac102757b65a46992157d1e948b55a8c8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651497652; 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=TxXg2pPI4qvdGVWsrw9CSwCaXPUFD9Xpu2a+MNTkNF0=; b=EqVQO5SgMqc6NisjeyfHWM5tZO7nlj9+V9wboW28Zzqiuv3hdcaXkNmyHIz2ZgjW/k7BwV JdPhg7AuEDJKDypra6pTBeRFUDGGusS/eA8HgQ0awMbtTsoQKGqEyROrOjvg5m2vN/+ix1 nllXbv9mwvQGbdPWvKdjvy9ZAbd8RKMeXfoB2KoEcoqVFqjfq1JYRIZHu0h44dL/5csniZ C7K0jO3ImxB5Awg2laOSieAmvLzJ7Tmz1hnEi1v8OJRJ0G0oxRKk9qI7SaSBGEqhtC1K3q lpiwPw5AW/nk1oaEIXaUkjWmTacOkeKRfkF5sHfVPhxXtdPb7LdISa1QiQ1OHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651497652; a=rsa-sha256; cv=none; b=ONOYVOOEkAujF/KyiAcfz3j3tnrnHDd2QbxkX5auFlKgJ7CIVPWnUf696ybwQOWQKetXQa 3noXZTxGzuavIXhKzGoxw4xtzCWbft4bXUpsX3wi7Peyf3hN4FGMOCsMCmDmrYRRkqEFwz uk8GZEkQOcmYUkyd4VqWwtdGa0Y8z9xCn9y7MQRLB6uy7JKdk8N3NFnk5FVNTEjxEZ9V7X Ndh8tjELylji/Un894ujOD+s1SdAxSfXx/v6zn8z3NkI8wAFNz539FLl0xQ0n0RcZ+b94b EEjRTjtrxBj9ZjjEjnD2d29LRSPKSAAMmqx4onZe5eCdsdvsHY1D2n3sSKij1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dmgk: URL: https://cgit.FreeBSD.org/ports/commit/?id=e49c427ac102757b65a46992157d1e948b55a8c8 commit e49c427ac102757b65a46992157d1e948b55a8c8 Author: Derek Schrock AuthorDate: 2022-05-02 13:06:54 +0000 Commit: Dmitri Goutnik CommitDate: 2022-05-02 13:10:58 +0000 mail/mutt: New hcache options change default to lmdb - Add three new(ish) hcache options HCACHE_{LMDB,GDBM,QDBM} - Update HCACHE_BDB to use database/db18 - Due to bdb5's EOL change the default hcache to HCACHE_LMDB. Favoring lmbd since it's performance is on par with BDB and that db18's AGPL3 licensing seems to be a point of contention. PR: 263211 --- UPDATING | 8 ++++++++ mail/mutt/Makefile | 18 ++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/UPDATING b/UPDATING index 65bfebe400d8..62eb9c273b1c 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,14 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20220502: + AFFECTS: mail/mutt + AUTHOR: dereks@lifeofadishwasher.com + + Default header cache option has been changed to the new option LMDB using + databases/lmdb. The BDB option still exists but now uses databases/db18 due + to the EOL of databases/db5. + 20220501: AFFECT: users of drm-current-kmod and drm-devel-kmod AUTHOR: manu@FreeBSD.org diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index e4ee2932a571..68951641fe52 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -2,6 +2,7 @@ PORTNAME= mutt DISTVERSION= 2.2.4 +PORTREVISION= 1 CATEGORIES+= mail MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ https://bitbucket.org/mutt/mutt/downloads/ \ @@ -51,15 +52,15 @@ OPTIONS_DEFINE= AUTOCRYPT DEBUG_LOGS DOCS EXAMPLES FLOCK GPGME \ GREETING_PATCH HTML ICONV IDN IFDEF_PATCH LOCALES_FIX \ MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH \ REVERSE_REPLY_PATCH SASL SMART_DATE SMIME SMTP URLVIEW -OPTIONS_DEFAULT= AUTOCRYPT DEBUG_LOGS GPGME GSSAPI_NONE HCACHE_BDB HTML \ +OPTIONS_DEFAULT= AUTOCRYPT DEBUG_LOGS GPGME GSSAPI_NONE HCACHE_LMDB HTML \ ICONV IDN IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES \ MAILDIR_MTIME_PATCH NCURSES NLS QUOTE_PATCH \ REVERSE_REPLY_PATCH SASL SMART_DATE SMIME SMTP URLVIEW OPTIONS_SINGLE= GSSAPI HCACHE SCREEN OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE -OPTIONS_SINGLE_HCACHE= HCACHE_BDB HCACHE_KYOTOCABINET HCACHE_NONE \ - HCACHE_TOKYOCABINET +OPTIONS_SINGLE_HCACHE= HCACHE_BDB HCACHE_GDBM HCACHE_KYOTOCABINET HCACHE_LMDB \ + HCACHE_NONE HCACHE_QDBM HCACHE_TOKYOCABINET OPTIONS_SINGLE_SCREEN= NCURSES SLANG OPTIONS_SUB= yes @@ -70,8 +71,11 @@ GPGME_DESC= Gpgme interface GREETING_PATCH_DESC= Greeting support HCACHE_BDB_DESC= Use Berkeley DB (BDB) HCACHE_DESC= Header Cache support +HCACHE_GDBM_DESC= Use GDBM HCACHE_KYOTOCABINET_DESC= Use Kyoto Cabinet +HCACHE_LMDB_DESC= Use LMDB HCACHE_NONE_DESC= Disable Header Cache +HCACHE_QDBM_DESC= Use QDBM HCACHE_TOKYOCABINET_DESC= Use Tokyo Cabinet HTML_DESC= HTML documentation IDN_DESC= International Domain Names (implies ICONV) @@ -126,14 +130,20 @@ GSSAPI_MIT_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ --with-gss=${GSSAPIBASEDIR} GSSAPI_NONE_CONFIGURE_ON= --without-gss -HCACHE_BDB_USES= bdb:42+ +HCACHE_BDB_USES= bdb:18 HCACHE_BDB_CONFIGURE_WITH= bdb=${LOCALBASE} HCACHE_BDB_VARS= CFLAGS+=-I${BDB_INCLUDE_DIR} \ LDFLAGS+=-L${BDB_LIB_DIR} +HCACHE_GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm +HCACHE_GDBM_CONFIGURE_WITH= gdbm=${LOCALBASE} HCACHE_KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet HCACHE_KYOTOCABINET_CONFIGURE_WITH= kyotocabinet=${LOCALBASE} +HCACHE_LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb +HCACHE_LMDB_CONFIGURE_WITH= lmdb=${LOCALBASE} HCACHE_NONE_CONFIGURE_ON= --disable-hcache HCACHE_NONE_CONFIGURE_OFF= --enable-hcache +HCACHE_QDBM_LIB_DEPENDS= libqdbm.so:databases/qdbm +HCACHE_QDBM_CONFIGURE_WITH= qdbm=${LOCALBASE} HCACHE_TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet HCACHE_TOKYOCABINET_CONFIGURE_WITH= tokyocabinet=${LOCALBASE}