diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2006-04-07 03:32:48 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2006-04-07 03:32:48 +0000 |
| commit | 6ccf25eab4af51bbca26f3920bebef9cb34f8b5c (patch) | |
| tree | 3f3ebdd10c4c158f9add2426cbfbcb5e9accbdfa /Mk/bsd.java.mk | |
| parent | . Update to 1.5.0 patchset 3. (diff) | |
. Add an entry for the new Diablo Caffe (JDK) 1.5.0 binary.
. Make Diablo Caffe 1.5.0 the default JDK for all the versions/architecture
that its available for.
. Make the standard jdk15 the default on FreeBSD 4.x as this should now be
stable with the release of patchset 3.
Reviewed by: hq
Notes
Notes:
svn path=/head/; revision=158994
Diffstat (limited to 'Mk/bsd.java.mk')
| -rw-r--r-- | Mk/bsd.java.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 114a8a6047f4..d5eaac45f5ba 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -175,6 +175,8 @@ _JAVA_VENDOR_LIST= freebsd bsdjava sun blackdown ibm # Set all meta-information about JDK ports: # port location, corresponding JAVA_HOME, JDK version, OS, vendor +_JAVA_PORT_NATIVE_FREEBSD_JDK_1_5_INFO= PORT=java/diablo-jdk15 HOME=${LOCALBASE}/diablo-jdk1.5.0 \ + VERSION=1.5.0 OS=native VENDOR=freebsd _JAVA_PORT_NATIVE_FREEBSD_JDK_1_3_INFO= PORT=java/diablo-jdk13 HOME=${LOCALBASE}/diablo-jdk1.3.1 \ VERSION=1.3.1 OS=native VENDOR=freebsd _JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1_INFO= PORT=java/jdk11 HOME=${LOCALBASE}/jdk1.1.8 \ @@ -218,12 +220,15 @@ _JAVA_OS_linux= Linux # Enforce preferred Java ports according to OS . if ${ARCH} == "amd64" _JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 +. elif ${OSVERSION} >= 500000 +_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 . else -_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 +_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 . endif # List all JDK ports -__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \ +__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 \ + JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3 \ JAVA_PORT_NATIVE_FREEBSD_JDK_1_3 \ |