Re: git: dcf26c53aba1 - main - shells/zsh: Fix build with DOCS option off and base system WITHOUT_DOCS

In reply to: Brad Davis : "git: dcf26c53aba1 - main - shells/zsh: Fix build with DOCS option off and base system WITHOUT_DOCS"
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Adam Weinberger <adamw_at_adamw.org>
Date: Sat, 11 Nov 2023 00:13:38 UTC
On Fri, Nov 10, 2023 at 10:24 AM Brad Davis <brd@freebsd.org> wrote:

> The branch main has been updated by brd:
>
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=dcf26c53aba1eff065dcc8ae6fc2bd731bd126ef
>
> commit dcf26c53aba1eff065dcc8ae6fc2bd731bd126ef
> Author:     Brad Davis <brd@FreeBSD.org>
> AuthorDate: 2023-11-10 15:21:19 +0000
> Commit:     Brad Davis <brd@FreeBSD.org>
> CommitDate: 2023-11-10 15:21:19 +0000
>
>     shells/zsh: Fix build with DOCS option off and base system WITHOUT_DOCS
>
>     PR:             274713
>     Reviewed by:    garga
>     Approved by:    maintainer timeout
>     Sponsored by:   Rubicon Communications, LLC ("Netgate")
> ---
>  shells/zsh/Makefile  |   3 +-
>  shells/zsh/pkg-plist | 214
> +++++++++++++++++++++++++--------------------------
>  2 files changed, 109 insertions(+), 108 deletions(-)
>
> diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
> index 57c3ba91ad30..23ff16c85c03 100644
> --- a/shells/zsh/Makefile
> +++ b/shells/zsh/Makefile
> @@ -1,6 +1,6 @@
>  PORTNAME=      zsh
>  DISTVERSION=   5.9
> -PORTREVISION=  2
> +PORTREVISION=  3
>  CATEGORIES=    shells
>  MASTER_SITES=  https://www.zsh.org/pub/ \
>                 SF \
> @@ -73,6 +73,7 @@ DOCS=         LICENCE META-FAQ README \
>                 Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ
> Etc/completion-style-guide \
>                 Doc/zsh*.html Doc/zsh.dvi
>  DOCS_DISTFILES=        ${DISTNAME}-doc${EXTRACT_SUFX}:doc
> +DOCS_CONFIGURE_OFF=    --enable-runhelpdir=no
>
>  PORTDOCS=      *
>  PORTEXAMPLES=  zlogin zshenv zshrc
> diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
> index bd9ee06ebf77..e79ff780de97 100644
> --- a/shells/zsh/pkg-plist
> +++ b/shells/zsh/pkg-plist
> @@ -1270,113 +1270,113 @@ bin/zsh-%%ZSH_VER%%
>  %%DATADIR%%/%%ZSH_VER%%/functions/Zle/which-command
>  %%DATADIR%%/%%ZSH_VER%%/functions/Zle/zcalc-auto-insert
>  %%DATADIR%%/%%ZSH_VER%%/functions/Zle/zed-set-file-name
> -%%DATADIR%%/%%ZSH_VER%%/help/alias
> -%%DATADIR%%/%%ZSH_VER%%/help/autoload
> -%%DATADIR%%/%%ZSH_VER%%/help/bg
> -%%DATADIR%%/%%ZSH_VER%%/help/bindkey
> -%%DATADIR%%/%%ZSH_VER%%/help/break
> -%%DATADIR%%/%%ZSH_VER%%/help/builtin
> -%%DATADIR%%/%%ZSH_VER%%/help/bye
> -%%DATADIR%%/%%ZSH_VER%%/help/cap
> -%%DATADIR%%/%%ZSH_VER%%/help/cd
> -%%DATADIR%%/%%ZSH_VER%%/help/chdir
> -%%DATADIR%%/%%ZSH_VER%%/help/clone
> -%%DATADIR%%/%%ZSH_VER%%/help/colon
> -%%DATADIR%%/%%ZSH_VER%%/help/command
> -%%DATADIR%%/%%ZSH_VER%%/help/comparguments
> -%%DATADIR%%/%%ZSH_VER%%/help/compcall
> -%%DATADIR%%/%%ZSH_VER%%/help/compctl
> -%%DATADIR%%/%%ZSH_VER%%/help/compdescribe
> -%%DATADIR%%/%%ZSH_VER%%/help/compfiles
> -%%DATADIR%%/%%ZSH_VER%%/help/compgroups
> -%%DATADIR%%/%%ZSH_VER%%/help/compquote
> -%%DATADIR%%/%%ZSH_VER%%/help/comptags
> -%%DATADIR%%/%%ZSH_VER%%/help/comptry
> -%%DATADIR%%/%%ZSH_VER%%/help/compvalues
> -%%DATADIR%%/%%ZSH_VER%%/help/continue
> -%%DATADIR%%/%%ZSH_VER%%/help/declare
> -%%DATADIR%%/%%ZSH_VER%%/help/dirs
> -%%DATADIR%%/%%ZSH_VER%%/help/disable
> -%%DATADIR%%/%%ZSH_VER%%/help/disown
> -%%DATADIR%%/%%ZSH_VER%%/help/dot
> -%%DATADIR%%/%%ZSH_VER%%/help/echo
> -%%DATADIR%%/%%ZSH_VER%%/help/echotc
> -%%DATADIR%%/%%ZSH_VER%%/help/echoti
> -%%DATADIR%%/%%ZSH_VER%%/help/emulate
> -%%DATADIR%%/%%ZSH_VER%%/help/enable
> -%%DATADIR%%/%%ZSH_VER%%/help/eval
> -%%DATADIR%%/%%ZSH_VER%%/help/exec
> -%%DATADIR%%/%%ZSH_VER%%/help/exit
> -%%DATADIR%%/%%ZSH_VER%%/help/export
> -%%DATADIR%%/%%ZSH_VER%%/help/false
> -%%DATADIR%%/%%ZSH_VER%%/help/fc
> -%%DATADIR%%/%%ZSH_VER%%/help/fg
> -%%DATADIR%%/%%ZSH_VER%%/help/float
> -%%DATADIR%%/%%ZSH_VER%%/help/functions
> -%%DATADIR%%/%%ZSH_VER%%/help/getcap
> -%%DATADIR%%/%%ZSH_VER%%/help/getln
> -%%DATADIR%%/%%ZSH_VER%%/help/getopts
> -%%DATADIR%%/%%ZSH_VER%%/help/hash
> -%%DATADIR%%/%%ZSH_VER%%/help/history
> -%%DATADIR%%/%%ZSH_VER%%/help/integer
> -%%DATADIR%%/%%ZSH_VER%%/help/jobs
> -%%DATADIR%%/%%ZSH_VER%%/help/kill
> -%%DATADIR%%/%%ZSH_VER%%/help/let
> -%%DATADIR%%/%%ZSH_VER%%/help/limit
> -%%DATADIR%%/%%ZSH_VER%%/help/local
> -%%DATADIR%%/%%ZSH_VER%%/help/logout
> -%%DATADIR%%/%%ZSH_VER%%/help/noglob
> -%%DATADIR%%/%%ZSH_VER%%/help/popd
> -%%DATADIR%%/%%ZSH_VER%%/help/print
> -%%DATADIR%%/%%ZSH_VER%%/help/printf
> -%%DATADIR%%/%%ZSH_VER%%/help/pushd
> -%%DATADIR%%/%%ZSH_VER%%/help/pushln
> -%%DATADIR%%/%%ZSH_VER%%/help/pwd
> -%%DATADIR%%/%%ZSH_VER%%/help/r
> -%%DATADIR%%/%%ZSH_VER%%/help/read
> -%%DATADIR%%/%%ZSH_VER%%/help/readonly
> -%%DATADIR%%/%%ZSH_VER%%/help/rehash
> -%%DATADIR%%/%%ZSH_VER%%/help/return
> -%%DATADIR%%/%%ZSH_VER%%/help/sched
> -%%DATADIR%%/%%ZSH_VER%%/help/set
> -%%DATADIR%%/%%ZSH_VER%%/help/setcap
> -%%DATADIR%%/%%ZSH_VER%%/help/setopt
> -%%DATADIR%%/%%ZSH_VER%%/help/shift
> -%%DATADIR%%/%%ZSH_VER%%/help/source
> -%%DATADIR%%/%%ZSH_VER%%/help/stat
> -%%DATADIR%%/%%ZSH_VER%%/help/suspend
> -%%DATADIR%%/%%ZSH_VER%%/help/test
> -%%DATADIR%%/%%ZSH_VER%%/help/times
> -%%DATADIR%%/%%ZSH_VER%%/help/trap
> -%%DATADIR%%/%%ZSH_VER%%/help/true
> -%%DATADIR%%/%%ZSH_VER%%/help/ttyctl
> -%%DATADIR%%/%%ZSH_VER%%/help/type
> -%%DATADIR%%/%%ZSH_VER%%/help/typeset
> -%%DATADIR%%/%%ZSH_VER%%/help/ulimit
> -%%DATADIR%%/%%ZSH_VER%%/help/umask
> -%%DATADIR%%/%%ZSH_VER%%/help/unalias
> -%%DATADIR%%/%%ZSH_VER%%/help/unfunction
> -%%DATADIR%%/%%ZSH_VER%%/help/unhash
> -%%DATADIR%%/%%ZSH_VER%%/help/unlimit
> -%%DATADIR%%/%%ZSH_VER%%/help/unset
> -%%DATADIR%%/%%ZSH_VER%%/help/unsetopt
> -%%DATADIR%%/%%ZSH_VER%%/help/vared
> -%%DATADIR%%/%%ZSH_VER%%/help/wait
> -%%DATADIR%%/%%ZSH_VER%%/help/whence
> -%%DATADIR%%/%%ZSH_VER%%/help/where
> -%%DATADIR%%/%%ZSH_VER%%/help/which
> -%%DATADIR%%/%%ZSH_VER%%/help/zcompile
> -%%DATADIR%%/%%ZSH_VER%%/help/zformat
> -%%DATADIR%%/%%ZSH_VER%%/help/zftp
> -%%DATADIR%%/%%ZSH_VER%%/help/zle
> -%%DATADIR%%/%%ZSH_VER%%/help/zmodload
> -%%DATADIR%%/%%ZSH_VER%%/help/zparseopts
> -%%DATADIR%%/%%ZSH_VER%%/help/zprof
> -%%DATADIR%%/%%ZSH_VER%%/help/zpty
> -%%DATADIR%%/%%ZSH_VER%%/help/zregexparse
> -%%DATADIR%%/%%ZSH_VER%%/help/zsocket
> -%%DATADIR%%/%%ZSH_VER%%/help/zstyle
> -%%DATADIR%%/%%ZSH_VER%%/help/ztcp
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/alias
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/autoload
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/bg
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/bindkey
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/break
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/builtin
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/bye
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/cap
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/cd
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/chdir
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/clone
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/colon
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/command
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/comparguments
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/compcall
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/compctl
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/compdescribe
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/compfiles
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/compgroups
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/compquote
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/comptags
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/comptry
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/compvalues
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/continue
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/declare
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/dirs
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/disable
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/disown
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/dot
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/echo
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/echotc
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/echoti
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/emulate
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/enable
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/eval
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/exec
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/exit
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/export
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/false
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/fc
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/fg
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/float
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/functions
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/getcap
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/getln
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/getopts
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/hash
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/history
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/integer
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/jobs
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/kill
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/let
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/limit
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/local
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/logout
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/noglob
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/popd
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/print
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/printf
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/pushd
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/pushln
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/pwd
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/r
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/read
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/readonly
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/rehash
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/return
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/sched
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/set
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/setcap
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/setopt
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/shift
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/source
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/stat
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/suspend
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/test
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/times
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/trap
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/true
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/ttyctl
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/type
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/typeset
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/ulimit
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/umask
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/unalias
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/unfunction
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/unhash
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/unlimit
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/unset
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/unsetopt
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/vared
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/wait
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/whence
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/where
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/which
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/zcompile
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/zformat
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/zftp
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/zle
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/zmodload
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/zparseopts
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/zprof
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/zpty
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/zregexparse
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/zsocket
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/zstyle
> +%%DOCS%%%%DATADIR%%/%%ZSH_VER%%/help/ztcp
>  %%DATADIR%%/%%ZSH_VER%%/scripts/newuser
>  man/man1/zsh.1.gz
>  man/man1/zshall.1.gz
>

This change seems a little unintuitive for me. The runtime help files have
a very different purpose from the HTML and DVI files that they're now tied
to. If I disable DOCS, I would not expect it to disable part of the runtime
package. I use run-help to access help files all the time, but there's no
scenario in which I'd ever need the DVI files. Can we maybe tie the help
files to a HELP option instead?
# Adam


-- 
Adam Weinberger
adamw@adamw.org
https://www.adamw.org