From nobody Sun May 01 06:57:11 2022 X-Original-To: dev-commits-ports-main@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 8D25B1AB101F; Sun, 1 May 2022 06:57:11 +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 4KrcTz3XL2z4fr3; Sun, 1 May 2022 06:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651388231; 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=o/5M19uXoZWSIdIDZh4WtxR/IaByGReTQ+NR1X1i2B8=; b=Xm7uKfvXIAMOSVRXQ4eTlMo2E2aPZ8H+KSo1/X5M1PbhxhkZ0IfbdA5V3tk/McxBEzyM5s rPDPBERKKW8faVPDOoB2oByJC2YCknbaY1V20fjnzTqwf25h5Ey7fDEQAW2lbo4WWcqjJt ksfu0dWd2BioLRWUrg2xC6xU7RGx+0CGY7tQu5p/eiFoazO2xxT8Pz9VtnSuj7kF8uYyCe JXP4/A/HJRrckwAYk66Nqx70XvAJzS06AXRhYLrBmVoSU/u5J7l7XKcYdq0JT4Rtd9EmSo 6b+sAUnrXv5HYWiDvfRCcLMoBIDGVmR36Tz6pm8VxNNPlISn9GQNuVLM+vWj6g== 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 5569F11271; Sun, 1 May 2022 06:57:11 +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 2416vBbL012397; Sun, 1 May 2022 06:57:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2416vBTf012396; Sun, 1 May 2022 06:57:11 GMT (envelope-from git) Date: Sun, 1 May 2022 06:57:11 GMT Message-Id: <202205010657.2416vBTf012396@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 90de298b222a - main - Mk/bsd.java.mk: Fix JAVA_VERSION matching List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90de298b222ab8b74c707c26af21d59547898ab5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651388231; 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=o/5M19uXoZWSIdIDZh4WtxR/IaByGReTQ+NR1X1i2B8=; b=JTocmuljvt4P9RCTd2U5KoNNCfgZYWuemSrLVJ4/Lzxr8B6q37E2vrxIZrGC6Vj1mi3fGu tWTb2qdHBmfSKlYmJlen3RHgrdywhOipopt73zBzdQ/WkkcMrbsGgcEVLimvmQFPPnqk+I XN4rdw2u/WYE7tPlRQP+vxwJU0YR1IViC0a8RW1oUlHEw6ixeU23KXvj+EnR1Xi6o9Zarb OJZmZbMucl20MRg1t3FSkPpZtKnVJXLFNoi+wGC2q8r1qAwBept4Lazx80FuxcaoKufIoz 7P8x1XfidxzE+gzBQ3HF6La/pGTdeVdJw3njautdbXOW1bhzI+Z3eViD0VMkqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651388231; a=rsa-sha256; cv=none; b=wp1OnAx/R+j39ps6hxCHyUkggGVViM/JrXJutRavS/qHOHhc9cLqOa2vSudVB0OJOJtqhL 4DvEoOIbnBd0ZwRoGeNNFYYl8HBnxsa14EqUfkC3FEO/roV0e22SWqZvNeyrGCRY/GF1k+ OYKvn1huJBO9YUIYBZlGn1kC89fQVKoXRoUn1GcbSqeSCBOyuU2PHiuEEt/KPw/kyfFrYf d9W3QZPSmtBQNX5+jKycxFWyA4ts5Cl0+s2QD9TzwwK4Ff1Ag43HkNaWNK4QiFGs8Yg0a4 WI4BuHWJkwIrnAYVpcZtqVaG/3iSGJUA61C3NN35Rl+mKyMoneVFIkft7iRu3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=90de298b222ab8b74c707c26af21d59547898ab5 commit 90de298b222ab8b74c707c26af21d59547898ab5 Author: Ashish SHUKLA AuthorDate: 2022-05-01 06:53:06 +0000 Commit: Ashish SHUKLA CommitDate: 2022-05-01 06:55:55 +0000 Mk/bsd.java.mk: Fix JAVA_VERSION matching Anchor the matched patterns to be at the beginning of each word to prevent unexpected surprises e.g. with JAVA_VERSION= 17+ it results in _JAVA_VERSION set to unexpected "17 8 11 12 13 14 15 16 17 18", instead of "17 18" PR: 263483 Reported by: jrm Reviewed by: glewis Approved by: glewis --- Mk/bsd.java.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 4833fab43c8a..a88204514650 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -285,7 +285,7 @@ JAVA_RUN= jre . undef _JAVA_PORTS_INSTALLED . undef _JAVA_PORTS_POSSIBLE . if defined(JAVA_VERSION) -_JAVA_VERSION= ${JAVA_VERSION:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.7/7/:S/1.8/8/:S/7+/7 8+/:S/8+/8 11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13 14+/:S/14+/14 15+/:S/15+/15 16+/:S/16+/16 17+/:S/17+/17 18+/:S/18+/18/} +_JAVA_VERSION= ${JAVA_VERSION:S/^1.7+/1.7 1.8+/:S/^1.8+/1.8 11+/:S/^1.7/7/:S/^1.8/8/:S/^7+/7 8+/:S/^8+/8 11+/:S/^11+/11 12+/:S/^12+/12 13+/:S/^13+/13 14+/:S/^14+/14 15+/:S/^15+/15 16+/:S/^16+/16 17+/:S/^17+/17 18+/:S/^18+/18/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif