From owner-freebsd-ports-bugs@freebsd.org Fri May 21 05:57:50 2021 Return-Path: Delivered-To: freebsd-ports-bugs@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5608F651678 for ; Fri, 21 May 2021 05:57:50 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FmbVk1p3Xz4ZK4 for ; Fri, 21 May 2021 05:57:50 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 3BE4F6518B2; Fri, 21 May 2021 05:57:50 +0000 (UTC) Delivered-To: ports-bugs@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3BA63651B97 for ; Fri, 21 May 2021 05:57:50 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FmbVk18VNz4ZGL for ; Fri, 21 May 2021 05:57:50 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0ABC5407B for ; Fri, 21 May 2021 05:57:50 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 14L5vnov079203 for ; Fri, 21 May 2021 05:57:49 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 14L5vnDX079202 for ports-bugs@FreeBSD.org; Fri, 21 May 2021 05:57:49 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 256001] dns/knot3: upgrade to 3.0.6 Date: Fri, 21 May 2021 05:57:50 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: eduardo@FreeBSD.org X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: ports-bugs@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 May 2021 05:57:50 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D256001 --- Comment #3 from Nuno Teixeira --- 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.=