Date: Tue, 3 May 2022 01:22:38 GMT From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1309940fd048 - main - Mk/bsd.java.mk: Revert previous commit allowing 1.11 as a version Message-ID: <202205030122.2431MckG051017@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=1309940fd048982c2b472bfc287bcbc1ed83c574 commit 1309940fd048982c2b472bfc287bcbc1ed83c574 Author: Greg Lewis <glewis@FreeBSD.org> AuthorDate: 2022-05-03 01:21:05 +0000 Commit: Greg Lewis <glewis@FreeBSD.org> CommitDate: 2022-05-03 01:21:05 +0000 Mk/bsd.java.mk: Revert previous commit allowing 1.11 as a version * 1.11 has never been a valid Java version. I've fixed the offeding port that used it rather than adding it here. --- 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 454c759258d4..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/^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/} +_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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205030122.2431MckG051017>