From owner-cvs-all@FreeBSD.ORG  Thu Feb  5 15:19:57 2004
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 8C88116A4F7; Thu,  5 Feb 2004 15:19:57 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 93F4F43D55; Thu,  5 Feb 2004 15:19:55 -0800 (PST)
	(envelope-from trevor@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i15NJt0B083452;
	Thu, 5 Feb 2004 15:19:55 -0800 (PST)
	(envelope-from trevor@repoman.freebsd.org)
Received: (from trevor@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i15NJt6D083451;
	Thu, 5 Feb 2004 15:19:55 -0800 (PST)
	(envelope-from trevor)
Message-Id: <200402052319.i15NJt6D083451@repoman.freebsd.org>
From: Trevor Johnson <trevor@FreeBSD.org>
Date: Thu, 5 Feb 2004 15:19:55 -0800 (PST)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/emulators/linux_base-6 Makefile
 ports/emulators/linux_base-8
 Makefile ports/emulators/linux_base-debian Makefile
 ports/emulators/linux_base         Makefile
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: Thu, 05 Feb 2004 23:19:57 -0000

trevor      2004/02/05 15:19:55 PST

  FreeBSD ports repository

  Modified files:
    emulators/linux_base-6 Makefile 
    emulators/linux_base-8 Makefile 
    emulators/linux_base-debian Makefile 
    emulators/linux_base-gentoo-stage1 Makefile 
    emulators/linux_base Makefile 
  Log:
  Fix CONFLICTS lines, as requested by eik then petef:
  
          I think it's a bug that linux_base thinks it conflicts with itself.
  
  --petef
  
          The problem occurs if you do
            make install; make install FORCE_PKG_REGISTER=yes
          which is somewhat supported, although [seldom] (never?) used.
  
  --eik
  
  Also record conflicts with cle_base.
  
  Revision  Changes    Path
  1.76      +1 -1      ports/emulators/linux_base-6/Makefile
  1.86      +1 -1      ports/emulators/linux_base-8/Makefile
  1.6       +1 -1      ports/emulators/linux_base-debian/Makefile
  1.5       +1 -1      ports/emulators/linux_base-gentoo-stage1/Makefile
  1.83      +1 -1      ports/emulators/linux_base/Makefile