Date: Sun, 27 Jun 2021 23:30:04 GMT From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b03649227fd3 - main - Mk/Uses/firebird.mk: Prepare support for firebird 3.0 and 4.0 Message-ID: <202106272330.15RNU4mP012295@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=b03649227fd333cad8521db8efae2d28b2acdb53 commit b03649227fd333cad8521db8efae2d28b2acdb53 Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2021-06-27 23:26:17 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106272330.15RNU4mP012295>