From owner-cvs-all@FreeBSD.ORG  Wed Apr 12 08:49:17 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: 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 6697A16A400;
	Wed, 12 Apr 2006 08:49:17 +0000 (UTC) (envelope-from vs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 21C4243D45;
	Wed, 12 Apr 2006 08:49:17 +0000 (GMT) (envelope-from vs@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 k3C8nGkg069077;
	Wed, 12 Apr 2006 08:49:16 GMT (envelope-from vs@repoman.freebsd.org)
Received: (from vs@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3C8nGR2069076;
	Wed, 12 Apr 2006 08:49:16 GMT (envelope-from vs)
Message-Id: <200604120849.k3C8nGR2069076@repoman.freebsd.org>
From: Volker Stolz <vs@FreeBSD.org>
Date: Wed, 12 Apr 2006 08:49:16 +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/lang/linux-j Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 12 Apr 2006 08:49:17 -0000

vs          2006-04-12 08:49:16 UTC

  FreeBSD ports repository

  Modified files:
    lang/linux-j         Makefile 
  Log:
  Band aid: bin/jconsole CONFLICTS with recently released diablo-jdk-1.5.0
  
  Revision  Changes    Path
  1.14      +2 -0      ports/lang/linux-j/Makefile