diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2008-08-18 15:42:41 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2008-08-18 15:42:41 +0000 |
| commit | 8edf38e1e74c6f03451b98353bb7aef1d2e5be80 (patch) | |
| tree | a1d359a1c4e224fd9dfaf39d1ffbd11b5e12eecc /Mk | |
| parent | 3b5949bbb7270844d586681ccde5c6d8db9d717e (diff) | |
| download | ports-8edf38e1e74c6f03451b98353bb7aef1d2e5be80.tar.gz ports-8edf38e1e74c6f03451b98353bb7aef1d2e5be80.zip | |
Notes
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.java.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 8b88d70038a0..df9ef05dd346 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -169,6 +169,8 @@ _JAVA_VENDOR_LIST= freebsd bsdjava sun blackdown # Set all meta-information about JDK ports: # port location, corresponding JAVA_HOME, JDK version, OS, vendor +_JAVA_PORT_NATIVE_FREEBSD_JDK_1_6_INFO= PORT=java/diablo-jdk16 HOME=${LOCALBASE}/diablo-jdk1.6.0 \ + VERSION=1.6.0 OS=native VENDOR=freebsd _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_BSDJAVA_JDK_1_3_INFO= PORT=java/jdk13 HOME=${LOCALBASE}/jdk1.3.1 \ @@ -201,15 +203,15 @@ _JAVA_OS_native= Native _JAVA_OS_linux= Linux # Enforce preferred Java ports according to OS -. if (${ARCH} == "amd64" && ${OSVERSION} >= 600000 && ${OSVERSION} < 700000) || \ - (${ARCH} == "i386" && ${OSVERSION} < 700000) -_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 +. if (${OSVERSION} >= 600000 && ${OSVERSION} < 800000) +_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_FREEBSD_JDK_1_6 . else -_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 +_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 . endif # List all JDK ports -__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 \ +__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_FREEBSD_JDK_1_6 \ + JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 \ |