diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2012-02-07 04:04:12 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2012-02-07 04:04:12 +0000 |
| commit | 10581660264e4aeb1825b07ccafe908c62a543c9 (patch) | |
| tree | 6b1f49a2b9ef9a21dd9f5ba7fcaa022dc99d99ed /Mk | |
| parent | . Update to 2.3_4. (diff) | |
. Make the openjdk6 port the preferred JDK by default.
Many thanks to erwin@ for a -exp run.
Notes
Notes:
svn path=/head/; revision=290539
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.java.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index ca8b3d7c045c..c9206b736778 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -191,11 +191,7 @@ _JAVA_OS_native= Native _JAVA_OS_linux= Linux # Enforce preferred Java ports according to OS -. if ${OSVERSION} < 800000 -_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_FREEBSD_JDK_1_6 -. else -_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 -. endif +_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 # List all JDK ports __JAVA_PORTS_ALL= JAVA_PORT_NATIVE_FREEBSD_JDK_1_6 \ |