From nobody Sun Apr 28 12:49:59 2024 X-Original-To: dev-commits-ports-all@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 4VS5s747M2z5JBZg; Sun, 28 Apr 2024 12:50:03 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4VS5s70rJvz4dYW; Sun, 28 Apr 2024 12:50:03 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714308603; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KLZ/B5SUP5kSyuo23mmRu26fycqkHuLKg4j31F6hG6c=; b=nJI59ygFdO0OgQTNSPDN7DizYXSM+OWzPm7qyCKp+FOZ+V+Nw5wr9NpIjmsaJs7hW5unnu 5OsmGVgPdh4PU+V8DSY+gQNrnNxLLUU/B9o7EaCgeTJRugc6s18McNTeys9EYdqrO4UaVk ImeupPA2b/gPIvY8VVh37IKr9crxeN69voidVmASVrCp/7sWlbBkwqxRltNmrXeMAvQ8cY UpI02de7xGC4y3voGcHea7zd2j1VdHk/il4cOGdu3huScDGfn4A2bX0Bb6trYAkKcw/ppO Xz4jb9RFVyB4NnjO0SPPKQHM11sWV37uhFsoVVEVRWqtbyv8kKJUzCIRBE+bhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714308603; a=rsa-sha256; cv=none; b=lIzLcVoeE96oYTYgaTRlBP9raXV/Pfbad3eKqiw/4x05G73oteSnmGOtIANqXV6qOzTT3f 8acBbskKQ2QVhuw9OAp725e11gKGLZUgxr2AobhytFwRH7zm62CDLgJ3WIjqBJ9dAfEKJF SSCuUtJmxXWcxS2AwxXLIdwyuQKIfbmwEHFu5pre/zi6SFVNeEULxazfzrv7N9aeE1Df0X 8KugGUPOMQqTXbeJM+Om7NLdrTTYZ2G/Muiy7CCObj7Dkz3yukenFqw6U4Tl6ofE4u87Fy cjYcR2ZygEolDQCNCFkU3rsJwlhJyS1XvL0vicqggLswLuDPQ9dBabKs2rPBCA== 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=1714308603; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KLZ/B5SUP5kSyuo23mmRu26fycqkHuLKg4j31F6hG6c=; b=fUv/x0VY72KeOdZMyRW7sxIxGXFujJHKM36RZRa7FaSMDAMvr6wRaM5B2E4JprZc56trMH lZkj7xm6LxFvpxRCOd7AQVhBO1zztbduocIevOelNUTD97+K/qcGvFKFIQrLVUHo+TGORz +DSOTTlaI6R7IF6GB6bQwtFoI4/MO65jXbPYvOnIcXdh4jw7QHE4irgVIPgSbOv8wwmfdJ TOkKzP6nVlQ83es5ruZ7uODImn+4BXh4+yiaebNUdJiJ7PTIylD67sIOAdyu7YPc6aFn4+ j4SiHV5JP7TJ0ilZi5UZOXavECAXV9lBfdqTKn/1pJEhjcjdOJf5hFBFz5F/0A== Received: from beaver (unknown [IPv6:2a02:169:175:0:12bf:48ff:fee1:88e]) (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) (Authenticated sender: ehaupt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VS5s62Nj3z1HRV; Sun, 28 Apr 2024 12:50:02 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Date: Sun, 28 Apr 2024 14:49:59 +0200 From: Emanuel Haupt To: Nuno Teixeira Cc: Emanuel Haupt , ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 4ab6c1871671 - main - */*: Remove GNU_CONFIGURE_MANPREFIX Message-Id: <20240428144959.4fe9e4e0ca163f1dc7b4788a@FreeBSD.org> In-Reply-To: References: <202404121936.43CJa5vU012745@gitrepo.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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=278589 > > 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.