From owner-cvs-all@FreeBSD.ORG  Tue Dec 21 19:49:43 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 ACE3C16A4CE; Tue, 21 Dec 2004 19:49:43 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 81DC943D54; Tue, 21 Dec 2004 19:49:43 +0000 (GMT)
	(envelope-from trevor@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 iBLJnhv4073226;
	Tue, 21 Dec 2004 19:49:43 GMT
	(envelope-from trevor@repoman.freebsd.org)
Received: (from trevor@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBLJnh4K073225;
	Tue, 21 Dec 2004 19:49:43 GMT
	(envelope-from trevor)
Message-Id: <200412211949.iBLJnh4K073225@repoman.freebsd.org>
From: Trevor Johnson <trevor@FreeBSD.org>
Date: Tue, 21 Dec 2004 19:49:43 +0000 (UTC)
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 Makefile
 ports/emulators/linux_base-debian 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: Tue, 21 Dec 2004 19:49:43 -0000

trevor      2004-12-21 19:49:43 UTC

  FreeBSD ports repository

  Modified files:
    emulators/linux_base-6 Makefile 
    emulators/linux_base-8 Makefile 
    emulators/linux_base Makefile 
    emulators/linux_base-debian Makefile 
  Log:
  Update CONFLICTS.
  
  PR:             75283
  Submitted by:   linimon
  
  Revision  Changes    Path
  1.78      +2 -1      ports/emulators/linux_base-6/Makefile
  1.92      +2 -1      ports/emulators/linux_base-8/Makefile
  1.13      +2 -1      ports/emulators/linux_base-debian/Makefile
  1.89      +2 -1      ports/emulators/linux_base/Makefile