From b8401953d63f1597b7a1e63e4f7957fdca820612 Mon Sep 17 00:00:00 2001
From: glewis <glewis@FreeBSD.org>
Date: Tue, 7 Feb 2012 04:04:12 +0000
Subject: . Make the openjdk6 port the preferred JDK by default.

  Many thanks to erwin@ for a -exp run.
---
 Mk/bsd.java.mk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'Mk/bsd.java.mk')

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 \
-- 
cgit