[Midnightbsd-cvs] mports [15470] U trunk/java/javavmwrapper: update vm wrapper

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Sep 18 21:15:17 EDT 2013


Revision: 15470
          http://svnweb.midnightbsd.org/mports/?rev=15470
Author:   laffer1
Date:     2013-09-18 21:15:15 -0400 (Wed, 18 Sep 2013)
Log Message:
-----------
update vm wrapper

Modified Paths:
--------------
    trunk/java/javavmwrapper/Makefile
    trunk/java/javavmwrapper/files/pkg-install.in
    trunk/java/javavmwrapper/pkg-plist
    trunk/java/javavmwrapper/src/javavm.1
    trunk/java/javavmwrapper/src/javavmwrapper.sh
    trunk/java/javavmwrapper/src/manvm.1
    trunk/java/javavmwrapper/src/registervm.1

Property Changed:
----------------
    trunk/java/javavmwrapper/files/javavm_opts.conf.dist
    trunk/java/javavmwrapper/files/pkg-install.in
    trunk/java/javavmwrapper/pkg-plist
    trunk/java/javavmwrapper/src/checkvms.1
    trunk/java/javavmwrapper/src/classpath.sh
    trunk/java/javavmwrapper/src/javavm.1
    trunk/java/javavmwrapper/src/javavmwrapper.sh
    trunk/java/javavmwrapper/src/manvm.1
    trunk/java/javavmwrapper/src/registervm.1

Modified: trunk/java/javavmwrapper/Makefile
===================================================================
--- trunk/java/javavmwrapper/Makefile	2013-09-19 01:07:40 UTC (rev 15469)
+++ trunk/java/javavmwrapper/Makefile	2013-09-19 01:15:15 UTC (rev 15470)
@@ -3,7 +3,7 @@
 # This port is self contained in the src directory.
 
 PORTNAME=	javavmwrapper
-PORTVERSION=	2.3.5
+PORTVERSION=	2.4.0
 CATEGORIES=	java
 MASTER_SITES=	# none
 DISTFILES=	# none

Index: trunk/java/javavmwrapper/files/javavm_opts.conf.dist
===================================================================
--- trunk/java/javavmwrapper/files/javavm_opts.conf.dist	2013-09-19 01:07:40 UTC (rev 15469)
+++ trunk/java/javavmwrapper/files/javavm_opts.conf.dist	2013-09-19 01:15:15 UTC (rev 15470)

Property changes on: trunk/java/javavmwrapper/files/javavm_opts.conf.dist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/java/javavmwrapper/files/pkg-install.in
===================================================================
--- trunk/java/javavmwrapper/files/pkg-install.in	2013-09-19 01:07:40 UTC (rev 15469)
+++ trunk/java/javavmwrapper/files/pkg-install.in	2013-09-19 01:15:15 UTC (rev 15470)
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # $MidnightBSD$
-# $FreeBSD: ports/java/javavmwrapper/files/pkg-install.in,v 1.3 2006/06/03 17:32:24 glewis Exp $
 
 LOCALBASE=%%LOCALBASE%%
 
@@ -22,9 +21,14 @@
 fi
 
 # Ensure all JDKs and JREs are installed
-for jvm in "${LOCALBASE}"/*jdk* "${LOCALBASE}"/*jre*; do
-    if [ -x "${jvm}/bin/java" ]; then
-        "${PKG_PREFIX}"/bin/registervm "${jvm}/bin/java" > /dev/null 2>&1
+_excl_dirs='bootstrap-openjdk'
+_find_expr='-depth 2 -regex .*/bin/java'
+for dir in ${_excl_dirs}; do
+    _find_expr="${_find_expr} ! -regex ${dir}/bin/java"
+done
+for jvm in `cd "${LOCALBASE}" && find *jdk* *jre* ${_find_expr} 2> /dev/null`; do
+    if [ -x "${LOCALBASE}/${jvm}" ]; then
+        "${PKG_PREFIX}"/bin/registervm "${LOCALBASE}/${jvm}" > /dev/null 2>&1
     fi
 done
 


Property changes on: trunk/java/javavmwrapper/files/pkg-install.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/java/javavmwrapper/pkg-plist
===================================================================
--- trunk/java/javavmwrapper/pkg-plist	2013-09-19 01:07:40 UTC (rev 15469)
+++ trunk/java/javavmwrapper/pkg-plist	2013-09-19 01:15:15 UTC (rev 15470)
@@ -1,4 +1,4 @@
- at comment $MidnightBSD: mports/Mk/bsd.mport.mk,v 1.107 2008/06/06 00:09:50 laffer1 Exp $
+ at comment $MidnightBSD$
 bin/classpath
 bin/javavm
 bin/registervm


Property changes on: trunk/java/javavmwrapper/pkg-plist
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Index: trunk/java/javavmwrapper/src/checkvms.1
===================================================================
--- trunk/java/javavmwrapper/src/checkvms.1	2013-09-19 01:07:40 UTC (rev 15469)
+++ trunk/java/javavmwrapper/src/checkvms.1	2013-09-19 01:15:15 UTC (rev 15470)

Property changes on: trunk/java/javavmwrapper/src/checkvms.1
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/java/javavmwrapper/src/classpath.sh
===================================================================
--- trunk/java/javavmwrapper/src/classpath.sh	2013-09-19 01:07:40 UTC (rev 15469)
+++ trunk/java/javavmwrapper/src/classpath.sh	2013-09-19 01:15:15 UTC (rev 15470)

Property changes on: trunk/java/javavmwrapper/src/classpath.sh
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/java/javavmwrapper/src/javavm.1
===================================================================
--- trunk/java/javavmwrapper/src/javavm.1	2013-09-19 01:07:40 UTC (rev 15469)
+++ trunk/java/javavmwrapper/src/javavm.1	2013-09-19 01:15:15 UTC (rev 15470)
@@ -4,6 +4,7 @@
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
+.\"
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
@@ -22,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: ports/java/javavmwrapper/src/javavm.1,v 1.8 2006/06/08 17:58:15 glewis Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 24, 2005
 .Os
@@ -101,8 +102,6 @@
 Currently allowed vendors are
 .Ql bsdjava ,
 .Ql freebsd ,
-.Ql blackdown ,
-.Ql ibm ,
 .Ql openjdk
 and
 .Ql sun .
@@ -114,11 +113,6 @@
 equal to the given version will be used.
 .Pp
 Currently allowed versions are
-.Ql 1.2+ ,
-.Ql 1.3 ,
-.Ql 1.3+ ,
-.Ql 1.4 ,
-.Ql 1.4+ ,
 .Ql 1.5 ,
 .Ql 1.5+ ,
 .Ql 1.6 ,
@@ -132,6 +126,16 @@
 For more information on environment variables which can be used to set
 options see
 .Pa %%PREFIX%%/etc/javavm_opts.conf.dist .
+.It Ev JAVAVM_FALLBACK_ONLY
+If this variable is set then instead of selecting the Java VM based on
+.Pa %%PORTSDIR%%/Mk/bsd.java.mk
+only the internal selection process is used.
+This may be useful to achieve consistent results for Java VM selection
+across multiple hosts, where some have the ports collection installed
+and others do not.
+However, this option, when used with scripts installed by a port, may
+result in Java VM selection inconsistent with that intended by the script
+author.
 .It Ev JAVAVM_DRYRUN
 When this variable is set, no Java VM is invoked.
 Instead, the Java VM wrapper prints out the following information:


Property changes on: trunk/java/javavmwrapper/src/javavm.1
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/java/javavmwrapper/src/javavmwrapper.sh
===================================================================
--- trunk/java/javavmwrapper/src/javavmwrapper.sh	2013-09-19 01:07:40 UTC (rev 15469)
+++ trunk/java/javavmwrapper/src/javavmwrapper.sh	2013-09-19 01:15:15 UTC (rev 15470)
@@ -174,8 +174,12 @@
             _VM=`dirname "${_VM}"`
             _VM=`dirname "${_VM}"`
             _VM=`basename "${_VM}"`
-            VERSION=`echo ${VM} | sed -e 's|[^0-9]*||' 2>/dev/null`
-            _VERSION=`echo ${_VM} | sed -e 's|[^0-9]*||' 2>/dev/null`
+            # 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`
+            _VERSION=`echo ${_VM} | sed -e 's|[^0-9]*||' -e 's|1\.||' \
+		                        -e 's|\.[0-9]||' 2>/dev/null`
             if [ "${VERSION}" \> "${_VERSION}" ]; then
                 _JAVAVMS="${_JAVAVMS}:${JAVAVM}:${_JAVAVM}"
                 JAVAVM=
@@ -185,14 +189,14 @@
                 continue
             else
                 case "${VM}" in
-                    diablo-jdk*)
+                    openjdk*)
                         _JAVAVMS="${_JAVAVMS}:${JAVAVM}:${_JAVAVM}"
                         JAVAVM=
                         continue
                         ;;
-                    diablo-jre*|openjdk*)
+                    diablo-jdk*)
                         case "${_VM}" in
-                            diablo*)
+                            open*)
                                 _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
                                 continue
                                 ;;
@@ -203,9 +207,9 @@
                                 ;;
                         esac
                         ;;
-                    jdk*)
+                    diablo-jre*|jdk*)
                         case "${_VM}" in
-                            diablo*|open*)
+                            open*|diablo*)
                                 _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
                                 continue
                                 ;;
@@ -218,7 +222,7 @@
                         ;;
                     jre*|linux-sun-jdk*)
                         case "${_VM}" in
-                            diablo*|open*|j*)
+                            open*|diablo*|j*)
                                 _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
                                 continue
                                 ;;
@@ -229,9 +233,9 @@
                                 ;;
                         esac
                         ;;
-                    linux-sun-jre*|linux-blackdown-jdk*)
+                    linux-sun-jre*)
                         case "${_VM}" in
-                            diablo*|open*|j*|linux-sun*)
+                            open*|diablo*|j*|linux-sun*)
                                 _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
                                 continue
                                 ;;
@@ -242,19 +246,6 @@
                                 ;;
                         esac
                         ;;
-                    linux-blackdown-jre*|linux-ibm-jdk*)
-                        case "${_VM}" in
-                            diablo*|open*|j*|linux-sun*|linux-blackdown*)
-                                _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
-                                continue
-                                ;;
-                            *)
-                                _JAVAVMS="${_JAVAVMS}:${JAVAVM}:${_JAVAVM}"
-                                JAVAVM=
-                                continue
-                                ;;
-                        esac
-                        ;;
                 esac
                 _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
             fi
@@ -467,11 +458,11 @@
     MANPATH="${JAVA_HOME}/man:${MANPATH}"
     export MANPATH
     if [ "${LANG}" = "ja_JP.eucJP" -a -x "${_JAVAVM_PREFIX}/bin/jman" ]; then
-	setJavaOptions jman "`basename ${JAVA_HOME}`"
-	exec ${_JAVAVM_PREFIX}/bin/jman -S 1 ${_JAVAVM_OPTS} ${1}
+        setJavaOptions jman "`basename ${JAVA_HOME}`"
+        exec ${_JAVAVM_PREFIX}/bin/jman -S 1 ${_JAVAVM_OPTS} ${1}
     else
-	setJavaOptions man "`basename ${JAVA_HOME}`"
-	exec man -S 1 ${_JAVAVM_OPTS} ${1}
+        setJavaOptions man "`basename ${JAVA_HOME}`"
+        exec man -S 1 ${_JAVAVM_OPTS} ${1}
     fi
 }
 
@@ -482,39 +473,43 @@
     # Use JAVA_HOME if it's set, unless its set to %%PREFIX%%
     if [ -n "${JAVA_HOME}" ]; then
         if [ "`realpath "${JAVA_HOME}"`" != "`realpath "${_JAVAVM_PREFIX}"`" ]; then
-	    if [ -f "${JAVA_HOME}/bin/${_JAVAVM_PROG}" ]; then
-		_JAVAVM_PROG_PATH="${JAVA_HOME}/bin"
-		return 0
-	    elif [ -f "${JAVA_HOME}/jre/bin/${_JAVAVM_PROG}" ]; then
-		_JAVAVM_PROG_PATH="${JAVA_HOME}/jre/bin"
-		return 0
-	    fi
-	fi
+            if [ -f "${JAVA_HOME}/bin/${_JAVAVM_PROG}" ]; then
+                _JAVAVM_PROG_PATH="${JAVA_HOME}/bin"
+                return 0
+            elif [ -f "${JAVA_HOME}/jre/bin/${_JAVAVM_PROG}" ]; then
+                _JAVAVM_PROG_PATH="${JAVA_HOME}/jre/bin"
+                return 0
+            fi
+        fi
     fi
 
     unset JAVA_HOME
 
-    # Determine location of bsd.port.mk if it exists
-    _JAVAVM_PORTSDIR=
-    if [ -r /usr/share/mk/bsd.port.mk ]; then
-        _JAVAVM_PORTSDIR=`"${_JAVAVM_MAKE}" -f /usr/share/mk/bsd.port.mk -V PORTSDIR 2>/dev/null`
-    fi
+    # Use bsd.java.mk to determine the VM to use if it exists unless
+    # JAVAVM_FALLBACK_ONLY is set
+    if [ -z "${JAVAVM_FALLBACK_ONLY}" ]; then
+        # Determine location of bsd.port.mk if it exists
+        _JAVAVM_PORTSDIR=
+        if [ -r /usr/share/mk/bsd.port.mk ]; then
+            _JAVAVM_PORTSDIR=`"${_JAVAVM_MAKE}" -f /usr/share/mk/bsd.port.mk -V PORTSDIR 2>/dev/null`
+        fi
 
-    _JAVAVM_BSD_PORT_MK=
-    if [ -n "${_JAVAVM_PORTSDIR}" -a -r "${_JAVAVM_PORTSDIR}/Mk/bsd.port.mk" ]; then
-        _JAVAVM_BSD_PORT_MK="${_JAVAVM_PORTSDIR}/Mk/bsd.port.mk"
-    fi
+        _JAVAVM_BSD_PORT_MK=
+        if [ -n "${_JAVAVM_PORTSDIR}" -a -r "${_JAVAVM_PORTSDIR}/Mk/bsd.port.mk" ]; then
+            _JAVAVM_BSD_PORT_MK="${_JAVAVM_PORTSDIR}/Mk/bsd.port.mk"
+        fi
 
-    # If bsd.port.mk was found, use that to determine the VM to use.
-    if [ -n "${_JAVAVM_BSD_PORT_MK}" ]; then
-        JAVA_HOME=`"${_JAVAVM_MAKE}" -f "${_JAVAVM_BSD_PORT_MK}" -V JAVA_HOME USE_JAVA=yes 2>/dev/null`
-        if [ -n "${JAVA_HOME}" -a -f "${JAVA_HOME}/bin/${_JAVAVM_PROG}" ]; then
-            _JAVAVM_PROG_PATH="${JAVA_HOME}/bin"
-            return 0
-        elif [ -n "${JAVA_HOME}" -a \
-               -f "${JAVA_HOME}/jre/bin/${_JAVAVM_PROG}" ]; then
-            _JAVAVM_PROG_PATH="${JAVA_HOME}/jre/bin"
-            return 0
+        # If bsd.port.mk was found, use that to determine the VM to use.
+        if [ -n "${_JAVAVM_BSD_PORT_MK}" ]; then
+            JAVA_HOME=`"${_JAVAVM_MAKE}" -f "${_JAVAVM_BSD_PORT_MK}" -V JAVA_HOME USE_JAVA=yes 2>/dev/null`
+            if [ -n "${JAVA_HOME}" -a -f "${JAVA_HOME}/bin/${_JAVAVM_PROG}" ]; then
+                _JAVAVM_PROG_PATH="${JAVA_HOME}/bin"
+                return 0
+            elif [ -n "${JAVA_HOME}" -a \
+                   -f "${JAVA_HOME}/jre/bin/${_JAVAVM_PROG}" ]; then
+                _JAVAVM_PROG_PATH="${JAVA_HOME}/jre/bin"
+                return 0
+            fi
         fi
     fi
 
@@ -532,25 +527,16 @@
         _JAVAVM_VERSION=
         for version in ${JAVA_VERSION}; do
             case "${version}" in
-                1.1+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.1 1.2 1.3 1.4 1.5 1.6 1.7"
+                1.5)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6"
                     ;;
-                1.2+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.2 1.3 1.4 1.5 1.6 1.7"
-                    ;;
-                1.3+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.3 1.4 1.5 1.6 1.7"
-                    ;;
-                1.4+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.4 1.5 1.6 1.7"
-                    ;;
                 1.5+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.5 1.6 1.7"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7"
                     ;;
                 1.6+)
                     _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7"
                     ;;
-                1.6+)
+                1.7+)
                     _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7"
                     ;;
                 *)
@@ -570,7 +556,7 @@
         if [ -n "${JAVA_VERSION}" ]; then
             _JAVAVM_VERSION=`echo ${_JAVAVM_VM} | \
                 sed -e 's|^[^0-9]*\([0-9]\)\.\([0-9]\)\.[0-9]$|\1.\2|' \
-		    -e 's|^[^0-9]*\([0-9]\)$|1.\1|'`
+                    -e 's|^[^0-9]*\([0-9]\)$|1.\1|'`
             for _JAVAVM_REQUESTED_VERSION in ${JAVA_VERSION}; do
                 if [ "${_JAVAVM_VERSION}" = "${_JAVAVM_REQUESTED_VERSION}" ]; then
                     _JAVAVM_VERSION=
@@ -585,7 +571,7 @@
         if [ -n "${JAVA_OS}" ]; then
             _JAVAVM_OS=
             case "${_JAVAVM_VM}" in
-                diablo*|j*)
+                diablo*|j*|openjdk*)
                     _JAVAVM_OS=native
                     ;;
                 linux*)
@@ -606,22 +592,10 @@
         if [ -n "${JAVA_VENDOR}" ]; then
             _JAVAVM_VENDOR=
             case "${_JAVAVM_VM}" in
-                linux-blackdown*)
-                    _JAVAVM_VENDOR=blackdown
-                    ;;
-                diablo*)
-                    _JAVAVM_VENDOR=freebsd
-                    ;;
-                j*)
-                    _JAVAVM_VENDOR=bsdjava
-                    ;;
-                linux-ibm*)
-                    _JAVAVM_VENDOR=ibm
-                    ;;
                 openjdk*)
                     _JAVAVM_VENDOR=openjdk
                     ;;
-                linux-sun*)
+                linux*)
                     _JAVAVM_VENDOR=sun
                     ;;
             esac


Property changes on: trunk/java/javavmwrapper/src/javavmwrapper.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Modified: trunk/java/javavmwrapper/src/manvm.1
===================================================================
--- trunk/java/javavmwrapper/src/manvm.1	2013-09-19 01:07:40 UTC (rev 15469)
+++ trunk/java/javavmwrapper/src/manvm.1	2013-09-19 01:15:15 UTC (rev 15470)
@@ -4,6 +4,7 @@
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
+.\"
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
@@ -22,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: ports/java/javavmwrapper/src/manvm.1,v 1.1 2006/06/12 16:57:29 glewis Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 12, 2006
 .Os
@@ -88,8 +89,6 @@
 Currently allowed vendors are
 .Ql bsdjava ,
 .Ql freebsd ,
-.Ql blackdown ,
-.Ql ibm ,
 .Ql openjdk
 and
 .Ql sun .
@@ -102,9 +101,6 @@
 greater than or equal to the given version will be used.
 .Pp
 Currently allowed versions are
-.Ql 1.3+ ,
-.Ql 1.4 ,
-.Ql 1.4+ ,
 .Ql 1.5 ,
 .Ql 1.5+ ,
 .Ql 1.6 ,


Property changes on: trunk/java/javavmwrapper/src/manvm.1
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/java/javavmwrapper/src/registervm.1
===================================================================
--- trunk/java/javavmwrapper/src/registervm.1	2013-09-19 01:07:40 UTC (rev 15469)
+++ trunk/java/javavmwrapper/src/registervm.1	2013-09-19 01:15:15 UTC (rev 15470)
@@ -4,6 +4,7 @@
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
+.\"
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
@@ -22,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: ports/java/javavmwrapper/src/registervm.1,v 1.2 2005/04/12 20:17:46 glewis Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 24, 2005
 .Os
@@ -57,12 +58,12 @@
 .El
 .Sh EXAMPLES
 .Bl -tag -width indent
-.It %%PREFIX%%/bin/registervm %%LOCALBASE%%/jdk.1.4.2/bin/java
-Register %%LOCALBASE%%/jdk1.4.2/bin/java as a possible choice of
+.It %%PREFIX%%/bin/registervm %%LOCALBASE%%/jdk1.6.0/bin/java
+Register %%LOCALBASE%%/jdk1.6.0/bin/java as a possible choice of
 Java VM for
 .Nm javavm .
-.It %%PREFIX%%/bin/unregistervm %%LOCALBASE%%/jdk.1.4.2/bin/java
-Remove %%LOCALBASE%%/jdk1.4.2/bin/java as a possible choice of
+.It %%PREFIX%%/bin/unregistervm %%LOCALBASE%%/jdk1.6.0/bin/java
+Remove %%LOCALBASE%%/jdk1.6.0/bin/java as a possible choice of
 Java VM for
 .Nm javavm .
 .El


Property changes on: trunk/java/javavmwrapper/src/registervm.1
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list