From 54ac1f403937abf45e22141e384df55b63f7a40a Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Thu, 14 Sep 2006 19:54:46 +0000
Subject: [PATCH] . Prefer diablo-jdk15 on 5.x/i386, 6.x/i386 and 6.x/amd64 and
 jdk15   everywhere else.

Reviewed by:	hq
Suggested by:	kris
---
 Mk/bsd.java.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk
index acc848b195c9..95e1b9f8fd71 100644
--- a/Mk/bsd.java.mk
+++ b/Mk/bsd.java.mk
@@ -216,9 +216,8 @@ _JAVA_OS_native=	Native
 _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
+.		if (${ARCH} == "amd64" && ${OSVERSION} >= 600000 && ${OSVERSION} < 700000) || \
+		   (${ARCH} == "i386" && ${OSVERSION} >= 500000 && ${OSVERSION} < 700000)
 _JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_FREEBSD_JDK_1_5
 .		else
 _JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5