From owner-cvs-all@FreeBSD.ORG  Sun Nov 30 21:29:54 2003
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 1657116A4CE; Sun, 30 Nov 2003 21:29:54 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 6895943FB1; Sun, 30 Nov 2003 21:29:53 -0800 (PST)
	(envelope-from marcus@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB15TrXJ099025;
	Sun, 30 Nov 2003 21:29:53 -0800 (PST)
	(envelope-from marcus@repoman.freebsd.org)
Received: (from marcus@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB15TrPg099024;
	Sun, 30 Nov 2003 21:29:53 -0800 (PST)
	(envelope-from marcus)
Message-Id: <200312010529.hB15TrPg099024@repoman.freebsd.org>
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Sun, 30 Nov 2003 21:29:53 -0800 (PST)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/x11/gnome2 Makefile ports/x11/gnome2-lite
 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: Mon, 01 Dec 2003 05:29:54 -0000

marcus      2003/11/30 21:29:53 PST

  FreeBSD ports repository

  Modified files:
    x11/gnome2           Makefile 
    x11/gnome2-lite      Makefile 
  Log:
  Add CONFLICTS for each other.
  
  Revision  Changes    Path
  1.2       +2 -0      ports/x11/gnome2-lite/Makefile
  1.74      +2 -0      ports/x11/gnome2/Makefile