From owner-freebsd-ports@FreeBSD.ORG  Tue Aug  7 20:12:31 2007
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D9F6516A417;
	Tue,  7 Aug 2007 20:12:31 +0000 (UTC)
	(envelope-from fbsd06@mlists.homeunix.com)
Received: from turtle-out.mxes.net (turtle-out.mxes.net [216.86.168.191])
	by mx1.freebsd.org (Postfix) with ESMTP id B9FA213C459;
	Tue,  7 Aug 2007 20:12:31 +0000 (UTC)
	(envelope-from fbsd06@mlists.homeunix.com)
Received: from mxout-03.mxes.net (mxout-03.mxes.net [216.86.168.178])
	by turtle-in.mxes.net (Postfix) with ESMTP id 89FCD1056E;
	Tue,  7 Aug 2007 15:51:42 -0400 (EDT)
Received: from gumby.homeunix.com. (unknown [87.81.140.128])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.mxes.net (Postfix) with ESMTP id C7A9751910;
	Tue,  7 Aug 2007 15:51:40 -0400 (EDT)
Date: Tue, 7 Aug 2007 20:51:38 +0100
From: RW <fbsd06@mlists.homeunix.com>
To: ports@FreeBSD.org
Message-ID: <20070807205138.6c5759d6@gumby.homeunix.com.>
X-Mailer: Claws Mail 2.10.0 (GTK+ 2.10.14; i386-portbld-freebsd6.2)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: glewis@FreeBSD.org, Doug Barton <dougb@FreeBSD.org>
Subject: Portmaster and Portmanager problem with jdk15
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Aug 2007 20:12:31 -0000

Both Portmaster and Portmanager (I haven't tried Portupgrade) install
java/linux-sun-jdk15 on an upgrade of java/jdk15. If I upgrade
jdk15 manually it isn't built, so it must be done by the tools.

The way the jdk15 makefile works is that it looks for the location
of an existing jdk installation for bootstrapping and sets
BOOTSTRAPJDKDIR accordingly. We then have:

# if no valid jdk found, set dependency
.if !defined(BOOTSTRAPJDKDIR)
BOOTSTRAPJDKDIR?=${LOCALBASE}/linux-sun-jdk${SUN_LINUX_JDK_VERSION} 
.endif
BUILD_DEPENDS+=${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk15


I don't know why this causes the build-tools to install
linux-sun-jdk15, but simply moving the BUILD_DEPENDS+= line inside the
if-endif block, seems to fix the problem. That line is only needed if
no jdk is present.