From 41a19263c65382d2fd9e9d8287621e014e8ca97d Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Sat, 2 Aug 2003 17:30:13 +0000
Subject: [PATCH] . Autodetect a previous jdk13 install and use that to
 bootstrap by   default if it exists.  This can be overidden either using
 JDK13DIR   or setting WITH_LINUX_BOOTSTRAP.

PR:		52195
---
 java/jdk12/Makefile | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/java/jdk12/Makefile b/java/jdk12/Makefile
index f46d3bd1162b..c7995a9f5fd9 100644
--- a/java/jdk12/Makefile
+++ b/java/jdk12/Makefile
@@ -21,9 +21,6 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		zip:${PORTSDIR}/archivers/zip \
 		${JDK11DIR}/bin/javac:${PORTSDIR}/java/jdk11 \
 		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
-.if !defined(NATIVE_BOOTSTRAP)
-BUILD_DEPENDS+=	${JDK12DIR}/bin/javac:${PORTSDIR}/java/linux-blackdown-jdk12
-.endif
 PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/java/jfc:extract
 LIB_DEPENDS=	odbc.1:${PORTSDIR}/databases/unixODBC
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
@@ -37,11 +34,6 @@ JDK_PATCHSET_VERSION=	11
 
 JDK11DIR?=	${LOCALBASE}/jdk1.1.8
 JFC11DIR?=	${WRKDIRPREFIX}${.CURDIR}/../../java/jfc/work/swing-1.1.1fcs
-.if defined(NATIVE_BOOTSTRAP)
-JDK12DIR?=      ${LOCALBASE}/jdk${JDK_VERSION}
-.else
-JDK12DIR?=	${LOCALBASE}/linux-blackdown-jdk${JDK_VERSION}
-.endif
 
 ONLY_FOR_ARCHS=	i386
 USE_GMAKE=	yes
@@ -76,6 +68,15 @@ PLIST_SUB+=	DEBUG:=""
 
 .include <bsd.port.pre.mk>
 
+.if !defined(JDK12DIR)
+.if defined(WITH_LINUX_BOOTSTRAP) || !exists(${PREFIX}/jdk${JDK_VERSION}/bin/javac)
+JDK12DIR=	${LOCALBASE}/linux-blackdown-jdk${JDK_VERSION}
+BUILD_DEPENDS+=	${JDK12DIR}/bin/javac:${PORTSDIR}/java/linux-blackdown-jdk12
+.else
+JDK12DIR=	${LOCALBASE}/jdk${JDK_VERSION}
+.endif
+.endif
+
 # Check for patchset
 .if !exists(${DISTDIR}/${PATCHSETFILE}) && !defined(PACKAGE_BUILDING)
 ECHO_MSG=/usr/bin/printf
@@ -114,7 +115,8 @@ pre-patch:
 	@${MKDIR} ${WRKSRC}/1.1_libs
 	@${CP} ${JFC11DIR}/*.jar ${WRKSRC}/1.1_libs
 
-.if !defined(NATIVE_BOOTSTRAP)
+.if defined(WITH_LINUX_BOOTSTRAP) || !exists(${PREFIX}/jdk${JDK_VERSION}/bin/javac)
+# Some checks for bootstrapping with a Linux JDK
 pre-build:
 	@if [ "$${WRKDIRPREFIX}" -a \
 	     -L "/compat/linux/$${WRKDIRPREFIX}" -a \