From owner-svn-ports-all@freebsd.org Wed Nov 27 00:56:25 2019 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 54F411C65B4; Wed, 27 Nov 2019 00:56: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) server-signature RSA-PSS (4096 bits) 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 47N2Qd1YHWz4TLS; Wed, 27 Nov 2019 00:56:25 +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 14A23591C; Wed, 27 Nov 2019 00:56:25 +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 xAR0uOFi018450; Wed, 27 Nov 2019 00:56:24 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAR0uO7O018446; Wed, 27 Nov 2019 00:56:24 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201911270056.xAR0uO7O018446@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Wed, 27 Nov 2019 00:56:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518486 - head/java/javavmwrapper/src X-SVN-Group: ports-head X-SVN-Commit-Author: glewis X-SVN-Commit-Paths: head/java/javavmwrapper/src X-SVN-Commit-Revision: 518486 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.29 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: Wed, 27 Nov 2019 00:56:25 -0000 Author: glewis Date: Wed Nov 27 00:56:24 2019 New Revision: 518486 URL: https://svnweb.freebsd.org/changeset/ports/518486 Log: * Teach javavmwrapper about "13" as a version specifier * Remove some white space while I'm here Modified: head/java/javavmwrapper/src/javavm.1 head/java/javavmwrapper/src/javavmwrapper.sh head/java/javavmwrapper/src/manvm.1 head/java/javavmwrapper/src/registervm.1 Modified: head/java/javavmwrapper/src/javavm.1 ============================================================================== --- head/java/javavmwrapper/src/javavm.1 Wed Nov 27 00:54:13 2019 (r518485) +++ head/java/javavmwrapper/src/javavm.1 Wed Nov 27 00:56:24 2019 (r518486) @@ -129,8 +129,10 @@ Currently allowed versions are .Ql 11 , .Ql 11+ , .Ql 12 , +.Ql 12+ , +.Ql 13 , and -.Ql 12+ . +.Ql 13+ . .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 Wed Nov 27 00:54:13 2019 (r518485) +++ head/java/javavmwrapper/src/javavmwrapper.sh Wed Nov 27 00:56:24 2019 (r518486) @@ -506,22 +506,25 @@ setJavaHome() { for version in ${JAVA_VERSION}; do case "${version}" in *7+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12 13" ;; *8+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 8 9 10 11 12" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 8 9 10 11 12 13" ;; *9+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 10 11 12" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 10 11 12 13" ;; 10+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 10 11 12" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 10 11 12 13" ;; 11+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12 13" ;; 12+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 12" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 12 13" + ;; + 13+) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 13" ;; 1.7) _JAVAVM_VERSION="${_JAVAVM_VERSION} 7" Modified: head/java/javavmwrapper/src/manvm.1 ============================================================================== --- head/java/javavmwrapper/src/manvm.1 Wed Nov 27 00:54:13 2019 (r518485) +++ head/java/javavmwrapper/src/manvm.1 Wed Nov 27 00:56:24 2019 (r518486) @@ -117,8 +117,10 @@ Currently allowed versions are .Ql 11 , .Ql 11+ , .Ql 12 , +.Ql 12+ , +.Ql 13 , and -.Ql 12+ . +.Ql 13+ . .It Ev JAVAVM_OPTS The contents of this environment variable will be passed to the invoked .Nm man Modified: head/java/javavmwrapper/src/registervm.1 ============================================================================== --- head/java/javavmwrapper/src/registervm.1 Wed Nov 27 00:54:13 2019 (r518485) +++ head/java/javavmwrapper/src/registervm.1 Wed Nov 27 00:56:24 2019 (r518486) @@ -1,6 +1,6 @@ .\" .\" Copyright (C) 2005 Greg Lewis. All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -10,7 +10,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" +.\" .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE