Created attachment 234825 [details] updated makefile.diff The attached Makefile.diff can be used to update the misc/xplr port to a recent version (0.19.0)
Created attachment 234826 [details] repaired Makefile.diff (I had it flipsideup) I made a mistake when creating the diff file, I had the order reversed. This attachment is the Makefile.diff you want.
Thank you for the patch, Matt. Few suggestions: * When generating a patch for submission, for ease of committers pushing changes, it's preferred using `git diff` oppose to `diff -u`[1] as the correct paths are maintained when applying patches. E.g., applying the submitted patch at the root level will fail: % fetch "https://bz-attachments.freebsd.org/attachment.cgi?id=234826" -o patch.diff patch.diff 4792 B 69 MBps 00s % git apply patch.diff -v patch.diff:207: trailing whitespace. yaml-rust-0.4.5 Checking patch Makefile... error: while searching for: PORTNAME= xplr DISTVERSIONPREFIX= v DISTVERSION= 0.17.3 PORTREVISION= 3 CATEGORIES= misc MAINTAINER= lcook@FreeBSD.org error: patch failed: Makefile:1 error: Makefile: patch does not apply % head -n2 patch.diff --- ../xplr/Makefile 2022-06-07 20:21:07.332216000 +0200 +++ Makefile 2022-06-07 22:12:23.686548000 +0200 * We can remove `PORTREVISION` since we bump `DISTVERSION`[2]. * As we are updating the port and likewise with the cargo crates, it is necessary to re-generate `distinfo` (checksums of those dependencies)[3]. * Ensuring basic testing helps potential bugs/issues do not find their way into ports, and alleviates further time spent for committers diagnosing problems that could have been caught otherwise. Often, poudriere[5] is used in helping to facilitate build, test and package varying ports en masse beyond smoke testing, becoming familiar with poudriere is a great start. Both portfmt[6] and portlint[7] are also your friends. With those suggestions aside, good job. I will go ahead and commit your patch, including the changes from my feedback. [1] https://docs.freebsd.org/en/books/porters-handbook/upgrading/#git-diff [2] https://docs.freebsd.org/en/books/porters-handbook/book/#makefile-portrevision [3] https://docs.freebsd.org/en/books/porters-handbook/book/#porting-checksum [4] https://docs.freebsd.org/en/books/porters-handbook/book/#porting-testing [5] https://freshports.org/ports-mgmt/poudriere [6] https://www.freshports.org/ports-mgmt/portfmt/ [7] https://www.freshports.org/ports-mgmt/portlint/
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=d06ab511bcb74a45d37c22db0588d2a006c2c303 commit d06ab511bcb74a45d37c22db0588d2a006c2c303 Author: Matt K <kilikmatej@protonmail.com> AuthorDate: 2022-06-22 01:15:54 +0000 Commit: Lewis Cook <lcook@FreeBSD.org> CommitDate: 2022-06-22 01:20:30 +0000 misc/xplr: Update to 0.19.0 PR: 264796 misc/xplr/Makefile | 132 ++++++++++++++------------- misc/xplr/distinfo | 264 ++++++++++++++++++++++++++++------------------------- 2 files changed, 208 insertions(+), 188 deletions(-)
Committed, thanks!