From owner-cvs-ports@FreeBSD.ORG  Mon Nov 29 17:33:42 2004
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 862B016A4CE; Mon, 29 Nov 2004 17:33:42 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 77EE543D48; Mon, 29 Nov 2004 17:33:42 +0000 (GMT)
	(envelope-from hq@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iATHXgGI018295;
	Mon, 29 Nov 2004 17:33:42 GMT
	(envelope-from hq@repoman.freebsd.org)
Received: (from hq@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iATHXg4C018294;
	Mon, 29 Nov 2004 17:33:42 GMT
	(envelope-from hq)
Message-Id: <200411291733.iATHXg4C018294@repoman.freebsd.org>
From: Herve Quiroz <hq@FreeBSD.org>
Date: Mon, 29 Nov 2004 17:33:42 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/Mk bsd.java.mk
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Nov 2004 17:33:42 -0000

hq          2004-11-29 17:33:42 UTC

  FreeBSD ports repository

  Modified files:
    Mk                   bsd.java.mk 
  Log:
  When USE_ANT is defined, JAVA_BUILD is automatically set to 'jdk' but this
  conflicts with the default values for JAVA_BUILD and JAVA_RUN. Those variables
  are indeed set a default value when none of the them (together with
  JAVA_EXTRACT) is defined. Having USE_ANT set a value for JAVA_BUILD will cause
  JAVA_RUN not to be set its default value.
  
  This has RUN_DEPENDS not correctly set (missing the JDK entry) on many ports
  that use USE_ANT.
  
  This patch addresses this issue by moving the statements dealing with default
  values to have them executed before USE_ANT handling.
  
  Approved by:    glewis (co-maintainer)
  
  Revision  Changes    Path
  1.59      +11 -9     ports/Mk/bsd.java.mk