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

26 files changed, 26 insertions, 27 deletions

diff --git a/textproc/ant-xinclude-task/Makefile b/textproc/ant-xinclude-task/Makefile
index 3257b34f046b..7609b9ba71ae 100644
--- a/textproc/ant-xinclude-task/Makefile
+++ b/textproc/ant-xinclude-task/Makefile
@@ -18,7 +18,7 @@ COMMENT=	XInclude task for Jakarta Ant
 BUILD_DEPENDS=	${JAVAJARDIR}/xincluder.jar:${PORTSDIR}/textproc/xincluder
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.1+
+JAVA_VERSION=	1.5+
 USE_ANT=	yes
 
 ALL_TARGET=	jar
diff --git a/textproc/denature/Makefile b/textproc/denature/Makefile
index 981d8f67ba41..8b919cdab9f7 100644
--- a/textproc/denature/Makefile
+++ b/textproc/denature/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Pa
 
 USE_PERL5=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 POD2MAN?=	pod2man
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/textproc/dom4j/Makefile b/textproc/dom4j/Makefile
index d7445db297b6..6c584ce7d058 100644
--- a/textproc/dom4j/Makefile
+++ b/textproc/dom4j/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Source XML framework for Java
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index 766bbbb37a5d..1b62541601bf 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -24,7 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 USE_ANT=	yes
 
 # Prevent out of memory error during build
diff --git a/textproc/jakarta-commons-digester/Makefile b/textproc/jakarta-commons-digester/Makefile
index 355e20aaf249..ef9b35035577 100644
--- a/textproc/jakarta-commons-digester/Makefile
+++ b/textproc/jakarta-commons-digester/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	${JAR_DEPENDS}
 RUN_DEPENDS=	${JAR_DEPENDS}
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 
 USE_ANT=	yes
 MAKE_ARGS=	-Dcommons-beanutils.api=${COMMONS_BEANUTILS_API} \
diff --git a/textproc/jakarta-poi/Makefile b/textproc/jakarta-poi/Makefile
index 82b7e8d03ed2..71798ebbc872 100644
--- a/textproc/jakarta-poi/Makefile
+++ b/textproc/jakarta-poi/Makefile
@@ -20,8 +20,7 @@ COMMENT=	Java API To Access Microsoft Format Files
 BUILD_DEPENDS=	${JAVALIBDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
-USE_JIKES=	no
+JAVA_VERSION=	1.5+
 
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/jarnal/Makefile b/textproc/jarnal/Makefile
index c88ab8837d42..973d28c33cc3 100644
--- a/textproc/jarnal/Makefile
+++ b/textproc/jarnal/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+
 
 LICENSE=	GPLv2
 
diff --git a/textproc/jaxup/Makefile b/textproc/jaxup/Makefile
index b50955769fff..5fe72f43b144 100644
--- a/textproc/jaxup/Makefile
+++ b/textproc/jaxup/Makefile
@@ -26,7 +26,7 @@ USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
diff --git a/textproc/jaxup/files/jaxup-xupdater.sh b/textproc/jaxup/files/jaxup-xupdater.sh
index aabc8ca05828..1fd12cf618fe 100644
--- a/textproc/jaxup/files/jaxup-xupdater.sh
+++ b/textproc/jaxup/files/jaxup-xupdater.sh
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="1.3+" %%LOCALBASE%%/bin/java -cp "`"%%LOCALBASE%%/bin/classpath"`:%%DATADIR%%/jaxup-xupdater.jar" "DOMXUpdater" "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" %%LOCALBASE%%/bin/java -cp "`"%%LOCALBASE%%/bin/classpath"`:%%DATADIR%%/jaxup-xupdater.jar" "DOMXUpdater" "$@"
diff --git a/textproc/jdictionary/Makefile b/textproc/jdictionary/Makefile
index 305fb4eaeb27..6423b1c5d2d2 100644
--- a/textproc/jdictionary/Makefile
+++ b/textproc/jdictionary/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Platform independent, plugin based dictionary
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 
 USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/textproc/jdictionary/Makefile.plugin b/textproc/jdictionary/Makefile.plugin
index 09dfd4a66fa3..f5dc656ac6c0 100644
--- a/textproc/jdictionary/Makefile.plugin
+++ b/textproc/jdictionary/Makefile.plugin
@@ -15,7 +15,7 @@ RUN_DEPENDS+=	jdictionary:${PORTSDIR}/textproc/jdictionary
 # WARNING: USE_JAVA is set to be able to use JAVASHAREDIR.
 #          Please make sure that JAVA_VERSION here is the same as in Makefile.
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	#
diff --git a/textproc/nux/Makefile b/textproc/nux/Makefile
index 22d8e5c829a8..6eca4ff7bb3d 100644
--- a/textproc/nux/Makefile
+++ b/textproc/nux/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${JAVALIBDIR}/xom.jar:${PORTSDIR}/textproc/xom \
 OPTIONS=	XQUERY_TOOL "Install the XQuery command-line tool" on
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/textproc/ppower4/Makefile b/textproc/ppower4/Makefile
index 970880482385..eeb84314c31e 100644
--- a/textproc/ppower4/Makefile
+++ b/textproc/ppower4/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/py-lucene/Makefile b/textproc/py-lucene/Makefile
index 82e9d62784a9..eff93cf73917 100644
--- a/textproc/py-lucene/Makefile
+++ b/textproc/py-lucene/Makefile
@@ -25,7 +25,7 @@ BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant \
 USE_PYTHON=	2.5+
 USE_GCC=	4.2+
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 USE_GMAKE=	yes
 PATCHSET=	-1
 LUCENE_VER=	2.4.1
diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile
index 9a6403473e41..c06853cfa7e5 100644
--- a/textproc/saxon-devel/Makefile
+++ b/textproc/saxon-devel/Makefile
@@ -25,7 +25,7 @@ OPTIONS=	JDOM "Install Jdom support" off \
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
diff --git a/textproc/saxon-devel/files/saxon.sh.in b/textproc/saxon-devel/files/saxon.sh.in
index b849bd18e7f4..fe3c728dfffb 100644
--- a/textproc/saxon-devel/files/saxon.sh.in
+++ b/textproc/saxon-devel/files/saxon.sh.in
@@ -17,4 +17,4 @@ do
 	SAXON_CLASSPATH="${SAXON_CLASSPATH}:${jarfile}"
 done
 
-JAVA_VERSION="1.4+" exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@"
diff --git a/textproc/saxon-he/files/saxon.sh.in b/textproc/saxon-he/files/saxon.sh.in
index 329e79110535..6dc0121e9c04 100644
--- a/textproc/saxon-he/files/saxon.sh.in
+++ b/textproc/saxon-he/files/saxon.sh.in
@@ -17,4 +17,4 @@ do
 	SAXON_CLASSPATH="${SAXON_CLASSPATH}:${jarfile}"
 done
 
-JAVA_VERSION="1.4+" exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@"
diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
index ba980b5e68b8..af354da01284 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
diff --git a/textproc/trang/Makefile b/textproc/trang/Makefile
index 02eb44011fc7..6e64e657b65b 100644
--- a/textproc/trang/Makefile
+++ b/textproc/trang/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Multi-format schema converter based on RELAX NG
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 
 .if !defined(NOPORTDOCS)
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index edb39a680cac..11616c516f65 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -22,7 +22,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/g}
diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile
index 6f1392eb7768..bee1daa1be33 100644
--- a/textproc/xerces-j/Makefile
+++ b/textproc/xerces-j/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT=	XML parser for Java
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/xerces-${PORTVERSION:S/./_/g}
diff --git a/textproc/xincluder/Makefile b/textproc/xincluder/Makefile
index ec6a53acead0..c4647f82223a 100644
--- a/textproc/xincluder/Makefile
+++ b/textproc/xincluder/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom \
 		java:${PORTSDIR}/java/javavmwrapper
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/textproc/xincluder/files/xincluder.sh.in b/textproc/xincluder/files/xincluder.sh.in
index ea0abe794e50..4ed46d6e30e6 100644
--- a/textproc/xincluder/files/xincluder.sh.in
+++ b/textproc/xincluder/files/xincluder.sh.in
@@ -12,4 +12,4 @@ case "${IAM}" in
 	*) echo "ERROR!" ; false ;;
 esac
 
-JAVA_VERSION="1.2+" "%%LOCALBASE%%/bin/java" -cp "`"%%LOCALBASE%%/bin/classpath"`" "com.elharo.xml.xinclude.${MAIN_CLASS}" "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "`"%%LOCALBASE%%/bin/classpath"`" "com.elharo.xml.xinclude.${MAIN_CLASS}" "$@"
diff --git a/textproc/xom/Makefile b/textproc/xom/Makefile
index f53911f7d995..37accd92e0f2 100644
--- a/textproc/xom/Makefile
+++ b/textproc/xom/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j \
 		${JAVALIBDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/XOM
 
diff --git a/textproc/xp/Makefile b/textproc/xp/Makefile
index 7dc4653d503e..b8e3c8dfcf93 100644
--- a/textproc/xp/Makefile
+++ b/textproc/xp/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	mike@vee.net
 COMMENT=	An XML parser written in Java
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.1+
+JAVA_VERSION=	1.5+
 
 NO_WORKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/textproc/xt/Makefile b/textproc/xt/Makefile
index 7002ade6f117..171b8d943c4b 100644
--- a/textproc/xt/Makefile
+++ b/textproc/xt/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j \
 		${LOCALBASE}/bin/classpath:${PORTSDIR}/java/javavmwrapper
 
 USE_JAVA=	YES
-JAVA_VERSION=	1.1+
+JAVA_VERSION=	1.5+
 NO_BUILD=	YES
 
 .if !defined(NOPORTDOCS)