diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2011-07-21 05:03:02 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2011-07-21 05:03:02 +0000 |
| commit | 06e66777937202f04d646d24d24f524b13d79478 (patch) | |
| tree | 85a44213b1929b12051c17091ea4ad53f819456b /editors | |
| parent | Fix another typo (diff) | |
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
Notes
Notes:
svn path=/head/; revision=278068
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/drjava/Makefile | 2 | ||||
| -rw-r--r-- | editors/jedit-devel/files/jedit.sh.in | 2 | ||||
| -rw-r--r-- | editors/jedit/files/jedit.sh.in | 2 | ||||
| -rw-r--r-- | editors/jext/Makefile | 2 | ||||
| -rw-r--r-- | editors/omegaT/Makefile | 2 | ||||
| -rw-r--r-- | editors/omegaT/files/omegaT.sh.in | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/editors/drjava/Makefile b/editors/drjava/Makefile index 1ebecbd503d1..2daa2a6e0fd4 100644 --- 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} diff --git a/editors/jedit-devel/files/jedit.sh.in b/editors/jedit-devel/files/jedit.sh.in index 6b2c3e618483..80b01341093d 100644 --- 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" "$@" diff --git a/editors/jedit/files/jedit.sh.in b/editors/jedit/files/jedit.sh.in index 91dc403347d0..80b01341093d 100644 --- 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" "$@" diff --git a/editors/jext/Makefile b/editors/jext/Makefile index 971a9a001f81..ce29d7b5f9d7 100644 --- 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 diff --git a/editors/omegaT/Makefile b/editors/omegaT/Makefile index fb9bcad9459a..76e01234b456 100644 --- 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} diff --git a/editors/omegaT/files/omegaT.sh.in b/editors/omegaT/files/omegaT.sh.in index de7e1d507799..9bd8c462711d 100644 --- 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" "$@" |