From nobody Tue Sep 17 01:50:51 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 4X74W01Kwcz5Wrkp; Tue, 17 Sep 2024 01:50:52 +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 4X74W00sQcz41Lt; Tue, 17 Sep 2024 01:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726537852; 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=0XeoOYVkCHPsfPp8Wx90w80bsgKQEczKwgSC0t3VG84=; b=M1nEWYojp4kbHGC4SB6TiqbdynIqR3hInSwz6oICLP+WPwiab9cfhTVts70RtsxX9DDP4F kvg8bi7fGwaYbMxsmJNA6PJmDX5/k7zYbp0sLctNLKlS+RwTfl6CsSQTVYcUb9CgSK5j6J q3wF0oVtIxU8zt3FK7Zp32wX+e0GVeU4MMU/3yWOahOb4JUR0J68LJok8A0XU4X7q2ylIh mGfqWDIaaltNal06++b72VJuLcFKOA8bKZNyshazRHPb/jSXTOwWUPSI54iK8efzG+FQOO 6Asfz2MMPiCwQVvar75GusImv3QhnTxDen8nG//tSDdT4jwEYu68VfxOe7Y8rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726537852; a=rsa-sha256; cv=none; b=BnDTV7Knkn4vpMfy2lCuNghC0BTAtmVnOPS3YiX880/tUJxY/p6r82Jwoqpp64UXpd6HUU bNTHQrBsoJ7bW9uGLviezr/XGXfFG45U5ilHamIySqGMYBcAnPeCweXmxmOB0+Onvxi9eG YdK5y5TDkJYFrNK+bNJf68ogIMaAjxOzFULyEIt8gehgQtS406gT4iAhobtLWeW2S1yICG Svi8cWH1bCXuKPtQxAgukfyRqfMWKpu/X2IM2aZzZnb51l4zONRCjRmNiuV6/ANqnfzlUl e0iW2h7T6PBqotWbiTJMBodCU4MiOR6xtH6gACWBK9ATn16SrKWAQa30HRdhkw== 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=1726537852; 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=0XeoOYVkCHPsfPp8Wx90w80bsgKQEczKwgSC0t3VG84=; b=DnMq9FLjdU2r1mPTAX++LXFkU2k1lnLar7WzngfyOhsBRpirsw+5kLUTcTLiD85jJEmPjh hv6+mszuFFaS+pjggLCSdkXLf4HZcEbj2aPz/4pC7W+fh2iC3+aEDN3Iqy0zNG69Bv8AAi cBC1BxozvjbX8jGK2hl5V5FGalex+Xw08UADGWJQdHBpNY2CTej9+W2DbJiGfv5FJdvvc8 FO/Gnn2bPPrbLsldKGNsgImI5ESIWvWWh4aR17bUTOxYZysW6rTnNfC3ldcsckMZJKnSlm qdhkY7vnCYQmHwMm8Aoeid/fd+juTFgLbockHoMH5AtMrzvhVsQmVwSBJYr9IQ== 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 4X74Vz6JvJzJhm; Tue, 17 Sep 2024 01:50:51 +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 48H1oprk023790; Tue, 17 Sep 2024 01:50:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48H1opAd023787; Tue, 17 Sep 2024 01:50:51 GMT (envelope-from git) Date: Tue, 17 Sep 2024 01:50:51 GMT Message-Id: <202409170150.48H1opAd023787@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 28a4afe89aff - main - Mk/bsd.default-versions.mk: Use a better way for detect WANT_FPC|LAZARUS_DEVEL 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: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28a4afe89afffdc8f14a555ae5b5918e5db63dda Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=28a4afe89afffdc8f14a555ae5b5918e5db63dda commit 28a4afe89afffdc8f14a555ae5b5918e5db63dda Author: Jose Alonso Cardenas Marquez AuthorDate: 2024-09-17 01:46:33 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2024-09-17 01:46:33 +0000 Mk/bsd.default-versions.mk: Use a better way for detect WANT_FPC|LAZARUS_DEVEL --- Mk/bsd.default-versions.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 23f2e5ca6247..65f8d7c6968e 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -51,10 +51,10 @@ FIREBIRD_DEFAULT?= 3.0 # Possible values: gfortran FORTRAN_DEFAULT?= gfortran # Possible values: 3.2.3, 3.3.1 -. if !defined(WANT_FPC_DEVEL) -FPC_DEFAULT?= 3.2.3 -. else +. if defined(WANT_FPC_DEVEL) && !empty(WANT_FPC_DEVEL) FPC_DEFAULT?= 3.3.1 +. else +FPC_DEFAULT?= 3.2.3 . endif # Possible values: 10, 11, 12, 13, 14, 15 # (Any other version is completely unsupported and not meant for general use.) @@ -76,10 +76,10 @@ IMAGEMAGICK_DEFAULT?= 7 # Possible values: 8, 11, 17, 18, 19, 20, 21 JAVA_DEFAULT?= 8 # Possible values: 3.4.0, 3.99 -. if !defined(WANT_LAZARUS_DEVEL) -LAZARUS_DEFAULT?= 3.4.0 -. else +. if defined(WANT_LAZARUS_DEVEL) && !empty(WANT_LAZARUS_DEVEL) LAZARUS_DEFAULT?= 3.99 +. else +LAZARUS_DEFAULT?= 3.4.0 . endif # Possible values: rust, legacy . if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64)