Created attachment 247015 [details] Patch The attached patch is going to introduce the support for SUBPACKAGES. We need to run an EXP-RUN to ensure we are not introducing any regressions.
There is a problem with the licenses: https://pkg-status.freebsd.org/pb2/data/140i386-default-foo/2023-12-19_10h24m35s/logs/errors/font-util-1.3.2.log https://pkg-status.freebsd.org/pb2/data/140i386-default-foo/2023-12-19_10h24m35s/logs/errors/gettext-runtime-0.22.3.log https://pkg-status.freebsd.org/pb2/data/140i386-default-foo/2023-12-19_10h24m35s/logs/errors/libatomic_ops-7.8.0.log https://pkg-status.freebsd.org/pb2/data/140i386-default-foo/2023-12-19_10h24m35s/logs/errors/poppler-data-0.4.12.log etc.
@antoine, could you manually change line 813 of Mk/bsd.license.mk to read @${INSTALL_DATA} ${_LICENSE_FILE_${lic}} ${STAGEDIR}${_LICENSE_DIR.${sp}}/${lic} i.e. replace the ${_LICENSE_DIR} there with ${_LICENSE_DIR.${sp}} and rerun it? mfg Tobias
Created attachment 247172 [details] Patch with fix
Uploaded the patch with the fix suggested by Tobias
It seems that there are 2 new failures: https://pkg-status.freebsd.org/package18/data/140amd64-default-foo/2023-12-27_09h30m03s/logs/errors/lha-1.14i_9.log https://pkg-status.freebsd.org/package18/data/140amd64-default-foo/2023-12-27_09h30m03s/logs/errors/wifi-firmware-kmod-20230508.log
Created attachment 247292 [details] New patch with a fix This patch contains a fix for the direct users of _LICENSE_DIR variable.
Exp-run seems fine
(In reply to Antoine Brodin from comment #7) \o/ *party time*
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=47564762a319a037686c921accbb831db779715c commit 47564762a319a037686c921accbb831db779715c Author: Luca Pizzamiglio <pizzamig@FreeBSD.org> AuthorDate: 2024-01-01 21:53:32 +0000 Commit: Luca Pizzamiglio <pizzamig@FreeBSD.org> CommitDate: 2024-01-01 21:58:53 +0000 component: add SUBPACKAGES This commit add SUBPACKAGES support to the framework. Fix users of _LICENSE_DIR Fix multi/dual license Add annotation to packages about being a subpkg Make do-depends aware of the subpackages Add PKGBASE.subpkg variable Fix actual-package-depends target Fix dependencies in sub-packages Implement LICENSE support Fix PLIST_FILES.subpkg Make DESCR.subpkg warning message shorter Add SUBPACKES to the list of OPTIONS_HELPERS Fix _strip_perms Simplify METADIR as in the original patch Fix _PLIST Fix the case when there are no subpackages Fix typo Fix _PKGDIR initialization Fix PLIST Fix typo in RE Fix METADIR Fix type in PKGFILE Fix [build|run]-depends-list targets Initial import of the subpackage framework This import is based on https://reviews.freebsd.org/D16457 PR: 275735 Differential Revision: https://reviews.freebsd.org/D40549 Mk/Scripts/depends-list.sh | 6 + Mk/Scripts/do-depends.sh | 23 +++- Mk/Scripts/functions.sh | 3 +- Mk/bsd.licenses.mk | 68 ++++++---- Mk/bsd.options.mk | 27 +++- Mk/bsd.port.mk | 310 +++++++++++++++++++++++++++++++-------------- 6 files changed, 313 insertions(+), 124 deletions(-)
Antoine: thanks for running this exp-run, as it identified a couple of regressions with the license framework. I'm closing this ticket, as this patch has finally landed.