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 /graphics/jdraw | |
parent | 63d4112e2e682002806fc4c52da2481ae7f045e7 (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 'graphics/jdraw')
-rw-r--r-- | graphics/jdraw/Makefile | 4 | ||||
-rw-r--r-- | graphics/jdraw/files/jdraw.in | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/graphics/jdraw/Makefile b/graphics/jdraw/Makefile index 2cd230b8ec56..ee7fd04ed8e1 100644 --- 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> diff --git a/graphics/jdraw/files/jdraw.in b/graphics/jdraw/files/jdraw.in index d2de0aa702cf..fdf78202b420 100644 --- 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%%" "$@" |