From owner-dev-commits-src-branches@freebsd.org Wed Aug 18 23:43:51 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0993B659016
for <dev-commits-src-branches@mailman.nyi.freebsd.org>;
Wed, 18 Aug 2021 23:43:51 +0000 (UTC)
(envelope-from junchoon@dec.sakura.ne.jp)
Received: from www121.sakura.ne.jp (www121.sakura.ne.jp [153.125.133.21])
(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 mx1.freebsd.org (Postfix) with ESMTPS id 4Gqkxd2mVcz3hcY;
Wed, 18 Aug 2021 23:43:48 +0000 (UTC)
(envelope-from junchoon@dec.sakura.ne.jp)
Received: from kalamity.joker.local (123-48-130-181.area1b.commufa.jp
[123.48.130.181]) (authenticated bits=0)
by www121.sakura.ne.jp (8.16.1/8.16.1/[SAKURA-WEB]/20201212) with ESMTPA id
17INhdMN010256; Thu, 19 Aug 2021 08:43:40 +0900 (JST)
(envelope-from junchoon@dec.sakura.ne.jp)
Date: Thu, 19 Aug 2021 08:43:39 +0900
From: Tomoaki AOKI <junchoon@dec.sakura.ne.jp>
To: dev-commits-src-branches@freebsd.org
Cc: manu@FreeBSD.org, jkim@FreeBSD.org
Subject: Re: git: e99783747e49 - stable/13 - pkgbase: Add an src.conf option
for splitting man pages
Message-Id: <20210819084339.16eaf17eeac1f936a6c2ceee@dec.sakura.ne.jp>
Reply-To: junchoon@dec.sakura.ne.jp
Organization: Junchoon corps
X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd13.0)
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-2022-JP
Content-Transfer-Encoding: 7bit
X-Rspamd-Queue-Id: 4Gqkxd2mVcz3hcY
X-Spamd-Bar: /
Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none;
spf=none (mx1.freebsd.org: domain of junchoon@dec.sakura.ne.jp has no SPF
policy when checking 153.125.133.21) smtp.mailfrom=junchoon@dec.sakura.ne.jp
X-Spamd-Result: default: False [-0.60 / 15.00];
HAS_REPLYTO(0.00)[junchoon@dec.sakura.ne.jp];
RCVD_VIA_SMTP_AUTH(0.00)[]; MV_CASE(0.50)[];
REPLYTO_ADDR_EQ_FROM(0.00)[]; TO_DN_NONE(0.00)[];
HAS_ORG_HEADER(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000];
FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[];
R_DKIM_NA(0.00)[];
ASN(0.00)[asn:7684, ipnet:153.125.128.0/18, country:JP];
MID_RHS_MATCH_FROM(0.00)[];
RECEIVED_SPAMHAUS_PBL(0.00)[123.48.130.181:received];
FAKE_REPLY(1.00)[]; ARC_NA(0.00)[];
NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[];
RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[];
NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain];
MIME_TRACE(0.00)[0:+]; AUTH_NA(1.00)[];
DMARC_NA(0.00)[sakura.ne.jp]; R_SPF_NA(0.00)[no SPF record];
RCVD_COUNT_TWO(0.00)[2];
MAILMAN_DEST(0.00)[dev-commits-src-branches]
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
<dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Aug 2021 23:43:51 -0000
This breaks at least x11/nvidia-driver build.
Additional MFC of git: 6827435548d2 [1] is needed.
[1]
https://cgit.freebsd.org/src/commit/?id=6827435548d257c672f934db5c6ff01012d96995
> The branch stable/13 has been updated by manu:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=e99783747e49d0df4c9bccbc33907333e2d77a1e
>
> commit e99783747e49d0df4c9bccbc33907333e2d77a1e
> Author: Emmanuel Vadot <manu at FreeBSD.org>
> AuthorDate: 2021-03-16 06:11:56 +0000
> Commit: Emmanuel Vadot <manu at FreeBSD.org>
> CommitDate: 2021-08-16 16:13:51 +0000
>
> pkgbase: Add an src.conf option for splitting man pages
>
> Man pages can be big in total, add an options to split man pages
> in -man packages so we produce smaller packages.
> This is useful for small jails or mfsroot produced of pkgbase.
> The option is off by default.
>
> Reviewed by: bapt, Mina Gali〓 <me at igalic.co>
> Differential Revision: https://reviews.freebsd.org/D29169
> MFC after: 2 weeks
>
> (cherry picked from commit c7e6cb9e08d6b51e677a9f5546b8e36d678687d0)
> ---
> release/packages/generate-ucl.sh | 5 +++++
> share/man/man5/src.conf.5 | 2 ++
> share/mk/bsd.man.mk | 9 +++++++++
> share/mk/src.opts.mk | 1 +
> tools/build/options/WITH_MANSPLITPKG | 2 ++
> 5 files changed, 19 insertions(+)
>
> diff --git a/release/packages/generate-ucl.sh
> b/release/packages/generate-ucl.sh index e900f9991912..67c10e485eb7
100755
> --- a/release/packages/generate-ucl.sh
> +++ b/release/packages/generate-ucl.sh
> @@ -71,6 +71,11 @@ main() {
> _descr="Debugging Symbols"
> pkgdeps="${outname}"
> ;;
> + *_man)
> + outname="${outname%%_man}"
> + _descr="Manual Pages"
> + pkgdeps="${outname}"
> + ;;
> ${origname})
> pkgdeps="runtime"
> ;;
> diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
> index a0c1b4bb8b8a..f118471c2770 100644
> --- a/share/man/man5/src.conf.5
> +++ b/share/man/man5/src.conf.5
> @@ -1099,6 +1099,8 @@ is set explicitly)
> .It Va WITHOUT_MANCOMPRESS
> Set to not to install compressed man pages.
> Only the uncompressed versions will be installed.
> +.It Va WITH_MANSPLITPKG
> +Set to split man pages into their own packages during make package.
> .It Va WITHOUT_MAN_UTILS
> Set to not build utilities for manual pages,
> .Xr apropos 1 ,
> diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
> index 1e67928a2754..21c5fe4f2424 100644
> --- a/share/mk/bsd.man.mk
> +++ b/share/mk/bsd.man.mk
> @@ -50,7 +50,11 @@
> .error bsd.man.mk cannot be included directly.
> .endif
>
> +.if ${MK_MANSPLITPKG} == "no"
> MINSTALL?= ${INSTALL} ${TAG_ARGS} -o ${MANOWN} -g ${MANGRP} -m $
{MANMODE} +.else
> +MINSTALL?= ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},man} -o ${MANOWN}
-g ${MANGRP} -m ${MANMODE} +.endif
>
> CATDIR= ${MANDIR:H:S/$/\/cat/}
> CATEXT= .cat
> @@ -226,8 +230,13 @@ maninstall: ${MAN}
> .endif # ${MK_MANCOMPRESS} == "no"
> .endif
> .for l t in ${_MANLINKS}
> +.if ${MK_MANSPLITPKG} == "no"
> rm -f ${DESTDIR}${t} ${DESTDIR}${t}${MCOMPRESS_EXT}; \
> ${INSTALL_MANLINK} ${TAG_ARGS} ${DESTDIR}${l}${ZEXT} $
{DESTDIR}${t}${ZEXT} +.else
> + rm -f ${DESTDIR}${t} ${DESTDIR}${t}${MCOMPRESS_EXT}; \
> + ${INSTALL_MANLINK} ${TAG_ARGS:D${TAG_ARGS},man} ${DESTDIR}$
{l}${ZEXT} ${DESTDIR}${t}${ZEXT} +.endif
> .endfor
>
> manlint:
> diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
> index 77c60aef0bc4..7d08b6a1da89 100644
> --- a/share/mk/src.opts.mk
> +++ b/share/mk/src.opts.mk
> @@ -208,6 +208,7 @@ __DEFAULT_NO_OPTIONS = \
> LOADER_FIREWIRE \
> LOADER_VERBOSE \
> LOADER_VERIEXEC_PASS_MANIFEST \
> + MANSPLITPKG \
> OFED_EXTRA \
> OPENLDAP \
> OPENSSL_KTLS \
> diff --git a/tools/build/options/WITH_MANSPLITPKG
> b/tools/build/options/WITH_MANSPLITPKG new file mode 100644
> index 000000000000..122da24e0bb4
> --- /dev/null
> +++ b/tools/build/options/WITH_MANSPLITPKG
> @@ -0,0 +1,2 @@
> +.\" $FreeBSD$
> +Set to split man pages into their own packages during make package.
--
Tomoaki AOKI <junchoon@dec.sakura.ne.jp>