Bug 271487
| Summary: | games/dMagnetic: Update to 0.37 | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Thomas Dettbarn <dettus> | ||||||||
| Component: | Individual Port(s) | Assignee: | Fernando Apesteguía <fernape> | ||||||||
| Status: | Closed FIXED | ||||||||||
| Severity: | Affects Only Me | CC: | fernape | ||||||||
| Priority: | --- | Keywords: | needs-qa | ||||||||
| Version: | Latest | ||||||||||
| Hardware: | Any | ||||||||||
| OS: | Any | ||||||||||
| URL: | https://dettus.net/dMagnetic | ||||||||||
| Attachments: |
|
||||||||||
Hi Thomas, The patch does not apply cleanly. It is trying to modify a certain files/patch-Makefile which does not exist in the repo yet. Can you have a look? Hmm... The problem is somewhere in the MORONIC way, I used git diff... For some reason, a simple git diff >freebsd.patch does not produce what you guys need, it somehow does not include the new files I put in there (The ones I git add'ed). For you, my Plan B is to omit this patch-Makefile, but BecauseOfReasons(tm) I would like to keep it. At least for now. Plan A is to find the proper commandline to produce a patch. Can you help me with that one? (Please...) (In reply to Thomas Dettbarn from comment #2) git diff will give you a diff from the *last* commit in your branch. It looks like you committed files/patch-Makefile in your local branch and then did some more changes and execute git diff. This might be it although I'm not sure. The thing you can do is: git diff main > freebsd.patch That should git you the differences between your local branch and main. Created attachment 242252 [details]
The patch to the FreeBSD portstree (attempt 2)
This patch has been created using
(git diff ; git diff --staged ) >freebsd_dmagnetic037.patch
git diff main produced the same result, so the patch is good. :) (In reply to Thomas Dettbarn from comment #5) Testing... Can I suggest you change the install instructions for FreeBSD in your home page? It says: FreeBSD pkg_add dMagnetic Cheers. Please, test the ports before submission. ===> Checking for items in STAGEDIR missing from pkg-plist Error: Orphaned: %%DATADIR%%/LICENSE.txt Will you update the patch? Created attachment 242269 [details]
The patch to the FreeBSD portstree (attempt 3)
Whilst working on the "make install target", I forgot to take a closer look at the pkg-plist.
My apologies, hopefully, this one will work better.
For the next release, I WILL set out pouderie.
Committed, Thanks! A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=0adb087f9b58eb26ab71ccc1344c7c73f98c2ae9 commit 0adb087f9b58eb26ab71ccc1344c7c73f98c2ae9 Author: Thomas Dettbarn <dettus@dettus.net> AuthorDate: 2023-05-19 11:43:22 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2023-05-22 06:44:12 +0000 games/dMagnetic: Update to 0.37 ChangeLog: https://dettus.net/dMagnetic PR: 271487 Reported by: dettus@dettus.net (maintainer) games/dMagnetic/Makefile | 11 +--------- games/dMagnetic/distinfo | 6 +++--- games/dMagnetic/files/patch-Makefile (new) | 34 ++++++++++++++++++++++++++++++ games/dMagnetic/pkg-plist | 1 + 4 files changed, 39 insertions(+), 13 deletions(-) |
Created attachment 242248 [details] The git diff patch to the freebsd-ports Hello! So, my little project games/dMagnetic saw release 0.37. (How time flies...) Please find the appropriate patch to the ports tree attached to this "Bug"report. :)