Date: Tue, 11 Dec 2012 05:11:45 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308661 - head/Mk Message-ID: <201212110511.qBB5BjI8004015@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Tue Dec 11 05:11:45 2012 New Revision: 308661 URL: http://svnweb.freebsd.org/changeset/ports/308661 Log: . 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. Modified: head/Mk/bsd.java.mk (contents, props changed) Modified: head/Mk/bsd.java.mk ============================================================================== --- head/Mk/bsd.java.mk Tue Dec 11 04:59:56 2012 (r308660) +++ head/Mk/bsd.java.mk Tue Dec 11 05:11:45 2012 (r308661) @@ -25,7 +25,7 @@ Java_Include_MAINTAINER= glewis@FreeBSD. # # 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212110511.qBB5BjI8004015>