From owner-svn-ports-head@freebsd.org  Thu Sep 28 20:14:22 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 85BADE08120;
 Thu, 28 Sep 2017 20:14:22 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 54B5B6C8AB;
 Thu, 28 Sep 2017 20:14:22 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8SKELLq034831;
 Thu, 28 Sep 2017 20:14:21 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8SKELYh034830;
 Thu, 28 Sep 2017 20:14:21 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201709282014.v8SKELYh034830@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jkim set sender to
 jkim@FreeBSD.org using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 28 Sep 2017 20:14:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r450869 - head/java/openjdk8
X-SVN-Group: ports-head
X-SVN-Commit-Author: jkim
X-SVN-Commit-Paths: head/java/openjdk8
X-SVN-Commit-Revision: 450869
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Sep 2017 20:14:22 -0000

Author: jkim
Date: Thu Sep 28 20:14:21 2017
New Revision: 450869
URL: https://svnweb.freebsd.org/changeset/ports/450869

Log:
  Use java/bootstrap-openjdk8 to bootstrap.

Modified:
  head/java/openjdk8/Makefile

Modified: head/java/openjdk8/Makefile
==============================================================================
--- head/java/openjdk8/Makefile	Thu Sep 28 20:12:51 2017	(r450868)
+++ head/java/openjdk8/Makefile	Thu Sep 28 20:14:21 2017	(r450869)
@@ -315,6 +315,23 @@ TOOLS_DIR+=	${${t}:S|/${BUILD_${t}}$||}
 CONFIGURE_ARGS+=	--with-tools-dir="${TOOLS_DIR:u:S/ /:/g}"
 .endif
 
+BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk8 \
+		${LOCALBASE}/openjdk7 \
+		${LOCALBASE}/bootstrap-openjdk8
+
+# do we have valid native jdk installed?
+.for BJDK in ${BOOTSTRAP_JDKS}
+.  if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac)
+BOOTSTRAPJDKDIR=	${BJDK}
+.  endif
+.endfor
+
+# if no valid jdk found, set dependency
+.if !defined(BOOTSTRAPJDKDIR)
+BOOTSTRAPJDKDIR?=	${LOCALBASE}/bootstrap-openjdk8
+BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk8
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386
@@ -328,31 +345,6 @@ JDK_BUILD_JVM=	server
 .else
 JDK_BUILD_JVM=	zero
 LIB_DEPENDS+=	libffi.so:devel/libffi
-.endif
-
-BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk8 \
-		${LOCALBASE}/openjdk7
-.if ${ARCH} == armv6 || ${ARCH} == armv7
-BOOTSTRAP_JDKS+=	${LOCALBASE}/bootstrap-openjdk
-.endif
-
-# do we have valid native jdk installed?
-.for BJDK in ${BOOTSTRAP_JDKS}
-.  if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac)
-BOOTSTRAPJDKDIR=	${BJDK}
-.  endif
-.endfor
-
-# if no valid jdk found, set dependency
-.if !defined(BOOTSTRAPJDKDIR)
-.  if ${ARCH} == armv6 || ${ARCH} == armv7
-# bootstrap-openjdk is based on openjdk7 and can compile openjdk8
-BOOTSTRAPJDKDIR?=	${LOCALBASE}/bootstrap-openjdk
-BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk
-.  else
-BOOTSTRAPJDKDIR?=	${LOCALBASE}/openjdk7
-BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk7
-.  endif
 .endif
 
 .if ${COMPILER_TYPE} == clang