svn commit: r306656 - head/java/openjdk7

[Greg Lewis]

Author: glewis
Date: Tue Oct 30 02:15:40 2012
New Revision: 306656
URL: http://svn.freebsd.org/changeset/ports/306656

Log:
  . Remove bootstrap-openjdk as a potential bootstrap.  It cannot compile
    openjdk7 at the moment.  Instead to default to openjdk6 as the bootstrap
    if nothing is already installed.
  
  Reported by:	olgeni@
  Feature safe:	yes

Modified:
  head/java/openjdk7/Makefile

Modified: head/java/openjdk7/Makefile
==============================================================================
--- head/java/openjdk7/Makefile	Tue Oct 30 02:03:29 2012	(r306655)
+++ head/java/openjdk7/Makefile	Tue Oct 30 02:15:40 2012	(r306656)
@@ -107,8 +107,7 @@ MAKE_ENV+=	HOTSPOT_BUILD_JOBS=${BUILD_JO
 .endif
 
 BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk7 \
-		${LOCALBASE}/openjdk6 \
-		${LOCALBASE}/bootstrap-openjdk
+		${LOCALBASE}/openjdk6
 
 .include <bsd.port.options.mk>
 
@@ -125,8 +124,8 @@ BOOTSTRAPJDKDIR=	${BJDK}
 
 # if no valid jdk found, set dependency
 .if !defined(BOOTSTRAPJDKDIR)
-BOOTSTRAPJDKDIR?=	${LOCALBASE}/bootstrap-openjdk
-BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/bootstrap-openjdk
+BOOTSTRAPJDKDIR?=	${LOCALBASE}/openjdk6
+BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/openjdk6
 .endif
 
 post-patch: