diff options
| author | Ashish SHUKLA <ashish@FreeBSD.org> | 2022-05-01 11:15:55 +0000 |
|---|---|---|
| committer | Ashish SHUKLA <ashish@FreeBSD.org> | 2022-05-01 11:34:08 +0000 |
| commit | 65526ee02dfb09c2bc1ea97622211fd231821af5 (patch) | |
| tree | 09236d88e61c56448144b878359621eb0f73232a | |
| parent | db009eb902b0ad5b1867e5e9e0aeee3656394068 (diff) | |
| download | ports-65526ee02dfb09c2bc1ea97622211fd231821af5.tar.gz ports-65526ee02dfb09c2bc1ea97622211fd231821af5.zip | |
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
| -rw-r--r-- | Mk/bsd.java.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 |