Using ports across major version changes

How does one "cross the bridge" between FreeBSD 15 and FreeBSD 16 when using 
poudriere to maintain a package repository on a host tracking -current?

Now that -current has gone from 15 to 16, searching for local packages reports
root@nemesis:/usr/local/poudriere # pkg search bash
pkg: repository FreeBSD-ports-kmods contains packages for wrong OS version: FreeBSD:16:aarch64
pkg: wrong architecture: FreeBSD:15:aarch64 instead of FreeBSD:16:aarch64
pkg: repository custom contains packages with wrong ABI: FreeBSD:15:aarch64

despite the fact that the shells/bash package was compiled after the transition.

It looks as if the pkg command expects the entire repository to be maintained
under a single major version number. In this case the repository contains only
pakcages needed for the local system, built one-at-a-time as found necessary.

What's the best way to restore normal operation? Something like 
poudriere bulk -a
might work if it builds only existing packages, but the man page 
says "all packages in the tree" which seems to imply it'll build
the entire ports tree, far too much for a Raspberry Pi (even a 4).

Thanks for reading!

bob prohaska