From owner-cvs-all@FreeBSD.ORG  Fri Apr 13 04:03:42 2012
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A2A99106564A;
	Fri, 13 Apr 2012 04:03:42 +0000 (UTC)
	(envelope-from glewis@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 763F68FC08;
	Fri, 13 Apr 2012 04:03:42 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id q3D43g1h015508;
	Fri, 13 Apr 2012 04:03:42 GMT
	(envelope-from glewis@repoman.freebsd.org)
Received: (from glewis@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q3D43gVN015507;
	Fri, 13 Apr 2012 04:03:42 GMT (envelope-from glewis)
Message-Id: <201204130403.q3D43gVN015507@repoman.freebsd.org>
From: Greg Lewis <glewis@FreeBSD.org>
Date: Fri, 13 Apr 2012 04:03:42 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/Mk bsd.java.mk
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** 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: Fri, 13 Apr 2012 04:03:42 -0000

glewis      2012-04-13 04:03:42 UTC

  FreeBSD ports repository

  Modified files:
    Mk                   bsd.java.mk 
  Log:
  . Instead of bailing when we hit a possibly conflicting variable being
    defined just clear it and issue a warning that it was set.
  
  PR:             165115
  Approved by:    hq@ (co-maintainer)
  
  Revision  Changes    Path
  1.93      +3 -3      ports/Mk/bsd.java.mk