From owner-cvs-all@FreeBSD.ORG  Sat Aug 21 04:54:30 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 9C6F016A4CE; Sat, 21 Aug 2004 04:54:30 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 7E96D43D1F; Sat, 21 Aug 2004 04:54:30 +0000 (GMT)
	(envelope-from lesi@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7L4sULH054700;
	Sat, 21 Aug 2004 04:54:30 GMT
	(envelope-from lesi@repoman.freebsd.org)
Received: (from lesi@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7L4sUba054699;
	Sat, 21 Aug 2004 04:54:30 GMT
	(envelope-from lesi)
Message-Id: <200408210454.i7L4sUba054699@repoman.freebsd.org>
From: Dejan Lesjak <lesi@FreeBSD.org>
Date: Sat, 21 Aug 2004 04:54:30 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/graphics/xpm 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: Sat, 21 Aug 2004 04:54:30 -0000

lesi        2004-08-21 04:54:30 UTC

  FreeBSD ports repository

  Modified files:
    graphics/xpm         Makefile 
  Log:
  Add conflicts to XFree86- and xorg- libraries, as they already include
  this library.
  
  Noticed by:     David Julien (david dot julien at gmail dot com)
  PR:             ports/70004
  Approved by:    anholt (mentor)
  
  Revision  Changes    Path
  1.40      +2 -0      ports/graphics/xpm/Makefile