From 79efffb355dfe70259e47bc8f8e6f9d41484e9a1 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 6 Jul 2026 19:41:47 +0200
Subject: [PATCH] ci: freebsd: fix pkg-version-skew + missing bzip2.pc build
 breakage

Adapted backport of master's three commits (this release's
install-pkg.sh lacks master's retry()/catalogue-refresh scaffolding,
so this isn't a mechanical cherry-pick - same net effect, minimal diff
against what's actually here):

- aaab164c0e ci: freebsd: set IGNORE_OSVERSION=yes to survive pkg repo/VM release skew
- f95ab701fe ci: freebsd: install bzip2 (freetype2's pkgconfig Requires)
- a959773be9 ci: freebsd: synthesize a bzip2.pc if the bzip2 package doesn't ship one

(cherry picked from commits aaab164c0e, f95ab701fe, a959773be9)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 .github/scripts/freebsd/install-pkg.sh | 46 ++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/.github/scripts/freebsd/install-pkg.sh b/.github/scripts/freebsd/install-pkg.sh
index 0a89fba00e..22ee846c35 100755
--- a/.github/scripts/freebsd/install-pkg.sh
+++ b/.github/scripts/freebsd/install-pkg.sh
@@ -2,8 +2,21 @@
 
 set -e
 
+# The CI VM's release is pinned (build-xserver.yml: release: "14.3"), but
+# FreeBSD's official package repo tracks the "14" ABI branch, not the exact
+# point release — when it rolls forward to packages built against a newer
+# point release than the pinned VM, pkg refuses to proceed non-interactively
+# ("pkg: repository FreeBSD contains packages for wrong OS version" /
+# "Ignore the mismatch and continue? [y/N]:", no TTY in CI to answer it).
+# IGNORE_OSVERSION=yes is pkg's own documented escape hatch for exactly this
+# case; a one-point-release ABI skew is expected to be compatible in
+# practice. This does NOT mask a genuine build/test failure — it only lets
+# `pkg update`/`pkg install` proceed past the version check.
+export IGNORE_OSVERSION=yes
+
 echo "--> install extra dependencies"
 pkg install -y \
+    bzip2 \
     curl \
     git \
     libdrm \
@@ -27,3 +40,36 @@ pkg install -y \
     xcb-util-wm \
     xkbcomp \
     xorgproto
+
+# The FreeBSD `bzip2` package installs libbz2 + headers but, at least on
+# this CI image, no bzip2.pc — freetype2's own .pc lists bzip2 in
+# Requires.private, so pkgconf's dependency resolution for xfont2 (which
+# needs freetype2) fails outright even though the actual library is
+# present and perfectly usable. This is a missing-metadata gap in the
+# package, not a missing library — synthesize the .pc pkgconf itself
+# never shipped, pointing at wherever `pkg` actually placed the files
+# (found via `pkg info -l`, not hardcoded, since the exact split between
+# base-system and /usr/local varies).
+if ! pkg-config --exists bzip2 2>/dev/null; then
+    echo "--> bzip2.pc missing from the bzip2 package; synthesizing one"
+    bz_hdr=$(pkg info -l bzip2 | grep -m1 '/bzlib\.h$') || true
+    bz_lib=$(pkg info -l bzip2 | grep -m1 '/libbz2\.so$') || true
+    bz_incdir=$(dirname "${bz_hdr:-/usr/local/include/bzlib.h}")
+    bz_libdir=$(dirname "${bz_lib:-/usr/local/lib/libbz2.so}")
+    bz_ver=$(pkg info bzip2 2>/dev/null | awk -F'[-:]' '/^Version/ {print $2; exit}')
+    pcdir=/usr/local/libdata/pkgconfig
+    mkdir -p "$pcdir"
+    cat > "$pcdir/bzip2.pc" <<EOF
+prefix=/usr/local
+libdir=$bz_libdir
+includedir=$bz_incdir
+
+Name: bzip2
+Description: bzip2 compression library
+Version: ${bz_ver:-1.0.8}
+Libs: -L\${libdir} -lbz2
+Cflags: -I\${includedir}
+EOF
+    echo "--> wrote $pcdir/bzip2.pc:"
+    cat "$pcdir/bzip2.pc"
+fi