x11-servers/xwayland-devel fails to fetch: ===> Cleaning for xwayland-devel-21.0.99.1.156 ===> Deleting distfiles for xwayland-devel-21.0.99.1.156 ===> xwayland-devel-21.0.99.1.156 depends on file: /usr/local/sbin/pkg - found => freedesktop-xorg-xserver-xorg-server-21.0.99.1-156-g38291fa86_GH0.tar.gz doesn't seem to exist in /usr/distfiles/. => Attempting to fetch https://codeload.github.com/freedesktop/xorg-xserver/tar.gz/xorg-server-21.0.99.1-156-g38291fa86?dummy=/freedesktop-xorg-xserver-xorg-server-21.0.99.1-156-g38291fa86_GH0.tar.gz fetch: https://codeload.github.com/freedesktop/xorg-xserver/tar.gz/xorg-server-21.0.99.1-156-g38291fa86?dummy=/freedesktop-xorg-xserver-xorg-server-21.0.99.1-156-g38291fa86_GH0.tar.gz: size unknown fetch: https://codeload.github.com/freedesktop/xorg-xserver/tar.gz/xorg-server-21.0.99.1-156-g38291fa86?dummy=/freedesktop-xorg-xserver-xorg-server-21.0.99.1-156-g38291fa86_GH0.tar.gz: size of remote file is not known freedesktop-xorg-xserver-xorg-server-21.0.99.1 5329 kB 3906 kBps 01s => 42e34498f87a.patch doesn't seem to exist in /usr/distfiles/. => Attempting to fetch https://github.com/freedesktop/xorg-xserver/commit/42e34498f87a.patch fetch: https://github.com/freedesktop/xorg-xserver/commit/42e34498f87a.patch: size mismatch: expected 10298, actual 10310 => Attempting to fetch http://distcache.FreeBSD.org/ports-distfiles/42e34498f87a.patch fetch: http://distcache.FreeBSD.org/ports-distfiles/42e34498f87a.patch: Not Found => Couldn't fetch it - please try to retrieve this => port manually into /usr/distfiles/ and try again. *** Error code 1 Stop. make: stopped in /ssd/ports/x11-servers/xwayland-devel Could you please stop cherry-picking upstream commits as fetched patches instead of putting them into files/? Not only this is fragile (this probably repeats the problem in 4055fc841fafb6b3d2aa3fa196de8a99b1e4d4b5), but it also makes it harder to review what was patched and to adapt patches to port updates.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa29c227d1f365cc72d5799fb3d792d3ccac3a3b commit aa29c227d1f365cc72d5799fb3d792d3ccac3a3b Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-12-28 11:46:18 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-12-28 11:47:40 +0000 x11-servers/xwayland-devel: unbreak fetch due to repo growth fetch: https://github.com/freedesktop/xorg-xserver/commit/42e34498f87a.patch: size mismatch: expected 10298, actual 10310 This reverts commit 4055fc841fafb6b3d2aa3fa196de8a99b1e4d4b5. PR: 260750 Reported by: amdmi3 x11-servers/xwayland-devel/distinfo | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
A commit in branch 2021Q4 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ad25d83ff6334d56204b0d0648981a7782f3631 commit 0ad25d83ff6334d56204b0d0648981a7782f3631 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-12-28 11:46:18 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-12-28 11:49:19 +0000 x11-servers/xwayland-devel: unbreak fetch due to repo growth fetch: https://github.com/freedesktop/xorg-xserver/commit/42e34498f87a.patch: size mismatch: expected 10298, actual 10310 This reverts commit 4055fc841fafb6b3d2aa3fa196de8a99b1e4d4b5. PR: 260750 Reported by: amdmi3 (cherry picked from commit aa29c227d1f365cc72d5799fb3d792d3ccac3a3b) x11-servers/xwayland-devel/distinfo | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
(In reply to Dmitry Marakasov from comment #0) > Not only this is fragile Can be easily fixed on GitHub side by passing --no-index or --full-index. GitHub already strips Git version from patch footer/signature (--), and GitLab followed a few years later. > but it also makes it harder to review what was patched Depends. Current style evolved (started ~5 years ago) in order to distinguish downstream hacks from backports and other changes submitted upstream. After learning the mistakes in www/firefox I've tried to bring the quality of patches up, the number of hacks down and scale to easily handle more than a few patches in one commit. > and to adapt patches to port updates. I don't want unrelated changes mixed in because a committer under "portmgr blanket" blindly used "make makepatch".
(In reply to Jan Beich from comment #3) > Depends. Well at least please don't do it to my ports for it messes up my work. I'm converting existing cases to files/ now.