Clean up after java/openjdk6 and java/openjdk6-jre removal

java/openjdk6 support was removed from Mk/bsd.java.mk (r512662) and
java/openjdk6 and java/openjdk6-jre were removed from the ports tree
(r512663).  Now this patch completely removes remaining stuff from the
ports tree.

PR:			241953 (exp-run)
Reviewed by:		glewis
Approved by:		portmgr (antoine)
Differential Revision:	https://reviews.freebsd.org/D22342

5 files changed, 11 insertions, 26 deletions

diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile
index ca8f2ee07ce5..f8712174f36f 100644
--- a/java/javavmwrapper/Makefile
+++ b/java/javavmwrapper/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	javavmwrapper
-PORTVERSION=	2.7.3
+PORTVERSION=	2.7.4
 CATEGORIES=	java
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/java/javavmwrapper/src/javavm.1 b/java/javavmwrapper/src/javavm.1
index eb366c0d8cef..efe3e195204d 100644
--- a/java/javavmwrapper/src/javavm.1
+++ b/java/javavmwrapper/src/javavm.1
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 24, 2005
+.Dd November 12, 2019
 .Os
 .Dt JAVAVM 1
 .Sh NAME
@@ -112,16 +112,12 @@ to a version, any Java VM with a version greater than or
 equal to the given version will be used.
 .Pp
 Currently allowed versions are
-.Ql 1.6 ,
-.Ql 1.6+ ,
 .Ql 1.7 ,
 .Ql 1.7+ ,
 .Ql 1.8 ,
 .Ql 1.8+ ,
 .Ql 1.9 ,
 .Ql 1.9+ ,
-.Ql 6 ,
-.Ql 6+ ,
 .Ql 7 ,
 .Ql 7+ ,
 .Ql 8 ,
@@ -202,8 +198,8 @@ Execute MyApp with the most up to date native Java VM that is registered
 with
 .Nm .
 This is necessary if MyApp uses JNI, for instance.
-.It Ev JAVA_VERSION="6 8" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
-Execute MyApp with either a Java VM that is either version 6 or version 8.
+.It Ev JAVA_VERSION="8 11" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
+Execute MyApp with either a Java VM that is either version 8 or version 11.
 .It Ev JAVAVM_DRYRUN=yes Pa %%LOCALBASE%%/bin/java
 Don't invoke the Java VM, but print out information about what would have
 been done.
diff --git a/java/javavmwrapper/src/javavmwrapper.sh b/java/javavmwrapper/src/javavmwrapper.sh
index 2dc2995bf2f7..321623b16ec7 100644
--- a/java/javavmwrapper/src/javavmwrapper.sh
+++ b/java/javavmwrapper/src/javavmwrapper.sh
@@ -173,8 +173,7 @@ sortConfiguration () {
             _VM=`dirname "${_VM}"`
             _VM=`dirname "${_VM}"`
             _VM=`basename "${_VM}"`
-            # Consistent version numbering for various install directory names
-            # including 'openjdk6', 'jdk1.6.0', 'linux-sun-jdk1.6.0', etc.
+            # Consistent version numbering for various install directory names.
             VERSION=`echo ${VM} | sed -e 's|[^0-9]*||' \
                                       -e 's|1\.\([0-9][0-9]*\)|\1|' \
                                       -e 's|\([0-9][0-9]*\)\.[0-9]|\1|' \
@@ -506,9 +505,6 @@ setJavaHome() {
         _JAVAVM_VERSION=
         for version in ${JAVA_VERSION}; do
             case "${version}" in
-                *6+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 6 7 8 9 10 11 12"
-                    ;;
                 *7+)
                     _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12"
                     ;;
@@ -527,9 +523,6 @@ setJavaHome() {
                 12+)
                     _JAVAVM_VERSION="${_JAVAVM_VERSION} 12"
                     ;;
-                1.6)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 6"
-                    ;;
                 1.7)
                     _JAVAVM_VERSION="${_JAVAVM_VERSION} 7"
                     ;;
diff --git a/java/javavmwrapper/src/manvm.1 b/java/javavmwrapper/src/manvm.1
index 8ee1022f0b1c..a621bc4c981e 100644
--- a/java/javavmwrapper/src/manvm.1
+++ b/java/javavmwrapper/src/manvm.1
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 12, 2006
+.Dd November 12, 2019
 .Os
 .Dt MANVM 1
 .Sh NAME
@@ -100,16 +100,12 @@ to a version, the on-line manual pages from any Java VM with a version
 greater than or equal to the given version will be used.
 .Pp
 Currently allowed versions are
-.Ql 1.6 ,
-.Ql 1.6+ ,
 .Ql 1.7 ,
 .Ql 1.7+ ,
 .Ql 1.8 ,
 .Ql 1.8+ ,
 .Ql 1.9 ,
 .Ql 1.9+ ,
-.Ql 6 ,
-.Ql 6+ ,
 .Ql 7 ,
 .Ql 7+ ,
 .Ql 8 ,
diff --git a/java/javavmwrapper/src/registervm.1 b/java/javavmwrapper/src/registervm.1
index 4ab769dc41db..16a73859e3c5 100644
--- a/java/javavmwrapper/src/registervm.1
+++ b/java/javavmwrapper/src/registervm.1
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 24, 2005
+.Dd November 12, 2019
 .Os
 .Dt REGISTERVM 1
 .Sh NAME
@@ -58,12 +58,12 @@ The location of the Java VM wrapper configuration file.
 .El
 .Sh EXAMPLES
 .Bl -tag -width indent
-.It %%PREFIX%%/bin/registervm %%LOCALBASE%%/jdk1.6.0/bin/java
-Register %%LOCALBASE%%/jdk1.6.0/bin/java as a possible choice of
+.It %%PREFIX%%/bin/registervm %%LOCALBASE%%/openjdk11/bin/java
+Register %%LOCALBASE%%/openjdk11/bin/java as a possible choice of
 Java VM for
 .Nm javavm .
-.It %%PREFIX%%/bin/unregistervm %%LOCALBASE%%/jdk1.6.0/bin/java
-Remove %%LOCALBASE%%/jdk1.6.0/bin/java as a possible choice of
+.It %%PREFIX%%/bin/unregistervm %%LOCALBASE%%/openjdk11/bin/java
+Remove %%LOCALBASE%%/openjdk11/bin/java as a possible choice of
 Java VM for
 .Nm javavm .
 .El