From nobody Sun May 01 11:34:59 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 A61D91ABADB4; Sun, 1 May 2022 11:34:59 +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 4KrkfW4DS3z3P6R; Sun, 1 May 2022 11:34:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651404899; 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=guEYUxRHpwnDka/Qi7mUSrSrelaff1hdczgC6+NyE3k=; b=xjau01Z0BPE4YaBa/UP+kovFWzkAKpiKnBc5AWqAHdJYGhBlIDrL2aj5QXsV+l6NflUvHX x6HRqgq1giI7J/zmk7hliAOfRJ0RYwuy8/Z4MxaX7dWIT6jeqPyeiRzS+2oKRoi/INsXpA eqBZjkndII6iX9IMgRP3JsjooABQsGM3/nI9JvQpD1tR328wqRRoTQJ9TFfInjAw9VAgZO PaJYUW/ef/eCAA9e9OcmhAzW2/fyGdHUnj416yvdsg/YDZ7N6BIXBMS7ZJspb4TCIasTU0 qmCSHIXv29JGpmByXpUGS3fUvTLXXwFnT0qworP4elSYhM8Oyo9oj4c+CgecIA== 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 7142515206; Sun, 1 May 2022 11:34:59 +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 241BYxF7089656; Sun, 1 May 2022 11:34:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 241BYx0c089655; Sun, 1 May 2022 11:34:59 GMT (envelope-from git) Date: Sun, 1 May 2022 11:34:59 GMT Message-Id: <202205011134.241BYx0c089655@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: 65526ee02dfb - main - Mk/bsd.java.mk: Extend JAVA_VERSION matching 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: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65526ee02dfb09c2bc1ea97622211fd231821af5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651404899; 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=guEYUxRHpwnDka/Qi7mUSrSrelaff1hdczgC6+NyE3k=; b=SvRvG8j+W6H/d4eSrUfRBciyiViHitAWJfhiRpMB0lA9xtzcV5UW0wy2QD4MTTCIUoqMJb 14oWQY5kPUS6VsfeopLZqm78WDLDkIVNDYENvvPsJ2Q4Wsn+X0AH+xrriTcEXQe6lY86q7 JHjN4Z9vLj6nvy2wV5DyMORxsS5EAb2bPkU8TgUlQnV8lbYjDt0cspc5feJ7t9e9bNBPgT Z61SaQZpBbIeRnWPUfipV1TR7ye1OTqSXJVbpaTXCUYui8VYOSgKbhMkMuiVrmuZ+JIV+x Gi8Dm2fPC56GzS6me/jcAzeV5XR/xznBSs2ieJ7mOp2/k6HrwUyuy5sWm9uqbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651404899; a=rsa-sha256; cv=none; b=mG50n5CVRI8KsCwry6Wg16XhFmgykozzKlHyPB5rutfXO69ZjLWxVk4dYYKgh3FpsY5y31 iRgPcehEETSDL2tszFSSpPnrTMgJQWh/dQdG3KiBDCmg/j6CNtpiTIvllMKnGoaO1tzbY9 uA1X2gNnCQG0gruge0f298TeM01jXXBBvr9y5apvVCf10kISlUeIfepju8AN3qxGGOdo2f ywRoytf10t6t6Syy53Uuzb29/TZ69R7c/jmCezBzW10LlneBKtcZRUBqK+Adwf/L51+0ij luYoYS1kC8Y2/QiR6W+6oppoLMevkQzrEjXVvpjB0WMuU1stpkyUFQZRZNw6/w== 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=65526ee02dfb09c2bc1ea97622211fd231821af5 commit 65526ee02dfb09c2bc1ea97622211fd231821af5 Author: Ashish SHUKLA AuthorDate: 2022-05-01 11:15:55 +0000 Commit: Ashish SHUKLA CommitDate: 2022-05-01 11:34:08 +0000 Mk/bsd.java.mk: Extend JAVA_VERSION matching Add explicit matching for 1.11+ which is used by x11-fm/mucommander, and was resulting in broken INDEX for it PR: 263483 Reported by: Tomoaki AOKI --- 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 a88204514650..454c759258d4 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/^1.11+/11 12+/:S/^1.11/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