Re: git: 15d781b53233 - main - lib: Gate libfigpar under MK_DIALOG

On Mon, 09 Feb 2026 14:24:56 +0100, "Herbert J. Skuhra" wrote:
> 
> On Tue, 16 Aug 2022 21:16:07 +0200, Emmanuel Vadot wrote:
> > 
> > The branch main has been updated by manu:
> > 
> > URL: https://cgit.FreeBSD.org/src/commit/?id=15d781b5323315afaed06fb2f2499f9164e1ef86
> > 
> > commit 15d781b5323315afaed06fb2f2499f9164e1ef86
> > Author:     Emmanuel Vadot <manu@FreeBSD.org>
> > AuthorDate: 2022-07-21 14:52:24 +0000
> > Commit:     Emmanuel Vadot <manu@FreeBSD.org>
> > CommitDate: 2022-08-16 19:15:12 +0000
> > 
> >     lib: Gate libfigpar under MK_DIALOG
> >     
> >     libfigpar is only used by dpv and dpv isn't built if WITHOUT_DIALOG
> >     is set.
> > ---
> >  lib/Makefile | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> > 
> > diff --git a/lib/Makefile b/lib/Makefile
> > index 482e4d603f4b..3f94cbc1f073 100644
> > --- a/lib/Makefile
> > +++ b/lib/Makefile
> > @@ -57,7 +57,6 @@ SUBDIR=	${SUBDIR_BOOTSTRAP} \
> >  	libexecinfo \
> >  	libexpat \
> >  	libfetch \
> > -	libfigpar \
> >  	libgcc_eh \
> >  	libgcc_s \
> >  	libgeom \
> > @@ -170,7 +169,7 @@ SUBDIR+=	clang
> >  SUBDIR.${MK_CUSE}+= 	libcuse
> >  SUBDIR.${MK_CXX}+=	libdevdctl
> >  SUBDIR.${MK_TOOLCHAIN}+=libpe
> > -SUBDIR.${MK_DIALOG}+=	libdpv
> > +SUBDIR.${MK_DIALOG}+=	libdpv libfigpar
> >  SUBDIR.${MK_FILE}+=	libmagic
> >  SUBDIR.${MK_GPIO}+=	libgpio
> >  SUBDIR.${MK_GSSAPI}+=	libgssapi librpcsec_gss
> 
> Should this be added to main and 15?
> 
> diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
> index aae83a44e53e..1c584cb02881 100644
> --- a/tools/build/mk/OptionalObsoleteFiles.inc
> +++ b/tools/build/mk/OptionalObsoleteFiles.inc
> @@ -1479,10 +1479,14 @@ OLD_FILES+=usr/lib/libdpv.a
>  OLD_FILES+=usr/lib/libdpv.so
>  OLD_LIBS+=usr/lib/libdpv.so.3
>  OLD_FILES+=usr/lib/libdpv_p.a
> +OLD_FILES+=usr/lib/libfigpar.a
> +OLD_FILES+=usr/lib/libfigpar.so
> +OLD_LIBS+=usr/lib/libfigpar.so.0
>  OLD_FILES+=usr/share/man/man1/dialog.1.gz
>  OLD_FILES+=usr/share/man/man1/dpv.1.gz
>  OLD_FILES+=usr/share/man/man3/dialog.3.gz
>  OLD_FILES+=usr/share/man/man3/dpv.3.gz
> +OLD_FILES+=usr/share/man/man3/figpar.3.gz
>  .endif
>  
>  .if ${MK_DICT} == no
> 
> 
> After updating my Raspberry Pi 4 from 14.3-STABLE to 15.0-STABLE today
> I have the following leftovers:
> 
> $ ls -l /usr/lib/libfigpar.*
> -r--r--r--  1 root wheel 11704 Jul 29  2025 /usr/lib/libfigpar.a
> lrwxr-xr-x  1 root wheel    14 Jul 29  2025 /usr/lib/libfigpar.so -> libfigpar.so.0
> -r--r--r--  1 root wheel 11416 Jul 29  2025 /usr/lib/libfigpar.so.0
> 
> 
> I can find libfigpar only in /usr/obj.

Sorry, more files. Updated patch below.

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index aae83a44e53e..eaa89b7679e8 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1479,10 +1479,22 @@ OLD_FILES+=usr/lib/libdpv.a
 OLD_FILES+=usr/lib/libdpv.so
 OLD_LIBS+=usr/lib/libdpv.so.3
 OLD_FILES+=usr/lib/libdpv_p.a
+OLD_FILES+=usr/lib/libfigpar.a
+OLD_FILES+=usr/lib/libfigpar.so
+OLD_LIBS+=usr/lib/libfigpar.so.0
 OLD_FILES+=usr/share/man/man1/dialog.1.gz
 OLD_FILES+=usr/share/man/man1/dpv.1.gz
 OLD_FILES+=usr/share/man/man3/dialog.3.gz
 OLD_FILES+=usr/share/man/man3/dpv.3.gz
+OLD_FILES+=usr/share/man/man3/dpv_free.3.gz
+OLD_FILES+=usr/share/man/man3/figpar.3.gz
+OLD_FILES+=usr/share/man/man3/get_config_option.3.gz
+OLD_FILES+=usr/share/man/man3/parse_config.3.gz
+OLD_FILES+=usr/share/man/man3/replaceall.3.gz
+OLD_FILES+=usr/share/man/man3/strcount.3.gz
+OLD_FILES+=usr/share/man/man3/strexpand.3.gz
+OLD_FILES+=usr/share/man/man3/strexpandnl.3.gz
+OLD_FILES+=usr/share/man/man3/strtolower.3.gz
 .endif
 
 .if ${MK_DICT} == no