My only other feedback from looking at the draft standard was that while we should have LicenseRef-Foo as described in the document, each time we have to do that because the matching score isn't high enough, we should encourage the maintainer to submit that to the SPDX legal team so that they can either tweak the markup for license Foo, or create a new Foo variant if the changes are legally different enough.

In D51414#1175013, @bofh wrote:

In D51414#1174997, @tuukka.pasanen_ilmi.fi wrote:

I've tested few random packages in ports.

• It's bit confusing that check-spdx-license compiles things when one might just want to check license. What I mean is that it should just extract and check license file in current port directory not try to compile whole package?

I think that is what this is doing. It's extracting and checking the license. There is no compiling involved.

Then is just me.. I find it confusing in some tested ports like Go ones just print so much stuff and it looks like it starts compile something.

In D51414#1174997, @tuukka.pasanen_ilmi.fi wrote:

I've tested few random packages in ports.

• It's bit confusing that check-spdx-license compiles things when one might just want to check license. What I mean is that it should just extract and check license file in current port directory not try to compile whole package?

I think that is what this is doing. It's extracting and checking the license. There is no compiling involved.

• Another one what might be easier to user to understand would be if match is 1.0 (I understood that is 100%) it should not be relevant to show other possible licenses?

Yes I have that code hidden and commented around somewhere still in the scripts and waiting for some other's feedback

• It would be nice to see unified diff if license differs from license that is mentioned in ports Makefile.

This is not easy to do. Initially we are actually normalizing the entire documents into a single line to avoid any ambiguity. So the unified diff is not helpful as it prints two huge lines. To have something really readable we have to break into lines again. I will look into it but no promises.

I've tested few random packages in ports.

Fix some corner cases of normalization.

Great, thank you for this work.

I do have the necessary CHANGES entry just not attached it here for keeping it clutter free. I will rerun one more mini exp tomorrow and commit.

Whatever is in the review description will do just fine for the CHANGES entry.

Oh, please add a entry to the CHANGES file too.

Approved as long as it's been tested with a "today" ports tree. ("today" being regarding to the day it will being pushed.)

In D48227#1100097, @rene wrote:

I can hold off branching 2025Q1

I can hold off branching 2025Q1

In D48227#1099827, @bofh wrote:

In D48227#1099753, @freebsd_dev.thsi.be wrote:

I've created https://reviews.freebsd.org/D48228
You can see there how I intended to re-do the USE_OCAML_LDCONFIG. I've been testingthat patch on 15amd64 and 13.3 armv7, everything build fine with the exception of math/coq which fails to build the documentation on armv7...

One other thing in that patch is the removal of USE_OCAMLFIND_PLIST, which make the bsd.ocaml.mk to Uses/ocaml.mk transistion less complicated. USE_OCAMLFIND_PLIST isn't really that useful, to the contrary it makes packaging error more likely (e.g. disabling a feature, not noticing less files are packages), so i think it is better to remove it.

Thanks for the work. Unfortunately due to the holidays and everything it's difficult to count maintainer-timeout and commit some of those patches.

In D48227#1099753, @freebsd_dev.thsi.be wrote:

I've created https://reviews.freebsd.org/D48228
You can see there how I intended to re-do the USE_OCAML_LDCONFIG. I've been testingthat patch on 15amd64 and 13.3 armv7, everything build fine with the exception of math/coq which fails to build the documentation on armv7...

One other thing in that patch is the removal of USE_OCAMLFIND_PLIST, which make the bsd.ocaml.mk to Uses/ocaml.mk transistion less complicated. USE_OCAMLFIND_PLIST isn't really that useful, to the contrary it makes packaging error more likely (e.g. disabling a feature, not noticing less files are packages), so i think it is better to remove it.

Here is the updated patch which converts everything from bsd.ocaml.mk to args for USES=ocaml. See the summary.

I've created https://reviews.freebsd.org/D48228
You can see there how I intended to re-do the USE_OCAML_LDCONFIG. I've been testingthat patch on 15amd64 and 13.3 armv7, everything build fine with the exception of math/coq which fails to build the documentation on armv7...

In D48227#1099727, @bofh wrote:

Hi,

We should have moved out of Mk/bsd.*.mk (except the obvious ones) maybe a decade ago and these are just some technical debts in the Mk directory. :)

So I am just trying to clear of the Mk directory and I plan to merge this before the next quarterly split. [...]

I am still trying to convert some other keywords into args.

We should have moved out of Mk/bsd.*.mk (except the obvious ones) maybe a decade ago and these are just some technical debts in the Mk directory. :)

The full list of arches is here: https://www.freebsd.org/platforms/

ping again

Update diff with more context

Can you re-upload the diff with arcanist or by generating the diff with more context, like arcanist does (git diff -U9999)

LGTM, but I didn't run-test this, as I don't use overlays.

ping

Not sure why but somehow I believe I failed to add this as the review in my commit message. This has already landed.

The new var should be names OPTIONS_DEFAULT_OTHER_ARCHS, without "E", to follow ONLY_FOR_ARCHS.

LGTM.

Already committed.

In D42068#985819, @rene wrote:

In D42068#985744, @jbeich wrote:

Before landing it'd be nice to turn off 12.4 package builders. Otherwise, /latest and /quarterly will become empty while /release_* still work. The space can be later reclaimed by consistently removing all sets and removing FreeBSD:12:* references on https://pkg.freebsd.org/

This cleanup only affects main, not quarterly/2023Q4. There is a 12-eol tag on main so the pkg builders could stick to that?

On a different note jbeich is somewhat correct. If the builders were still started it would end up with an empty pkgset and the cluster pkgset would overwrite the pkg repos with an empty set being served. Although not exactly sure on how the builders are run so we disabled the pkgsync script and backed it up and have removed the pkgsets.

In D42068#985744, @jbeich wrote:

Before landing it'd be nice to turn off 12.4 package builders. Otherwise, /latest and /quarterly will become empty while /release_* still work. The space can be later reclaimed by consistently removing all sets and removing FreeBSD:12:* references on https://pkg.freebsd.org/

Before landing it'd be nice to turn off 12.4 package builders. Otherwise, /latest and /quarterly will become empty while /release_* still work. The space can be later reclaimed by consistently removing all sets and removing FreeBSD:12:* references on https://pkg.freebsd.org/

In D42068#985549, @jbeich wrote:

Many patches for missing <byteswap.h> and <endian.h> on FreeBSD < 13 can probably be dropped e.g.,

Many patches for missing <byteswap.h> and <endian.h> on FreeBSD < 13 can probably be dropped e.g.,

• audio/bespokesynth/files/patch-libs_link_include_ableton_platforms_linux_Linux.hpp
• audio/mixxx/files/patch-lib_kaitai_kaitaistream.cpp
• audio/umurmur/Makefile (BROKEN_*)
• audio/umurmur/files/patch-src_byteorder.h
• audio/webrtc-audio-processing/files/patch-powerpc64 (keep <altivec.h> part)
• audio/zita-alsa-pcmi/files/patch-source_zita-alsa-pcmi.cc
• biology/abyss/files/patch-Common_city.cc
• databases/redisdesktopmanager/files/patch-3rdparty_simdjson_singleheader_simdjson.h
• devel/chrpath/files/patch-protos.h (keep Elf_Ehdr part)
• devel/cityhash/files/patch-src_city.cc
• devel/dwarves/files/patch-lib_bpf_src_btf.c (the first 3 hunks, keep from compare_vsi_off onwards)
• devel/efivar/files/patch-src-efivar.h (keep __builtin_* part)
• devel/elfutils/files/patch-lib_byteswap.h
• devel/firmware-utils/files/patch-* (<endian.h> part, keep `"freebsd.h")
• devel/py-pysimdjson/files/patch-simdjson_simdjson.h
• graphics/igt-gpu-tools/files/patch-lib_igt_\_core.h (keep <signal.h> part)
• graphics/libemf/files/patch-libemf_libemf.cpp
• multimedia/dvb-apps/files/patch-lib_libucsi_endianops.h
• multimedia/ringrtc/files/patch-src_webrtc_src_rtc_\_base_byte_\_order.h
• multimedia/smpeg/files/patch-video_\_video.h
• net/mercury/Makefile (BROKEN)
• net/yate/files/patch-libs_yradio_radio.cpp
• security/pam_pwdfile/files/patch-md5.c
• sysutils/afflib/files/patch-lib_qemu_bswap.h
• sysutils/dd_rescue/files/patch-aes_\_c.c
• sysutils/lttng-tools/files/patch-src_bin_lttng-crash_lttng-crash.c
• sysutils/lttng-tools/files/patch-src_common_compat_endian.h
• sysutils/zbackup/files/patch-compression.cc
• sysutils/zbackup/files/patch-endian.hh
• www/envoy/files/patch-envoy_common_platform.h (keep ENVOY_MMSG_MORE part)
• www/mod_gnutls/files/patch-src_gnutls_\_sni.c
• www/qt5-webengine/files/patch-src_3rdparty_chromium_third_\_party_smhasher_src_City.cpp

Latest rebase and most probably the last one before the sunset.

More changes by @jbeich

In D42068#980655, @jbeich wrote:

In D42068#980602, @bofh wrote:

These are still not fixed. I've also noticed more cruft:

• devel/libffcall/files/patch-ffcall-abi.h

I think this patch is not related to sparc but aarch64.

aarch64 (arm64) has 2 "a" in the architecture name. sparc64 (64-bit sparc, or sparc V9) may not define __sparc64__ on non-BSDs thus required checking both __sparc__ and __arch64__.

Add more changes by @jbeich

In D42068#980602, @bofh wrote:

These are still not fixed. I've also noticed more cruft:

• devel/libffcall/files/patch-ffcall-abi.h

I think this patch is not related to sparc but aarch64.

These are still not fixed. I've also noticed more cruft:

• devel/libffcall/files/patch-ffcall-abi.h

I think this patch is not related to sparc but aarch64.

In D42068#980467, @jbeich wrote:

• shells/v7sh/files/Makefile (only ${OSREL:R} < 13)
• www/tor-browser/files/patch-third_\_party_libwebrtc_rtc_\_base_ip_\_address.cc

Update as per @jhale

Missed cruft (based on 2023-12-11 checkout):

• lang/emilua/Makefile (only IGNORE_FreeBSD_12)
• lang/go-devel/Makefile (only ${OSREL:R} < 13)
• lang/mlton/Makefile (keep ${OSREL:R} >= 13 but make unconditional)
• mail/fetchmail/Makefile (only ${OSREL:R} < 13)
• net/widentd/Makefile (only ${OSREL:R} < 13)
• shells/v7sh/files/Makefile (only ${OSREL:R} < 13)
• sysutils/plasma5-powerdevil/files/patch-daemon_backends_upower_freebsdbacklighthelper.cpp
• www/tor-browser/files/patch-third_\_party_libwebrtc_rtc_\_base_ip_\_address.cc

Rebase and add some changes as per @jbeich

Thanks @jbeich . I will look into it and refresh the patch.

Missed cruft (based on 2023-10-14 checkout):

• audio/opus/Makefile (only arm conditional)
• cad/nvc/Makefile (only !exists(/usr/include/unwind.h) conditional)
• comms/ebusd/files/patch-src_lib_ebus_datatype.cpp
• devel/android-tools/files/patch-vendor_adb_compression_\_utils.h
• devel/llvm1[2-3]/Makefile (only unwind.h-related _BUILD_DEPENDS, _USES, inline comments)
• emulators/rpcs3/files/patch-libc++13
• graphics/darktable/Makefile (only ${OPSYS}_${OSREL:R} == FreeBSD_12 conditional)
• graphics/krita/files/patch-cmake_modules_xsimd_xsimdMacros.cmake
• graphics/qt5-wayland/files/patch-src_client_qwaylandshmbackingstore.cpp (only && __FreeBSD_version >= 1300048 part)
• java/openjdk*/Makefile (only ${OSREL:C/\.[0-9]//} == 12 conditional and the related patch)
• mail/thunderbird/files/patch-third_\_party_libwebrtc_rtc_\_base_ip_\_address.cc
• multimedia/dav1d/files/patch-freebsd12
• multimedia/pipewire/files/patch-src_modules_module-netjack2_peer.c
• net-im/libquotient/files/patch-Quotient_qt_\_connection_\_util.h
• net/samba413/Makefile (only ${OSVERSION} < 1300000 conditional)
• sysutils/arcconf/Makefile (only ${OSREL:R} == 12 part)
• www/chromium/files/patch-third_\_party_wayland_include_config.h (only memfd part)
• www/chromium/files/patch-ui_ozone_platform_wayland_host_zwp_\_text_\_input_\_wrapper_\_v1.cc
• Ditto (as www/chromium) in devel/electron*, www/iridium, www/ungoogled-chromium
• www/librewolf/files/patch-third_\_party_libwebrtc_rtc_\_base_ip_\_address.cc
• x11/xdg-desktop-portal-luminous/Makefile (only BROKEN_FreeBSD_12)

BROKEN_FreeBSD12 in www/ladybird can be removed too

https://cgit.FreeBSD.org/ports/commit/?id=0815295e0b7988daf05dc1665b4ff523c7083763 can be reverted too as part of this change