On Thu, Nov 21, 2024 at 07:10:42PM +0000, Stuart Henderson wrote:
> On 2024/11/21 19:10, Kirill A. Korinsky wrote:
> > On Mon, 11 Nov 2024 22:33:15 +0100,
> > Edd Barrett <edd@theunixzoo.co.uk> wrote:
> > > 
> > > Here's the update to TeX Live 2024.
> > > 
> > > Notes:
> > > 
> > >  - ConTeXt is unbroken this time. Requires the luametatex update I just posted.
> > > 
> > >  - I disabled dvisvgm because it's build system is broken and can't be
> > >    persuaded to unbundle its deps. Shout if you use this program. We can port
> > >    it separately if need be.
> > >    https://tug.org/pipermail/tldistro/2024q2/000477.html
> > > 
> > >  - Tested with a partial bulk on anything that {LIB,BUILD}_DEPENDS on TL. All
> > >    OK on amd64. Can anyone try on big endian?
> > > 
> > > Please have a play and let me know how you get on.
> > > 
> > > Diff attached, because it's >33K lines :)
> > > 
> > 
> > Thanks for update! Just tested locally.
> > 
> > Slava Voronzoff had asked to confirm, via telegram group, that some
> > texlive_texmf port tries to remvoe /usr/local/bin.
> > 
> > I'd like to confirm that removing texlive_texmf-minimal-2024 leads to
> > 
> >   Error deleting directory /usr/local/bin: Directory not empty
> 
> There are bogus "bin/" entries in a couple of PLISTs.

It's already the case with tl2023, but indeed we should drop them.

> Also I'm not 100% sure but I think the "updating" of @conflict markers
> goes too far - these really only want to be listed when there are actual
> conflicts (in some cases, e.g. share/texmf-dist/tex/latex/etoolbox,
> share/texmf-dist/tex/latex/everyshi, share/texmf-dist/tex/latex/xpatch,
> bin/eptex, they are needed). Problem with over-listing @conflicts is
> that pkg_add has to merge the updates together - and if there's one
> set of ports in the tree where this is a problem (for disk use on
> updates) that's texlive.

I agree that too strict @conflicts aren't good.  They seem to be
refreshed by texmf/files/update_plist_hints.py.  Sadly it appears that
adding only minimal @conflicts will help much with this update.  Using
sort(1), comm(1), sed(1) etc on the old and new PLISTS, I get:

pbuild /usr/ports/print/texlive$ cvs diff 2>/dev/null | grep -e '^Index.*pkg/PLIST-' -e '^+@conflict '
Index: base/pkg/PLIST-main
Index: texmf/pkg/PLIST-buildset
+@conflict texlive_texmf-main-<2024
Index: texmf/pkg/PLIST-context
Index: texmf/pkg/PLIST-docs
Index: texmf/pkg/PLIST-full
Index: texmf/pkg/PLIST-main
+@conflict texlive_texmf-full-<2024
+@conflict texlive_texmf-buildset-<2024

With this, pkg_add -u works fine, but unless I'm missing something
pkg_add still seems to update all the texlive-*-2024 packages as a
bundle.

pkg_add -u output slightly mangled:

--8<--
pbuild /usr/ports$ doas env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all/ pkg_add -u
luametatex-2.10.08p0->2.11.01: ok
texlive_base-2024p0:texlive_mktexlsr-2023->2024: ok
texlive_texmf-buildset-2023p0->2024 forward dependencies:
| Dependency of texlive_texmf-minimal-2023p0 on texlive_texmf-buildset-2023p0 doesn't match
| Dependency of texlive_base-2023 on texlive_texmf-buildset-2023 doesn't match
Merging texlive_texmf-minimal-2023p0->2024 (ok)
Merging texlive_base-2023->2024p0 (ok)
texlive_base-2023+texlive_texmf-buildset-2023p0+texlive_texmf-minimal-2023p0->texlive_base-2024p0+texlive_texlive_base-2024p0+texlive...:.libs-texlive_synctex-2024+texlive_synctex-2023->texlive_synctex-2024 (proc
texlive_base-2024p0+texlive...:.libs-texlive_synctex-2024+texlive_synctex-2023->texlive_synctex-2024: ok
texlive_base-2023+texlive_texmf-buildset-2023p0+texlive_texmf-minimal-2023p0->texlive_base-2024p0+texlive_texlive_base-2023+texlive_texmf-buildset-2023p0+texlive_texmf-full-2023p0+texlive_texmf-minimal-2023p0->texlive_base-2024p0+texlive_texmf-buildset-2024+texlive_texmf-full-2024+texlive_texmf-minimal-2024 (processi
texlive_base-2023+texlive_texmf-buildset-2023p0+texlive_texmf-full-2023p0+texlive_texmf-minimal-2023p0->texlive_base-2024p0+texlive_texmf-buildset-2024+texlive_texmf-full-2024+texlive_texmf-minimal-2024 forward dependencies:
| Dependency of texlive_texmf-context-2023p0 on texlive_texmf-full-2023p0 doesn't match
Merging texlive_texmf-context-2023p0->2024 (ok)
texlive_base-2023+texlive_texmf-buildset-2023p0+texlive_texmf-context-2023p0+texlive_texmf-full-2023p0+texlive_texmf-minimal-2023p0->texlive_base-2024p0+texlive_texmf-buildset-2024+texlive_texmf-context-2024+texl
texlive_base-2023+texlive_texmf-buildset-2023p0+texlive_texmf-context-2023p0+texlive_texmf-full-2023p0+texlive_texmf-minimal-2023p0->texlive_base-2024p0+texlive_texmf-buildset-2024+texlive_texmf-context-2024+texlive_texmf-full-2024+texlive_texmf-minimal-2024: ok
texlive_texmf-docs-2023p0->2024: ok
Running tags: ok
Read shared items: ok
New and changed readme(s):
	/usr/local/share/doc/pkg-readmes/texlive_base
[...]
-->8--


-- 
jca