Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Oct 2022 16:10:14 GMT
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 88b442430854 - main - Mk/Uses/firebird.mk: cleanup
Message-ID:  <202210141610.29EGAEVw045249@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=88b4424308540bab2199f3e0d8c31f82bfbece2d

commit 88b4424308540bab2199f3e0d8c31f82bfbece2d
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2022-10-14 16:08:49 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2022-10-14 16:10:03 +0000

    Mk/Uses/firebird.mk: cleanup
    
    - remove useless for loops
    - avoid IGNORE overwrite
---
 Mk/Uses/firebird.mk | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/Mk/Uses/firebird.mk b/Mk/Uses/firebird.mk
index 23aaf9c5eb65..63123bf5f503 100644
--- a/Mk/Uses/firebird.mk
+++ b/Mk/Uses/firebird.mk
@@ -16,17 +16,11 @@ FIREBIRD_VER=	${FIREBIRD_DEFAULT}
 # Mk/bsd.default-versions.mk in sync.
 VALID_FIREBIRD_VER=        2.5 3.0 4.0
 
-.  for v in ${FIREBIRD_DEFAULT}
-.    if ! ${VALID_FIREBIRD_VER:M$v}
+.  if ! ${VALID_FIREBIRD_VER:M${FIREBIRD_DEFAULT}}
 IGNORE=		Invalid Firebird default version ${FIREBIRD_DEFAULT}; valid versions are ${VALID_FIREBIRD_VER}
-.    endif
-.  endfor
-
-.  for w in ${FIREBIRD_VER}
-.    if ! ${VALID_FIREBIRD_VER:M$w}
+.  elif ! ${VALID_FIREBIRD_VER:M${FIREBIRD_VER}}
 IGNORE=		Invalid Firebird version ${FIREBIRD_VER}; valid versions are ${VALID_FIREBIRD_VER}
-.    endif
-.  endfor
+.  endif
 
 LIB_DEPENDS+=	libfbclient.so:databases/firebird${FIREBIRD_VER:S/.//}-client
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210141610.29EGAEVw045249>