When I installed FreeBSD 15.0, I had migrated to using pkgbase rather than freebsd-update. Pkgbase uses pkg (surpise) to upgrade packages, the base system and kernel modules.

With 15.1 announced, it was my first opportunity to try an upgrade with pkgbase. The steps are as follows:

# pkg upgrade -yr FreeBSD-ports pkg
# pkg -oABI=FreeBSD:15:amd64 -oOSVERSION=1501000 upgrade -r FreeBSD-base
# find /etc /usr/local/etc -name "*.pkgnew" -ls # list amended conf files (there were none)

Then, the UEFI boot loader must be upgraded:

# efibootmgr -v
Boot to FW : false
BootCurrent: 0002
Timeout    : 1 seconds
BootOrder  : 0002, 0001
+Boot0002* UEFI OS HD(1,GPT,d8c8ed92-3d97-11f0-818e-4ccc6af963b7,0x28,0x100000)/File(\EFI\BOOT\BOOTX64.EFI)
                  ada0p1:/EFI/BOOT/BOOTX64.EFI (null)
Boot0001* Hard Drive BBS(HD,,0x0)/VenHw(5ce8128b-2cec-40f0-8372-80640e3dc858,0200)
# mount_msdosfs /dev/ada0p1 /boot/efi
# cd /boot
# cp loader.efi /boot/efi/efi/BOOT/loader.efi
# cp loader.efi /boot/efi/efi/BOOT/BOOTx64.efi
# shutdown -r now

On reboot, I upgraded the kmods packages:

# pkg upgrade -r FreeBSD-ports-kmods

and then the normal ports.

However, I found Xorg would not come up; it died loading the ati driver.

A couple of hours later, I tried the pkg upgrade -r FreeBSD-ports-kmods command again. It upgraded one package:

drm-66-kmod upgraded: 6.6.25.1500068_10 -> 6.6.25.1501000_8

After that upgrade, Xorg started successfully. Bad upgrade timing on my part?

Asciidoctor

Later, I discovered I had to manually update devel/ruby-gems to ruby34-gems-4.0.9, due to the upgrade to ruby34, and then use gem to re-install (asciidoctor):

doas pkg install devel/ruby-gems
doas gem install asciidoctor