From 94e7c2f71a461186e86fdd684dfbac8fbf977a11 Mon Sep 17 00:00:00 2001
From: glewis <glewis@FreeBSD.org>
Date: Sat, 23 Jul 2005 07:02:22 +0000
Subject: . Default to using jbootstrap as the bootstrap, not
 linux-blackdown-jdk13.

PR:		83758
---
 java/jdk13/Makefile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'java/jdk13')

diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile
index dd289fa..e74d24c 100644
--- a/java/jdk13/Makefile
+++ b/java/jdk13/Makefile
@@ -112,19 +112,17 @@ LD_LIBRARY_PATH_FILES=	../src/solaris/javavm/runtime/javai_md.c \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500000 && !exists(${PREFIX}/jdk${JDK_VERSION}/bin/javac)
-WITH_LINUX_BOOTSTRAP=yes
-.endif
-
 .if !defined(JDK13DIR)
 .if defined(WITH_LINUX_BOOTSTRAP)
 JDK13DIR=	${LOCALBASE}/linux-blackdown-jdk${JDK_VERSION}
 BUILD_DEPENDS+=	${JDK13DIR}/bin/javac:${PORTSDIR}/java/linux-blackdown-jdk13
-.elif exists(${PREFIX}/jdk${JDK_VERSION}/bin/javac)
+.elif exists(${LOCALBASE}/jdk${JDK_VERSION}/bin/javac)
 JDK13DIR=	${LOCALBASE}/jdk${JDK_VERSION}
-.else
+.elif exists(${LOCALBASE}/diablo-jdk${JDK_VERSION}/bin/javac)
 JDK13DIR=	${LOCALBASE}/diablo-jdk${JDK_VERSION}
-BUILD_DEPENDS+=	${JDK13DIR}/bin/javac:${PORTSDIR}/java/diablo-jdk13
+.else
+JDK13DIR=	${LOCALBASE}/jbootstrap
+BUILD_DEPENDS+=	${JDK13DIR}/bin/javac:${PORTSDIR}/java/jbootstrap
 .endif
 .endif
 
-- 
cgit v1.1