From nobody Tue Jul 09 17:41:12 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 4WJSvs07HRz5QnDl; Tue, 09 Jul 2024 17:41:13 +0000 (UTC) (envelope-from git@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WJSvr6mx7z4fFk; Tue, 9 Jul 2024 17:41:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720546873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JVD073MIPGZN3h8t2Mh99u0oWMxmTNwy2g4jczI08y0=; b=k8UwUIFUZd2nLM6MAE45aAswc3OoATY45erAkNdYS05FjLpblxBtY/pv8dNnI2Mu36bmBy qUgtNSi+rteFk4wTpV2pKBMXqSBiksbBcm+Mnuqd5YFckHRd2n4I8Hd+wHruIrLvviQcmU T+swBfcb1fun7lzQtRMCtHLrwsajBRVe1tY5YUaxGvPxCsbvGQsU/UjLSnCAogGw0pQQGK YhNT/8YgiLyYdS6o7s1HP5B6WgpD3OzmMnSrko6DhpogiyKbF0mcJrGdnrsH1VmEs3Yy6H FFNOseGqQpJS2oDFq472rB9wN8tl6SAS52fZ7H8jYHr8wKOtj062JoHdRMd3nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720546872; a=rsa-sha256; cv=none; b=URoBRvp7gZPY/58FNxwD7oa70iculf3e8IOiy1T/yFKR71+tzqZj+Tm0I4qG4cKZRpQBcv ryR5DaD/Jx3BJpxrVxe/8Tj6sceXo/lCxwm7alMsd+D4/4em8bE0820Y42DZ0gzl3RGTvD Jylm1/L4RLgRl1jBK2uxWxfaX+G200tc9H4PehsejrEYS7zSIt/ZYPVn1wPvupv1mj1qLL /zCb2qxdHhww8COXpHQvuwtLo7N2Yz2qmDB1U6E6hyV5ZxsOEiUlombrc3MdPH5M7Y1f73 70XhTAuVWtviyt2MiCQGhzNO/LXf/Ny6jlGrpQzbLhvkpXh3iP74B5JIfBW2qw== 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=1720546872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JVD073MIPGZN3h8t2Mh99u0oWMxmTNwy2g4jczI08y0=; b=vlbCrS6Rg3uywsFHZAqCaIHX/sRltHN95meNP0eSITRn/oY3+1uNRQNgVOXO0o+hKNuWGj qH1ac/06sxwkjRgsFAM7i9Tbjr3obFXEIwfSjB5C1+P0EDoO+Gwb7IYypq6a9GQFQvtdgh P9mvulabisRul2FzcOVrAaNMlK9G4PMJTgUT6lCtNhvF2sE15ioCHWFyyeHtLNE62gjxlt 9X4RHgIAC//ddBuYhyGSHaS3C5kKs/KQXzj+G4IkL885TPXTmjZBi0zArGWeCuGhq0wCEJ ZNBN5O/FuDgNusk9PXL9SKLI0gwNeDUWH3iBXAsVTyc+YitIhCmfGJem/YXgtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 4WJSvr6NWLzk6n; Tue, 9 Jul 2024 17:41:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 469HfCl1081957; Tue, 9 Jul 2024 17:41:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 469HfC88081954; Tue, 9 Jul 2024 17:41:12 GMT (envelope-from git) Date: Tue, 9 Jul 2024 17:41:12 GMT Message-Id: <202407091741.469HfC88081954@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 38cc769ee806 - main - devel/py-libzfs: Make the OSVERSION check more accurate 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; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38cc769ee806e95985981189cd7987fd3f41db99 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=38cc769ee806e95985981189cd7987fd3f41db99 commit 38cc769ee806e95985981189cd7987fd3f41db99 Author: Gleb Popov AuthorDate: 2024-07-09 17:40:13 +0000 Commit: Gleb Popov CommitDate: 2024-07-09 17:41:08 +0000 devel/py-libzfs: Make the OSVERSION check more accurate PR: 279450 Reported by: Hiroo Ono --- devel/py-libzfs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/py-libzfs/Makefile b/devel/py-libzfs/Makefile index f68d645c2054..2db1495ec1c6 100644 --- a/devel/py-libzfs/Makefile +++ b/devel/py-libzfs/Makefile @@ -24,7 +24,7 @@ MAKE_ENV= freebsd_src=${SRC_BASE} .include -.if ${OSVERSION} >= 1500000 +.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1500018 || (${OSVERSION} >= 1401000 && ${OSVERSION} < 1500000)) EXTRA_PATCHES+= ${FILESDIR}/extra-zpool-add.patch .endif