git: 28a4afe89aff - main - Mk/bsd.default-versions.mk: Use a better way for detect WANT_FPC|LAZARUS_DEVEL

From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Tue, 17 Sep 2024 01:50:51 UTC
The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=28a4afe89afffdc8f14a555ae5b5918e5db63dda

commit 28a4afe89afffdc8f14a555ae5b5918e5db63dda
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2024-09-17 01:46:33 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
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)