From 08d5c4f240805c8d1b768e84e0df9b7a5da2d552 Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Mon, 21 Jul 2003 17:21:49 +0000 Subject: . Switch to using the appropriate Blackdown JDK for bootstrapping since it doesn't require user intervention to download and install. PR: 30576 --- java/jdk12/Makefile | 4 ++-- java/jdk13/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/jdk12/Makefile b/java/jdk12/Makefile index 5def629433c3..f46d3bd1162b 100644 --- a/java/jdk12/Makefile +++ b/java/jdk12/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ ${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-sun-jdk12 +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 @@ -40,7 +40,7 @@ JFC11DIR?= ${WRKDIRPREFIX}${.CURDIR}/../../java/jfc/work/swing-1.1.1fcs .if defined(NATIVE_BOOTSTRAP) JDK12DIR?= ${LOCALBASE}/jdk${JDK_VERSION} .else -JDK12DIR?= ${LOCALBASE}/linux-sun-jdk${JDK_VERSION} +JDK12DIR?= ${LOCALBASE}/linux-blackdown-jdk${JDK_VERSION} .endif ONLY_FOR_ARCHS= i386 diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile index ae038b9994d5..6f2b150ce7f2 100644 --- a/java/jdk13/Makefile +++ b/java/jdk13/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ zip:${PORTSDIR}/archivers/zip \ ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif .if !defined(NATIVE_BOOTSTRAP) -BUILD_DEPENDS+= ${JDK13DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk13 +BUILD_DEPENDS+= ${JDK13DIR}/bin/javac:${PORTSDIR}/java/linux-blackdown-jdk13 .endif .if !defined(WITHOUT_PLUGIN) BUILD_DEPENDS+= msgfmt:${PORTSDIR}/devel/gettext @@ -52,7 +52,7 @@ JDK_PATCHSET_VERSION= 8 .if defined(NATIVE_BOOTSTRAP) JDK13DIR?= ${LOCALBASE}/jdk${JDK_VERSION} .else -JDK13DIR?= ${LOCALBASE}/linux-sun-jdk${JDK_VERSION} +JDK13DIR?= ${LOCALBASE}/linux-blackdown-jdk${JDK_VERSION} .endif ONLY_FOR_ARCHS= i386 -- cgit v1.2.3