From nobody Sun Apr 28 12:56:36 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VS60w5kYnz5JCBj; Sun, 28 Apr 2024 12:56:48 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VS60w5CGfz4ffs; Sun, 28 Apr 2024 12:56:48 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714309008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=rhuM2dWZcXSW3whcSlEdmhFvVGcVhVAiQEQdFeODsiM=; b=TkpE0E7OEFukqyJUmcbS7vJHwG2/FK4Zg6wAMQuVvFl4PcbmYWfNV2tlPe5QBllcMYQeav 2zavXo2JAVLXWQyRrq3PUvG1wx+xIqKQaHdgdGVsySJid+wDzd1wN7B6p2W5gUx0WBin4L REAW7XQy/E/Ta551L63VaC/sRmK0nwaY+JBFrFnQnXIABK16lYblciMklmLyTkZxbNL4Eg cXc0dJ9DQIr39aE9Igedl8FcOMzTV/GtOH+APAjTzkb4RVDlca7msJ9IX1BON75G7m0Qc5 y/86btiEsViUPoolH74N4/KJwLsVFpjCkSsUm1x857LImq+gBzDYh6yatDr1TA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714309008; a=rsa-sha256; cv=none; b=wCpq9cc3njMRCLzpGtrFulSWFU1XXc3NbqSNxXZ0LlfBPQU2htOWeiirlSaX8ZteLoUjzS 0HV89wLPPdTUjGpR1+ZfHrzU4ifmk7uzkGd1pabH6cS0VWezAzQuBhcNsTsZ5QOZoIJ+qM 0jTK44SQwMySVV5kYGdFMlBxppDCpKcQfTeQXatax+ZN33AUive/SlgxrhFYjEV7EBGSQ+ pQ98jtzLehbPcAqZO/CAYxnQsk/1gNbsLlkA4fSkBkAnbLcuawCktD3A0p96a9fkLB05QO xKmIkQo0v02EkFQk9BXJOFxFlN+WQKMRqHYvX73DszvO9O8xlgLXiVCI8zixcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714309008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=rhuM2dWZcXSW3whcSlEdmhFvVGcVhVAiQEQdFeODsiM=; b=fAiB4nzN2jMDT+wy/ImL8cCqeXhbZcczqkLCnadIAAtv7vMvV2/y/NLyPe92Wnvhhl4ttv feIOR09O/2aL0U4qVJiPw4KpVyDO1qr77jxtYoAY5hMNro/VEopuigBlS7TpacG4j8Nly7 WlcN3w9UtzGytnjfWCKGwK9fG7XIegej0chHrredectqgWH1Q2VewK61cjv1LJITOJmBb8 /PEE4hGnbVYcq+9Vrb61+oEaZjzXQXrwJ8WDc5pXdmq6qUiOghykPVJ2NvBksm6wd0mRxY HY8S1e2+88FZYmrWuLBSKIinE/SpxzETuo1G8Ui+DRFZ6IZe7ZqjAzsu+dwwWw== Received: from mail-yb1-f180.google.com (mail-yb1-f180.google.com [209.85.219.180]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VS60w4gnpz1JL4; Sun, 28 Apr 2024 12:56:48 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-yb1-f180.google.com with SMTP id 3f1490d57ef6-d9b9adaf291so3801797276.1; Sun, 28 Apr 2024 05:56:48 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCUGPROd31dW0iKyAOPDAYlNY8i0rE+y0JAHDg0gRNMJFwvNHfc1gktPlgSXAIJerzcpGZ9+TDh4PYj6g6pyjdSxyIoG47apq31eNawHaogqtUx5/e+w/8gMev6jlU4A9L06Q8XdlfHrCUBEgj3ERRGwBU26/1k= X-Gm-Message-State: AOJu0YzmVbPB0ygPAjPWxex8huqvLrQJrJaJmoGV98q2S151L1aNNgEp ux8dq7IBqCJQEahXq7gTb5xMlbGhBBErCDQdnoxJh5svy1yCetm4SI5ZrKTbw68rTMCKt4fWGkS bpSxhH3EAQeyXwY6tmJp7bFI0c14= X-Google-Smtp-Source: AGHT+IF4uRCgOpyYvW2+2ZT7sqbhpuDkjpokdBH4JhbOfodjXyrTC2NMhOzEzt3pNPyil92RkMfDznuZE4QPXs/llYQ= X-Received: by 2002:a25:6990:0:b0:de1:5c04:9b5c with SMTP id e138-20020a256990000000b00de15c049b5cmr8063128ybc.16.1714309007926; Sun, 28 Apr 2024 05:56:47 -0700 (PDT) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 References: <202404121936.43CJa5vU012745@gitrepo.freebsd.org> <20240428144959.4fe9e4e0ca163f1dc7b4788a@FreeBSD.org> In-Reply-To: <20240428144959.4fe9e4e0ca163f1dc7b4788a@FreeBSD.org> From: Nuno Teixeira Date: Sun, 28 Apr 2024 13:56:36 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 4ab6c1871671 - main - */*: Remove GNU_CONFIGURE_MANPREFIX To: Emanuel Haupt Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000073f4cb061727abc4" --00000000000073f4cb061727abc4 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Ok, I understand it as I misunderstood 2024Q2 was including manprefix update. But taking your commit as an example, since manprefix fix was removed from all your ports what happens if you need a cherry-pick to quarterly in the future? Thanks Emanuel Haupt escreveu (domingo, 28/04/2024 =C3=A0(s) 13:50): > Nuno Teixeira wrote: > > Hello Emanuel, > > > > I did the same for my ports and I'm doing it when it applies to ports > > from PRs updates. > > Today I found a problem when I tried to cherry-pick a port without > > GNU_CONFIGURE_MANPREFIX fix as it appears that 2024Q2 doesn't have > > 9fd7ee1cdf6c applied. > > > > I've checked Mk/bsd.port.mk and it remains pointed to man and not > > share/man. > > > > Am I missing something? I was thinking that 2024Q2 was delayd because > > of this... > > > > Here is a case where I did remove manprefix fix and tried to > > cherry-pick to quarterly. > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D278589 > > > > Cheers, > > That's the problem with sweeping commits: eventually, you make it > impossible to use cherry-pick because that would end up including the > entire commit, along with all other Makefiles it touched. In the past, > I've simply committed the change manually in the quarterly branch (git > commit, git push). > > Since 2024Q2 was branched before the GNU_CONFIGURE_MANPREFIX change, > you'll need to keep the band-aid in the quarterly branch for this cycle. > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --00000000000073f4cb061727abc4 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Ok, I understand it as I misunderstood 2024Q2 was inc= luding manprefix update.

But taking your commit as= an example, since manprefix fix was removed from all your ports what happe= ns if you need a cherry-pick to quarterly in the future?

= Thanks

Emanuel Haupt <eha= upt@freebsd.org> escreveu (domingo, 28/04/2024 =C3=A0(s) 13:50):
=
Nuno Teixeira <<= a href=3D"mailto:eduardo@freebsd.org" target=3D"_blank">eduardo@freebsd.org= > wrote:
> Hello Emanuel,
>
> I did the same for my ports and I'm doing it when it applies to po= rts
> from PRs updates.
> Today I found a problem when I tried to cherry-pick a port without
> GNU_CONFIGURE_MANPREFIX fix as it appears that 2024Q2 doesn't have=
> 9fd7ee1cdf6c applied.
>
> I've checked Mk/bsd.port.mk and it remains pointed to man and not
> share/man.
>
> Am I missing something? I was thinking that 2024Q2 was delayd because<= br> > of this...
>
> Here is a case where I did remove manprefix fix and tried to
> cherry-pick to quarterly.
> https://bugs.freebsd.org/bugzilla/sho= w_bug.cgi?id=3D278589
>
> Cheers,

That's the problem with sweeping commits: eventually, you make it
impossible to use cherry-pick because that would end up including the
entire commit, along with all other Makefiles it touched. In the past,
I've simply committed the change manually in the quarterly branch (git<= br> commit, git push).

Since 2024Q2 was branched before the GNU_CONFIGURE_MANPREFIX change,
you'll need to keep the band-aid in the quarterly branch for this cycle= .


--
Nuno Teixeira
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--00000000000073f4cb061727abc4--