Attachment #204577 for bug #223304

Lines 117-125 Link Here

(-)src/javavm.1 2019-05-23 14:13:16.546969000 -0700 (-2 / +10 lines)
117	.Ql 1.5+ ,	117	.Ql 1.5+ ,
118	.Ql 1.6 ,	118	.Ql 1.6 ,
119	.Ql 1.6+ ,	119	.Ql 1.6+ ,
120	.Ql 1.7	120	.Ql 1.7 ,
		121	.Ql 1.7+ ,
		122	.Ql 1.8 ,
		123	.Ql 1.8+ ,
		124	.Ql 9 ,
		125	.Ql 9+ ,
		126	.Ql 11 ,
		127	.Ql 11+ ,
		128	.Ql 12 ,
121	and	129	and
122	.Ql 1.7+ .	130	.Ql 12+ .
123	.It Ev JAVAVM_OPTS	131	.It Ev JAVAVM_OPTS
124	The contents of this environment variable will be passed to the invoked	132	The contents of this environment variable will be passed to the invoked
125	Java VM as options.	133	Java VM as options.




        for version in ${JAVA_VERSION}; do
            case "${version}" in
                1.6+)
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7 1.8 9 11 12"
                    ;;
                1.7+)
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7 1.8 9 11 12"
                    ;;
                1.8+)
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.8 9 11 12"
                    ;;
                9+)
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 11 12"
                    ;;
                11+)
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12"
                    ;;
                12+)
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 12"
                    ;;
                *)
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}"

Lines 105-113 Link Here

(-)src/manvm.1 2019-05-23 14:14:07.319255000 -0700 (-2 / +11 lines)
105	.Ql 1.5+ ,	105	.Ql 1.5+ ,
106	.Ql 1.6 ,	106	.Ql 1.6 ,
107	.Ql 1.6+ ,	107	.Ql 1.6+ ,
108	.Ql 1.7	108	.Ql 1.7 ,
		109	.Ql 1.7+ ,
		110	.Ql 1.8 ,
		111	.Ql 1.8+ ,
		112	.Ql 9 ,
		113	.Ql 9+ ,
		114	.Ql 11 ,
		115	.Ql 11+ ,
		116	.Ql 12 ,
109	and	117	and
110	.Ql 1.7+ .	118	.Ql 12+ .
		119
111	.It Ev JAVAVM_OPTS	120	.It Ev JAVAVM_OPTS
112	The contents of this environment variable will be passed to the invoked	121	The contents of this environment variable will be passed to the invoked
113	.Nm man	122	.Nm man

Return to bug 223304

Lines 501-516 Link Here

(-)src/javavmwrapper.sh 2019-05-23 14:16:14.177715000 -0700 (-5 / +11 lines)
501	for version in ${JAVA_VERSION}; do	501	for version in ${JAVA_VERSION}; do
502	case "${version}" in	502	case "${version}" in
503	1.6+)	503	1.6+)
504	_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7 1.8 1.9"	504	_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7 1.8 9 11 12"
505	;;	505	;;
506	1.7+)	506	1.7+)
507	_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7 1.8 1.9"	507	_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7 1.8 9 11 12"
508	;;	508	;;
509	1.8+)	509	1.8+)
510	_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.8 1.9"	510	_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.8 9 11 12"
511	;;	511	;;
512	1.9+)	512	9+)
513	_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.9"	513	_JAVAVM_VERSION="${_JAVAVM_VERSION} 9 11 12"
		514	;;
		515	11+)
		516	_JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12"
		517	;;
		518	12+)
		519	_JAVAVM_VERSION="${_JAVAVM_VERSION} 12"
514	;;	520	;;
515	*)	521	*)
516	_JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}"	522	_JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}"