Page MenuHomeFreeBSD
Differential D26646

Cleanup ports after 11.3-EOL
ClosedPublic
Actions

Authored by rene on Oct 2 2020, 8:58 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Dec 17, 1:08 PM
Unknown Object (File)
Mon, Dec 9, 4:45 AM
Unknown Object (File)
Nov 8 2024, 5:14 PM
Unknown Object (File)
Oct 26 2024, 5:42 PM
Unknown Object (File)
Oct 26 2024, 5:41 PM
Unknown Object (File)
Oct 26 2024, 5:40 PM
Unknown Object (File)
Oct 26 2024, 5:40 PM
Unknown Object (File)
Oct 26 2024, 5:39 PM
View All Files
Subscribers
andrew
dab
emaste
imp
zeising

Details

Reviewers
jbeich
mandree
mikael
Group Reviewers
portmgr
emulation
chromium
gnome
x11
rust
Commits
rP553534: lang/rust-bootstrap: Update sysroot to build the rust bootstrap
rP551540: graphics/rawtherapee: update comments and _REASONS after 11.3 EOL
Summary

Mk/bsd.port.mk: bump minimum supported version of FreeBSD to 11.4

Bump versions for ports referencing 11.3 using "git grep 1103"

Remove some 12.0 compatibility too while here.

www/chromium: Remove now obsolete instructions for hanging tabs

r337328 was in 12-CURRENT and has been MFC'd to 11.2-STABLE

sysutils/p5-BSD-Jail-Object: no need to differentiate between FreeBSD 7 and 8 anymore.

emulators/mesen: add some patches originally proposed for r516983

Merge branch 'main' into 11.3-cleanup

Merge branch 'main' into 11.3-cleanup

Merge branch 'main' into 11.3-cleanup

more 11.3 cleanup

#git grep 11\\.3 | grep -vw distinfo | grep -vw pkg-plist | manualfilter

Diff Detail

Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 34312
Build 31445: arc lint + arc unit

Event Timeline

rene created this revision.Oct 2 2020, 8:58 PM
Herald added subscribers: dab, emaste, andrew. · View Herald TranscriptOct 2 2020, 8:58 PM
rene requested review of this revision.Oct 2 2020, 8:58 PM
Harbormaster completed remote builds in B33955: Diff 77802.Oct 2 2020, 8:58 PM
rene added a comment.Oct 2 2020, 9:00 PM

The diff to Mk/bsd.port.mk might be a bit stale, I based this patch on the cgit-beta main branch.

rene retitled this revision from Mk/bsd.port.mk: bump minimum supported version of FreeBSD to 11.4 to Cleanup ports after 11.3-EOL.Oct 2 2020, 9:50 PM
rene edited the summary of this revision. (Show Details)
rene edited reviewers, added: x11; removed: zeising.
jbeich added inline comments.Oct 2 2020, 10:07 PM
multimedia/libva/Makefile
29 ↗(On Diff #77802)

Can you drop above 2 lines as well? Nothing needs flags specific to OS version along with the comment documenting why it was there.

mikael added a reviewer: rust.Oct 3 2020, 7:32 AM
mandree added a comment.Oct 3 2020, 8:24 AM

Rene, for graphics/rawtherapee I will need to investigate first. Thanks for the reminder.

mandree added inline comments.Oct 3 2020, 8:27 AM
graphics/rawtherapee/Makefile
101 ↗(On Diff #77802)

Please do not update this line, AFAIR 12.0 was fine and there is no need to update this check and skew history.

zeising added a subscriber: zeising.Oct 3 2020, 9:49 AM
zeising added inline comments.
graphics/drm-kmod/Makefile
22

This comment is technically not true.
I'm not sure if it'suseful to update the version check to say 12.1, or if it can just be left as is.

mandree requested changes to this revision.Oct 3 2020, 10:06 AM

Rationale first, then the request in the bottom three lines in boldface.

(11:59:16) mandree: updating version ranges in Makefiles does NOT make much sense to me. Removing stuff marked "remove after 11.3 EOL" DOES make sense, however.
(11:59:41) rene0: this can be a relatively sweeping patch by definition, because the removed code is never activated again
(12:00:37) mandree: but why revise historic information? That's useless. The feature and component versions of the historic now-end-of-life do not change.
(12:00:47) mandree: rene0: no, it cannot
(12:01:01) mandree: it forges history, that's why I am objecting quite strongly, as seen above.
(12:01:40) rene0: the history is still in svn/git
(12:01:49) mandree: No need to forge Makefiles
(12:02:02) rene0: the port itself is a recipe, not an official record of events
(12:02:08) mandree: you essentially make Makefile and SVN history fall apart, and that's frowned upon
(12:03:47) rene0: the ports can still be comitted individually
(12:05:47) mandree: so let me put it actionable: the rawtherapee and ebsnvme-id and linux-c7-libdrm and drm-kmod and i386-wine patches are all wrong. Feel free to update the IGNORE lines but not the .if lines.
(12:05:51) mandree: The rust-bootstrap and gnatcross-sysroot-aarch64 patch may be dangerous because you bring new assumptions about what the actual port does with the release information.
(12:05:51) mandree: Make run-time tests before/after the patch, consult the experts, and DO NOT COMMIT unless you have EXPLICIT approval.

This revision now requires changes to proceed.Oct 3 2020, 10:06 AM
mandree added a comment.Oct 3 2020, 10:13 AM

I am adding a few inline comments (not thorough), please review them and then omit blunt sweeping OSVERSION changes.

Mk/bsd.port.mk
1180 ↗(On Diff #77802)

This is the only place where OSVERSION checks need to be updated.

emulators/i386-wine-devel/Makefile.amd64
35

This update on the .if line should NOT be made. The one on the following IGNORE line is fine though.

emulators/i386-wine/Makefile.amd64
36

This update on the .if line should NOT be made. Changing IGNORE is fine.

graphics/drm-kmod/Makefile
19

Please do not update this - versions >= 1200080 and < 1201000 do not magically change their behaviour, so again this check should not be changed. Even if you think that it can no longer be activated, let's not make review of "why did we did this or that in the past" kind more difficult and mislead people reading history.

mikael accepted this revision as: mikael.Oct 3 2020, 10:15 AM

Ok for www/deno

mikael added a comment.Oct 3 2020, 10:16 AM

I'll need to test the new generated rust bootstrap, when do you plan to land it?

rene added a comment.Oct 3 2020, 10:27 AM
In D26646#593698, @mikael wrote:

I'll need to test the new generated rust bootstrap, when do you plan to land it?

Well, given all the you're-doing-it-wrong hostility on #bsdports instead of just explaining things, maybe never.

This revision was not accepted when it landed; it landed in state Needs Revision.Oct 5 2020, 7:52 PM
Closed by commit rP551540: graphics/rawtherapee: update comments and _REASONS after 11.3 EOL (authored by mandree). · Explain Why
This revision was automatically updated to reflect the committed changes.
mandree added a commit: rP551540: graphics/rawtherapee: update comments and _REASONS after 11.3 EOL.
mandree reopened this revision.Oct 5 2020, 8:15 PM

uh, this should not have been closed - the commit tracking interface is a bit too simplistic and is not up for partial commits. Reopening.

emaste added a comment.Oct 5 2020, 8:39 PM

uh, this should not have been closed

Yes do not list the review in a commit Differential Revision unless it should be closed. You can list the D# in the commit message and Phab will add a link between the commit and the review - e.g. something like "This commit is part of review D26646" or "Reported by: rene in review D26646"

@rene will you re-upload the diff to put it back in a known stte

imp added a subscriber: imp.Oct 5 2020, 8:58 PM
In D26646#594599, @emaste wrote:

uh, this should not have been closed

Yes do not list the review in a commit Differential Revision unless it should be closed. You can list the D# in the commit message and Phab will add a link between the commit and the review - e.g. something like "This commit is part of review D26646" or "Reported by: rene in review D26646"

@rene will you re-upload the diff to put it back in a known stte

Hmmm, I've always just listed it multiple commits and reopend and/or not cared about the state of the review (though usually when I do that, it's on boring reviews that get few if any comments, not something as contentions as this one)...

rene updated this revision to Diff 77942.Oct 6 2020, 3:37 PM

Rebase on ee5204859b9328a9f189d2912812add11ccf73af

  • Mk/bsd.port.mk: bump minimum supported version of FreeBSD to 11.4
  • Bump versions for ports referencing 11.3 using "git grep 1103"
  • www/chromium: Remove now obsolete instructions for hanging tabs
  • sysutils/p5-BSD-Jail-Object: no need to differentiate between FreeBSD 7 and 8 anymore.
  • emulators/mesen: add some patches originally proposed for r516983
  • Merge branch 'main' into 11.3-cleanup
  • Merge branch 'main' into 11.3-cleanup
  • Merge branch 'main' into 11.3-cleanup
  • more 11.3 cleanup
  • Merge branch 'main' into 11.3-cleanup
Harbormaster completed remote builds in B34018: Diff 77942.Oct 6 2020, 3:37 PM
rene added a comment.Oct 6 2020, 3:40 PM

Ah, arc diff likes to repeat its previous "commit" log.

The hash is that of the main branch of https://cgit-beta.freebsd.org/ports.git

jbeich added a comment.Oct 16 2020, 4:39 PM
In D26646#593698, @mikael wrote:

I'll need to test the new generated rust bootstrap, when do you plan to land it?

Did you manage to? 1.47 update was a good opportunity.

rene updated this revision to Diff 78350.Oct 17 2020, 2:21 PM
  • Merge branch 'main' into 11.3-cleanup, rebase upon 98a89e70ef40
Harbormaster completed remote builds in B34228: Diff 78350.Oct 17 2020, 2:21 PM
rene added a comment.Oct 17 2020, 2:26 PM
In D26646#597821, @jbeich wrote:
In D26646#593698, @mikael wrote:

I'll need to test the new generated rust bootstrap, when do you plan to land it?

Did you manage to? 1.47 update was a good opportunity.

I left rust at 11.3 for now.

rene mentioned this in rP552579: Bump minimally supported FreeBSD version to 11.4.Oct 17 2020, 2:28 PM
jbeich added a comment.Oct 17 2020, 2:28 PM

@rene, can you address libva inline comment?

rene mentioned this in rP552580: emulators/rpcs3: update a comment about dropping compatibility code.Oct 17 2020, 2:31 PM
rene mentioned this in rP552583: emulators/yuzu: update two comments about dropping compatibility code.Oct 17 2020, 2:35 PM
rene mentioned this in rP552584: graphics/waifu2x-converter-cpp: update a comment about dropping compability code.Oct 17 2020, 2:37 PM
rene mentioned this in rP552586: mail/thunderbird: remove a patch file only useful for FreeBSD 11.3.Oct 17 2020, 2:41 PM
rene updated this revision to Diff 78351.Oct 17 2020, 2:44 PM
rene marked an inline comment as done.
  • multimedia/libva: drop two additional obsolete lines
Harbormaster completed remote builds in B34229: Diff 78351.Oct 17 2020, 2:45 PM
rene mentioned this in rP552587: multimedia/libva: clean up code specific to FreeBSD 11.3.Oct 17 2020, 2:47 PM
rene mentioned this in rP552588: www/chromium: drop pkg-message which was only useful for FreeBSD <= 11.2.
rene mentioned this in rP552589: www/cliqz: drop patch specific to FreeBSD 11.3.Oct 17 2020, 2:49 PM
rene mentioned this in rP552591: www/firefox-esr: remove a patch only useful on FreeBSD 11.3.Oct 17 2020, 2:55 PM
rene mentioned this in rP552593: www/webkit2-gtk3: binutils is no longer needed for debug builds.Oct 17 2020, 2:58 PM
rene mentioned this in rP552594: x11-toolkits/wlroots: remove a case specific to FreeBSD 11.3.
rene marked an inline comment as done.Oct 17 2020, 3:00 PM

Applied the patches which should be politically safe.

mikael added a comment.Oct 17 2020, 3:56 PM
In D26646#597821, @jbeich wrote:
In D26646#593698, @mikael wrote:

I'll need to test the new generated rust bootstrap, when do you plan to land it?

Did you manage to? 1.47 update was a good opportunity.

No, too many fallout with the1.47 update, I couldn't find the time to try to update the bootstrap.

mandree requested changes to this revision.Oct 17 2020, 4:02 PM

@rene can you PLEASE stop editing all the many .if lines and updating them from >= [11.3] to >= [11.4] and similar, in particular (1) graphics/drm-kmod/ (2) graphics/linux-c7-libdrm and (3) sysutils/ebsnvme-id
I repeat, these are .if lines that check behaviour for past versions of FreeBSD - and their past behaviour does not change with 11.3 becoming EOL, it does not make sense to update these version limits, it will only be confusing for people when they debug and touch history.

This revision now requires changes to proceed.Oct 17 2020, 4:02 PM
mandree added a comment.Oct 17 2020, 4:11 PM

Please also see my new inline comments above.

emulators/i386-wine-devel/Makefile.amd64
35

This update on the .if line should NOT be made. The one on the following IGNORE line is fine though.

I withdraw that, I was misreading the intentions when commenting for the first time.

emulators/i386-wine/Makefile.amd64
36

This update on the .if line should NOT be made. Changing IGNORE is fine.

^ please disregard (see i386-wine-devel, same reason)

graphics/drm-kmod/Makefile
19

Please do not update this - versions >= 1200080 and < 1201000 do not magically change their behaviour, so again this check should not be changed. Even if you think that it can no longer be activated, let's not make review of "why did we did this or that in the past" kind more difficult and mislead people reading history.

This comment stands, please drop this change. The behaviour of, say, exactly 1200080, does not change, so we should not clobber this knowledge of when *exactly* the kmod became needed. It will only confuse people trying to understand "why 1201000" because the OSVERSION you check is now detached from the actual OSVERSION that correlates with the change.

graphics/linux-c7-libdrm/Makefile
22

Please omit this change. We gain exactly nothing, except confusion because we lose the connection between the OSVERSION that brought the relevant change and the new .if check.

sysutils/ebsnvme-id/Makefile
25

This change does not make sense. Either we leave it as is to document the behavior of historic FreeBSD versions, or we change it all the way and also remove the OSVERSION < 1104000 part, since Mk/bsd.port.mk should handle it already through the UNSUPPORTED... checks.

rene mentioned this in rP552882: emulators/i386-wine-devel: adjust check for supported versions after 11.3 EOL.Oct 21 2020, 7:07 PM
rene mentioned this in rP552886: graphics/drm-fbsd11.2-kmod: update pkg-descr that this port is for FreeBSD 11.4.Oct 21 2020, 7:22 PM
rene mentioned this in rP552887: www/falkon: clean up note only relevant for FreeBSD 11.2 and earlier..Oct 21 2020, 7:27 PM
rene updated this revision to Diff 78566.Oct 21 2020, 8:19 PM
rene marked 5 inline comments as done.
  • Merge branch 'main' into 11.3-cleanup
  • Merge branch 'main' into 11.3-cleanup
  • graphics/dspdfviewer: simplify logic for -Wno-error=extra-semi-stmt
  • simplify check for supported versions after 11.3 EOL
Harbormaster completed remote builds in B34311: Diff 78566.Oct 21 2020, 8:19 PM
rene mentioned this in rP552891: graphics/dspdfviewer: simplify logic for -Wno-error=extra-semi-stmt.Oct 21 2020, 8:20 PM
rene mentioned this in rP552894: sysutils/ebsnvme-id: simplify check for supported versions after 11.3 EOL.Oct 21 2020, 8:22 PM
rene updated this revision to Diff 78569.Oct 21 2020, 9:29 PM
  • Fix sanity check
Harbormaster completed remote builds in B34312: Diff 78569.Oct 21 2020, 9:29 PM
rene mentioned this in rP552961: sysutils/p5-BSD-Jail-Object: remove legacy code in patch for FreeBSD 7/8.Oct 22 2020, 11:11 AM
mandree added inline comments.Oct 22 2020, 7:13 PM
graphics/drm-kmod/Makefile
19

@rene Again, please omit these changes to graphics/drm-kmod/Makefile, as @zeising also pointed out. You are checking features of historic kernels here, not ports tree, and existing kernel features don't change because someone pulls the plug on the ports tree. You don't really attain simplification here, just leave this file untouched. Let's clean this up after the entire 11 branch is EOL.

mandree requested changes to this revision.Oct 22 2020, 7:13 PM
This revision now requires changes to proceed.Oct 22 2020, 7:13 PM
rene mentioned this in rP553231: graphics/drm-kmod: simplify logic a bit..Oct 24 2020, 10:05 PM
This revision was not accepted when it landed; it landed in state Needs Revision.Oct 28 2020, 10:49 AM
Closed by commit rP553534: lang/rust-bootstrap: Update sysroot to build the rust bootstrap (authored by mikael). · Explain Why
This revision was automatically updated to reflect the committed changes.
mikael added a commit: rP553534: lang/rust-bootstrap: Update sysroot to build the rust bootstrap.
rene mentioned this in rP557055: www/chromium: Synchronize with HEAD.Dec 5 2020, 12:31 PM

Revision Contents
Changeset List

PathSize
emulators/
i386-wine-devel/
4 lines
i386-wine/
4 lines
mesen/
16 lines
graphics/
drm-fbsd11.2-kmod/
2 lines
drm-kmod/
10 lines
dspdfviewer/
3 lines
linux-c7-libdrm/
4 lines
lang/
gnatcross-binutils-aarch64/
2 lines
gnatcross-sysroot-aarch64/
6 lines
sysutils/
ebsnvme-id/
2 lines
p5-BSD-Jail-Object/
files/
36 lines
www/
falkon/
5 lines

Diff 78569

View Options

emulators/i386-wine-devel/Makefile.amd64

Loading...
View Options

emulators/i386-wine/Makefile.amd64

Loading...
View Options

emulators/mesen/Makefile

Loading...
View Options

graphics/drm-fbsd11.2-kmod/pkg-descr

Loading...
View Options

graphics/drm-kmod/Makefile

Loading...
View Options

graphics/dspdfviewer/Makefile

Loading...
View Options

graphics/linux-c7-libdrm/Makefile

Loading...
View Options

lang/gnatcross-binutils-aarch64/Makefile

Loading...
View Options

lang/gnatcross-sysroot-aarch64/Makefile

Loading...
View Options

sysutils/ebsnvme-id/Makefile

Loading...
View Options

sysutils/p5-BSD-Jail-Object/files/patch-Object.pm

Loading...
View Options

www/falkon/pkg-message

Loading...