From owner-svn-ports-head@freebsd.org Tue Feb 23 04:44:49 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6186655C88E; Tue, 23 Feb 2021 04:44:49 +0000 (UTC) (envelope-from glewis@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 4Dl60d2C5Jz3tK1; Tue, 23 Feb 2021 04:44:49 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3AB5E12F52; Tue, 23 Feb 2021 04:44:49 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11N4inMr018887; Tue, 23 Feb 2021 04:44:49 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11N4imF0018884; Tue, 23 Feb 2021 04:44:48 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <202102230444.11N4imF0018884@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Tue, 23 Feb 2021 04:44:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566368 - in head/java/javavmwrapper: . src X-SVN-Group: ports-head X-SVN-Commit-Author: glewis X-SVN-Commit-Paths: in head/java/javavmwrapper: . src X-SVN-Commit-Revision: 566368 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Feb 2021 04:44:49 -0000 Author: glewis Date: Tue Feb 23 04:44:48 2021 New Revision: 566368 URL: https://svnweb.freebsd.org/changeset/ports/566368 Log: Add support for 16 as a version specifier Modified: head/java/javavmwrapper/Makefile head/java/javavmwrapper/src/javavm.1 head/java/javavmwrapper/src/javavmwrapper.sh Modified: head/java/javavmwrapper/Makefile ============================================================================== --- head/java/javavmwrapper/Makefile Tue Feb 23 04:37:06 2021 (r566367) +++ head/java/javavmwrapper/Makefile Tue Feb 23 04:44:48 2021 (r566368) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= javavmwrapper -PORTVERSION= 2.7.6 +PORTVERSION= 2.7.7 CATEGORIES= java MASTER_SITES= # none DISTFILES= # none Modified: head/java/javavmwrapper/src/javavm.1 ============================================================================== --- head/java/javavmwrapper/src/javavm.1 Tue Feb 23 04:37:06 2021 (r566367) +++ head/java/javavmwrapper/src/javavm.1 Tue Feb 23 04:44:48 2021 (r566368) @@ -135,8 +135,10 @@ Currently allowed versions are .Ql 14 , .Ql 14+ , .Ql 15 , +.Ql 15+ , +.Ql 16 , and -.Ql 15+ . +.Ql 16+ . .It Ev JAVAVM_OPTS The contents of this environment variable will be passed to the invoked Java VM as options. Modified: head/java/javavmwrapper/src/javavmwrapper.sh ============================================================================== --- head/java/javavmwrapper/src/javavmwrapper.sh Tue Feb 23 04:37:06 2021 (r566367) +++ head/java/javavmwrapper/src/javavmwrapper.sh Tue Feb 23 04:44:48 2021 (r566368) @@ -506,31 +506,34 @@ setJavaHome() { for version in ${JAVA_VERSION}; do case "${version}" in *7+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12 13 14 15" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12 13 14 15 16" ;; *8+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 8 9 10 11 12 13 14 15" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 8 9 10 11 12 13 14 15 16" ;; *9+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 10 11 12 13 14 15" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 10 11 12 13 14 15 16" ;; 10+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 10 11 12 13 14 15" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 10 11 12 13 14 15 16" ;; 11+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12 13 14 15" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12 13 14 15 16" ;; 12+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 12 13 14 15" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 12 13 14 15 16" ;; 13+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 13 14 15" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 13 14 15 16" ;; 14+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 14 15" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 14 15 16" ;; 15+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 15" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 15 16" + ;; + 16+) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 16" ;; 1.7) _JAVAVM_VERSION="${_JAVAVM_VERSION} 7"