From owner-cvs-all@FreeBSD.ORG  Thu Oct  5 18:53:46 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 E303F16A417;
	Thu,  5 Oct 2006 18:53:46 +0000 (UTC)
	(envelope-from bsam@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2FF9843D70;
	Thu,  5 Oct 2006 18:53:44 +0000 (GMT)
	(envelope-from bsam@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k95IriIl025689;
	Thu, 5 Oct 2006 18:53:44 GMT (envelope-from bsam@repoman.freebsd.org)
Received: (from bsam@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k95IriuM025687;
	Thu, 5 Oct 2006 18:53:44 GMT (envelope-from bsam)
Message-Id: <200610051853.k95IriuM025687@repoman.freebsd.org>
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Thu, 5 Oct 2006 18:53:43 +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/emulators/linux_base-fc4 Makefile
 ports/emulators/linux_base-suse-9.1
 Makefile ports/emulators/linux_base-suse-9.2 Makefile
 ports/emulators/linux_base-suse-9.3 Makefile
 ports/emulators/linux_dist-gentoo-stage1
 Makefile ports/emulators/linux_dist-gentoo-stage2 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: Thu, 05 Oct 2006 18:53:47 -0000

bsam        2006-10-05 18:53:43 UTC

  FreeBSD ports repository

  Modified files:
    emulators/linux_base-fc4 Makefile 
    emulators/linux_base-suse-9.1 Makefile 
    emulators/linux_base-suse-9.2 Makefile 
    emulators/linux_base-suse-9.3 Makefile 
    emulators/linux_dist-gentoo-stage1 Makefile 
    emulators/linux_dist-gentoo-stage2 Makefile 
    emulators/linux_dist-gentoo-stage3 Makefile 
    x11/linux-XFree86-libs Makefile 
  Log:
  Revert back previous commit of removing deleted ports from
  CONFLICTS variable. Give happy users just another chance to
  update their systems.
  
  Pointed out by:         infofarmer, kris
  
  Revision  Changes    Path
  1.22      +3 -1      ports/emulators/linux_base-fc4/Makefile
  1.103     +2 -1      ports/emulators/linux_base-suse-9.1/Makefile
  1.101     +2 -1      ports/emulators/linux_base-suse-9.2/Makefile
  1.102     +2 -1      ports/emulators/linux_base-suse-9.3/Makefile
  1.36      +3 -1      ports/emulators/linux_dist-gentoo-stage1/Makefile
  1.7       +3 -1      ports/emulators/linux_dist-gentoo-stage2/Makefile
  1.7       +3 -1      ports/emulators/linux_dist-gentoo-stage3/Makefile
  1.26      +1 -1      ports/x11/linux-XFree86-libs/Makefile