From 65526ee02dfb09c2bc1ea97622211fd231821af5 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sun, 1 May 2022 11:15:55 +0000 Subject: 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 -- cgit v1.2.3