From 06e66777937202f04d646d24d24f524b13d79478 Mon Sep 17 00:00:00 2001 From: Mark Linimon Date: Thu, 21 Jul 2011 05:03:02 +0000 Subject: 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 --- textproc/jaxup/Makefile | 2 +- textproc/jaxup/files/jaxup-xupdater.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'textproc/jaxup') 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" "$@" -- cgit v1.2.3