63 files changed, 64 insertions, 89 deletions

diff --git a/java/Makefile b/java/Makefile
index c18e0d18994a..045525fba59d 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -99,8 +99,6 @@
     SUBDIR += jcommon
     SUBDIR += jdbcpool
     SUBDIR += jde
-    SUBDIR += jdk13
-    SUBDIR += jdk13-doc
     SUBDIR += jdk14-doc
     SUBDIR += jdk15
     SUBDIR += jdk15-doc
@@ -126,9 +124,6 @@
     SUBDIR += junit
     SUBDIR += kaffe
     SUBDIR += langspec
-    SUBDIR += linux-blackdown-jdk14
-    SUBDIR += linux-sun-jdk13
-    SUBDIR += linux-sun-jdk14
     SUBDIR += linux-sun-jdk15
     SUBDIR += linux-sun-jdk16
     SUBDIR += linux-sun-jre15
diff --git a/java/cacao/Makefile b/java/cacao/Makefile
index 005ce77fc31a..076b5b9c41c5 100644
--- a/java/cacao/Makefile
+++ b/java/cacao/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/share/classpath/glibj.zip:${PORTSDIR}/java/classpath
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libltdl
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 GNU_CONFIGURE=	yes
 MAN1=		cacao.1
 CONFIGURE_ARGS+=	--with-classpath-prefix=${LOCALBASE}
diff --git a/java/castor/Makefile b/java/castor/Makefile
index 54f8b0c523cd..28e764d103e8 100644
--- a/java/castor/Makefile
+++ b/java/castor/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Data binding for XML (JAXB) and SQL database (JDO)
 LICENSE=	ASL
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}-anttasks.jar \
diff --git a/java/commonclipse/Makefile b/java/commonclipse/Makefile
index 7593259c0616..126297c1e19c 100644
--- a/java/commonclipse/Makefile
+++ b/java/commonclipse/Makefile
@@ -22,7 +22,7 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 PLIST_SUB=	DISTNAME=${DISTNAME}
 
diff --git a/java/cryptix-jce/Makefile b/java/cryptix-jce/Makefile
index a887684a05b4..54555ea36557 100644
--- a/java/cryptix-jce/Makefile
+++ b/java/cryptix-jce/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JCE (Java Cryptography Extension) by Cryptix
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.1+
+JAVA_VERSION=	1.5+
 USE_ZIP=	yes
 NO_BUILD=	yes
 
diff --git a/java/eclipse-checkstyle/Makefile b/java/eclipse-checkstyle/Makefile
index 93eea54824b7..61b3da35a556 100644
--- a/java/eclipse-checkstyle/Makefile
+++ b/java/eclipse-checkstyle/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	eclipse:${PORTSDIR}/java/eclipse
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 USE_ZIP=	yes
 
 do-install:
diff --git a/java/eclipse-drjava/Makefile b/java/eclipse-drjava/Makefile
index cf5cf5084c8b..b432a7f37c8e 100644
--- a/java/eclipse-drjava/Makefile
+++ b/java/eclipse-drjava/Makefile
@@ -23,7 +23,7 @@ NO_WRKSUBDIR=	yes
 USE_JAVA=	yes
 USE_ZIP=	yes
 
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 
 DATADIR=	${PREFIX}/lib/eclipse/plugins
diff --git a/java/eclipse-findbugs/Makefile b/java/eclipse-findbugs/Makefile
index 1a061267cc46..8799ebc1375e 100644
--- a/java/eclipse-findbugs/Makefile
+++ b/java/eclipse-findbugs/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	eclipse:${PORTSDIR}/java/eclipse
 NO_BUILD=	yes
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 
 PLIST_DIRS=	\
diff --git a/java/eclipse-jad/Makefile b/java/eclipse-jad/Makefile
index eb66c3791f55..73b6798712c6 100644
--- a/java/eclipse-jad/Makefile
+++ b/java/eclipse-jad/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	eclipse:${PORTSDIR}/java/eclipse \
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 
 PLIST_FILES=	share/eclipse/dropins/${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/java/eclipse-lomboz/Makefile b/java/eclipse-lomboz/Makefile
index 86595cee9a5c..7008b54e819b 100644
--- a/java/eclipse-lomboz/Makefile
+++ b/java/eclipse-lomboz/Makefile
@@ -27,7 +27,7 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 
 do-install:
diff --git a/java/eclipse-ocl/Makefile b/java/eclipse-ocl/Makefile
index 10d2b906638d..1e0688eb798c 100644
--- a/java/eclipse-ocl/Makefile
+++ b/java/eclipse-ocl/Makefile
@@ -25,7 +25,7 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 
 do-install:
diff --git a/java/eclipse-propedit/Makefile b/java/eclipse-propedit/Makefile
index 0cb51d10297e..36f7910f8673 100644
--- a/java/eclipse-propedit/Makefile
+++ b/java/eclipse-propedit/Makefile
@@ -24,7 +24,7 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 
 do-install:
diff --git a/java/eclipse-quantum/Makefile b/java/eclipse-quantum/Makefile
index d02252343aad..7f4200a9393d 100644
--- a/java/eclipse-quantum/Makefile
+++ b/java/eclipse-quantum/Makefile
@@ -24,7 +24,7 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 NO_EXTRACT=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 USE_ZIP=	yes
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
diff --git a/java/eclipse-shelled/Makefile b/java/eclipse-shelled/Makefile
index 83d8e7bbb764..49a53e8608bd 100644
--- a/java/eclipse-shelled/Makefile
+++ b/java/eclipse-shelled/Makefile
@@ -23,7 +23,7 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 
 do-install:
diff --git a/java/eclipse-uml/Makefile b/java/eclipse-uml/Makefile
index 2790e23910b8..f9d5da7ce7b7 100644
--- a/java/eclipse-uml/Makefile
+++ b/java/eclipse-uml/Makefile
@@ -24,7 +24,7 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 
 do-install:
diff --git a/java/eclipse-vep/Makefile b/java/eclipse-vep/Makefile
index 3359b77164dd..3261596ac5c5 100644
--- a/java/eclipse-vep/Makefile
+++ b/java/eclipse-vep/Makefile
@@ -27,7 +27,7 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 
 do-install:
diff --git a/java/eclipse-viplugin/Makefile b/java/eclipse-viplugin/Makefile
index bb25d8bc7cc2..1ceb55fd5041 100644
--- a/java/eclipse-viplugin/Makefile
+++ b/java/eclipse-viplugin/Makefile
@@ -23,7 +23,7 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 PLIST_SUB=	RELEASEVERSION=${PORTVERSION}
 
diff --git a/java/infobus/Makefile b/java/infobus/Makefile
index 5ab1f5f15742..a7720c268afe 100644
--- a/java/infobus/Makefile
+++ b/java/infobus/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Enables dynamic exchange of data between JavaBeans(TM)
 
 USE_ZIP=	YES
 USE_JAVA=	YES
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/java/j2sdkee13/Makefile b/java/j2sdkee13/Makefile
index 79180bd66f7d..5acdc7d69e09 100644
--- a/java/j2sdkee13/Makefile
+++ b/java/j2sdkee13/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java 2 SDK Enterprise Edition
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 
 NO_BUILD=	YES
 
diff --git a/java/jaf/Makefile b/java/jaf/Makefile
index 2afb0629f308..a5fc07e9d630 100644
--- a/java/jaf/Makefile
+++ b/java/jaf/Makefile
@@ -16,7 +16,7 @@ COMMENT=	JavaBeansTM Activation Framework
 
 USE_ZIP=	YES
 USE_JAVA=	YES
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
diff --git a/java/jai-imageio/Makefile b/java/jai-imageio/Makefile
index e2a1dd45f90d..ac5e5f74e786 100644
--- a/java/jai-imageio/Makefile
+++ b/java/jai-imageio/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	java@FreeBSD.org
 COMMENT=	Plug-ins for the Java Image I/O Framework
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386
diff --git a/java/jai/Makefile b/java/jai/Makefile
index 19a29e0ec1c4..9a6a2413dc0f 100644
--- a/java/jai/Makefile
+++ b/java/jai/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	java@FreeBSD.org
 COMMENT=	High performance image processing libraries for Java
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./_/g}
 NO_BUILD=	yes
 
diff --git a/java/jakarta-bcel/Makefile b/java/jakarta-bcel/Makefile
index f4ff4ed0a5a9..12db600a8842 100644
--- a/java/jakarta-bcel/Makefile
+++ b/java/jakarta-bcel/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A library for generating Java bytecode
 
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 
 PLIST_FILES=	%%JAVAJARDIR%%/bcel.jar
 
diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile
index 8c663ddd09c0..e3dbcba3d165 100644
--- a/java/jakarta-commons-beanutils/Makefile
+++ b/java/jakarta-commons-beanutils/Makefile
@@ -23,7 +23,7 @@ JAR_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-
 		${JAVALIBDIR}/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 
 USE_ANT=	yes
 ALL_TARGET=	dist
diff --git a/java/jakarta-commons-cli/Makefile b/java/jakarta-commons-cli/Makefile
index 7bcfa682e84c..52a9ac5838fc 100644
--- a/java/jakarta-commons-cli/Makefile
+++ b/java/jakarta-commons-cli/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Java library for command line arguments and options
 LICENSE=	ASL
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/java/jakarta-commons-codec/Makefile b/java/jakarta-commons-codec/Makefile
index 77df682fe65e..8edf2bc60002 100644
--- a/java/jakarta-commons-codec/Makefile
+++ b/java/jakarta-commons-codec/Makefile
@@ -20,7 +20,7 @@ LICENSE=	ASL
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 USE_ANT=	yes
 
 ALL_TARGET=	dist
diff --git a/java/jakarta-commons-dbcp/Makefile b/java/jakarta-commons-dbcp/Makefile
index fabdbc84f094..b5870fa5051b 100644
--- a/java/jakarta-commons-dbcp/Makefile
+++ b/java/jakarta-commons-dbcp/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${JAVALIBDIR}/commons-pool.jar:${PORTSDIR}/java/jakarta-commons-poo
 		${JAVALIBDIR}/jta.jar:${PORTSDIR}/java/jta
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 
 USE_ANT=	yes
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
diff --git a/java/jakarta-commons-discovery/Makefile b/java/jakarta-commons-discovery/Makefile
index acecfccc07b8..27e4c677dace 100644
--- a/java/jakarta-commons-discovery/Makefile
+++ b/java/jakarta-commons-discovery/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A Java library for locating resources (including classes)
 
 USE_JAVA=	YES
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	YES
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/java/jakarta-commons-httpclient/Makefile b/java/jakarta-commons-httpclient/Makefile
index e4bb5b6370ff..d23c44150a4c 100644
--- a/java/jakarta-commons-httpclient/Makefile
+++ b/java/jakarta-commons-httpclient/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-
 RUN_DEPENDS+=	${JAVAJARDIR}/commons-codec.jar:${PORTSDIR}/java/jakarta-commons-codec
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 USE_ANT=	yes
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
 
diff --git a/java/jakarta-commons-lang/Makefile b/java/jakarta-commons-lang/Makefile
index b78fc62aa50a..3f1e72eba41a 100644
--- a/java/jakarta-commons-lang/Makefile
+++ b/java/jakarta-commons-lang/Makefile
@@ -19,10 +19,9 @@ COMMENT=	Jakarta library with helper utilities for the java.lang API
 LICENSE=	ASL
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 
 USE_ANT=	yes
-USE_JIKES=	no
 
 ALL_TARGET=	jar
 .if !defined(NOPORTDOCS)
diff --git a/java/jakarta-commons-logging/Makefile b/java/jakarta-commons-logging/Makefile
index 8aa03c4528f8..cdeb07e076b1 100644
--- a/java/jakarta-commons-logging/Makefile
+++ b/java/jakarta-commons-logging/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Generic logging wrapper library
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/java/jakarta-commons-pool/Makefile b/java/jakarta-commons-pool/Makefile
index 82b6e0d41cfe..837be33ea29d 100644
--- a/java/jakarta-commons-pool/Makefile
+++ b/java/jakarta-commons-pool/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Jakarta Object-pooling API
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 
 USE_ANT=	yes
 ALL_TARGET=	build-jar
diff --git a/java/jakarta-commons-primitives/Makefile b/java/jakarta-commons-primitives/Makefile
index 948c1e591fd5..b3fa3d4a5394 100644
--- a/java/jakarta-commons-primitives/Makefile
+++ b/java/jakarta-commons-primitives/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	hq@FreeBSD.org
 COMMENT=	A library supporting Java primitive types
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 USE_ANT=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/java/jakarta-oro/Makefile b/java/jakarta-oro/Makefile
index 54aa64afb8d1..3eb079c816c4 100644
--- a/java/jakarta-oro/Makefile
+++ b/java/jakarta-oro/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Perl/awk/sh regular expressions for Java
 BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 
 PLIST=	${WRKDIR}/PLIST
 
diff --git a/java/jakarta-regexp/Makefile b/java/jakarta-regexp/Makefile
index 34b3c1b83489..718176c8c3fa 100644
--- a/java/jakarta-regexp/Makefile
+++ b/java/jakarta-regexp/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Regular expressions for Java
 BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 
 PLIST=	${WRKDIR}/PLIST
 
diff --git a/java/jakarta-struts/Makefile b/java/jakarta-struts/Makefile
index 730be1036a99..f548f776dc2d 100644
--- a/java/jakarta-struts/Makefile
+++ b/java/jakarta-struts/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	toha@toha.org.ua
 COMMENT=	Struts framework
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	YES
 USE_ZIP=	YES
 
diff --git a/java/jasmin/Makefile b/java/jasmin/Makefile
index 192ea3f7e3d4..7cee7cf756c1 100644
--- a/java/jasmin/Makefile
+++ b/java/jasmin/Makefile
@@ -18,7 +18,7 @@ USE_ZIP=	yes
 USE_ANT=	yes
 ALL_TARGET=	jasmin
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=	.*\.(txt|xml|j|class|java|mf|css|bnf|html)
 
diff --git a/java/javavmwrapper/src/javavm.1 b/java/javavmwrapper/src/javavm.1
index d10f3ce8b4ab..d2095bc6ec41 100644
--- a/java/javavmwrapper/src/javavm.1
+++ b/java/javavmwrapper/src/javavm.1
@@ -99,7 +99,6 @@ A space delimited list of Java VM vendors.
 The selected Java VM must have been released by one of the vendors in the list.
 .Pp
 Currently allowed vendors are
-.Ql blackdown ,
 .Ql bsdjava ,
 .Ql freebsd ,
 .Ql ibm ,
@@ -114,14 +113,6 @@ 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.1 ,
-.Ql 1.1+ ,
-.Ql 1.2 ,
-.Ql 1.2+ ,
-.Ql 1.3 ,
-.Ql 1.3+ ,
-.Ql 1.4 ,
-.Ql 1.4+ ,
 .Ql 1.5 ,
 .Ql 1.5+ ,
 .Ql 1.6 ,
@@ -178,16 +169,16 @@ Execute the most up to date and
 .Dq native
 Java VM registered with
 .Nm .
-.It Ev JAVA_VERSION=1.4+ Pa %%LOCALBASE%%/bin/javac MyClass.java
+.It Ev JAVA_VERSION=1.5+ Pa %%LOCALBASE%%/bin/javac MyClass.java
 Compile MyClass.java with a registered Java VM's javac that is at least
-version 1.4.
+version 1.5.
 .It Ev JAVA_OS=native Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
 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="1.2 1.4" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
-Execute MyApp with either a Java VM that is either version 1.2 or version 1.4.
+.It Ev JAVA_VERSION="1.5 1.7" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
+Execute MyApp with either a Java VM that is either version 1.5 or version 1.7.
 .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/manvm.1 b/java/javavmwrapper/src/manvm.1
index a288d0dc5286..f6781a1b5d25 100644
--- a/java/javavmwrapper/src/manvm.1
+++ b/java/javavmwrapper/src/manvm.1
@@ -86,7 +86,6 @@ The on-line manual pages to be displayed must come from a Java VM that has
 been released by one of the vendors in the list.
 .Pp
 Currently allowed vendors are
-.Ql blackdown ,
 .Ql bsdjava ,
 .Ql freebsd ,
 .Ql ibm ,
@@ -102,14 +101,6 @@ 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.1 ,
-.Ql 1.1+ ,
-.Ql 1.2 ,
-.Ql 1.2+ ,
-.Ql 1.3 ,
-.Ql 1.3+ ,
-.Ql 1.4 ,
-.Ql 1.4+ ,
 .Ql 1.5 ,
 .Ql 1.5+ ,
 .Ql 1.6 ,
diff --git a/java/jaxen/Makefile b/java/jaxen/Makefile
index b7cc0c25cbc1..88b257083ca1 100644
--- a/java/jaxen/Makefile
+++ b/java/jaxen/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	hq@FreeBSD.org
 COMMENT=	Java XPath Engine
 
 USE_JAVA=	YES
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	YES
 
 JARFILES=	jaxen-core.jar jaxen-dom.jar jaxen-dom4j.jar jaxen-exml.jar jaxen-full.jar jaxen-jdom.jar lib/saxpath.jar
diff --git a/java/jboss2/Makefile b/java/jboss2/Makefile
index e669bd264862..2cc11e6fd0e7 100644
--- a/java/jboss2/Makefile
+++ b/java/jboss2/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JBoss 2.x, an open-source J2EE application server
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 
 USE_ZIP=	YES
 NO_BUILD=	YES
diff --git a/java/jcalendar/Makefile b/java/jcalendar/Makefile
index c50557ce6692..4711b5651803 100644
--- a/java/jcalendar/Makefile
+++ b/java/jcalendar/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Java Date Chooser
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 USE_ANT=	yes
 WRKSRC=		${WRKDIR}/src
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar \
diff --git a/java/jcommon/Makefile b/java/jcommon/Makefile
index 3a65dd858a9f..a5a12e60c66e 100644
--- a/java/jcommon/Makefile
+++ b/java/jcommon/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A collection of useful classes used by JFreeChart and JFreeReport
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 
 .if !defined(WITHOUT_COMPILE)
 USE_ANT=	yes
diff --git a/java/jdbcpool/Makefile b/java/jdbcpool/Makefile
index c41a0195d2e3..34f58a654d9c 100644
--- a/java/jdbcpool/Makefile
+++ b/java/jdbcpool/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	java@FreeBSD.org
 COMMENT=	JDBC connection pool
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 
 PORTDOCS=	CHANGES LICENSE README
diff --git a/java/jdom/Makefile b/java/jdom/Makefile
index 55483c39eef2..1f20cde46bbc 100644
--- a/java/jdom/Makefile
+++ b/java/jdom/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Java library for accessing and manipulating XML documents
 RUN_DEPENDS=	${JAVALIBDIR}/jaxen-jdom.jar:${PORTSDIR}/java/jaxen
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 USE_ANT=	yes
 
 ALL_TARGET=	package
diff --git a/java/jfreechart/Makefile b/java/jfreechart/Makefile
index e5f9f31f825e..a76f1516ddb1 100644
--- a/java/jfreechart/Makefile
+++ b/java/jfreechart/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A free Java class library for generating charts
 RUN_DEPENDS=	${JAVALIBDIR}/jcommon.jar:${PORTSDIR}/java/jcommon
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 
 .if !defined(WITHOUT_COMPILE)
 USE_ANT=	yes
diff --git a/java/jgraph/Makefile b/java/jgraph/Makefile
index e88f1d55646e..d14fd14f7eef 100644
--- a/java/jgraph/Makefile
+++ b/java/jgraph/Makefile
@@ -22,7 +22,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_RUN=	yes
 
 .if !defined(WITHOUT_COMPILE) || !defined(NOPORTDOCS)
diff --git a/java/jgrapht/Makefile b/java/jgrapht/Makefile
index 50d9640f4cc1..4e34cbe76082 100644
--- a/java/jgrapht/Makefile
+++ b/java/jgrapht/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Java package for mathematical graph-theory objects and algorithms
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 
 .if !defined(WITHOUT_COMPILE)
 USE_ANT=	yes
diff --git a/java/jgraphx/Makefile b/java/jgraphx/Makefile
index 0d5ed7b3a7d1..8abc7f24bc5e 100644
--- a/java/jgraphx/Makefile
+++ b/java/jgraphx/Makefile
@@ -24,7 +24,7 @@ MANUAL_PACKAGE_BUILD=	needs interactive license confirmation
 USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_RUN=	yes
 
 .if !defined(WITHOUT_COMPILE) || !defined(NOPORTDOCS)
diff --git a/java/jmf/Makefile b/java/jmf/Makefile
index 746e48bc238b..71dcedbdfcfe 100644
--- a/java/jmf/Makefile
+++ b/java/jmf/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	toha@toha.org.ua
 COMMENT=	Java Media Framework
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 USE_ZIP=	YES
 NO_BUILD=	YES
 
diff --git a/java/jmp/Makefile b/java/jmp/Makefile
index 1c7b48b10c12..d3c716b7aabe 100644
--- a/java/jmp/Makefile
+++ b/java/jmp/Makefile
@@ -26,11 +26,10 @@ USE_BISON=	build
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.3 1.4 1.5
+JAVA_VERSION=	1.5
 JAVA_OS=	native
 JAVA_BUILD=	jdk
 NEED_JAVAC=	yes
-USE_JIKES=	no
 
 MAN1=		jmp.1
 
diff --git a/java/jode/Makefile b/java/jode/Makefile
index e385f4f97e22..acc020b11f5f 100644
--- a/java/jode/Makefile
+++ b/java/jode/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 VENDOR_VERSION=	1.1.2-pre1
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 NEED_JAVAC=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/java/jode/files/patch-bin-jode b/java/jode/files/patch-bin-jode
index 3b3f86cfec9b..a5e07eca4f32 100644
--- a/java/jode/files/patch-bin-jode
+++ b/java/jode/files/patch-bin-jode
@@ -14,5 +14,5 @@
 -CP=`echo $CLASSPATH | sed s/:/,/`
 -CLASSPATH=@datadir@/jode-@VERSION@.jar:@CLASSPATH@ \
 -@JAVA@ $CLAZZ --classpath $CP $*
-+JAVA_VERSION="1.2+" exec @prefix@/bin/java -cp @datadir@/jode-@VERSION@.jar:@datadir@/getopt.jar \
++JAVA_VERSION="%%JAVA_VERSION%%" exec @prefix@/bin/java -cp @datadir@/jode-@VERSION@.jar:@datadir@/getopt.jar \
 +	$CLAZZ $CP "$@"
diff --git a/java/jomp/Makefile b/java/jomp/Makefile
index bbacf0ab031a..d4abd6e3cddb 100644
--- a/java/jomp/Makefile
+++ b/java/jomp/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	brueffer@FreeBSD.org
 COMMENT=	Prototype OpenMP implementation for Java
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/java/jta/Makefile b/java/jta/Makefile
index 2590b75e40bb..a295203bd61e 100644
--- a/java/jta/Makefile
+++ b/java/jta/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Java Transaction API (JTA)
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 
 NO_BUILD=	yes
 NO_CDROM=	See the license
diff --git a/java/jump/Makefile b/java/jump/Makefile
index 965695a489f1..03cfd94b7e73 100644
--- a/java/jump/Makefile
+++ b/java/jump/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java library for arbitrary precision computations
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 USE_ANT=	yes
 
 .if defined(NOPORTDOCS)
diff --git a/java/mx4j/Makefile b/java/mx4j/Makefile
index 4d9fa32b7f03..583490f68f00 100644
--- a/java/mx4j/Makefile
+++ b/java/mx4j/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	simon@olofsson.de
 COMMENT=	Open Source implementation of the Java Management Extensions (JMX)
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
diff --git a/java/poseidon/Makefile b/java/poseidon/Makefile
index 0cca1576f2ae..5036420fde1b 100644
--- a/java/poseidon/Makefile
+++ b/java/poseidon/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A popular UML CASE tool
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_VENDOR=	${_JAVA_VENDOR_LIST:Nsun}	# the port is broken with Sun JDKs
 NO_BUILD=	yes
 RESTRICTED=	Redistribution is not permitted
diff --git a/java/sqlitejdbc/Makefile b/java/sqlitejdbc/Makefile
index c1aed2e69c38..80b01c4d49ba 100644
--- a/java/sqlitejdbc/Makefile
+++ b/java/sqlitejdbc/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 USE_GMAKE=	yes
 MAKE_ENV=	JAVA_HOME="${JAVA_HOME}"
 ALL_TARGET=	native
diff --git a/java/subversion-java/Makefile b/java/subversion-java/Makefile
index 485a70a5b2ea..c25a62f60977 100644
--- a/java/subversion-java/Makefile
+++ b/java/subversion-java/Makefile
@@ -16,7 +16,7 @@ MASTERDIR=	${.CURDIR}/../../devel/subversion
 PKGDIR=		${.CURDIR}
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
diff --git a/java/sun-wtk/Makefile b/java/sun-wtk/Makefile
index d0b0455763b9..cd8b5d8db320 100644
--- a/java/sun-wtk/Makefile
+++ b/java/sun-wtk/Makefile
@@ -21,7 +21,7 @@ EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 
 USE_LINUX=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 DOWNLOAD_URL=	https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=j2me_wireless_toolkit-${PORTVERSION:S/./_/}-oth-JPR@CDS-CDS_Developer
 
diff --git a/java/trove4j/Makefile b/java/trove4j/Makefile
index 5f490d60c4ad..154a77dd10fb 100644
--- a/java/trove4j/Makefile
+++ b/java/trove4j/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	hq@FreeBSD.org
 COMMENT=	High performance collections API for Java
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 
 .if !defined(NOPORTDOCS)
diff --git a/java/xdoclet/Makefile b/java/xdoclet/Makefile
index d68e508d45f3..cd3fd74afd2f 100644
--- a/java/xdoclet/Makefile
+++ b/java/xdoclet/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Java attribute-oriented code generation engine
 RUN_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes