summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2004-12-05 07:06:33 +0000
committerGreg Lewis <glewis@FreeBSD.org>2004-12-05 07:06:33 +0000
commit47777f27c3932f0970a27e3ed083a72c8f01b7d3 (patch)
tree67fb51e659f36c5c9a5e6f634429d2ad21c251f3 /Mk
parentWith portmgr hat on, reset maintainership of ports whose committer has (diff)
. Default 4.x to jdk14 as the Diablo JDK has been marked FORBIDDEN.
Notes
Notes: svn path=/head/; revision=123199
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.java.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk
index dccdc3b71345..139705c90c44 100644
--- a/Mk/bsd.java.mk
+++ b/Mk/bsd.java.mk
@@ -202,10 +202,8 @@ _JAVA_OS_native= Native
_JAVA_OS_linux= Linux
# Enforce preferred Java ports according to OS
-. if ${OSVERSION} >= 500000
+. if ${OSVERSION} >= 400000
_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4
-. elif ${OSVERSION} >= 400000
-_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_FREEBSD_JDK_1_3
. else
_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1
. endif