From owner-svn-ports-all@freebsd.org Mon Sep 7 18:35:25 2020 Return-Path: Delivered-To: svn-ports-all@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 264893D3B6E; Mon, 7 Sep 2020 18:35:25 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BlcR074Bhz4Yn4; Mon, 7 Sep 2020 18:35:24 +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 D605623BAC; Mon, 7 Sep 2020 18:35:24 +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 087IZOi6092198; Mon, 7 Sep 2020 18:35:24 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 087IZOYo092194; Mon, 7 Sep 2020 18:35:24 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <202009071835.087IZOYo092194@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Mon, 7 Sep 2020 18:35:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547936 - 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: 547936 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Sep 2020 18:35:25 -0000 Author: glewis Date: Mon Sep 7 18:35:23 2020 New Revision: 547936 URL: https://svnweb.freebsd.org/changeset/ports/547936 Log: Add support for 15 as a version Modified: head/java/javavmwrapper/Makefile head/java/javavmwrapper/src/javavm.1 head/java/javavmwrapper/src/javavmwrapper.sh head/java/javavmwrapper/src/manvm.1 Modified: head/java/javavmwrapper/Makefile ============================================================================== --- head/java/javavmwrapper/Makefile Mon Sep 7 18:34:28 2020 (r547935) +++ head/java/javavmwrapper/Makefile Mon Sep 7 18:35:23 2020 (r547936) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= javavmwrapper -PORTVERSION= 2.7.5 +PORTVERSION= 2.7.6 CATEGORIES= java MASTER_SITES= # none DISTFILES= # none Modified: head/java/javavmwrapper/src/javavm.1 ============================================================================== --- head/java/javavmwrapper/src/javavm.1 Mon Sep 7 18:34:28 2020 (r547935) +++ head/java/javavmwrapper/src/javavm.1 Mon Sep 7 18:35:23 2020 (r547936) @@ -131,8 +131,12 @@ Currently allowed versions are .Ql 12 , .Ql 12+ , .Ql 13 , +.Ql 13+ , +.Ql 14 , +.Ql 14+ , +.Ql 15 , and -.Ql 13+ . +.Ql 15+ . .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 Mon Sep 7 18:34:28 2020 (r547935) +++ head/java/javavmwrapper/src/javavmwrapper.sh Mon Sep 7 18:35:23 2020 (r547936) @@ -506,28 +506,31 @@ setJavaHome() { for version in ${JAVA_VERSION}; do case "${version}" in *7+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12 13 14" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12 13 14 15" ;; *8+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 8 9 10 11 12 13 14" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 8 9 10 11 12 13 14 15" ;; *9+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 10 11 12 13 14" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 10 11 12 13 14 15" ;; 10+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 10 11 12 13 14" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 10 11 12 13 14 15" ;; 11+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12 13 14" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12 13 14 15" ;; 12+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 12 13 14" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 12 13 14 15" ;; 13+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 13 14" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 13 14 15" ;; 14+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 14" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 14 15" + ;; + 15+) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 15" ;; 1.7) _JAVAVM_VERSION="${_JAVAVM_VERSION} 7" Modified: head/java/javavmwrapper/src/manvm.1 ============================================================================== --- head/java/javavmwrapper/src/manvm.1 Mon Sep 7 18:34:28 2020 (r547935) +++ head/java/javavmwrapper/src/manvm.1 Mon Sep 7 18:35:23 2020 (r547936) @@ -119,8 +119,12 @@ Currently allowed versions are .Ql 12 , .Ql 12+ , .Ql 13 , +.Ql 13+ , +.Ql 14 , +.Ql 14+ , +.Ql 15 , and -.Ql 13+ . +.Ql 15+ . .It Ev JAVAVM_OPTS The contents of this environment variable will be passed to the invoked .Nm man