diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2012-12-11 05:11:45 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2012-12-11 05:11:45 +0000 |
| commit | e31c3703901c6fb7430ef234eb486295f8b8bc33 (patch) | |
| tree | bb2482718072a67be0aa7190744667a45be2318b /Mk/bsd.java.mk | |
| parent | - Trim header (diff) | |
. Fix all of the ports which still have as a version requirement
JAVA_VERSION=1.5
or
JAVA_VERSION=1.5+
The previous revision took this out as a valid version number meaning
that we end up with the non-existent "/bin/java" as the desired JDK.
Expand 1.5 to 1.6 and 1.5+ to 1.6 1.7 for now. This can be reverted
once all the ports are updated.
Notes
Notes:
svn path=/head/; revision=308661
Diffstat (limited to 'Mk/bsd.java.mk')
| -rw-r--r-- | Mk/bsd.java.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 99c53a7b190f..a49adc0f23cb 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -25,7 +25,7 @@ Java_Include_MAINTAINER= glewis@FreeBSD.org hq@FreeBSD.org # # JAVA_VERSION List of space-separated suitable java versions for the # port. An optional "+" allows you to specify a range of -# versions. (allowed values: 1.6[+] 1.7[+]) +# versions. (allowed values: 1.5[+] 1.6[+] 1.7[+]) # # JAVA_OS List of space-separated suitable JDK port operating systems # for the port. (allowed values: native linux) @@ -156,7 +156,7 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}" . endif # The complete list of Java versions, os and vendors supported. -__JAVA_VERSION_LIST= 1.6 1.7 +__JAVA_VERSION_LIST= 1.5 1.6 1.7 _JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} _JAVA_OS_LIST= native linux _JAVA_VENDOR_LIST= sun openjdk @@ -252,7 +252,7 @@ JAVA_RUN= jre . undef _JAVA_PORTS_INSTALLED . undef _JAVA_PORTS_POSSIBLE . if defined(JAVA_VERSION) -_JAVA_VERSION= ${JAVA_VERSION:S/1.6+/1.6 1.7+/:S/1.7+/1.7/} +_JAVA_VERSION= ${JAVA_VERSION:S/1.5/1.6/:S/1.5+/1.6+/:S/1.6+/1.6 1.7+/:S/1.7+/1.7/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif |