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

8 files changed, 8 insertions, 8 deletions

diff --git a/lang/bsh/Makefile b/lang/bsh/Makefile
index 4571b18116e5..5eba29da4093 100644
--- a/lang/bsh/Makefile
+++ b/lang/bsh/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	simon@olofsson.de
 COMMENT=	A Java scripting language
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 
 SUB_FILES=	${PORTNAME}.sh
diff --git a/lang/clojure/files/clojure-bin.in b/lang/clojure/files/clojure-bin.in
index 99af0c916a5e..4d97a737539f 100644
--- a/lang/clojure/files/clojure-bin.in
+++ b/lang/clojure/files/clojure-bin.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="1.5+" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/jline.jar:%%JAVAJARDIR%%/clojure-1.2.0.jar:%%JAVAJARDIR%%/clojure-contrib-1.2.0.jar:%%JAVAJARDIR%%/swank-clojure-1.2.1.jar:$CLASSPATH" %%CLOJURE_JLINE_RUNNER%% clojure.main "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/jline.jar:%%JAVAJARDIR%%/clojure-1.2.0.jar:%%JAVAJARDIR%%/clojure-contrib-1.2.0.jar:%%JAVAJARDIR%%/swank-clojure-1.2.1.jar:$CLASSPATH" %%CLOJURE_JLINE_RUNNER%% clojure.main "$@"
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 5e2c9a9acdb9..d5abaafbdec7 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -58,7 +58,7 @@ OPTIONS=	JAVA	"Enable Java applications"	on \
 
 .if !defined(WITHOUT_JAVA)
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 # Make sure ${JAVA_HOME}/bin is in the path
 CONFIGURE_ENV+=	PATH=${PATH}:${JAVA_HOME}/bin
 MAKE_ENV+=	PATH=${PATH}:${JAVA_HOME}/bin
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index 5e2c9a9acdb9..d5abaafbdec7 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -58,7 +58,7 @@ OPTIONS=	JAVA	"Enable Java applications"	on \
 
 .if !defined(WITHOUT_JAVA)
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 # Make sure ${JAVA_HOME}/bin is in the path
 CONFIGURE_ENV+=	PATH=${PATH}:${JAVA_HOME}/bin
 MAKE_ENV+=	PATH=${PATH}:${JAVA_HOME}/bin
diff --git a/lang/jakarta-commons-jelly/Makefile b/lang/jakarta-commons-jelly/Makefile
index abb52e947d4c..58e704812868 100644
--- a/lang/jakarta-commons-jelly/Makefile
+++ b/lang/jakarta-commons-jelly/Makefile
@@ -18,7 +18,7 @@ COMMENT=	XML based scripting engine
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/lang/sisc/Makefile b/lang/sisc/Makefile
index 326b764cfbc2..5f7e1f867650 100644
--- a/lang/sisc/Makefile
+++ b/lang/sisc/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	An extensible Java-based Scheme interpreter
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 
 NO_BUILD=	yes
 PORTDOCS=	COPYING README
diff --git a/lang/starlogo/Makefile b/lang/starlogo/Makefile
index c893276821fe..8950c82582cb 100644
--- a/lang/starlogo/Makefile
+++ b/lang/starlogo/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	java@FreeBSD.org
 COMMENT=	Specialized version of the Logo programming language written in Java
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 
 USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/lang/starlogo/files/starlogo.sh.in b/lang/starlogo/files/starlogo.sh.in
index 344a6c123222..70248e4c8d3b 100644
--- a/lang/starlogo/files/starlogo.sh.in
+++ b/lang/starlogo/files/starlogo.sh.in
@@ -3,4 +3,4 @@
 # $FreeBSD$
 
 cd %%DATADIR%%/sample-projects && \
-JAVA_VERSION="1.2+" "%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%/starlogo.jar" starlogo.Toplevel compiler english "init 100" "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%/starlogo.jar" starlogo.Toplevel compiler english "init 100" "$@"