> > 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:
Ah, that's a pity - still, I think it would be good to use the minimal @conflicts to give a hint for future updates. > 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 I think that should be texlive_texmf-minimal-<2024 (the subpackage extension doesn't match the PKGNAME, it confused me a few times when I was reading the diff!). > 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 >
