From owner-cvs-all@FreeBSD.ORG  Mon Jan 12 05:58:27 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 8EADA16A4CE; Mon, 12 Jan 2004 05:58:27 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id DB36243D31; Mon, 12 Jan 2004 05:58:26 -0800 (PST)
	(envelope-from krion@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 i0CDwQ0B062919;
	Mon, 12 Jan 2004 05:58:26 -0800 (PST)
	(envelope-from krion@repoman.freebsd.org)
Received: (from krion@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0CDwQWr062918;
	Mon, 12 Jan 2004 05:58:26 -0800 (PST)
	(envelope-from krion)
Message-Id: <200401121358.i0CDwQWr062918@repoman.freebsd.org>
From: Kirill Ponomarew <krion@FreeBSD.org>
Date: Mon, 12 Jan 2004 05:58:26 -0800 (PST)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/misc/display 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, 12 Jan 2004 13:58:27 -0000

krion       2004/01/12 05:58:26 PST

  FreeBSD ports repository

  Modified files:
    misc/display         Makefile 
  Log:
  - Utilize CONFLICTS
  
  PR:             61247
  Submitted by:   Ports Fury
  
  Revision  Changes    Path
  1.16      +4 -2      ports/misc/display/Makefile