Date: Fri, 21 May 2021 05:57:50 +0000 From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 256001] dns/knot3: upgrade to 3.0.6 Message-ID: <bug-256001-7788-5UyxjgYrv5@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-256001-7788@https.bugs.freebsd.org/bugzilla/> References: <bug-256001-7788@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D256001 --- Comment #3 from Nuno Teixeira <eduardo@FreeBSD.org> --- git diff instead of svn diff I seriously dislike maintaining the ridiculous amounts of dependencies = for simply communicating a few lines of mutations. So by these neither, but a normal diff. How to apply this diff? I've tried `git apply` and patch < knot-3.0.6.diff`: --- Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- dns/knot3.orig/Makefile 2021-05-20 13:36:55.791207000 +0000 |+++ dns/knot3/Makefile 2021-05-20 13:41:13.335190000 +0000 -------------------------- Patching file Makefile using Plan A... Hunk #1 failed at 1. Hunk #2 failed at 14. Hunk #3 failed at 45. Hunk #4 failed at 68. Hunk #5 failed at 85. 5 out of 5 hunks failed--saving rejects to Makefile.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN dns/knot3.orig/distinfo dns/knot3/distinfo |--- dns/knot3.orig/distinfo 2021-05-20 13:36:55.791321000 +0000 |+++ dns/knot3/distinfo 2021-05-20 13:18:01.279381000 +0000 -------------------------- Patching file dns/knot3/distinfo using Plan A... Hunk #1 failed at 1. 1 out of 1 hunks failed--saving rejects to dns/knot3/distinfo.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN dns/knot3.orig/pkg-plist dns/knot3/pkg-plist |--- dns/knot3.orig/pkg-plist 2021-05-20 13:36:55.791539000 +0000 |+++ dns/knot3/pkg-plist 2021-05-20 13:18:53.052281000 +0000 -------------------------- Patching file dns/knot3/pkg-plist using Plan A... Hunk #1 failed at 41. 1 out of 1 hunks failed--saving rejects to dns/knot3/pkg-plist.rej done --- Any clues? But I admit portclippy does provide useful pointers (where portlint left you clueless). Still, clearly it's a dangerous one to "fly by the tools": It isn't always keeping in account things are within an "if" block. Also I'm not really comfortable using variables before having them defi= ned. Is it safe to revers the order of these lines? USERS=3D knot GROUPS=3D knot SUB_LIST+=3D USERS=3D"${USERS}" GROUPS=3D"${GROUPS}" Yes, you are right, I think its better maintain this order. --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-256001-7788-5UyxjgYrv5>