From nobody Thu Jul 03 21:31:16 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 4bY91w53cmz61DrQ; Thu, 03 Jul 2025 21:31:32 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 4bY91w239Fz4D9S; Thu, 03 Jul 2025 21:31:32 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751578292; 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=1EPQd5ofn8W3Rl89jGmhVYCR8y1q/xaf6wuhLZmCa+Y=; b=gasMoxT9GeD5vQTjIv2AtgyAO74m9Nv/yRUWCysU8k3vRwrFWj9tGGmyLhA0zer1pCOzAX fyCFJhHslH+mNB5pVIU6bY+1zIUauKQg1kGMLIUxojEpKy15RLL2FavA1tn3aAhg/l13kb eSzYKQayUlSfkEdcN8Qw5nFNWFlxx8H+ZZoKPf6/c/t/RsBZwTp50vRKTIzfCb4tcyxmE6 TyYUqQ8ZKNBUyiQGUhIQhY3W8yqkvUKBbBbUDZletim5tf5nvL6ffpWV6PaWtBpsm0Okr+ kwVJjSuxdnA6nJ38bIk8GJuaJrxG5V0Ts2t55PdTj8jn1K2eQfDyRst3vJd3fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751578292; 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=1EPQd5ofn8W3Rl89jGmhVYCR8y1q/xaf6wuhLZmCa+Y=; b=Pta42+yDJCuDl66MsmhQvRIxKHo+ypvQ+YN+FZNpfJiH+DX59DangsSAWfKYdXq+JYPKRt YJAu+YsE0mvdLWwvlnZdnjschjLhx+2Cwjy3PMWb2jpqpNzdGxHelSid576w1U8HQyHJQu 8PdZ9BzRq0OpP7eWcNFK6rcuEochKgaXBg0slyW89sXUQkmAJBzm29N36E6+IqUpvp8Hqy xs+8gvsC2Rzi9bA+KI9bzfqcRFFuYq3Ma9jL8TopXbszOxpfySqID6UgMZ+9rObw6XK/5K +wIwBGRGjSlUGCj549zwsESyQkjbaXrQMX4iFsQVpVvat8ynWOQG9NWi5+meBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751578292; a=rsa-sha256; cv=none; b=LvUKrheYRLZ3oEXWm5WQn40ZUybl8VCLznylNNtTzGjM/kEMoFql7jyej+/nC/6d73o6X8 eL+JcUAK44CaKbvTc6gaCgPwJLDbMj6aVpQ9/uiQhIcc52KMhkSBzAkRRrbloqADjb9Mvm oIq694Z2wc8dkWxkZEJ8KR7BTqbBhtJ8AEhs9KPUJ9P6qGHno1MQw3yRr3hExiPz3IULQJ KU6gPUosrdz8hN+dBpQaruqW+fJAxYJblqWmzO9dbEYxYkfjQr9ez5C2cSewuFlo5raPQV t28ZLX4G1q90gdkZQa0+6QPbt0x61AVFEJlMVMVIkTf0xALSZA6Gjfqm+CdraQ== Received: by freefall.freebsd.org (Postfix, from userid 1354) id 3641D117C0; Thu, 03 Jul 2025 21:31:32 +0000 (UTC) From: Jan Beich To: Rene Ladan 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: References: <202507011719.561HJAqs015946__18644.1537736513$1751390365$gmane$org@gitrepo.freebsd.org> Date: Thu, 03 Jul 2025 23:31:16 +0200 Message-ID: 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 Content-Type: text/plain Rene Ladan writes: > On Thu, Jul 03, 2025 at 10:36:36PM +0200, Jan Beich wrote: > >> Rene Ladan writes: >> >> > On Wed, Jul 02, 2025 at 03:03:11PM +0200, Jan Beich wrote: >> >> Rene Ladan 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 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 >> >> >> or >> >> $ git reset -p >> >> >> 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". > > I didn't know I wanted to ask this :) But also if it would be handier > if you or I handles the revert. Reverting others' commits can cause conflicts. Besides, you're best positioned to write the commit message. Note, I'm still not ready to test anything on 13.5. My recently pushed changes were tested on 13.4 with a slightly out-of-date tree.