From nobody Tue Nov 2 15:59:33 2021 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 0A92218364A1; Tue, 2 Nov 2021 15:59:35 +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 4HkF2s6yJsz4R7H; Tue, 2 Nov 2021 15:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3B9A627B42; Tue, 2 Nov 2021 15:59:33 +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 1A2FxXC3051472; Tue, 2 Nov 2021 15:59:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A2FxXgr051471; Tue, 2 Nov 2021 15:59:33 GMT (envelope-from git) Date: Tue, 2 Nov 2021 15:59:33 GMT Message-Id: <202111021559.1A2FxXgr051471@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 7167d0f0c87b - main - mail/neomutt: fix WITHOUT=DOCS 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7167d0f0c87b861a118644b509091545e13aa3ce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=7167d0f0c87b861a118644b509091545e13aa3ce commit 7167d0f0c87b861a118644b509091545e13aa3ce Author: Baptiste Daroussin AuthorDate: 2021-11-02 15:55:53 +0000 Commit: Baptiste Daroussin CommitDate: 2021-11-02 15:56:51 +0000 mail/neomutt: fix WITHOUT=DOCS The trick we abused in order to still get the manpages while not building the docs it not working anymore. Make the manpages conditionnes to the DOCS option as well Reported by: gahr --- mail/neomutt/Makefile | 4 +--- mail/neomutt/pkg-plist | 12 ++++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile index ecbd8ded0412..c405f6c0d6b5 100644 --- a/mail/neomutt/Makefile +++ b/mail/neomutt/Makefile @@ -86,12 +86,10 @@ GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gss=${LOCALBASE} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --with-gss=${LOCALBASE} +DOCS_CONFIGURE_OFF= --disable-doc DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \ lynx:www/lynx -# Trick neomutt into building manpages and neomuttrc -DOCS_VARS_OFF= BINARY_ALIAS=xsltproc=true \ - BINARY_ALIAS+=xmlcatalog=true post-install: ${RM} ${STAGEDIR}${PREFIX}/etc/mime* diff --git a/mail/neomutt/pkg-plist b/mail/neomutt/pkg-plist index 7b918216c6fc..2568e22aff2f 100644 --- a/mail/neomutt/pkg-plist +++ b/mail/neomutt/pkg-plist @@ -1,12 +1,12 @@ bin/neomutt libexec/neomutt/pgpewrap libexec/neomutt/smime_keys -man/man1/neomutt.1.gz -man/man1/pgpewrap_neomutt.1.gz -man/man1/smime_keys_neomutt.1.gz -man/man5/mbox_neomutt.5.gz -man/man5/mmdf_neomutt.5.gz -man/man5/neomuttrc.5.gz +%%PORTDOCS%%man/man1/neomutt.1.gz +%%PORTDOCS%%man/man1/pgpewrap_neomutt.1.gz +%%PORTDOCS%%man/man1/smime_keys_neomutt.1.gz +%%PORTDOCS%%man/man5/mbox_neomutt.5.gz +%%PORTDOCS%%man/man5/mmdf_neomutt.5.gz +%%PORTDOCS%%man/man5/neomuttrc.5.gz @sample etc/neomuttrc.dist etc/neomuttrc %%NLS%%share/locale/bg/LC_MESSAGES/neomutt.mo %%NLS%%share/locale/ca/LC_MESSAGES/neomutt.mo