From nobody Fri Oct 14 16:10:14 2022 X-Original-To: dev-commits-ports-all@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 4MprvW3kn6z4fmKH; Fri, 14 Oct 2022 16:10:15 +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 4MprvW1jBGz3Fmt; Fri, 14 Oct 2022 16:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665763815; 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=k5Q3w1YRBMYY4o/EtoO5EqLGk3HqjICFmX+hfvJaMIM=; b=iA+o8FAMi174HJlxEufwshVeANguJ6z7LtcWhFXWLD/QLKBF8BpVaVXsEaDqjc+F5WvLsb uT09c88pqI8jVQR/CN4mIuIE3VPXrFjvvtF1UaaVYqmUvwTw3Nto4K5CbG3D5G9JAby5Y+ qQvUJex6lFF055NQqYOEQ05MSXurNrbhFDCKEv1SPnTAPmRr8btHW0+i8+Pa7bYWPHP1om vcWNFSMUcvgysXcpcW+K9Fem43gAsVwK77WKz/ygiB6xd96jBioA5V8lTLe6BMGXlEy00b QE/5lP8j0XYHDIMXghPlyQ++RtGHphTfXYfeYr/z0hZ68K6NxmZUUPEdHMCvHw== 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 4MprvW0frhzqXG; Fri, 14 Oct 2022 16:10:15 +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 29EGAESD045255; Fri, 14 Oct 2022 16:10:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29EGAEVw045249; Fri, 14 Oct 2022 16:10:14 GMT (envelope-from git) Date: Fri, 14 Oct 2022 16:10:14 GMT Message-Id: <202210141610.29EGAEVw045249@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 88b442430854 - main - Mk/Uses/firebird.mk: cleanup List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88b4424308540bab2199f3e0d8c31f82bfbece2d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665763815; 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=k5Q3w1YRBMYY4o/EtoO5EqLGk3HqjICFmX+hfvJaMIM=; b=xDWxsM41LoY8wqicoqpn9Cwpg/kbkW9hyruaAIHpuyRU11uqJaylSWZCFq16Nd1c+Z4ExT t+MHMM+oLvfXz9KWi2Ydp85c1NXGF1XeEbBNJbBdhkEwgfMEy5syOKtq5dKOdgi+Ff3A6l ooOt73WYiaNNtVxpjFYzyZ5nHTF9GwI8IU1oXmZzw1ndFu0xdH6pXoALZbJmSwc5iQTAvp qamck4k5dqQw3wQxjkDSlrli7v/arty3wSBcbbMX/Th65kkbNxRG52ggZU28WdHwQG53HI EA20OUqxM0E//k48SJNa331nW7ssb/CwZ47sGf7SU+nTbDmCwIezrr4T4+kjBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665763815; a=rsa-sha256; cv=none; b=KwCyha/19clI8yRg8eFayd8GsRnQSRYDUEx3Y3zt8c/EAEhg3CUpXTSYm9bWpkieREUteT OF4m6bBhcLYy2OmoYie++SdYxj4kYj28CGIKl/qWwqkYvrmSJPmYQdIxyi9OiL41wflXI3 2JTQBYA/cQgT/VpKpBRQYhvsB9P7kCkXvIHWpoC3vKVPUBhyisJom+0acBUsXdRuswUgwL nGmegQKF/dfm/yXgIgv5zfKUQB+z+KfK/zsS291N+QYDPLQxvQDv8y5jPukDhsY7nwg49u xjXqFRu/EfgqWokrVzGWd5ep4CdPoe2T8UL/uaMSNrWbfU9FVSvRTauLvByzVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=88b4424308540bab2199f3e0d8c31f82bfbece2d commit 88b4424308540bab2199f3e0d8c31f82bfbece2d Author: Baptiste Daroussin AuthorDate: 2022-10-14 16:08:49 +0000 Commit: Baptiste Daroussin 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