Now that the Java 1.3 and Java 1.4 ports are deprecated and will expire soon,

remove support for them from bsd.java.mk. As Jikes is not available in Java 1.5 or higher, remove it from bsd.java.mk too (suggested by hq@) and from the ports which used it (only occurences were USE_JIKES=no). Support for the Blackdown VM is also removed, as it is not available in Java 1.5 and higher. Also remove the mapping from Java 1.1-1.4 to Java 1.5+ in bsd.java.mk to detect old, broken ports; therefore bump the minimal value of JAVA_VERSION to 1.5. While here, replace static values of JAVA_VERSION in files/*.in by %%JAVA_VERSION%% . PR: ports/158969 Submitted by: rene Tested on: pointyhat-west -exp
svn path=/head/; revision=278068
2025-05-25 07:26:29 -04:00 · 2011-07-21 05:03:02 +00:00 · 2011-07-21 05:03:02 +00:00 · 06e6677793 · 2021-03-31 03:12:20 +00:00
commit 06e6677793
parent 63d4112e2e
270 changed files with 284 additions and 396 deletions
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@ -688,7 +688,7 @@ MOZ_OPTIONS+=	--disable-debug				\

 .if defined(WITH_JAVA) && defined(_WITH_JAVA)
 USE_JAVA=	yes
-JAVA_VERSION+=	1.4+
+JAVA_VERSION+=	1.5+
 JAVA_OS+=	native
 CONFIGURE_ENV+=	JAVA_HOME="${JAVA_HOME}"
 MOZ_OPTIONS+=	--enable-javaxpcom
--- a/Mk/bsd.java.mk
+++ b/Mk/bsd.java.mk
@ -25,15 +25,13 @@ Java_Include_MAINTAINER=	glewis@FreeBSD.org hq@FreeBSD.org
 #
 # JAVA_VERSION		List of space-separated suitable java versions for the
 #					port. An optional "+" allows you to specify a range of
-#					versions. (allowed values: 1.3[+] 1.4[+] 1.5[+] 1.6[+]
-#					1.7[+])
+#					versions. (allowed values: 1.5[+] 1.6[+] 1.7[+])
 #
 # JAVA_OS			List of space-separated suitable JDK port operating systems
 #					for the port. (allowed values: native linux)
 #
 # JAVA_VENDOR		List of space-separated suitable JDK port vendors for the
-#					port. (allowed values: freebsd bsdjava sun blackdown
-#					openjdk)
+#					port. (allowed values: freebsd bsdjava sun openjdk)
 #
 # JAVA_BUILD		When set, it means that the selected JDK port should be
 #					added to build dependencies for the port.
@ -41,9 +39,6 @@ Java_Include_MAINTAINER=	glewis@FreeBSD.org hq@FreeBSD.org
 # JAVA_RUN			This variable works exactly the same as JAVA_BUILD but
 #					regarding run dependencies.
 #
-# USE_JIKES			Whether the port should or should not use jikes(1) to build.
-#					See Stage 6 header for further detail.
-#
 # USE_ANT			Should be defined when the port uses Apache Ant. Ant is thus
 #					considered to be the sub-make command. When no 'do-build'
 #					target is defined by the port, a default one will be set
@ -69,19 +64,19 @@ Java_Include_MAINTAINER=	glewis@FreeBSD.org hq@FreeBSD.org
 #								(e.g. 'FreeBSD Foundation')
 #
 # JAVA_HOME			Path to the installation directory of the JDK. (e.g.
-#					'/usr/local/jdk1.3.1')
+#					'/usr/local/jdk1.5.0')
 #
 # JAVAC				Path to the Java compiler to use. (e.g.
-#					'/usr/local/jdk1.5.0/bin/javac' or '/usr/local/bin/jikes')
+#					'/usr/local/jdk1.5.0/bin/javac' or '/usr/local/bin/javac')
 #
 # JAR				Path to the JAR tool to use. (e.g.
 #					'/usr/local/jdk1.5.0/bin/jar' or '/usr/local/bin/fastjar')
 #
 # APPLETVIEWER		Path to the appletviewer utility. (e.g.
-#					'/usr/local/linux-jdk1.3.1/bin/appletviewer')
+#					'/usr/local/linux-jdk1.5.0/bin/appletviewer')
 #
 # JAVA				Path to the java executable. Use this for executing Java
-#					programs. (e.g. '/usr/local/jdk1.3.1/bin/java')
+#					programs. (e.g. '/usr/local/jdk1.5.0/bin/java')
 #
 # JAVADOC			Path to the javadoc utility program.
 #
@ -113,13 +108,10 @@ Java_Include_MAINTAINER=	glewis@FreeBSD.org hq@FreeBSD.org
 # JAVALIBDIR		The directory where JAR files installed by other ports
 #					are located.
 #
-# HAVE_JIKES		Defined and set to "yes" whenever the port will effectively
-#					use Jikes. See stage 6 header for further detail.
-#
 #-------------------------------------------------------------------------------
 # Porter's hints
 #
-# To retrieve the Major version number from JAVA_PORT_VERSION (e.g. "1.3"):
+# To retrieve the Major version number from JAVA_PORT_VERSION (e.g. "1.5"):
 #		-> ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/}
 #
 #-------------------------------------------------------------------------------
@ -164,10 +156,10 @@ SUB_LIST+=		JAVA_OS="${JAVA_OS}"
 .		endif

 # The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST=	1.3 1.4 1.5 1.6 1.7
-_JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} 1.1+ 1.2+
+__JAVA_VERSION_LIST=	1.5 1.6 1.7
+_JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
 _JAVA_OS_LIST=			native linux
-_JAVA_VENDOR_LIST=		freebsd bsdjava sun blackdown openjdk
+_JAVA_VENDOR_LIST=		freebsd bsdjava sun openjdk

 # Set all meta-information about JDK ports:
 # port location, corresponding JAVA_HOME, JDK version, OS, vendor
@ -179,18 +171,10 @@ _JAVA_PORT_NATIVE_FREEBSD_JDK_1_6_INFO=		PORT=java/diablo-jdk16			HOME=${LOCALBA
 											VERSION=1.6.0	OS=native	VENDOR=freebsd
 _JAVA_PORT_NATIVE_FREEBSD_JDK_1_5_INFO=		PORT=java/diablo-jdk15			HOME=${LOCALBASE}/diablo-jdk1.5.0 \
 											VERSION=1.5.0	OS=native	VENDOR=freebsd
-_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3_INFO=		PORT=java/jdk13					HOME=${LOCALBASE}/jdk1.3.1 \
-											VERSION=1.3.1	OS=native	VENDOR=bsdjava
 _JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5_INFO=		PORT=java/jdk15					HOME=${LOCALBASE}/jdk1.5.0 \
 											VERSION=1.5.0	OS=native	VENDOR=bsdjava
 _JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6_INFO=		PORT=java/jdk16					HOME=${LOCALBASE}/jdk1.6.0 \
 											VERSION=1.6.0	OS=native	VENDOR=bsdjava
-_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO=	PORT=java/linux-blackdown-jdk14	HOME=${LOCALBASE}/linux-blackdown-jdk1.4.2 \
-											VERSION=1.4.2	OS=linux	VENDOR=blackdown
-_JAVA_PORT_LINUX_SUN_JDK_1_3_INFO=			PORT=java/linux-sun-jdk13		HOME=${LOCALBASE}/linux-sun-jdk1.3.1 \
-											VERSION=1.3.1	OS=linux	VENDOR=sun
-_JAVA_PORT_LINUX_SUN_JDK_1_4_INFO=			PORT=java/linux-sun-jdk14		HOME=${LOCALBASE}/linux-sun-jdk1.4.2 \
-											VERSION=1.4.2	OS=linux	VENDOR=sun
 _JAVA_PORT_LINUX_SUN_JDK_1_5_INFO=			PORT=java/linux-sun-jdk15		HOME=${LOCALBASE}/linux-sun-jdk1.5.0 \
 											VERSION=1.5.0	OS=linux	VENDOR=sun
 _JAVA_PORT_LINUX_SUN_JDK_1_6_INFO=			PORT=java/linux-sun-jdk16		HOME=${LOCALBASE}/linux-sun-jdk1.6.0 \
@ -200,7 +184,6 @@ _JAVA_PORT_LINUX_SUN_JDK_1_6_INFO=			PORT=java/linux-sun-jdk16		HOME=${LOCALBASE
 _JAVA_VENDOR_freebsd=		"FreeBSD Foundation"
 _JAVA_VENDOR_bsdjava=		"BSD Java Porting Team"
 _JAVA_VENDOR_openjdk=		"OpenJDK BSD Porting Team"
-_JAVA_VENDOR_blackdown=		Blackdown
 _JAVA_VENDOR_sun=			Sun

 # Verbose description for each OS
@ -208,7 +191,7 @@ _JAVA_OS_native=	Native
 _JAVA_OS_linux=		Linux

 # Enforce preferred Java ports according to OS
-.		if (${OSVERSION} >= 600000 && ${OSVERSION} < 800000)
+.		if ${OSVERSION} < 800000
 _JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_FREEBSD_JDK_1_6
 .		else
 _JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6
@ -221,12 +204,8 @@ __JAVA_PORTS_ALL=	JAVA_PORT_NATIVE_FREEBSD_JDK_1_6 \
 					JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \
 					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 \
 					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \
-					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3 \
 					JAVA_PORT_LINUX_SUN_JDK_1_6 \
-					JAVA_PORT_LINUX_SUN_JDK_1_5 \
-					JAVA_PORT_LINUX_SUN_JDK_1_4 \
-					JAVA_PORT_LINUX_SUN_JDK_1_3 \
-					JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4
+					JAVA_PORT_LINUX_SUN_JDK_1_5
 _JAVA_PORTS_ALL=	${JAVA_PREFERRED_PORTS} \
 					${_JAVA_PREFERRED_PORTS} \
 					${__JAVA_PORTS_ALL}
@ -235,11 +214,6 @@ _JAVA_PORTS_ALL=	${JAVA_PREFERRED_PORTS} \
 # relative path within the JAVA_HOME directory.
 _JDK_FILE=bin/javac

-# Set the path to Jikes and define the Jikes dependency
-_JIKES_PATH=	${LOCALBASE}/bin/jikes
-DEPEND_JIKES=	${_JIKES_PATH}:${PORTSDIR}/java/jikes
-
-
 #-------------------------------------------------------------------------------
 # Stage 2: Determine which JDK ports are suitable and which JDK ports are
 # suitable
@ -296,7 +270,7 @@ JAVA_RUN=	jre
 .		undef _JAVA_PORTS_INSTALLED
 .		undef _JAVA_PORTS_POSSIBLE
 .		if defined(JAVA_VERSION)
-_JAVA_VERSION=	${JAVA_VERSION:S/1.1+/1.3+/:S/1.2+/1.3+/:S/1.3+/1.3 1.4+/:S/1.4+/1.4 1.5+/:S/1.5+/1.5 1.6+/:S/1.6+/1.6 1.7+/:S/1.7+/1.7/}
+_JAVA_VERSION=	${JAVA_VERSION:S/1.5+/1.5 1.6+/:S/1.6+/1.6 1.7+/:S/1.7+/1.7/}
 .		else
 _JAVA_VERSION=	${__JAVA_VERSION_LIST}
 .		endif
@ -391,41 +365,6 @@ JAVA_PORT_OS_DESCRIPTION:=		${JAVA_PORT_OS:S/^/\${_JAVA_OS_/:S/$/}/}
 # Stage 4: Add any dependencies if necessary
 #

-# Jikes support: If USE_JIKES is set to YES, then use Jikes. If USE_JIKES is
-# set to NO, then don't use it. If it is set to a different value, then fail
-# with an error message. Otherwise USE_JIKES is not set, in which case it is
-# checked if Jikes is already installed. If it is, then it will be used,
-# otherwise it will not be used.
-#
-# As a result, HAVE_JIKES is defined and set to "yes" when Jikes is used by the
-# port according to the above policy.
-
-.		undef HAVE_JIKES
-
-# Enforce USE_JIKES=NO if not defined and using Java 1.5+
-# XXX: This is a temporary fix to be removed when Jikes supports Java 1.5
-.		if (${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.5") || \
-           (${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.6") || \
-           (${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.7")
-USE_JIKES?=		NO
-.		endif
-# First test if USE_JIKES has a valid value
-.		if defined(USE_JIKES) && !(${USE_JIKES:U} == "YES") && !(${USE_JIKES:U} == "NO")
-check-makevars::
-	@${ECHO_CMD} "${PKGNAME}: Makefile error: \"${USE_JIKES}\" is not a valid value for USE_JIKES. It should be YES or NO, or it should be undefined.";
-	@${FALSE}
-.		endif
-# Then test if jikes is needed or available: -> HAVE_JIKES=yes
-.		if (exists(${_JIKES_PATH}) && (!defined(USE_JIKES) || (${USE_JIKES:U} == "YES"))) \
-			|| (defined(USE_JIKES) && (${USE_JIKES:U} == "YES"))
-HAVE_JIKES=		yes
-.		endif
-
-# Add jikes port to the dependencies if needed
-.		if !defined(NO_BUILD) && defined(HAVE_JIKES)
-BUILD_DEPENDS+=	${DEPEND_JIKES}
-.		endif
-
 # Ant Support: USE_ANT --> JAVA_BUILD=jdk
 .		if defined(USE_ANT)
 JAVA_BUILD=		jdk
@ -452,9 +391,6 @@ RUN_DEPENDS+=		${DEPEND_JAVA}
 .		if defined(USE_ANT)
 ANT?=				${LOCALBASE}/bin/ant
 MAKE_ENV+=			JAVA_HOME=${JAVA_HOME}
-.			if defined(HAVE_JIKES)
-MAKE_ARGS+=			-Dbuild.compiler=jikes
-.			endif
 BUILD_DEPENDS+=		${ANT}:${PORTSDIR}/devel/apache-ant
 ALL_TARGET?=
 .			if !target(do-build)
@ -469,22 +405,15 @@ do-build:
 #
 # At this stage both JAVA_HOME and JAVA_PORT are definitely given a value.
 #
-# Define the location of the Java compiler. If HAVE_JIKES is defined, then
-# use Jikes.
+# Define the location of the Java compiler.

-# Only define JAVAC if a JDK is needed or USE_JIKES=yes
+# Only define JAVAC if a JDK is needed
 .		undef JAVAC

 # Then test if a JAVAC has to be set (JAVA_BUILD==jdk)
 .		if defined(JAVA_BUILD)
 .			if (${JAVA_BUILD:U} == "JDK") && !defined(JAVAC)
-# Use jikes if available and not explicitly forbidden (see Stage 6)
-.				if defined(HAVE_JIKES)
-JAVAC?=			${_JIKES_PATH} -bootclasspath ${JAVA_CLASSES}
-# Otherwise use 'javac'
-.				else
 JAVAC?=			${JAVA_HOME}/bin/javac
-.				endif
 .			endif
 .		endif

--- a/archivers/javatar/Makefile
+++ b/archivers/javatar/Makefile
@ -18,7 +18,7 @@ COMMENT=	A Java tar archive io package
 RUN_DEPENDS=	${JAVALIBDIR}/activation.jar:${PORTSDIR}/java/jaf

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 NO_BUILD=	yes

--- a/archivers/jzip.org/Makefile
+++ b/archivers/jzip.org/Makefile
@ -21,7 +21,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 PLIST_FILES=	%%JAVAJARDIR%%/jzip.org.jar bin/${PORTNAME}
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}.src

 SUB_FILES=	${PORTNAME}.sh
--- a/archivers/jzip.org/files/jzip.org.sh.in
+++ b/archivers/jzip.org/files/jzip.org.sh.in
@ -2,4 +2,4 @@
 #
 # $FreeBSD$

-JAVA_VERSION=1.2+ "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jzip.org.jar" "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jzip.org.jar" "$@"
--- a/archivers/jzlib/Makefile
+++ b/archivers/jzlib/Makefile
@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A re-implementation of zlib in pure Java

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 JAR_FILE=	${WRKSRC}/${PORTNAME}.jar

--- a/astro/openmap/Makefile
+++ b/astro/openmap/Makefile
@ -16,7 +16,7 @@ COMMENT=	Java toolkit for manipulating and displaying geographic data
 RUN_DEPENDS=	classpath:${PORTSDIR}/java/javavmwrapper

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 PKGMESSAGE=	${WRKSRC}/LICENSE

--- a/audio/jid3lib/Makefile
+++ b/audio/jid3lib/Makefile
@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java ID3 Tag Library

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 USE_ANT=	yes

 PLIST_FILES=	%%JAVAJARDIR%%/jid3lib.jar
--- a/audio/jmusic/Makefile
+++ b/audio/jmusic/Makefile
@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Composition in Java

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes

--- a/audio/jxm/Makefile
+++ b/audio/jxm/Makefile
@ -19,7 +19,7 @@ COMMENT=	XMPCR (USB XM radio) control software
 RUN_DEPENDS=	${JAVA_HOME}/jre/lib/ext/CommDriver.jar:${PORTSDIR}/comms/java-commapi-freebsd

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native

 NO_BUILD=	yes
--- a/audio/jxm/files/jxm.sh.in
+++ b/audio/jxm/files/jxm.sh.in
@ -2,4 +2,4 @@
 #
 # $FreeBSD$

-JAVA_VERSION="1.4+" JAVA_OS="native" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jxm.jar" "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" JAVA_OS="native" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jxm.jar" "$@"
--- a/audio/musiccontrol/Makefile
+++ b/audio/musiccontrol/Makefile
@ -22,7 +22,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/mpg123:${PORTSDIR}/audio/mpg123 \
 		${LOCALBASE}/bin/simplemod:${PORTSDIR}/audio/simplemod

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 PLIST_FILES=	share/java/classes/MusicControl-${PORTVERSION}.jar bin/musiccontrol

--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@ -36,8 +36,8 @@ USE_ANT=	yes
 USE_GECKO=	libxul
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-JAVA_VERSION=	1.4+
-JAVA_VENDOR=	freebsd bsdjava sun blackdown
+JAVA_VERSION=	1.5+
+JAVA_VENDOR=	freebsd bsdjava sun
 NOCCACHE=	yes

 WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}/TuxGuitar
--- a/audio/tuxguitar/files/patch-build.properties
+++ b/audio/tuxguitar/files/patch-build.properties
@ -1,7 +1,7 @@
 --- build.properties.orig	2010-02-26 12:11:41.000000000 +0100
 +++ build.properties	2010-02-26 12:13:52.000000000 +0100
@@ -5,15 +5,15 @@
- ant.build.javac.target=1.4
+ ant.build.javac.target=1.5
 
 ########## DEFAULT LINUX BUILD PROPERTIES ##########
 -lib.swt.jni=lib/
--- a/benchmarks/scimark2/Makefile
+++ b/benchmarks/scimark2/Makefile
@ -20,8 +20,7 @@ WRKSRC=		${WRKDIR}
 USE_ZIP=	yes

 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
-USE_JIKES=	NO
+JAVA_VERSION=	1.5+
 NEED_JAVAC=	yes
 JAVAC_OPTS?=	-O

--- a/biology/artemis/Makefile
+++ b/biology/artemis/Makefile
@ -19,7 +19,7 @@ COMMENT=	A DNA sequence viewer and annotation tool
 WRKSRC=		${WRKDIR}/${PORTNAME}

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 NO_BUILD=	yes
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
--- a/biology/jalview/Makefile
+++ b/biology/jalview/Makefile
@ -16,7 +16,7 @@ MAINTAINER=	fernan@iib.unsam.edu.ar
 COMMENT=	A viewer and editor for multiple sequence alignments

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 USE_ANT=	yes
 ALL_TARGET=	makejars
 WRKSRC=		${WRKDIR}/${PORTNAME}
--- a/cad/impact/Makefile
+++ b/cad/impact/Makefile
@ -18,7 +18,7 @@ COMMENT=	Dynamic Finite Element Program Suite
 USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/Impact
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes

 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@ -33,7 +33,7 @@ USE_TCL_RUN=	84+
 USE_TCL_THREADS=yes
 USE_JAVA=	yes
 USE_XORG=	xmu
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 #.if defined(MAINTAINER_MODE)
 # linux-sun-jdk was required for 6.1, but 6.2 is OK with diablo-jdk.
 #JAVA_OS=	linux
--- a/comms/java-commapi-freebsd/Makefile
+++ b/comms/java-commapi-freebsd/Makefile
@ -18,7 +18,7 @@ BUILD_DEPENDS=	${JDKDIR}/jre/lib/ext/comm.jar:${PORTSDIR}/comms/java-commapi
 RUN_DEPENDS=	${JDKDIR}/jre/lib/ext/comm.jar:${PORTSDIR}/comms/java-commapi

 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 JAVA_BUILD=	yes

--- a/comms/java-commapi/Makefile
+++ b/comms/java-commapi/Makefile
@ -17,7 +17,7 @@ COMMENT=	Sun's Java Communications API

 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+

 NO_CDROM=	Sun has a funky license for this software
 RESTRICTED=	no commercial use
--- a/comms/rxtx/Makefile
+++ b/comms/rxtx/Makefile
@ -19,7 +19,7 @@ COMMENT=	Native interface to serial ports in Java
 USE_ZIP=	yes
 USE_GMAKE=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 GNU_CONFIGURE=	yes

--- a/databases/frontbase-jdbc/Makefile
+++ b/databases/frontbase-jdbc/Makefile
@ -17,7 +17,7 @@ MAINTAINER?=	ports@FreeBSD.org
 COMMENT=	The Java JDBC implementation for FrontBase

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 NO_BUILD=	yes
 JARFILE=	frontbasejdbc.jar
--- a/databases/hsqldb/Makefile
+++ b/databases/hsqldb/Makefile
@ -18,7 +18,7 @@ COMMENT=	An embeddable SQL database written in Java
 LICENSE=	BSD

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 USE_ANT=	yes
 USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
--- a/databases/isql-viewer/Makefile
+++ b/databases/isql-viewer/Makefile
@ -26,7 +26,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper \
 		${JAVALIBDIR}/mysql-connector-java.jar:${PORTSDIR}/databases/mysql-connector-java

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes

 ISQL=		iSQL-Viewer
--- a/databases/jakarta-commons-dbutils/Makefile
+++ b/databases/jakarta-commons-dbutils/Makefile
@ -20,7 +20,7 @@ COMMENT=	JDBC helper library
 BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit

 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 USE_ANT=	yes

 ALL_TARGET=	dist
--- a/databases/jdbc-oracle8i/Makefile
+++ b/databases/jdbc-oracle8i/Makefile
@ -25,7 +25,7 @@ RESTRICTED=	'Must be downloaded direct from Oracle via www interface'

 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+	# Should be "1.2 1.3" but tested OK with 1.4
+JAVA_VERSION=	1.5+

 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
--- a/databases/jdbc-oracle9i/Makefile
+++ b/databases/jdbc-oracle9i/Makefile
@ -20,7 +20,7 @@ COMMENT=	The JDBC drivers for Oracle 9i
 RESTRICTED=	'Must be downloaded direct from Oracle via www interface'

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@ -23,7 +23,7 @@ CONFLICTS=	mysql-connector-java*-5.0.*
 LICENSE=	GPLv2

 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 BUILDDIR=	${WRKDIR}/${DISTNAME}
 APIDOCSDIR=	${DOCSDIR}/javadoc
 SRCDIR=		${WRKDIR}/${DISTNAME}/src
--- a/databases/openbase-jdbc/Makefile
+++ b/databases/openbase-jdbc/Makefile
@ -17,7 +17,7 @@ COMMENT=	The Java JDBC implementation for OpenBase

 USE_JAVA=	yes
 USE_ZIP=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 NO_BUILD=	yes
 JARFILE=	OpenBaseJDBC.jar
--- a/databases/postgis-jdbc/Makefile
+++ b/databases/postgis-jdbc/Makefile
@ -17,7 +17,7 @@ COMMENT=	PostGIS spatial data structures for JDBC
 RUN_DEPENDS=	${JAVALIBDIR}/postgresql.jar:${PORTSDIR}/databases/postgresql-jdbc

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes

 PLIST_FILES=	%%JAVAJARDIR%%/postgis_1.4.0.jar
--- a/deskutils/freemind/Makefile
+++ b/deskutils/freemind/Makefile
@ -22,7 +22,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper

 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 DATADIR=	${JAVASHAREDIR}/${PORTNAME}-${PORTVERSION}
 DATAFILES=	accessories doc lib license patterns.xml plugins user.properties
--- a/deskutils/ganttproject/Makefile
+++ b/deskutils/ganttproject/Makefile
@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-src/${PORTNAME}-builder

 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 USE_ANT=	yes

 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
--- a/devel/antlr/Makefile
+++ b/devel/antlr/Makefile
@ -19,7 +19,7 @@ CONFLICTS=	pccts-[0-9]*

 USE_GMAKE=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 OPTIONS=	PYTHON "Include Python runtime support" off

--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@ -26,7 +26,7 @@ MANPAGE_DISTFILE=	${PORTNAME}-manpage-${MANPAGE_VERSION}.tgz
 MANPAGE_VERSION=	20030908
 USE_BZIP2=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 NO_BUILD=	YES
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
--- a/devel/avalon-framework/Makefile
+++ b/devel/avalon-framework/Makefile
@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache Avalon core framework for component programming

 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes

 WRKSRC=		${WRKDIR}/${PORTNAME}
--- a/devel/charva/Makefile
+++ b/devel/charva/Makefile
@ -20,7 +20,7 @@ RUN_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-

 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 USE_ANT=	yes
 ALL_TARGET=	clean makeDLL dist

--- a/devel/doctorj/Makefile
+++ b/devel/doctorj/Makefile
@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for analyzing Java code and documentation

 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 USE_ANT=	yes

 ALL_TARGET=	jarfile
--- a/devel/flex-sdk/Makefile
+++ b/devel/flex-sdk/Makefile
@ -20,7 +20,7 @@ CONFLICTS=	ja-flex-sdk-2.* flex-sdk-2.* flex-sdk-3.*
 USE_ZIP=	YES
 USE_DOS2UNIX=	YES
 USE_JAVA=	YES
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 WRKSRC=		${WRKDIR}
 SUB_FILES=	${SCRIPTS:C/\$/.sh/g}
 NO_BUILD=	YES
--- a/devel/flex-sdk2/Makefile
+++ b/devel/flex-sdk2/Makefile
@ -23,7 +23,7 @@ CONFLICTS=	ja-flex-sdk-2.* flex-sdk-3.* flex-sdk-4.*
 NO_LATEST_LINK=	YES
 USE_ZIP=	YES
 USE_JAVA=	YES
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 WRKSRC=		${WRKDIR}
 DOWNLOAD_URL=	http://labs.adobe.com/technologies/flex/sdk/flex2sdk.html
 SUB_FILES=	asdoc.sh compc.sh fdb.sh mxmlc.sh
--- a/devel/flex-sdk35/Makefile
+++ b/devel/flex-sdk35/Makefile
@ -21,7 +21,7 @@ CONFLICTS=	ja-flex-sdk-2.* flex-sdk-2.* flex-sdk-4.*
 NO_LATEST_LINK=	YES
 USE_ZIP=	YES
 USE_JAVA=	YES
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 WRKSRC=		${WRKDIR}
 SUB_FILES=	${SCRIPTS:C/\$/.sh/g}
 NO_BUILD=	YES
--- a/devel/flex_compiler_shell/Makefile
+++ b/devel/flex_compiler_shell/Makefile
@ -23,7 +23,7 @@ CONFLICTS=	flex-sdk-3.*

 USE_ZIP=	YES
 USE_JAVA=	YES
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 WRKSRC=		${WRKDIR}
 NO_BUILD=	YES
 SUB_FILES=	fcsh
--- a/devel/fujaba/Makefile
+++ b/devel/fujaba/Makefile
@ -19,7 +19,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper

 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/Fujaba\ Tool\ Suite\ ${PORTVERSION}

--- a/devel/glib-java/Makefile
+++ b/devel/glib-java/Makefile
@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 USE_GNOME=	gnomehack glib20
 CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
--- a/devel/itext/Makefile
+++ b/devel/itext/Makefile
@ -25,7 +25,7 @@ RUN_DEPENDS=	${JAVAJARDIR}/bcmail.jar:${PORTSDIR}/java/bouncycastle \

 USE_BZIP2=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 USE_ANT=	yes
 ALL_TARGET=	jar jar.rtf jar.rups
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
--- a/devel/jakarta-commons-configuration/Makefile
+++ b/devel/jakarta-commons-configuration/Makefile
@ -21,7 +21,7 @@ RUN_DEPENDS=	${JAVALIBDIR}/commons-beanutils.jar:${PORTSDIR}/java/jakarta-common
 		${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging

 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes

 .if !defined(NOPORTDOCS)
--- a/devel/jakarta-commons-daemon/Makefile
+++ b/devel/jakarta-commons-daemon/Makefile
@ -17,11 +17,10 @@ MAINTAINER=	ronald@echteman.nl
 COMMENT=	Wrapper code to start/stop a Java application as a daemon

 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 JAVA_BUILD=	jdk
 NEED_JAVAC=	yes
-USE_JIKES=	no
 USE_ANT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
--- a/devel/jakarta-commons-jxpath/Makefile
+++ b/devel/jakarta-commons-jxpath/Makefile
@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities for manipulating Java Beans using the XPath syntax

 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes

 .include <bsd.port.pre.mk>
--- a/devel/jakarta-commons-modeler/Makefile
+++ b/devel/jakarta-commons-modeler/Makefile
@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mechanisms to create Model MBeans compatible with JMX specification

 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes

 .include <bsd.port.pre.mk>
--- a/devel/java-util-concurrent/Makefile
+++ b/devel/java-util-concurrent/Makefile
@ -17,7 +17,7 @@ MAINTAINER=	hq@FreeBSD.org
 COMMENT=	Utility classes for concurrent Java programming

 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+

 USE_ANT=	yes
 ALL_TARGET=	dist
--- a/devel/javolution/Makefile
+++ b/devel/javolution/Makefile
@ -16,7 +16,7 @@ COMMENT=	A Java solution for real time and embedded systems

 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JDKMVERSION=	${JAVA_PORT_VERSION:C/^([0-9]\.[0-9])(.*)$/\1/}
 USE_ANT=	yes
 ALL_TARGET=	${JDKMVERSION}
--- a/devel/jep/Makefile
+++ b/devel/jep/Makefile
@ -18,7 +18,7 @@ CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
 MAKE_ENV=	JAVA_HOME=${JAVA_HOME}
 CONFIGURE_ARGS=	--prefix=${PREFIX} --exec-prefix=${PREFIX}
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 USE_PYTHON=	2.2+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
--- a/devel/jsap/Makefile
+++ b/devel/jsap/Makefile
@ -16,7 +16,7 @@ MAINTAINER=	hq@FreeBSD.org
 COMMENT=	Java package to parse command-line arguments

 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes

 .if !defined(NOPORTDOCS)
--- a/devel/libgconf-java/Makefile
+++ b/devel/libgconf-java/Makefile
@ -24,7 +24,7 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 USE_GNOME=	gnomehack gconf2
 CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
--- a/devel/libglade-java/Makefile
+++ b/devel/libglade-java/Makefile
@ -26,7 +26,7 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 USE_GNOME=	gnomehack libglade2
 CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
--- a/devel/looks/Makefile
+++ b/devel/looks/Makefile
@ -17,7 +17,7 @@ COMMENT=	The JGoodies Looks improve the appearance of your Java applications

 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
--- a/devel/maven2/Makefile
+++ b/devel/maven2/Makefile
@ -16,7 +16,7 @@ MAINTAINER=	hq@FreeBSD.org
 COMMENT=	Java project management tool, 2.0 branch

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 SUB_FILES=	m2.sh
--- a/devel/netscape-java40/Makefile
+++ b/devel/netscape-java40/Makefile
@ -17,7 +17,7 @@ MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Classes to allow a Java applet access to Javascript objects

 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes

 JARFILES=	java40.jar LICENSE.java40.txt
--- a/devel/obfuscatejs/Makefile
+++ b/devel/obfuscatejs/Makefile
@ -24,7 +24,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper

 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 SUB_FILES=	${PORTNAME}
 SUB_LIST=	OBFUSCATEJSJAR=${DATADIR}/${OBFUSCATEJSJAR}
--- a/devel/ocaml-camljava/Makefile
+++ b/devel/ocaml-camljava/Makefile
@ -18,7 +18,7 @@ COMMENT=	An OCaml-Java library interface

 USE_OCAML=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 .include <bsd.port.pre.mk>

--- a/devel/p5-Inline-Java/Makefile
+++ b/devel/p5-Inline-Java/Makefile
@ -20,7 +20,7 @@ BUILD_DEPENDS=	p5-Inline>=0.44:${PORTSDIR}/devel/p5-Inline \
 RUN_DEPENDS=	${BUILD_DEPENDS}

 USE_JAVA=       yes
-JAVA_VERSION=   1.4+
+JAVA_VERSION=   1.5+
 JAVA_OS=        native

 PERL_CONFIGURE=	5.8.1+
--- a/devel/p5-Java/Makefile
+++ b/devel/p5-Java/Makefile
@ -18,7 +18,7 @@ COMMENT=	Perl extension for accessing a JVM remotely or locally
 USE_RC_SUBR=	javaserver.sh
 PERL_CONFIGURE=	YES
 USE_JAVA=	yes
-JAVA_VERSION=	1.1+
+JAVA_VERSION=	1.5+

 MAN3=		Java.3 JavaArray.3

--- a/devel/pmd/Makefile
+++ b/devel/pmd/Makefile
@ -19,7 +19,7 @@ BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit

 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 USE_ANT=	yes

 MAKE_ARGS=	-cp ${JAVALIBDIR}/junit.jar
--- a/devel/portlet-api/Makefile
+++ b/devel/portlet-api/Makefile
@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Portlet API (JSR-168)

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes

 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
--- a/devel/py-jcc/Makefile
+++ b/devel/py-jcc/Makefile
@ -20,7 +20,7 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	JCC
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_VENDOR=	freebsd
 USE_GCC=	4.2+

--- a/devel/simian/Makefile
+++ b/devel/simian/Makefile
@ -29,7 +29,7 @@ NO_WRKSUBDIR=	yes

 .if !defined(WITHOUT_JAVA)
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 PLIST_SUB+=	JAVA=""
 SUB_LIST+=	JAVA=""
 .else
--- a/devel/smc/Makefile
+++ b/devel/smc/Makefile
@ -18,7 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The State Machine Compiler

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes

 do-install:
--- a/devel/statcvs/Makefile
+++ b/devel/statcvs/Makefile
@ -22,7 +22,7 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 USE_ZIP=	yes
 USE_JAVA=	yes
 USE_ANT=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 .if !defined(NOPORTDOCS)
 ALL_TARGET=	jar javadoc
--- a/devel/statsvn/Makefile
+++ b/devel/statsvn/Makefile
@ -24,7 +24,7 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 USE_ZIP=	yes
 USE_JAVA=	yes
 USE_ANT=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 .if !defined(NOPORTDOCS)
 ALL_TARGET=	dist javadoc
--- a/devel/tijmp/Makefile
+++ b/devel/tijmp/Makefile
@ -22,7 +22,6 @@ JAVA_VERSION=	1.6+
 JAVA_OS=	native
 JAVA_BUILD=	jdk
 NEED_JAVAC=	yes
-USE_JIKES=	no

 GNU_CONFIGURE=	yes

--- a/devel/tinylaf/Makefile
+++ b/devel/tinylaf/Makefile
@ -16,7 +16,7 @@ COMMENT=	A pluggable Look and Feel for Java

 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes

 JARFILE=	${PORTNAME}.jar tinycp.jar
--- a/dns/crossip/Makefile
+++ b/dns/crossip/Makefile
@ -15,7 +15,7 @@ MAINTAINER=	dan@algenta.com
 COMMENT=	Java DNS update client for the ThatIP protocol

 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 USE_ZIP=	yes

 NO_BUILD=	yes
--- a/editors/drjava/Makefile
+++ b/editors/drjava/Makefile
@ -19,7 +19,7 @@ COMMENT=	A lightweight IDE for writing Java programs

 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 SUB_FILES=	${PORTNAME}
 SUB_LIST=	DRJAVAJAR=${DRJAVAJAR}
--- a/editors/jedit-devel/files/jedit.sh.in
+++ b/editors/jedit-devel/files/jedit.sh.in
@ -4,4 +4,4 @@
 # Java heap size, in megabytes
 JAVA_HEAP_SIZE=32

-JAVA_VERSION="1.4+" "%%LOCALBASE%%/bin/java" -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar "%%DATADIR%%/jedit.jar" "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar "%%DATADIR%%/jedit.jar" "$@"
--- a/editors/jedit/files/jedit.sh.in
+++ b/editors/jedit/files/jedit.sh.in
@ -4,4 +4,4 @@
 # Java heap size, in megabytes
 JAVA_HEAP_SIZE=32

-JAVA_VERSION="1.5+" "%%LOCALBASE%%/bin/java" -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar "%%DATADIR%%/jedit.jar" "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar "%%DATADIR%%/jedit.jar" "$@"
--- a/editors/jext/Makefile
+++ b/editors/jext/Makefile
@ -15,7 +15,7 @@ MAINTAINER=	vd@FreeBSD.org
 COMMENT=	Powerful 100% pure Java text editor

 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 NO_WRKSUBDIR=	yes
 USE_XORG=	x11
 NO_BUILD=	yes
--- a/editors/omegaT/Makefile
+++ b/editors/omegaT/Makefile
@ -20,7 +20,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 USE_ZIP=	yes
 USE_ANT=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 NO_WRKSUBDIR=	yes

 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
--- a/editors/omegaT/files/omegaT.sh.in
+++ b/editors/omegaT/files/omegaT.sh.in
@ -9,4 +9,4 @@ if [ ! -f ${HOME}/.omegat/omegat.prefs ] ; then
  cp "%%DATADIR%%/omegat.prefs" ${HOME}/.omegat && chmod 644 ${HOME}/.omegat/omegat.prefs
 fi

-JAVA_VERSION="1.2+" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/OmegaT.jar" "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/OmegaT.jar" "$@"
--- a/finance/venice/Makefile
+++ b/finance/venice/Makefile
@ -17,7 +17,7 @@ COMMENT=	Merchant Of Venice, a stock market trading program
 NO_BUILD=	yes
 USE_JAVA=	yes
 JAVA_RUN=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 JARFILE=	${PORTNAME}.jar

--- a/ftp/jftp/Makefile
+++ b/ftp/jftp/Makefile
@ -21,7 +21,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper

 WRKSRC=		${WRKDIR}/j-ftp
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 SUB_FILES=	jftp.sh
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
--- a/games/cgoban2/Makefile
+++ b/games/cgoban2/Makefile
@ -21,7 +21,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 WRKSRC=		${WRKDIR}/cgoban

 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes

 PLIST_FILES=	bin/cgoban2 %%DATADIR%%/cgoban.jar share/pixmaps/cgoban2.png
--- a/games/dmjava/Makefile
+++ b/games/dmjava/Makefile
@ -21,7 +21,7 @@ EXTRACT_AFTER_ARGS=	-d ${WRKSRC}

 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes

 do-install:
--- a/games/ftjava/Makefile
+++ b/games/ftjava/Makefile
@ -19,7 +19,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Full Thrust PBEM Client

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 USE_ZIP=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
--- a/games/jchessboard/Makefile
+++ b/games/jchessboard/Makefile
@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Chess game and PGN viewer/editor written in Java

 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+

 DATADIR=	${JAVASHAREDIR}/${PORTNAME}

--- a/games/jin/Makefile
+++ b/games/jin/Makefile
@ -17,7 +17,7 @@ COMMENT=	A graphical client for chess servers

 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 SUB_FILES=	${PORTNAME}
 SUB_LIST=	JINJAR=${JINJAR}
--- a/games/jtans/Makefile
+++ b/games/jtans/Makefile
@ -24,7 +24,7 @@ EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	.
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 SUB_FILES=	jtans.sh
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
--- a/games/jtans/files/jtans.sh.in
+++ b/games/jtans/files/jtans.sh.in
@ -2,4 +2,4 @@
 #
 # $FreeBSD$

-JAVA_VERSION="1.3+" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/jtans_appli-1.0.jar"
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/jtans_appli-1.0.jar"
--- a/games/pcgen/Makefile
+++ b/games/pcgen/Makefile
@ -18,7 +18,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 USE_ZIP=	YES
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:S/.//g}
 USE_JAVA=	YES
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	YES

 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
--- a/games/spicetrade/Makefile
+++ b/games/spicetrade/Makefile
@ -20,7 +20,7 @@ COMMENT=	Colourful 14th century Arab spice trading game
 NO_PACKAGE=	Package will be 186MB, set FORCE_PACKAGE if you really want to build it

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 NO_BUILD=	yes

--- a/graphics/aoi/Makefile
+++ b/graphics/aoi/Makefile
@ -18,7 +18,7 @@ COMMENT=	An open source Java written 3D modelling and rendering studio
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper

 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 USE_ZIP=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/ArtOfIllusion${PORTVERSION:S/.//g}
--- a/graphics/barbecue/Makefile
+++ b/graphics/barbecue/Makefile
@ -17,7 +17,7 @@ COMMENT=	A Java barcode generator
 RUN_DEPENDS=	${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom

 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes

 JARFILES=	${PORTNAME}-${PORTVERSION}.jar
--- a/graphics/batik/Makefile
+++ b/graphics/batik/Makefile
@ -19,7 +19,6 @@ COMMENT=	SVG Toolkit
 USE_ZIP=	yes
 USE_JAVA=	1.5+
 USE_ANT=	yes
-USE_JIKES=	no
 ALL_TARGET=	jars all-jar
 # Prevent out of memory error during build
 MAKE_ENV+=	"ANT_OPTS=-Xmx512m"
--- a/graphics/cairo-java/Makefile
+++ b/graphics/cairo-java/Makefile
@ -24,7 +24,7 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 USE_GNOME=	gnomehack gnometarget
 CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
--- a/graphics/cosmoplayer/Makefile
+++ b/graphics/cosmoplayer/Makefile
@ -21,7 +21,7 @@ COMMENT=	Java classes to support VRML
 RUN_DEPENDS=	${JAVALIBDIR}/java40.jar:${PORTSDIR}/devel/netscape-java40

 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes

 JARFILES=	npcosmop211.jar LICENSE.npcosmop211.txt
--- a/graphics/jave6/Makefile
+++ b/graphics/jave6/Makefile
@ -18,7 +18,7 @@ COMMENT=	Java ASCII-Art-Generator

 USE_JAVA=	YES
 USE_ZIP=	YES
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	YES
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 LNKTARGET=	${PREFIX}/bin/jave6
--- a/graphics/jdraw/Makefile
+++ b/graphics/jdraw/Makefile
@ -37,10 +37,8 @@ do-install:

 .if defined(WITH_PLASTIC3D)
 PLASTIC3D=	"-Dlf=\"com.jgoodies.looks.plastic.Plastic3DLookAndFeel\""
-JAVA_VERSION=	1.5+
 RUN_DEPENDS+=	${JAVAJARDIR}/looks.jar:${PORTSDIR}/devel/looks
-.else
-JAVA_VERSION=	1.4+
 .endif
+JAVA_VERSION=	1.5+

 .include <bsd.port.post.mk>
--- a/graphics/jdraw/files/jdraw.in
+++ b/graphics/jdraw/files/jdraw.in
@ -5,11 +5,7 @@ if [ -z "${JAVA_VERSION}" ]; then
 	JAVA_VERSION="%%JAVA_VERSION%%"
 fi

-if [ "${JAVA_VERSION}" \> "1.4" ]; then
- 	LOOK_AND_FEEL="%%PLASTIC3D%%"
- else
-	LOOK_AND_FEEL=
-fi
+LOOK_AND_FEEL="%%PLASTIC3D%%"

 exec "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%" ${LOOK_AND_FEEL} -jar "%%JDRAWJAR%%" "$@"

--- a/graphics/jogl/Makefile
+++ b/graphics/jogl/Makefile
@ -46,7 +46,7 @@ USE_ZIP=	yes
 USE_ANT=	yes
 USE_LDCONFIG=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+

 BUILD_WRKSRC=	${WRKSRC}/jogl/make

--- a/graphics/jpatch/Makefile
+++ b/graphics/jpatch/Makefile
@ -20,7 +20,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper

 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}${DISTVERSION}

--- a/graphics/jpatch/files/jpatch.sh.in
+++ b/graphics/jpatch/files/jpatch.sh.in
@ -2,4 +2,4 @@
 #
 # $FreeBSD$

-JAVA_VERSION="1.4+" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jpatch.jar" "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jpatch.jar" "$@"
--- a/Show more
+++ b/Show more