aboutsummaryrefslogtreecommitdiffstats
path: root/Mk/bsd.java.mk
diff options
context:
space:
mode:
authorglewis <glewis@FreeBSD.org>2012-02-07 12:04:12 +0800
committerglewis <glewis@FreeBSD.org>2012-02-07 12:04:12 +0800
commitb8401953d63f1597b7a1e63e4f7957fdca820612 (patch)
tree40061871ef15c6414b9ae9ecd7bfe4df6b45b6bd /Mk/bsd.java.mk
parent8a1ebf29c46de694ee2b7fe86300a526c8d242db (diff)
downloadfreebsd-ports-gnome-b8401953d63f1597b7a1e63e4f7957fdca820612.tar.gz
freebsd-ports-gnome-b8401953d63f1597b7a1e63e4f7957fdca820612.tar.zst
freebsd-ports-gnome-b8401953d63f1597b7a1e63e4f7957fdca820612.zip
. Make the openjdk6 port the preferred JDK by default.
Many thanks to erwin@ for a -exp run.
Diffstat (limited to 'Mk/bsd.java.mk')
-rw-r--r--Mk/bsd.java.mk6
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 \