From owner-cvs-all@FreeBSD.ORG  Sun Dec 14 23:04:51 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 5F8E716A4CE; Sun, 14 Dec 2003 23:04:51 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 8EDB143D32; Sun, 14 Dec 2003 23:04:50 -0800 (PST)
	(envelope-from znerd@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBF74oXJ068611;
	Sun, 14 Dec 2003 23:04:50 -0800 (PST)
	(envelope-from znerd@repoman.freebsd.org)
Received: (from znerd@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBF74owK068610;
	Sun, 14 Dec 2003 23:04:50 -0800 (PST)
	(envelope-from znerd)
Message-Id: <200312150704.hBF74owK068610@repoman.freebsd.org>
From: Ernst de Haan <znerd@FreeBSD.org>
Date: Sun, 14 Dec 2003 23:04:50 -0800 (PST)
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-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Dec 2003 07:04:51 -0000

znerd       2003/12/14 23:04:50 PST

  FreeBSD ports repository

  Modified files:
    Mk                   bsd.java.mk 
  Log:
  Fixed bug. If a Linux 1.4 JDK would have been installed, it
  would not have been picked up if USE_JAVA was set to "1.3+".
  
  The behaviour is now as follows if USE_JAVA is set to
  "1.3+":
  - If the setting is 1.3+, then use an already installed 1.3
    or 1.4 JDK. If there is no such JDK, then set USE_JAVA to
    1.3. The FreeBSD JDK 1.4 is preferred over all other
    JDK's.
  
  Noticed by:     pav
  
  Revision  Changes    Path
  1.36      +8 -5      ports/Mk/bsd.java.mk