From nobody Thu Jul 03 20:36:36 2025
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 4bY7pr0Lykz617Bv;
	Thu, 03 Jul 2025 20:36:52 +0000 (UTC)
	(envelope-from jbeich@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132])
	(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 "freefall.freebsd.org", Issuer "R11" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4bY7pq6y50z44jj;
	Thu, 03 Jul 2025 20:36:51 +0000 (UTC)
	(envelope-from jbeich@freebsd.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1751575012;
	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=rmTwDZiRrRbZFTBl1wTCjaC8J2WrZDn1UMrLLESu/Hs=;
	b=Df0HiAw+tB+IKWbMWsINMpjE0Gmoe0INFehjPnQ3APBG5nBs94zrf+tAwAUtRqWrlrNUth
	GifbOK7DpY6GjZtL3WZOdnsXv/JEuIBjjP3dWmINDjNWRm/ACr+C61I7wt5SagYBSDNF2H
	sBvZ7e/8LIflmd1xcTIUyGhdMbtmMlbRFKaixt66q4bwwn3EtkFrBY30iTMxw/nTQ7PgjK
	jgqPqVqnO4FZy7Y9gcWxRGZDXhjA+Z/TCrlZoV1UMbajE7bPsBKqMaT4jNpyc5ovf+NRgt
	Agt7WjC63zV/VkRegRsLrjLdthdMMuMENRRpwOJn4xstmoultuDhZmBBsrGjTg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1751575012;
	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=rmTwDZiRrRbZFTBl1wTCjaC8J2WrZDn1UMrLLESu/Hs=;
	b=HTiks7JflhSiRqCo+ZAju8Hjxr0uGH/Vhne4G5lLqB9pSnvYRr6LcZ425tlbeg8oD5BHG0
	MS/zgIxUPe1lCzoK8+oVkoYBggEnWpkhzc3LRye7VUbyXnKM5fY3/SH98N6U6zgVZCqozE
	QrWakuAFyhyHDa8mbkm9sWmEJZng0G+WZSA7fKA8iYfJgoWNd2ndNpVSt7akt7VaN8Z5Dz
	SCiTFKwsYYvhZPS/Zjp3C0w+kM0YlT+Z2ut9fKcYTFJNSx2B0N01YEjCbtPX1mqauU+mj/
	6Xc155TJSqZLwTO69nim1JwvuHTYOKe8JrHslNZv9NnepSqRUetnt7dNDsauxA==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751575012; a=rsa-sha256; cv=none;
	b=FQpvssiKZSSi2N3TDY9ISUQ8WvbK0hUj9Z6wO90Xd8o1YKrk033/nkVH336B225+qM1yl9
	U+R4w77H4d7hBb8FZe9tPLyzAKrCnhzQ/UPxECw9ppfxG+zQgGDyjCUdJT613/uR5XCtTx
	y1H6cdNOJJ2qZEijbcolCz9gXStY8HqmWaSmTrJV/UUgD7DoAY+ua7cE6xzFNtAw+vdTzK
	slVsbXtrse56pCS95o/+ElhPizU9XX/8rTkP36hPhG5EBlAdok4wq2v3ZGBQ2CXhZwajFB
	+Jcpqw4lHlL+zlzNLEkGs4GNCOh9j75g1apUvUXD7rmhCCO07nLhsEomrM3WSA==
Received: by freefall.freebsd.org (Postfix, from userid 1354)
	id E2EB511666; Thu, 03 Jul 2025 20:36:51 +0000 (UTC)
From: Jan Beich <jbeich@FreeBSD.org>
To: Rene Ladan <rene@freebsd.org>
Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org,
	dev-commits-ports-main@freebsd.org
Subject: Re: git: 3be82964f866 - main - Mk/bsd.port.mk: mark FreeBSD 13.4 as
 unsupported.
In-Reply-To: <aGbgS29EaUj5byEo@freefall.freebsd.org>
References: <202507011719.561HJAqs015946__18644.1537736513$1751390365$gmane$org@gitrepo.freebsd.org>
	<y0t6-68z4-wny@FreeBSD.org> <aGbgS29EaUj5byEo@freefall.freebsd.org>
Date: Thu, 03 Jul 2025 22:36:36 +0200
Message-ID: <pleh-vwob-wny@FreeBSD.org>
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-ports-main@freebsd.org
Sender: owner-dev-commits-ports-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain

Rene Ladan <rene@freebsd.org> writes:

> On Wed, Jul 02, 2025 at 03:03:11PM +0200, Jan Beich wrote:
>> Rene Ladan <rene@FreeBSD.org> writes:
>> > -# XXX Drop after FreeBSD 13.4 EOL around 2026-01-31
>> > -# https://cgit.freebsd.org/src/commit/?id=af93fea71038
>> > -.if !exists(/usr/include/sys/timerfd.h)
>> > -LIB_DEPENDS+=	libepoll-shim.so:devel/libepoll-shim
>> > -.endif
>> 
>> Likely needs to be reverted as <sys/timerfd.h> doesn't exist in 13.5.
>> The XXX line was written under assumption 13.4 would be the last version
>> from /stable/13 i.e., before re@ accelerated -RELEASE pace[1].
>> 
> Ah, I didn't check if timerfd.h exists on 13.5. What would be the easiest
> route to revert this part?

Do you mean Git commands?

  $ git revert -n 3be82964f866

then either

  $ git reset && git add -e
  <remove unrelated hunks in a text editor>

or

  $ git reset -p
  <press "n" which hunks to undo>

and finish with

  $ git commit

then clean up unstaged/unused files from the revert

  $ git reset --hard
  $ git clean -xdf # or rm -rf lang/crystal/files/

Note, "git reset -p" is error-prone, so you may want to confirm what
will end up in a commit via "git diff --cached" vs. "git diff".