2026-09-26T10:22:54+0000 Johannes Thyssen Tishman <[email protected]>: > 2026-09-25T16:55:20+0100 Stuart Henderson <[email protected]>: > > On 2026/09/25 14:48, Johannes Thyssen Tishman wrote: > > > Please find below an update for devel/kyua to version 0.14.1. Since > > > version 0.10, devel/kyua-cli and devel/kyua-testers have been merged > > > into one[0]. Cc'd MAINTAINER. > > > > > > I've haven't dealt with a port rename/removal yet, so I'd be grateful > > > for some guidance. > > > > > > Changelog: https://github.com/freebsd/kyua/blob/master/NEWS > > > > > > Notes about this update: > > > 1. Specifying -std in CXXFLAGS_base-clang doesn't seem necessary > > > anymore. C++20 is required since last release. > > > 2. devel/atf doesn't seem necessary in LIB_DEPENDS anymore > > > 3. Use ${FULLPKGNAME}:${BUILD_PKGPATH} to avoid matching older port > > > versions > > > > > > [0] > > > https://github.com/freebsd/kyua/blob/33d348582c677ba63daa301d802aefea7aca52af/NEWS#L318 > > > > > > Index: devel/Makefile > > > =================================================================== > > > RCS file: /cvs/ports/devel/Makefile,v > > > diff -u -p -r1.2616 Makefile > > > --- devel/Makefile 23 Sep 2026 16:58:19 -0000 1.2616 > > > +++ devel/Makefile 25 Sep 2026 14:21:34 -0000 > > > @@ -271,8 +271,7 @@ > > > SUBDIR += knfmt > > > SUBDIR += kproperty > > > SUBDIR += kreport > > > - SUBDIR += kyua-cli > > > - SUBDIR += kyua-testers > > > + SUBDIR += kyua > > > SUBDIR += lager > > > SUBDIR += legit > > > SUBDIR += leiningen > > > Index: devel/kyua/Makefile > > > =================================================================== > > > RCS file: /cvs/ports/devel/kyua-cli/Makefile,v > > > diff -u -p -r1.12 Makefile > > > --- devel/kyua/Makefile 18 Nov 2023 18:53:30 -0000 1.12 > > > +++ devel/kyua/Makefile 25 Sep 2026 14:21:34 -0000 > > > > > @@ -1,40 +1,35 @@ > > > COMMENT = testing framework > > > -DISTNAME = kyua-cli-0.8 > > > -REVISION = 3 > > > +DISTNAME = kyua-0.14.1 > > > > this diff is slightly confusing, you've mv'd the directory but kept > > the original CVS files. cvs rm -Rf kyua-cli, remove the CVS dirs under > > devel/kyua, and when it's ready to go in, import under devel/kyua. > > > > you'll need these in devel/kyua/pkg/PLIST: > > @pkgpath devel/kyua-cli > > @pkgpath devel/kyua-testers > > @conflict kyua-cli-* > > @conflict kyua-testers-* > > > > and in devel/quirks $stem_extensions I think you'll need these > > > > 'kyua-cli' => 'kyua', > > 'kyua-testers' => 'kyua', > > > > to test the upgrade path, build new packages including quirks, move > > them to a dir on their own. install the old packages. change to the > > dir with new packages and "PKG_PATH=./ pkg_add -u -D unsigned". > > you'll get "could not update" for all the other unrelated ports but > > if things are right you should be left with just the one new > > kyua package installed and no errors other than the unrelated > > "could not update". > > Thanks for the help Stuart. I hope I got it correct this time. The diff > below removes and unhooks devel/kyua-{cli,testers}, updates > devel/quirks, updates devel/lutok (needed by devel/kyua), and hooks > devel/kyua (port attached as a tarball). > > Additionally, it updates devel/atf and revises yesterday's update for > mail/mlmmj, both of which now depend on devel/kyua. > > By following your instruction I got the following output from pkg_add > when updating: > > # PKG_PATH=./ pkg_add -u -D unsigned > quirks-7.226->7.226: ok > kyua-cli-0.8p3+kyua-testers-0.2p1->kyua-0.14.1: ok > Read shared items: ok > Couldn't find updates for atf-0.18p3 blake3-1.8.7 ccache-4.14 > fmt-11.2.0p0 gettext-runtime-1.0 libhiredis-1.4.1 libiconv-1.19 > libsodium-1.0.22 lua-5.1.5p9 lua-5.4.8p2 lutok-0.6.3 lz4-1.10.0 > pkglocatedb-1.5 sqlite3-3.53.2 updatedb-0p0 vim-9.2.1125p0 > xxhash-0.8.3p0 xz-5.8.4 zstd-1.5.7p0 > # pkg_info | grep kyua > kyua-0.14.1 testing framework > > What's the preferred way to commit this dance?
I just realized I probably also need to update devel/quirk's version, correct? Index: devel/quirks/Makefile =================================================================== RCS file: /cvs/ports/devel/quirks/Makefile,v diff -u -p -r1.1819 Makefile --- devel/quirks/Makefile 23 Sep 2026 16:47:23 -0000 1.1819 +++ devel/quirks/Makefile 26 Sep 2026 10:25:15 -0000 @@ -3,7 +3,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-7.226 +PKGNAME = quirks-7.227 PKG_ARCH = * MAINTAINER = Marc Espie <[email protected]>
