From nobody Wed Mar 30 02:41:52 2022 X-Original-To: dev-commits-ports-main@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 9D8361A4B5A1; Wed, 30 Mar 2022 02:41: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 4KSrL842FVz3Nnl; Wed, 30 Mar 2022 02:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648608112; 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=7oDtr+ArcfIgfE7cstCuPE8xVodo0DNwhbQsPQ0+Dro=; b=Lo0qCJRaMRk+0BSN9RuGF5FtJIzMNznuOjcX9uak95Ctpz1pFrvAIQCq4zLossutTNEysR YrcuFibD/4JPUX1Yba5xA7k95OX2FhG1uHlDVbGjoqFnWgRvlgzCFtkM9pNA40lW8xEl3L 9U19qTFdaLNwQGx8oXKkXfqv2G6sa5aFzOH6dy5NY42mjrJbUi67OjO+OGVnO4YvgBiYSK URxCLbW92XKOET2VwzEQppR0WeI+nYWTP6R2ZyxF6uBV/lw6P8I/oQEpgRqAcBnBXy9pR3 NhNcexHXuqmtHIpziWRzcfRGBwgN35ARNi08PYArpdN0a+5L1P/hwREA1wBNBA== 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 6B2182B1F; Wed, 30 Mar 2022 02:41: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 22U2fqKS061698; Wed, 30 Mar 2022 02:41:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22U2fqoT061697; Wed, 30 Mar 2022 02:41:52 GMT (envelope-from git) Date: Wed, 30 Mar 2022 02:41:52 GMT Message-Id: <202203300241.22U2fqoT061697@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guangyuan Yang Subject: git: a75484502d2e - main - mail/mutt: Update to 2.2.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ygy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a75484502d2e4ad425d5f65ff68d3dec6ccbce12 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648608112; 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=7oDtr+ArcfIgfE7cstCuPE8xVodo0DNwhbQsPQ0+Dro=; b=d4IV2Tbp4WpVzcSdDfz6NR8UTxBoIUgkS9KvTlvDKZssPi9ScdBYcpQbrFxDZeIbmYHh9X iuiVNqaNk05tYpXQ8QUmgh1kYEo8kR1pkS1U+LZC/thRMk5/02sQ2GcPFUSFUhc1DEBLf2 JcykxsaPPIk/Tc1WGLKlRwRQcTM/xtgrjNOFiWYbbmMilhzskZsmCW89pu007MusQyhvAe HLHdajEvgMFE685H9UUG4W+0NVhKOiVE+UuDMZa3/rZdbX6c7ZQnXsg5ypb8/imepFmaTo 48iAFr32mMU4QH4JSDRwQkNz011Bopu+yCs878L9ip03jmdnSghoMbUP06/H2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648608112; a=rsa-sha256; cv=none; b=uz2bf9WI7TMxW/yv+mnJytwqIyyQHpkkCjC6WbHOTPF4B+SNjezmItIDTEjxa7Yq7yhmbc GXsizu36vp7hvK59AkX+OmGAWGrjlzdmsG74R9OKIrnxU/WX73Dh/lPiAHE9novoT4Y6a9 NE1CjS2eX9W7mDL5DbNZ2bHGgJ2ugzgs8HFUeUZb2MgFm25voc+znddD7gr473Xg+6UoIj spYWwBLBxjp5OqY39NQKYI+HBH30gOUU0tN8RoZVuNdaNH5iBdunq/f6c9ci6n5mPc7leF 6Yxcg9MxIDlzRvVM8FsV07jtNS7be8+KU3raRVHJajhJaDus4MMXOI5xw7D5EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ygy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a75484502d2e4ad425d5f65ff68d3dec6ccbce12 commit a75484502d2e4ad425d5f65ff68d3dec6ccbce12 Author: Derek Schrock AuthorDate: 2022-03-30 02:41:41 +0000 Commit: Guangyuan Yang CommitDate: 2022-03-30 02:41:41 +0000 mail/mutt: Update to 2.2.2 - Portclippy/portfmt cleanup - Tell portclippy to ignore makesum hack Changelog: https://marc.info/?l=mutt-users&m=164824319527784&w=2 PR: 262849 --- mail/mutt/Makefile | 138 ++++++++++++++++++++++++++--------------------------- mail/mutt/distinfo | 6 +-- 2 files changed, 71 insertions(+), 73 deletions(-) diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 7db789b9909f..6e7ffde9ef3a 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,7 +1,7 @@ # Created by: Udo Schweigert PORTNAME= mutt -DISTVERSION= 2.2.1 +DISTVERSION= 2.2.2 CATEGORIES+= mail MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ https://bitbucket.org/mutt/mutt/downloads/ \ @@ -10,9 +10,9 @@ MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ DIST_SUBDIR= mutt EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ - http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ - http://vc.org.ua/mutt/:vc +PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ + http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \ + http://vc.org.ua/mutt/:vc PATCH_DIST_STRIP= -p1 MAINTAINER= dereks@lifeofadishwasher.com @@ -42,23 +42,26 @@ CONFIGURE_ARGS= --disable-fcntl \ CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS} .endif -CONFLICTS= ja-mutt ja-mutt-devel mutt-1.4* \ - mutt-devel-lite mutt-lite zh-mutt-devel +CONFLICTS= ja-mutt ja-mutt-devel mutt-1.4* mutt-devel-lite mutt-lite \ + zh-mutt-devel INFO= ${PORTNAME} -OPTIONS_SUB= yes - -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_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 \ + 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_SCREEN= NCURSES SLANG +OPTIONS_SUB= yes AUTOCRYPT_DESC= Convenient End-to-End Encryption DEBUG_LOGS_DESC= Debugging capabilities @@ -81,48 +84,35 @@ NLS_DESC= Native language support (implies ICONV) QUOTE_PATCH_DESC= Extended quoting REVERSE_REPLY_PATCH_DESC= Reverse_reply SASL_DESC= SASL authentication -SMIME_DESC= SMIME email check option patch SLANG_DESC= SLANG support SMART_DATE_DESC= Dynamic date formatting with "%@" +SMIME_DESC= SMIME email check option patch SMTP_DESC= SMTP relay support URLVIEW_DESC= Use urlview for the URL selector menu -OPTIONS_DEFAULT= AUTOCRYPT DEBUG_LOGS GPGME GSSAPI_NONE HCACHE_BDB 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 - -.ifmake makesum # for optional distfiles patchfiles -OPTIONS_OVERRIDE= ${OPTIONS_DEFAULT} ${OPTIONS_DEFINE} -.MAKEOVERRIDES+= OPTIONS_OVERRIDE -.endif - -AUTOCRYPT_CONFIGURE_ENABLE= autocrypt AUTOCRYPT_IMPLIES= GPGME IDN +AUTOCRYPT_BUILD_DEPENDS= ${AUTOCRYPT_DEPENDS} +AUTOCRYPT_RUN_DEPENDS= ${AUTOCRYPT_DEPENDS} AUTOCRYPT_USES= sqlite:3 +AUTOCRYPT_CONFIGURE_ENABLE= autocrypt AUTOCRYPT_CONFIGURE_WITH= sqlite3=${LOCALBASE} AUTOCRYPT_DEPENDS= gnupg>=2.1:security/gnupg \ gpgme>=1.8:security/gpgme -AUTOCRYPT_BUILD_DEPENDS= ${AUTOCRYPT_DEPENDS} -AUTOCRYPT_RUN_DEPENDS= ${AUTOCRYPT_DEPENDS} - -URLVIEW_RUN_DEPENDS= urlview:textproc/urlview DEBUG_LOGS_CONFIGURE_ON= --enable-debug -DOCS_CONFIGURE_OFF= --disable-doc DOCS_BUILD_DEPENDS= lynx:www/lynx +DOCS_CONFIGURE_OFF= --disable-doc -# Handle ncurses/ncurses-port/slang -SLANG_CONFIGURE_ON= --with-slang=${LOCALBASE} -SLANG_LIB_DEPENDS= libslang.so:devel/libslang2 -SLANG_VARS= PKGMESSAGE=${FILESDIR}/pkg-message.slang +FLOCK_CONFIGURE_ENABLE= flock -NCURSES_USES= ncurses +GPGME_LIB_DEPENDS+= libassuan.so:security/libassuan \ + libgpg-error.so:security/libgpg-error \ + libgpgme.so:security/gpgme -NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls -NLS_IMPLIES= ICONV +GPGME_CONFIGURE_ENABLE= gpgme + +GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc # Handle GSSAPI from various places GSSAPI_BASE_USES= gssapi @@ -136,58 +126,66 @@ GSSAPI_MIT_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ --with-gss=${GSSAPIBASEDIR} GSSAPI_NONE_CONFIGURE_ON= --without-gss -HCACHE_NONE_CONFIGURE_ON= --disable-hcache -HCACHE_NONE_CONFIGURE_OFF= --enable-hcache - -HCACHE_BDB_CONFIGURE_WITH= bdb=${LOCALBASE} -HCACHE_BDB_USES= bdb:42+ -HCACHE_BDB_VARS= CFLAGS+=-I${BDB_INCLUDE_DIR} \ - LDFLAGS+=-L${BDB_LIB_DIR} - -HCACHE_TOKYOCABINET_CONFIGURE_WITH= tokyocabinet=${LOCALBASE} -HCACHE_TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet - -HCACHE_KYOTOCABINET_CONFIGURE_WITH= kyotocabinet=${LOCALBASE} +HCACHE_BDB_USES= bdb:42+ +HCACHE_BDB_CONFIGURE_WITH= bdb=${LOCALBASE} +HCACHE_BDB_VARS= CFLAGS+=-I${BDB_INCLUDE_DIR} \ + LDFLAGS+=-L${BDB_LIB_DIR} HCACHE_KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet +HCACHE_KYOTOCABINET_CONFIGURE_WITH= kyotocabinet=${LOCALBASE} +HCACHE_NONE_CONFIGURE_ON= --disable-hcache +HCACHE_NONE_CONFIGURE_OFF= --enable-hcache +HCACHE_TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet +HCACHE_TOKYOCABINET_CONFIGURE_WITH= tokyocabinet=${LOCALBASE} ICONV_USES= iconv:translit ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} ICONV_CONFIGURE_OFF= --disable-iconv -REVERSE_REPLY_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-reverse_reply - -SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE} - -SMIME_EXTRA_PATCHES= ${PATCHDIR}/extra-smime-sender - -SMART_DATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smartdate - -FLOCK_CONFIGURE_ENABLE= flock - -LOCALES_FIX_CONFIGURE_ON= --enable-locales-fix - +IDN_IMPLIES= ICONV IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 \ libunistring.so:devel/libunistring IDN_CONFIGURE_WITH= idn2=${LOCALBASE} -IDN_IMPLIES= ICONV IFDEF_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ifdef -GPGME_LIB_DEPENDS+= libassuan.so:security/libassuan \ - libgpg-error.so:security/libgpg-error \ - libgpgme.so:security/gpgme -GPGME_CONFIGURE_ENABLE= gpgme - -SMTP_CONFIGURE_ENABLE= smtp +LOCALES_FIX_CONFIGURE_ON= --enable-locales-fix MAILDIR_MTIME_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-maildir-mtime -GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc +NCURSES_USES= ncurses + +NLS_IMPLIES= ICONV +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \ mutt-${GREETING_PATCH_VERSION}.vvv.quote:vc +REVERSE_REPLY_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-reverse_reply + +SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 +SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE} + +# Handle ncurses/ncurses-port/slang +SLANG_LIB_DEPENDS= libslang.so:devel/libslang2 +SLANG_CONFIGURE_ON= --with-slang=${LOCALBASE} +SLANG_VARS= PKGMESSAGE=${FILESDIR}/pkg-message.slang + +SMART_DATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smartdate + +SMIME_EXTRA_PATCHES= ${PATCHDIR}/extra-smime-sender + +SMTP_CONFIGURE_ENABLE= smtp + +URLVIEW_RUN_DEPENDS= urlview:textproc/urlview + +.ifnmake portclippy +.ifmake makesum # for optional distfiles patchfiles +OPTIONS_OVERRIDE= ${OPTIONS_DEFAULT} ${OPTIONS_DEFINE} +.MAKEOVERRIDES+= OPTIONS_OVERRIDE +.endif +.endif + .include VVV_PATCH_VERSION= 1.13.0 diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo index 762881e84e14..087614d349ed 100644 --- a/mail/mutt/distinfo +++ b/mail/mutt/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1645313041 -SHA256 (mutt/mutt-2.2.1.tar.gz) = b76d30d42b6c90aa9abf9f330e41800934eedf7b858a32c120ee3ae63587abb5 -SIZE (mutt/mutt-2.2.1.tar.gz) = 5503979 +TIMESTAMP = 1648312918 +SHA256 (mutt/mutt-2.2.2.tar.gz) = 10de870cf37646c0b3f5bcf579c3cc2fd9285bda1d04be9ad7c33ec2ee820fcc +SIZE (mutt/mutt-2.2.2.tar.gz) = 5507066 SHA256 (mutt/mutt-2.2.0.vc.greeting) = 7abb467cfaa0ccbfa1fa7cdf8585eefef94e039459ff95fb59efe23043d941d2 SIZE (mutt/mutt-2.2.0.vc.greeting) = 1979 SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02