From owner-dev-commits-ports-main@freebsd.org Sun Jun 27 23:30:05 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2501464AF9C; Sun, 27 Jun 2021 23:30:05 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GCn5n0LB7z3MJR; Sun, 27 Jun 2021 23:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E41CB1ACEE; Sun, 27 Jun 2021 23:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15RNU4K1012299; Sun, 27 Jun 2021 23:30:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15RNU4mP012295; Sun, 27 Jun 2021 23:30:04 GMT (envelope-from git) Date: Sun, 27 Jun 2021 23:30:04 GMT Message-Id: <202106272330.15RNU4mP012295@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: b03649227fd3 - main - Mk/Uses/firebird.mk: Prepare support for firebird 3.0 and 4.0 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: b03649227fd333cad8521db8efae2d28b2acdb53 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2021 23:30:05 -0000 The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=b03649227fd333cad8521db8efae2d28b2acdb53 commit b03649227fd333cad8521db8efae2d28b2acdb53 Author: Jose Alonso Cardenas Marquez AuthorDate: 2021-06-27 23:26:17 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2021-06-27 23:29:53 +0000 Mk/Uses/firebird.mk: Prepare support for firebird 3.0 and 4.0 PR: 256846 Approved by: rene --- Mk/Uses/firebird.mk | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/Mk/Uses/firebird.mk b/Mk/Uses/firebird.mk index c5f72cd679c9..80c06442a251 100644 --- a/Mk/Uses/firebird.mk +++ b/Mk/Uses/firebird.mk @@ -8,15 +8,26 @@ _INCLUDE_USES_FIREBIRD_MK= yes .if !empty(firebird_ARGS) FIREBIRD_VER= ${firebird_ARGS} +.else +FIREBIRD_VER= ${FIREBIRD_DEFAULT} .endif -FIREBIRD_VER?= ${FIREBIRD_DEFAULT:S/.//} - # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -.if ${FIREBIRD_VER} == 25 -LIB_DEPENDS+= libfbclient.so:databases/firebird25-client -.else -IGNORE= cannot install: unknown Firebird version: ${FIREBIRD_VER} -.endif +VALID_FIREBIRD_VER= 2.5 3.0 4.0 + +.for v in ${FIREBIRD_DEFAULT} +. if ! ${VALID_FIREBIRD_VER:M$v} +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} +IGNORE= Invalid Firebird version ${FIREBIRD_VER}; valid versions are ${VALID_FIREBIRD_VER} +. endif +.endfor + +LIB_DEPENDS+= libfbclient.so:databases/firebird${FIREBIRD_VER:S/.//}-client + .endif