git: 7167d0f0c87b - main - mail/neomutt: fix WITHOUT=DOCS

From: Baptiste Daroussin <bapt_at_FreeBSD.org>
Date: Tue, 02 Nov 2021 15:59:33 UTC
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7167d0f0c87b861a118644b509091545e13aa3ce

commit 7167d0f0c87b861a118644b509091545e13aa3ce
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2021-11-02 15:55:53 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
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