From owner-svn-ports-all@freebsd.org Fri Jul 26 21:47:10 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 6B521AA792; Fri, 26 Jul 2019 21:47:10 +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 4C51784820; Fri, 26 Jul 2019 21:47:10 +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 2192A1D619; Fri, 26 Jul 2019 21:47:10 +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 x6QLl9fj072286; Fri, 26 Jul 2019 21:47:09 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6QLl9u7072285; Fri, 26 Jul 2019 21:47:09 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201907262147.x6QLl9u7072285@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Fri, 26 Jul 2019 21:47:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507376 - 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: 507376 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4C51784820 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.94)[-0.939,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Fri, 26 Jul 2019 21:47:10 -0000 Author: glewis Date: Fri Jul 26 21:47:09 2019 New Revision: 507376 URL: https://svnweb.freebsd.org/changeset/ports/507376 Log: Sort VMs by version numerically * VMs were sorted by VM version by lexicographically sorting the version as a string. Switch to numeric sorting now that there are versions like 10, 11, and 12 so that the intended sort order (most recent first) is preserved. * Bump minor version. Modified: head/java/javavmwrapper/Makefile head/java/javavmwrapper/src/javavmwrapper.sh Modified: head/java/javavmwrapper/Makefile ============================================================================== --- head/java/javavmwrapper/Makefile Fri Jul 26 21:03:55 2019 (r507375) +++ head/java/javavmwrapper/Makefile Fri Jul 26 21:47:09 2019 (r507376) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= javavmwrapper -PORTVERSION= 2.7.1 +PORTVERSION= 2.7.2 CATEGORIES= java MASTER_SITES= # none DISTFILES= # none Modified: head/java/javavmwrapper/src/javavmwrapper.sh ============================================================================== --- head/java/javavmwrapper/src/javavmwrapper.sh Fri Jul 26 21:03:55 2019 (r507375) +++ head/java/javavmwrapper/src/javavmwrapper.sh Fri Jul 26 21:47:09 2019 (r507376) @@ -176,14 +176,16 @@ sortConfiguration () { # Consistent version numbering for various install directory names # including 'openjdk6', 'jdk1.6.0', 'linux-sun-jdk1.6.0', etc. VERSION=`echo ${VM} | sed -e 's|[^0-9]*||' -e 's|1\.||' \ - -e 's|\.[0-9]||' 2>/dev/null` + -e 's|\.[0-9]||' -e 's|-jre||' \ + 2>/dev/null` _VERSION=`echo ${_VM} | sed -e 's|[^0-9]*||' -e 's|1\.||' \ - -e 's|\.[0-9]||' 2>/dev/null` - if [ "${VERSION}" \> "${_VERSION}" ]; then + -e 's|\.[0-9]||' -e 's|-jre||' \ + 2>/dev/null` + if [ "${VERSION}" -gt "${_VERSION}" ]; then _JAVAVMS="${_JAVAVMS}:${JAVAVM}:${_JAVAVM}" JAVAVM= continue - elif [ "${VERSION}" \< "${_VERSION}" ]; then + elif [ "${VERSION}" -lt "${_VERSION}" ]; then _JAVAVMS="${_JAVAVMS}:${_JAVAVM}" continue else