java/155967: javavm wrapper insists on diablo

[Achilleas Mantzios]

>Number:         155967
>Category:       java
>Synopsis:       javavm wrapper insists on diablo
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-java
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 27 09:10:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Achilleas Mantzios
>Release:        8.2-RELEASE
>Organization:
home
>Environment:
FreeBSD panix.internal.net 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Wed Mar 23 13:27:15 EET 2011     doroot at panix.internal.net:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
Javavm wrapper relies on /usr/ports/Mk/bsd.java.mk to decide on the java vm to use. It seems that /usr/ports/Mk/bsd.java.mk prefers diablo over the openjdk port.
>How-To-Repeat:
Just try to install openjdk. diablo 1.6 will be installed as a build dependency, openjdk will be installed after, and the system will default to diablo, whereas the user's intention was to use openjdk.
>Fix:
apply the following patch to /usr/ports/Mk/bsd.java.mk

*** bsd.java.mk.orig	2011-03-27 08:33:34.000000000 +0300
--- bsd.java.mk	2011-03-27 08:42:33.000000000 +0300
***************
*** 212,217 ****
--- 212,219 ----
  # Enforce preferred Java ports according to OS
  .		if (${OSVERSION} >= 600000 && ${OSVERSION} < 800000)
  _JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_FREEBSD_JDK_1_6
+ .		else if (${OSVERSION} >= 800000)
+ _JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_OPENJDK_JDK_1_6
  .		else
  _JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6
  .		endif

>Release-Note:
>Audit-Trail:
>Unformatted: