sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-01 02:46:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

. Prefer diablo-jdk15 on 5.x/i386, 6.x/i386 and 6.x/amd64 and jdk15

Browse source 
everywhere else.

Reviewed by:	hq
Suggested by:	kris
This commit is contained in:
Greg Lewis 2006-09-14 19:54:46 +00:00
parent 9630b17f2d
commit 54ac1f4039
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=173079
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mk/bsd.java.mk
View file

@ -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