From owner-cvs-all@FreeBSD.ORG Fri Jul 13 05:38:44 2012 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 39F45106564A; Fri, 13 Jul 2012 05:38:44 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 255278FC12; Fri, 13 Jul 2012 05:38:44 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id q6D5cifR041013; Fri, 13 Jul 2012 05:38:44 GMT (envelope-from glewis@repoman.freebsd.org) Received: (from glewis@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q6D5ciFf041012; Fri, 13 Jul 2012 05:38:44 GMT (envelope-from glewis) Message-Id: <201207130538.q6D5ciFf041012@repoman.freebsd.org> From: Greg Lewis Date: Fri, 13 Jul 2012 05:38:44 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: ports/java/javavmwrapper Makefile ports/java/javavmwrapper/src javavm.1 javavmwrapper.sh X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2012 05:38:44 -0000 glewis 2012-07-13 05:38:44 UTC FreeBSD ports repository Modified files: java/javavmwrapper Makefile java/javavmwrapper/src javavm.1 javavmwrapper.sh Log: . Make the version numbers consistent so they can be compared correctly. E.g. for jdk1.6.0 and openjdk6 will use '6' as the version. . Modify the preference order for Java VMs used by the internal fallback logic to reflect that openjdk is now the default Java VM rather than diablo. . Remove code for Java vendors that are no longer in the ports tree (e.g. blackdown, ibm). . Remove code for handling version numbers that are no longer present in the tree (e.g. only 1.5 and up is supported). . Note that openjdk is a native Java VM. . If the environment variable JAVAVM_FALLBACK_ONLY is set then only use the internal logic to select a Java VM, don't use the ports logic even if the ports collection is installed. [1] . Update the manual page for JAVAVM_FALLBACK_ONLY. . Bump version to 2.4. PR: 167799 [1] Revision Changes Path 1.35 +1 -1 ports/java/javavmwrapper/Makefile 1.14 +11 -1 ports/java/javavmwrapper/src/javavm.1 1.25 +56 -79 ports/java/javavmwrapper/src/javavmwrapper.sh